Skip to content

Commit 6d5a3d4

Browse files
authored
Merge branch 'Development' into 550-error-when-trying-to-invert-search
2 parents d8d1781 + e0fef89 commit 6d5a3d4

3 files changed

Lines changed: 24 additions & 19 deletions

File tree

src/LogExpert.Core/Classes/Columnizer/ColumnizerPicker.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static ILogLineMemoryColumnizer DecideMemoryColumnizerByName (string name
6363
/// Creates a new instance of the specified columnizer type and loads its configuration from the given directory.
6464
/// </summary>
6565
/// <remarks>The method requires that the columnizer type has a public parameterless constructor. If the
66-
/// type implements IColumnizerConfigurator, its configuration is loaded from the specified directory. If these
66+
/// type implements IColumnizerConfiguratorMemory, its configuration is loaded from the specified directory. If these
6767
/// conditions are not met, the method returns null.</remarks>
6868
/// <param name="columnizer">The columnizer instance whose type will be cloned. If null, the method returns null.</param>
6969
/// <param name="directory">The directory path from which to load the configuration for the new columnizer instance.</param>
@@ -82,7 +82,7 @@ public static ILogLineMemoryColumnizer CloneMemoryColumnizer (ILogLineMemoryColu
8282
{
8383
var o = cti.Invoke([]);
8484

85-
if (o is IColumnizerConfigurator configurator)
85+
if (o is IColumnizerConfiguratorMemory configurator)
8686
{
8787
configurator.LoadConfig(directory);
8888
}

src/PluginRegistry/PluginHashGenerator.Generated.cs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,36 @@ public static partial class PluginValidator
1010
{
1111
/// <summary>
1212
/// Gets pre-calculated SHA256 hashes for built-in plugins.
13-
/// Generated: 2026-03-21 14:00:02 UTC
13+
/// Generated: 2026-03-21 13:53:09 UTC
1414
/// Configuration: Release
1515
/// Plugin count: 22
1616
/// </summary>
1717
public static Dictionary<string, string> GetBuiltInPluginHashes()
1818
{
1919
return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
2020
{
21-
["AutoColumnizer.dll"] = "79A8DDA2A50EC4BBC11BA939D2CC15B30E610AFE278C997BDCE3459386A50DD9",
21+
["AutoColumnizer.dll"] = "4FE61EAD71582B2DA5AF277765DF038DF478981B7B4AF2E9042572BDBD34AE0E",
2222
["BouncyCastle.Cryptography.dll"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
2323
["BouncyCastle.Cryptography.dll (x86)"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
24-
["CsvColumnizer.dll"] = "389426400E50895AB96D0CE0C607C2C944B86833627330F2A509A3A2961A5E61",
25-
["CsvColumnizer.dll (x86)"] = "389426400E50895AB96D0CE0C607C2C944B86833627330F2A509A3A2961A5E61",
26-
["DefaultPlugins.dll"] = "4350362CD7F3C764C413EAED4C6CC6FF9C545604FBEFB9558835B6BA1F34744F",
27-
["FlashIconHighlighter.dll"] = "B2276EADEB5C79E2215987839A41ED0F69B1EFD174944B723BB140101A863757",
28-
["GlassfishColumnizer.dll"] = "AB9F2EB6EA24DCB855B94A7A177B8878C951910B90F097E338D370C8998F6A85",
29-
["JsonColumnizer.dll"] = "4B2D17C4F6FA51C6D285EA53A646C9F41561B58BA32A6DA8E26A71A68D7996FA",
30-
["JsonCompactColumnizer.dll"] = "E27961FA5279C36143F7A48ADF47EDF3817BD5A9BAF392CB55FBE002FF44EF86",
31-
["Log4jXmlColumnizer.dll"] = "B5AC7D05808AE2BE04276E41F6ED59FDB9E21C580CEE1A9D386C9B5F26C918C9",
32-
["LogExpert.Core.dll"] = "2ECDB578584EF7EDA19B64923B0C4A722E51AE1E6B558465A0C73A55A07F3F36",
33-
["LogExpert.Resources.dll"] = "CEB97D76874EFEB2FE95459259ED7208612A6AF9F501337621EA07E0BEA2E88B",
24+
["CsvColumnizer.dll"] = "B0E95C447A04CFFC3C2FF031BE748522F1E115BCD739EA38AB197FA4C6B28901",
25+
["CsvColumnizer.dll (x86)"] = "B0E95C447A04CFFC3C2FF031BE748522F1E115BCD739EA38AB197FA4C6B28901",
26+
["DefaultPlugins.dll"] = "8B791276C41B91E10A2366806C44ED07A1517157850F5249F358B31AB127E383",
27+
["FlashIconHighlighter.dll"] = "80780C3C018F6776871FDD34D76863ED94C64BDBFED465600D08C8628A068079",
28+
["GlassfishColumnizer.dll"] = "6312E000AED78957FBDDC5447899953FC070E181AA1F1352413902EEBB66530C",
29+
["JsonColumnizer.dll"] = "D9C8783D5ABE712363C00F6B803B36E8E11E7A04BE36E2D78AA057F9E4E9309C",
30+
["JsonCompactColumnizer.dll"] = "17533C027EBCC0CEA3E86EED698A5FDEE30BADA5DE32647852224E4259288637",
31+
["Log4jXmlColumnizer.dll"] = "98FC61F54854E833F2EB77472C9E6796DC6C77BBEE2DA80F84646CD544A4EC6A",
32+
["LogExpert.Core.dll"] = "599781A63BD8D8F335BAE5FD2D9C90751DFF5947B9EE87AC56240CBB71BD1265",
33+
["LogExpert.Resources.dll"] = "6969D29C0F13C41334B0442AB1FB6ACF6F793E065FF831175BF11C1ABAE32C75",
3434
["Microsoft.Extensions.DependencyInjection.Abstractions.dll"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93",
3535
["Microsoft.Extensions.DependencyInjection.Abstractions.dll (x86)"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93",
3636
["Microsoft.Extensions.Logging.Abstractions.dll"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D",
3737
["Microsoft.Extensions.Logging.Abstractions.dll (x86)"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D",
38-
["RegexColumnizer.dll"] = "4E9AE1EA493CDEFD9688AF0BB62712B011100A93A9437CB684922FC89216E045",
39-
["SftpFileSystem.dll"] = "B16327C3320CCC66C83C56AAFB9A97899FDB6ACA0F3BCCD9825387C95B9DFF44",
40-
["SftpFileSystem.dll (x86)"] = "0FE4E409607D74F80853E827AFD295567BCA78A03398DD6BCCFEE32C66780240",
41-
["SftpFileSystem.Resources.dll"] = "50530CD7A94D12ADE4DB0DB4DF9B09B8F92CA3BD65F1B823B7391EB088C69D88",
42-
["SftpFileSystem.Resources.dll (x86)"] = "50530CD7A94D12ADE4DB0DB4DF9B09B8F92CA3BD65F1B823B7391EB088C69D88",
38+
["RegexColumnizer.dll"] = "1FC232254A2328EF8BDB489BE8A098928833436CB8F21284FAD4F38A9021A5F9",
39+
["SftpFileSystem.dll"] = "48DAF44CF3C9F797E18D0E9ACA0AD69258CE1284530DF12B05DBA746A66E8F87",
40+
["SftpFileSystem.dll (x86)"] = "EE429E8EE1113652183B0F049E1DBCF1E3ADF1464DF7B5CE6397FA740699EA1E",
41+
["SftpFileSystem.Resources.dll"] = "B886F8CD8199F50729F763F5B55D05D9F080F8D3AA2ABB05B525BEA03140B3F0",
42+
["SftpFileSystem.Resources.dll (x86)"] = "B886F8CD8199F50729F763F5B55D05D9F080F8D3AA2ABB05B525BEA03140B3F0",
4343

4444
};
4545
}

src/RegexColumnizer/RegexColumnizer.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,11 @@ public void Configure (ILogLineMemoryColumnizerCallback callback, string configD
429429

430430
string filePath = Path.Join(configDir, $"{name}Columnizer.json");
431431

432+
_config ??= new RegexColumnizerConfig
433+
{
434+
Name = GetName()
435+
};
436+
432437
RegexColumnizerConfigDialog dlg = new(_config);
433438
if (dlg.ShowDialog() == DialogResult.OK)
434439
{

0 commit comments

Comments
 (0)