Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/ColumnizerLib/ILogLineColumnizerCallback.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#pragma warning disable IDE0040

namespace LogExpert;

///<summary>
Expand Down
22 changes: 8 additions & 14 deletions src/LogExpert.Core/Classes/Bookmark/BookmarkDataProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,11 @@ public BookmarkDataProvider (SortedList<int, Entities.Bookmark> bookmarkList)

#endregion

#region Delegates

public delegate void AllBookmarksRemovedEventHandler (object sender, EventArgs e);

public delegate void BookmarkAddedEventHandler (object sender, EventArgs e);

public delegate void BookmarkRemovedEventHandler (object sender, EventArgs e);

#endregion

#region Events

public event BookmarkAddedEventHandler BookmarkAdded;
public event BookmarkRemovedEventHandler BookmarkRemoved;
public event AllBookmarksRemovedEventHandler AllBookmarksRemoved;
public event EventHandler<EventArgs> BookmarkAdded;
public event EventHandler<EventArgs> BookmarkRemoved;
public event EventHandler<EventArgs> AllBookmarksRemoved;

#endregion

Expand Down Expand Up @@ -141,8 +131,10 @@ public void RemoveBookmarkForLine (int lineNum)
OnBookmarkRemoved();
}

public void RemoveBookmarksForLines (List<int> lineNumList)
public void RemoveBookmarksForLines (IEnumerable<int> lineNumList)
{
ArgumentNullException.ThrowIfNull(lineNumList);

foreach (var lineNum in lineNumList)
{
_ = BookmarkList.Remove(lineNum);
Expand All @@ -155,6 +147,8 @@ public void RemoveBookmarksForLines (List<int> lineNumList)

public void AddBookmark (Entities.Bookmark bookmark)
{
ArgumentNullException.ThrowIfNull(bookmark);

BookmarkList.Add(bookmark.LineNum, bookmark);
OnBookmarkAdded();
}
Expand Down
1 change: 1 addition & 0 deletions src/LogExpert.Core/Classes/Bookmark/BookmarkExporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public static class BookmarkExporter
public static void ExportBookmarkList (SortedList<int, Entities.Bookmark> bookmarkList, string logfileName,
string fileName)
{
ArgumentNullException.ThrowIfNull(bookmarkList);
FileStream fs = new(fileName, FileMode.Create, FileAccess.Write);
StreamWriter writer = new(fs);
writer.WriteLine("Log file name;Line number;Comment");
Expand Down
6 changes: 3 additions & 3 deletions src/LogExpert.Core/Classes/Columnizer/ColumnizerPicker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,15 @@ public static ILogLineColumnizer FindBetterColumnizer (string fileName,
/// <param name="fileName"></param>
/// <param name="logFileReader"></param>
/// <returns></returns>
public static ILogLineColumnizer FindColumnizer (string fileName, IAutoLogLineColumnizerCallback logFileReader, IList<ILogLineColumnizer> list)
public static ILogLineColumnizer FindColumnizer (string fileName, IAutoLogLineColumnizerCallback logFileReader, IList<ILogLineColumnizer> registeredColumnizer)
{
if (string.IsNullOrEmpty(fileName))
{
return new DefaultLogfileColumnizer();
}

ArgumentNullException.ThrowIfNull(registeredColumnizer);

List<ILogLine> loglines = [];

if (logFileReader != null)
Expand All @@ -120,8 +122,6 @@ public static ILogLineColumnizer FindColumnizer (string fileName, IAutoLogLineCo
];
}

var registeredColumnizer = list;

List<Tuple<Priority, ILogLineColumnizer>> priorityListOfColumnizers = [];

foreach (ILogLineColumnizer logLineColumnizer in registeredColumnizer)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Globalization;
using System.Text.RegularExpressions;

using static LogExpert.Core.Classes.Columnizer.TimeFormatDeterminer;
Expand Down Expand Up @@ -142,13 +143,13 @@ public string[] GetColumnNames ()
var i = 1;
while (columnNames.Count < GetColumnCount())
{
columnNames.Insert(columnNames.Count - 1, "Source" + i++.ToString());
columnNames.Insert(columnNames.Count - 1, $"Source{i++.ToString(CultureInfo.InvariantCulture)}");
}

return columnNames.ToArray();
}

public IColumnizedLogLine SplitLine (LogExpert.ILogLineColumnizerCallback callback, ILogLine line)
public IColumnizedLogLine SplitLine (ILogLineColumnizerCallback callback, ILogLine line)
{
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
// 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
Expand Down
34 changes: 29 additions & 5 deletions src/LogExpert.Core/Classes/Filter/FilterPipe.cs
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
using System.Text;

using LogExpert.Core.Interface;

using NLog;

namespace LogExpert.Core.Classes.Filter;

public class FilterPipe
public class FilterPipe : IDisposable
{
#region Fields

private static readonly Logger _logger = LogManager.GetCurrentClassLogger();

private IList<int> _lineMappingList = [];
private List<int> _lineMappingList = [];
private StreamWriter _writer;
private readonly object _fileNameLock = new();
private bool _disposed;

#endregion

#region cTor

public FilterPipe (FilterParams filterParams, ILogWindow logWindow)
public FilterPipe(FilterParams filterParams, ILogWindow logWindow)
{
FilterParams = filterParams;
LogWindow = logWindow;
IsStopped = false;
FileName = Path.GetTempFileName();
_disposed = false;

_logger.Info($"Created temp file: {FileName}");
}
Expand Down Expand Up @@ -191,5 +191,29 @@ private void OnClosed ()
Closed?.Invoke(this, EventArgs.Empty);
}

public void Dispose ()
{
Dispose(true);
GC.SuppressFinalize(this);
}

protected virtual void Dispose (bool disposing)
{
if (!_disposed)
{
if (disposing)
{
_writer?.Dispose();
}
_disposed = true;
}
}

~FilterPipe ()
{
Dispose(false);
}


#endregion
}
1 change: 1 addition & 0 deletions src/LogExpert.Core/Interface/IBookmarkData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace LogExpert.Core.Interface;

#pragma warning disable IDE0040
public interface IBookmarkData
{
#region Properties
Expand Down
Loading