Skip to content

Commit b5caaab

Browse files
authored
Merge pull request #548 from LogExperts/545-display-issues-with-csv-columnizer
545 display issues with csv columnizer
2 parents 166679c + 248c896 commit b5caaab

149 files changed

Lines changed: 632 additions & 1209 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build/_build.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net10.0</TargetFramework>
66
<RootNamespace></RootNamespace>
77
<IsPackable>False</IsPackable>
8-
<NoWarn>CS0649;CS0169</NoWarn>
8+
<NoWarn>CS0649;CS0169;CS9107</NoWarn>
99
<NukeTelemetryVersion>1</NukeTelemetryVersion>
1010
</PropertyGroup>
1111

src/AutoColumnizer/AutoColumnizer.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace AutoColumnizer;
44

5-
public class AutoColumnizer : ILogLineColumnizer
5+
public class AutoColumnizer : ILogLineMemoryColumnizer
66
{
77
#region ILogLineColumnizer implementation
88

@@ -28,7 +28,6 @@ public string GetDescription ()
2828
return "Automatically find the right columnizer for any file";
2929
}
3030

31-
3231
public int GetColumnCount ()
3332
{
3433
throw new NotImplementedException();
@@ -39,7 +38,7 @@ public string[] GetColumnNames ()
3938
throw new NotImplementedException();
4039
}
4140

42-
public IColumnizedLogLine SplitLine (ILogLineColumnizerCallback callback, ILogLine line)
41+
public IColumnizedLogLineMemory SplitLine (ILogLineMemoryColumnizerCallback callback, ILogLineMemory logLine)
4342
{
4443
throw new NotImplementedException();
4544
}
@@ -54,12 +53,12 @@ public int GetTimeOffset ()
5453
throw new NotImplementedException();
5554
}
5655

57-
public DateTime GetTimestamp (ILogLineColumnizerCallback callback, ILogLine line)
56+
public DateTime GetTimestamp (ILogLineMemoryColumnizerCallback callback, ILogLineMemory logLine)
5857
{
5958
throw new NotImplementedException();
6059
}
6160

62-
public void PushValue (ILogLineColumnizerCallback callback, int column, string value, string oldValue)
61+
public void PushValue (ILogLineMemoryColumnizerCallback callback, int column, string value, string oldValue)
6362
{
6463
}
6564

src/AutoColumnizer/AutoColumnizer.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
<AssemblyTitle>AutoColumnizer</AssemblyTitle>
66
<OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
7+
<RootNamespace>AutoColumnizer</RootNamespace>
78
</PropertyGroup>
89

910
<ItemGroup>

src/ColumnizerLib.UnitTests/Extensions/LogLineExtensionsTests.cs

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/ColumnizerLib/Column.cs

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -41,34 +41,6 @@ static Column ()
4141

4242
public static IColumnMemory EmptyColumn { get; }
4343

44-
[Obsolete]
45-
IColumnizedLogLine IColumn.Parent { get; }
46-
47-
[Obsolete]
48-
string IColumn.FullValue
49-
{
50-
get;
51-
//set
52-
//{
53-
// field = value;
54-
55-
// var temp = FullValue.ToString();
56-
57-
// foreach (var replacement in _replacements)
58-
// {
59-
// temp = replacement(temp);
60-
// }
61-
62-
// DisplayValue = temp.AsMemory();
63-
//}
64-
}
65-
66-
[Obsolete("Use the DisplayValue property of IColumnMemory")]
67-
string IColumn.DisplayValue { get; }
68-
69-
[Obsolete("Use Text property of ITextValueMemory")]
70-
string ITextValue.Text => DisplayValue.ToString();
71-
7244
public IColumnizedLogLineMemory Parent
7345
{
7446
get; set => field = value;

src/ColumnizerLib/ColumnizedLogLine.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ public class ColumnizedLogLine : IColumnizedLogLineMemory
44
{
55
#region Properties
66

7-
[Obsolete("Use the Property of IColumnizedLogLineMemory")]
8-
ILogLine IColumnizedLogLine.LogLine { get; }
9-
10-
[Obsolete("Use the Property of IColumnizedLogLineMemory")]
11-
IColumn[] IColumnizedLogLine.ColumnValues { get; }
12-
137
public ILogLineMemory LogLine { get; set; }
148

159
public IColumnMemory[] ColumnValues { get; set; }

src/ColumnizerLib/Extensions/Extensions.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
namespace ColumnizerLib.Extensions;
22

3-
[System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1708:Identifiers should differ by more than case", Justification = "Intentionally")]
43
[System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "Intentionally")]
54
public static class Extensions
65
{
7-
extension(ILogLine logLine)
8-
{
9-
public string ToClipBoardText () => logLine == null ? string.Empty : $"\t{logLine.LineNumber + 1}\t{logLine.FullLine}";
10-
}
11-
126
extension(ILogLineMemory logLine)
137
{
148
public string ToClipBoardText () => logLine == null ? string.Empty : $"\t{logLine.LineNumber + 1}\t{logLine.FullLine}";

src/ColumnizerLib/IAutoLogLineColumnizerCallback.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
namespace ColumnizerLib;
22

3+
[Obsolete("This interface is deprecated. Use IAutoLogLineMemoryColumnizerCallback for a memory-based implementation instead.")]
34
public interface IAutoLogLineColumnizerCallback
45
{
56
/// <summary>

src/ColumnizerLib/IAutoLogLineMemoryColumnizerCallback.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace ColumnizerLib;
22

3-
public interface IAutoLogLineMemoryColumnizerCallback : IAutoLogLineColumnizerCallback
3+
public interface IAutoLogLineMemoryColumnizerCallback
44
{
55
/// <summary>
66
/// Returns the log line with the given index (zero-based).

src/ColumnizerLib/IColumn.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
namespace ColumnizerLib;
22

3+
[Obsolete("This interface is deprecated. Use IColumnMemory for a memory-based implementation instead.")]
34
public interface IColumn : ITextValue
45
{
56
#region Properties

0 commit comments

Comments
 (0)