Skip to content

Commit 3d5cff8

Browse files
HirogenHirogen
authored
Merge pull request #440 from LogExperts/379-not-able-to-open-a-sftp-url
ssh works again, removed no longer used files
2 parents c030448 + 130492a commit 3d5cff8

24 files changed

Lines changed: 163 additions & 960 deletions

‎src/LogExpert.Core/Classes/Log/LogfileReader.cs‎

Lines changed: 62 additions & 62 deletions
Large diffs are not rendered by default.

‎src/LogExpert.Core/Classes/Log/RolloverFilenameBuilder.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using System;
21
using System.Globalization;
32
using System.Text;
43
using System.Text.RegularExpressions;
@@ -83,11 +82,13 @@ public void SetFileName (string fileName)
8382
{
8483
}
8584
}
85+
8686
_indexGroup = match.Groups["index"];
8787
if (_indexGroup.Success)
8888
{
8989
Index = _indexGroup.Value.Length > 0 ? int.Parse(_indexGroup.Value) : 0;
9090
}
91+
9192
_condGroup = match.Groups["cond"];
9293
}
9394
}

‎src/LogExpert.Core/Interface/IConfigManager.cs‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using LogExpert.Core.Config;
1+
using LogExpert.Core.Config;
22
using LogExpert.Core.EventArguments;
33

44
namespace LogExpert.Core.Interface;
@@ -7,14 +7,24 @@ namespace LogExpert.Core.Interface;
77
public interface IConfigManager
88
{
99
Settings Settings { get; }
10+
1011
string PortableModeDir { get; }
12+
1113
string ConfigDir { get; }
14+
1215
IConfigManager Instance { get; }
16+
1317
string PortableModeSettingsFileName { get; }
14-
void Export(FileInfo fileInfo, SettingsFlags highlightSettings);
15-
void Export(FileInfo fileInfo);
16-
void Import(FileInfo fileInfo, ExportImportFlags importFlags);
17-
void ImportHighlightSettings(FileInfo fileInfo, ExportImportFlags importFlags);
18+
19+
void Export (FileInfo fileInfo, SettingsFlags highlightSettings);
20+
21+
void Export (FileInfo fileInfo);
22+
23+
void Import (FileInfo fileInfo, ExportImportFlags importFlags);
24+
25+
void ImportHighlightSettings (FileInfo fileInfo, ExportImportFlags importFlags);
26+
1827
event EventHandler<ConfigChangedEventArgs> ConfigChanged; //TODO: All handlers that are public shoulld be in Core
19-
void Save(SettingsFlags flags);
28+
29+
void Save (SettingsFlags flags);
2030
}

‎src/LogExpert.Tests/BufferShiftTest.cs‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using System.Collections.Generic;
2-
using System.Linq;
31
using System.Text;
42

53
using LogExpert.Core.Classes.Log;
@@ -35,7 +33,9 @@ public void TestShiftBuffers1 ()
3533
MaxDayTry = 0,
3634
FormatPattern = "*$J(.)"
3735
};
36+
3837
LinkedList<string> files = CreateTestFilesWithoutDate();
38+
3939
EncodingOptions encodingOptions = new()
4040
{
4141
Encoding = Encoding.Default
@@ -57,6 +57,7 @@ public void TestShiftBuffers1 ()
5757
Assert.That(li.FullName, Is.EqualTo(fileName));
5858
enumerator.MoveNext();
5959
}
60+
6061
var oldCount = lil.Count;
6162

6263
// Simulate rollover
@@ -68,6 +69,7 @@ public void TestShiftBuffers1 ()
6869
reader.ShiftBuffers();
6970

7071
lil = reader.GetLogFileInfoList();
72+
7173
Assert.That(lil.Count, Is.EqualTo(oldCount + 1));
7274

7375
Assert.That(reader.LineCount, Is.EqualTo(linesPerFile * lil.Count));
@@ -77,6 +79,7 @@ public void TestShiftBuffers1 ()
7779
Assert.That(lil.Count, Is.EqualTo(files.Count));
7880
enumerator = files.GetEnumerator();
7981
enumerator.MoveNext();
82+
8083
foreach (LogFileInfo li in lil)
8184
{
8285
var fileName = enumerator.Current;
@@ -89,8 +92,10 @@ public void TestShiftBuffers1 ()
8992
//
9093
enumerator = files.GetEnumerator();
9194
enumerator.MoveNext();
95+
9296
IList<LogBuffer> logBuffers = reader.GetBufferList();
9397
var startLine = 0;
98+
9499
foreach (LogBuffer logBuffer in logBuffers)
95100
{
96101
Assert.That(enumerator.Current, Is.EqualTo(logBuffer.FileInfo.FullName));
@@ -106,20 +111,22 @@ public void TestShiftBuffers1 ()
106111
enumerator.MoveNext(); // move to 2nd entry. The first file now contains 2nd file's content (because rollover)
107112
logBuffers = reader.GetBufferList();
108113
int i;
114+
109115
for (i = 0; i < logBuffers.Count - 2; ++i)
110116
{
111117
LogBuffer logBuffer = logBuffers[i];
112118
ILogLine line = logBuffer.GetLineOfBlock(0);
113-
Assert.That(line.FullLine.Contains(enumerator.Current, System.StringComparison.Ordinal));
119+
Assert.That(line.FullLine.Contains(enumerator.Current, StringComparison.Ordinal));
114120
enumerator.MoveNext();
115121
}
122+
116123
enumerator.MoveNext();
117124
// the last 2 files now contain the content of the previously watched file
118125
for (; i < logBuffers.Count; ++i)
119126
{
120127
LogBuffer logBuffer = logBuffers[i];
121128
ILogLine line = logBuffer.GetLineOfBlock(0);
122-
Assert.That(line.FullLine.Contains(enumerator.Current, System.StringComparison.Ordinal));
129+
Assert.That(line.FullLine.Contains(enumerator.Current, StringComparison.Ordinal));
123130
}
124131

125132
oldCount = lil.Count;
@@ -142,6 +149,6 @@ public void TestShiftBuffers1 ()
142149
ILogLine firstLine = reader.GetLogLine(0);
143150
var names = new string[files.Count];
144151
files.CopyTo(names, 0);
145-
Assert.That(firstLine.FullLine.Contains(names[2], System.StringComparison.Ordinal));
152+
Assert.That(firstLine.FullLine.Contains(names[2], StringComparison.Ordinal));
146153
}
147154
}

‎src/LogExpert.Tests/CSVColumnizerTest.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
using LogExpert.Core.Classes.Log;
1+
using LogExpert.Core.Classes.Log;
22
using LogExpert.Core.Entities;
33

44
using NUnit.Framework;
55

6-
using System;
7-
using System.IO;
8-
96
namespace LogExpert.Tests;
107

118
[TestFixture]
@@ -14,11 +11,11 @@ public class CSVColumnizerTest
1411
[TestCase(@".\TestData\organizations-10000.csv", new[] { "Index", "Organization Id", "Name", "Website", "Country", "Description", "Founded", "Industry", "Number of employees" })]
1512
[TestCase(@".\TestData\organizations-1000.csv", new[] { "Index", "Organization Id", "Name", "Website", "Country", "Description", "Founded", "Industry", "Number of employees" })]
1613
[TestCase(@".\TestData\people-10000.csv", new[] { "Index", "User Id", "First Name", "Last Name", "Sex", "Email", "Phone", "Date of birth", "Job Title" })]
17-
public void Instantiat_CSVFile_BuildCorrectColumnizer(string filename, string[] expectedHeaders)
14+
public void Instantiat_CSVFile_BuildCorrectColumnizer (string filename, string[] expectedHeaders)
1815
{
1916
CsvColumnizer.CsvColumnizer csvColumnizer = new();
2017
var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, filename);
21-
LogfileReader reader = new(path, new EncodingOptions(), true, 40, 50, new MultiFileOptions(), PluginRegistry.PluginRegistry.Instance);
18+
LogfileReader reader = new(path, new EncodingOptions(), false, 40, 50, new MultiFileOptions(), PluginRegistry.PluginRegistry.Instance);
2219
reader.ReadFiles();
2320
ILogLine line = reader.GetLogLine(0);
2421
IColumnizedLogLine logline = new ColumnizedLogLine();

‎src/LogExpert.Tests/ColumnizerPickerTest.cs‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
using JsonColumnizer;
1+
using JsonColumnizer;
2+
23
using LogExpert.Core.Classes.Columnizer;
34
using LogExpert.Core.Classes.Log;
45
using LogExpert.Core.Entities;
6+
57
using Moq;
8+
69
using NUnit.Framework;
7-
using System;
8-
using System.IO;
910

1011
namespace LogExpert.Tests;
1112

@@ -19,7 +20,7 @@ public class ColumnizerPickerTest
1920
[TestCase("Square Bracket Columnizer", "30/08/2018 08:51:42.712 [TRACE] hello", "30/08/2018 08:51:42.712 [DATAIO][] world", null, null, null)]
2021
[TestCase("Square Bracket Columnizer", "", "30/08/2018 08:51:42.712 [TRACE] hello", "30/08/2018 08:51:42.712 [TRACE] hello", "[DATAIO][b][c] world", null)]
2122
[TestCase("Timestamp Columnizer", "30/08/2018 08:51:42.712 no bracket 1", "30/08/2018 08:51:42.712 no bracket 2", "30/08/2018 08:51:42.712 [TRACE] with bracket 1", "30/08/2018 08:51:42.712 [TRACE] with bracket 2", "no bracket 3")]
22-
public void FindColumnizer_ReturnCorrectColumnizer(string expectedColumnizerName, string line0, string line1, string line2, string line3, string line4)
23+
public void FindColumnizer_ReturnCorrectColumnizer (string expectedColumnizerName, string line0, string line1, string line2, string line3, string line4)
2324
{
2425
var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "test");
2526

@@ -62,11 +63,11 @@ public void FindColumnizer_ReturnCorrectColumnizer(string expectedColumnizerName
6263

6364
[TestCase(@".\TestData\JsonColumnizerTest_01.txt", typeof(JsonCompactColumnizer))]
6465
[TestCase(@".\TestData\SquareBracketColumnizerTest_02.txt", typeof(SquareBracketColumnizer))]
65-
public void FindReplacementForAutoColumnizer_ValidTextFile_ReturnCorrectColumnizer(
66+
public void FindReplacementForAutoColumnizer_ValidTextFile_ReturnCorrectColumnizer (
6667
string fileName, Type columnizerType)
6768
{
6869
var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, fileName);
69-
LogfileReader reader = new(path, new EncodingOptions(), true, 40, 50, new MultiFileOptions(), PluginRegistry.PluginRegistry.Instance);
70+
LogfileReader reader = new(path, new EncodingOptions(), false, 40, 50, new MultiFileOptions(), PluginRegistry.PluginRegistry.Instance);
7071
reader.ReadFiles();
7172

7273
Mock<ILogLineColumnizer> autoColumnizer = new();
@@ -80,7 +81,7 @@ public void FindReplacementForAutoColumnizer_ValidTextFile_ReturnCorrectColumniz
8081
}
8182

8283
[TestCase(@".\TestData\FileNotExists.txt", typeof(DefaultLogfileColumnizer))]
83-
public void DecideColumnizerByName_WhenReaderIsNotReady_ReturnCorrectColumnizer(
84+
public void DecideColumnizerByName_WhenReaderIsNotReady_ReturnCorrectColumnizer (
8485
string fileName, Type columnizerType)
8586
{
8687
var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, fileName);
@@ -94,7 +95,7 @@ public void DecideColumnizerByName_WhenReaderIsNotReady_ReturnCorrectColumnizer(
9495

9596
[TestCase(@"Invalid Name", typeof(DefaultLogfileColumnizer))]
9697
[TestCase(@"JSON Columnizer", typeof(JsonColumnizer.JsonColumnizer))]
97-
public void DecideColumnizerByName_ValidTextFile_ReturnCorrectColumnizer(
98+
public void DecideColumnizerByName_ValidTextFile_ReturnCorrectColumnizer (
9899
string columnizerName, Type columnizerType)
99100
{
100101
var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, columnizerName);

‎src/LogExpert.Tests/JsonColumnizerTest.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
1-
using LogExpert.Core.Classes.Log;
1+
using LogExpert.Core.Classes.Log;
22
using LogExpert.Core.Entities;
33

44
using NUnit.Framework;
55

6-
using System;
7-
using System.IO;
8-
96
namespace LogExpert.Tests;
107

118
[TestFixture]
129
public class JsonColumnizerTest
1310
{
1411
[TestCase(@".\TestData\JsonColumnizerTest_01.txt", "time @m level")]
15-
public void GetColumnNames_HappyFile_ColumnNameMatches(string fileName, string expectedHeaders)
12+
public void GetColumnNames_HappyFile_ColumnNameMatches (string fileName, string expectedHeaders)
1613
{
1714
var jsonColumnizer = new JsonColumnizer.JsonColumnizer();
1815
var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, fileName);
19-
LogfileReader reader = new(path, new EncodingOptions(), true, 40, 50, new MultiFileOptions(), PluginRegistry.PluginRegistry.Instance);
16+
LogfileReader reader = new(path, new EncodingOptions(), false, 40, 50, new MultiFileOptions(), PluginRegistry.PluginRegistry.Instance);
2017
reader.ReadFiles();
2118

2219
ILogLine line = reader.GetLogLine(0);

‎src/LogExpert.Tests/JsonCompactColumnizerTest.cs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
using LogExpert.Core.Classes.Log;
1+
using LogExpert.Core.Classes.Log;
22
using LogExpert.Core.Entities;
33

44
using NUnit.Framework;
55

6-
using System;
7-
using System.Collections.Generic;
8-
using System.IO;
9-
106
namespace LogExpert.Tests;
117

128
[TestFixture]
@@ -16,11 +12,11 @@ public class JsonCompactColumnizerTest
1612
// As long as the json file contains one of the pre-defined key, it's perfectly supported.
1713
[TestCase(@".\TestData\JsonCompactColumnizerTest_02.json", Priority.PerfectlySupport)]
1814
[TestCase(@".\TestData\JsonCompactColumnizerTest_03.json", Priority.WellSupport)]
19-
public void GetPriority_HappyFile_PriorityMatches(string fileName, Priority priority)
15+
public void GetPriority_HappyFile_PriorityMatches (string fileName, Priority priority)
2016
{
2117
var jsonCompactColumnizer = new JsonColumnizer.JsonCompactColumnizer();
2218
var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, fileName);
23-
LogfileReader logFileReader = new(path, new EncodingOptions(), true, 40, 50, new MultiFileOptions(), PluginRegistry.PluginRegistry.Instance);
19+
LogfileReader logFileReader = new(path, new EncodingOptions(), false, 40, 50, new MultiFileOptions(), PluginRegistry.PluginRegistry.Instance);
2420
logFileReader.ReadFiles();
2521
List<ILogLine> loglines = new()
2622
{

‎src/LogExpert.Tests/RolloverHandlerTestBase.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.IO;
4-
51
using LogExpert.Core.Classes.Log;
62

73
namespace LogExpert.Tests;
@@ -60,6 +56,7 @@ protected LinkedList<string> RolloverSimulation (LinkedList<string> files, strin
6056
LinkedList<string>.Enumerator nextEnumerator = fileList.GetEnumerator();
6157
nextEnumerator.MoveNext(); // move on 2nd entry
6258
enumerator.MoveNext();
59+
6360
while (nextEnumerator.MoveNext())
6461
{
6562
File.Move(nextEnumerator.Current, enumerator.Current);
@@ -98,7 +95,7 @@ protected string CreateFile (DirectoryInfo dInfo, string fileName)
9895
{
9996
for (var i = 1; i <= lineCount; ++i)
10097
{
101-
writer.WriteLine("Line number " + i.ToString("D3") + " of File " + fullName);
98+
writer.WriteLine($"Line number {i:D3} of File {fullName}");
10299
}
103100

104101
writer.Flush();

‎src/LogExpert.Tests/SquareBracketColumnizerTest.cs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
using LogExpert.Core.Classes.Columnizer;
1+
using LogExpert.Core.Classes.Columnizer;
22
using LogExpert.Core.Classes.Log;
33
using LogExpert.Core.Entities;
44

55
using NUnit.Framework;
66

7-
using System;
8-
using System.Collections.Generic;
9-
using System.IO;
10-
117
namespace LogExpert.Tests;
128

139
[TestFixture]
@@ -17,12 +13,12 @@ public class SquareBracketColumnizerTest
1713
[TestCase(@".\TestData\SquareBracketColumnizerTest_02.txt", 5)]
1814
[TestCase(@".\TestData\SquareBracketColumnizerTest_03.txt", 6)]
1915
[TestCase(@".\TestData\SquareBracketColumnizerTest_05.txt", 3)]
20-
public void GetPriority_HappyFile_ColumnCountMatches(string fileName, int count)
16+
public void GetPriority_HappyFile_ColumnCountMatches (string fileName, int count)
2117
{
2218
SquareBracketColumnizer squareBracketColumnizer = new();
2319
var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, fileName);
2420

25-
LogfileReader logFileReader = new(path, new EncodingOptions(), true, 40, 50, new MultiFileOptions(), PluginRegistry.PluginRegistry.Instance);
21+
LogfileReader logFileReader = new(path, new EncodingOptions(), false, 40, 50, new MultiFileOptions(), PluginRegistry.PluginRegistry.Instance);
2622
logFileReader.ReadFiles();
2723
List<ILogLine> loglines = new()
2824
{

0 commit comments

Comments
 (0)