more log fixes

This commit is contained in:
Matt Parker
2025-10-24 19:57:45 +10:00
parent c174bc09da
commit 700e8758c7

View File

@@ -1,16 +1,19 @@
using FileWatcherEx; using FileWatcherEx;
using Microsoft.Extensions.FileSystemGlobbing; using Microsoft.Extensions.FileSystemGlobbing;
using Microsoft.Extensions.Logging;
using SharpIDE.Application.Features.Events; using SharpIDE.Application.Features.Events;
using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence; using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
namespace SharpIDE.Application.Features.FileWatching; namespace SharpIDE.Application.Features.FileWatching;
public sealed class IdeFileWatcher : IDisposable public sealed class IdeFileWatcher(ILogger<IdeFileWatcher> logger) : IDisposable
{ {
private Matcher? _matcher; private Matcher? _matcher;
private FileSystemWatcherEx? _fileWatcher; private FileSystemWatcherEx? _fileWatcher;
private SharpIdeSolutionModel? _solution; private SharpIdeSolutionModel? _solution;
private readonly ILogger<IdeFileWatcher> _logger = logger;
public void StartWatching(SharpIdeSolutionModel solution) public void StartWatching(SharpIdeSolutionModel solution)
{ {
_solution = solution; _solution = solution;
@@ -72,7 +75,7 @@ public sealed class IdeFileWatcher : IDisposable
{ {
GlobalEvents.Instance.FileSystemWatcherInternal.FileRenamed.InvokeParallelFireAndForget(oldFullPath, fullPath); GlobalEvents.Instance.FileSystemWatcherInternal.FileRenamed.InvokeParallelFireAndForget(oldFullPath, fullPath);
} }
//Console.WriteLine($"FileSystemWatcher: Renamed - {oldFullPath}, {fullPath}"); _logger.LogTrace("FileSystemWatcher: Renamed - {OldFullPath} -> {FullPath}", oldFullPath, fullPath);
} }
private void HandleDeleted(string fullPath) private void HandleDeleted(string fullPath)
@@ -86,7 +89,7 @@ public sealed class IdeFileWatcher : IDisposable
{ {
GlobalEvents.Instance.FileSystemWatcherInternal.FileDeleted.InvokeParallelFireAndForget(fullPath); GlobalEvents.Instance.FileSystemWatcherInternal.FileDeleted.InvokeParallelFireAndForget(fullPath);
} }
//Console.WriteLine($"FileSystemWatcher: Deleted - {fullPath}"); _logger.LogTrace("FileSystemWatcher: Deleted - {FullPath}", fullPath);
} }
private void HandleCreated(string fullPath) private void HandleCreated(string fullPath)
@@ -100,7 +103,7 @@ public sealed class IdeFileWatcher : IDisposable
{ {
GlobalEvents.Instance.FileSystemWatcherInternal.FileCreated.InvokeParallelFireAndForget(fullPath); GlobalEvents.Instance.FileSystemWatcherInternal.FileCreated.InvokeParallelFireAndForget(fullPath);
} }
//Console.WriteLine($"FileSystemWatcher: Created - {fullPath}"); _logger.LogTrace("FileSystemWatcher: Created - {FullPath}", fullPath);
} }
// The only changed event we care about is files, not directories // The only changed event we care about is files, not directories
@@ -110,7 +113,7 @@ public sealed class IdeFileWatcher : IDisposable
private void HandleChanged(string fullPath) private void HandleChanged(string fullPath)
{ {
if (Path.HasExtension(fullPath) is false) return; // we don't care about directory changes if (Path.HasExtension(fullPath) is false) return; // we don't care about directory changes
//Console.WriteLine($"FileSystemWatcher: Changed - {fullPath}"); _logger.LogTrace("FileSystemWatcher: Changed - {FullPath}", fullPath);
GlobalEvents.Instance.FileSystemWatcherInternal.FileChanged.InvokeParallelFireAndForget(fullPath); GlobalEvents.Instance.FileSystemWatcherInternal.FileChanged.InvokeParallelFireAndForget(fullPath);
} }