updated dependencies and code style

Author: d2phap

LICENSE

@@ -1,6 +1,6 @@
-MIT License
+MIT License
 
-Copyright (c) 2022 Duong Dieu Phap
+Copyright (c) 2025 Duong Dieu Phap
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,4 +1,4 @@
-# FileWatcherEx for Windows
+# FileWatcherEx for Windows
 A wrapper of `System.IO.FileSystemWatcher` to standardize the events and avoid false change notifications. It has been being used in [ImageGlass - A lightweight, versatile image viewer](https://github.com/d2phap/ImageGlass) project.
 
 This project is based on the *VSCode FileWatcher*: https://github.com/Microsoft/vscode-filewatcher-windows
@@ -14,7 +14,7 @@ This project is based on the *VSCode FileWatcher*: https://github.com/Microsoft/
 ## Features
 - Standardizes the events of `System.IO.FileSystemWatcher`.
 - No false change notifications when a file system item is created, deleted, changed or renamed.
-- Supports .NET 6.0, 7.0.
+- Supports .NET 6.0, 7.0, 8.0, 9.0
 
 ## Installation
 Run the command:
@@ -63,6 +63,5 @@ void FW_OnRenamed(object sender, FileChangedEvent e)
 - [GitHub sponsor](https://github.com/sponsors/d2phap)
 - [Patreon](https://www.patreon.com/d2phap)
 - [PayPal](https://www.paypal.me/d2phap)
-- [Wire Transfers](https://donorbox.org/imageglass)
 
 Thanks for your gratitude and finance help!

Source/Demo/Demo.WinForms.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>

Source/FileSystemEventRecorder/FileSystemEventRecorder.cs

@@ -1,14 +1,14 @@
-using System.Collections.Concurrent;
+using CsvHelper;
+using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Globalization;
-using CsvHelper;
 
 namespace FileSystemEventRecorder;
 
 // event received from C# FileSystemWatcher
 internal record EventRecord(
-    string FullPath, 
-    string EventName, 
+    string FullPath,
+    string EventName,
     string? OldFullPath, // only provided by "rename" event
     long NowInTicks
 );
@@ -33,7 +33,7 @@ public static class FileSystemEventRecords
 
     public static void Main(string[] args)
     {
-        var (watchedDirectory, csvOutputFile) = ProcessArguments(args); 
+        var (watchedDirectory, csvOutputFile) = ProcessArguments(args);
 
         var watcher = new FileSystemWatcher();
         watcher.Path = watchedDirectory;
@@ -48,7 +48,7 @@ public static void Main(string[] args)
             EventRecords.Enqueue(new EventRecord(ev.FullPath, "deleted", null, Stopwatch.GetTimestamp()));
 
         watcher.Changed += (_, ev) =>
-            EventRecords.Enqueue(new EventRecord(ev.FullPath, "changed", null,  Stopwatch.GetTimestamp()));
+            EventRecords.Enqueue(new EventRecord(ev.FullPath, "changed", null, Stopwatch.GetTimestamp()));
         watcher.Renamed += (_, ev) =>
             EventRecords.Enqueue(new EventRecord(ev.FullPath, "renamed", ev.OldFullPath, Stopwatch.GetTimestamp()));
         watcher.Error += (_, ev) =>
@@ -96,7 +96,7 @@ private static void ProcessQueueAndWriteToDisk(string csvOutputFile)
         else
         {
             Console.WriteLine($"Recorded {EventRecords.Count} file system events.");
-            var records = MapToDiffTicks();
+            var records = MapToDiffTicks;
 
             Console.WriteLine($"Writing CSV to {csvOutputFile}.");
             using (var writer = new StreamWriter(csvOutputFile))
@@ -110,35 +110,39 @@ private static void ProcessQueueAndWriteToDisk(string csvOutputFile)
     }
 
     // post-process queue. Calculate difference between previous and current event 
-    private static IEnumerable<EventRecordWithDiff> MapToDiffTicks()
+    private static IEnumerable<EventRecordWithDiff> MapToDiffTicks
     {
-        List<EventRecordWithDiff> eventsWithDiffs = new();
-        long previousTicks = 0;
-        foreach (var eventRecord in EventRecords)
+        get
         {
-            var diff = previousTicks switch
+            List<EventRecordWithDiff> eventsWithDiffs = [];
+            long previousTicks = 0;
+
+            foreach (var eventRecord in EventRecords)
             {
-                0 => 0, // first run
-                _ => eventRecord.NowInTicks - previousTicks
-            };
-
-            previousTicks = eventRecord.NowInTicks;
-            double diffInMilliseconds = Convert.ToInt64(new TimeSpan(diff).TotalMilliseconds);
-
-            var directory = Path.GetDirectoryName(eventRecord.FullPath) ?? "";
-            var fileName = Path.GetFileName(eventRecord.FullPath);
-            var oldFileName = Path.GetFileName(eventRecord.OldFullPath);
-            
-            var record = new EventRecordWithDiff(
-                directory,
-                fileName,
-                eventRecord.EventName,
-                oldFileName,
-                diff,
-                diffInMilliseconds);
-            eventsWithDiffs.Add(record);
-        }
+                var diff = previousTicks switch
+                {
+                    0 => 0, // first run
+                    _ => eventRecord.NowInTicks - previousTicks
+                };
+
+                previousTicks = eventRecord.NowInTicks;
+                double diffInMilliseconds = Convert.ToInt64(new TimeSpan(diff).TotalMilliseconds);
+
+                var directory = Path.GetDirectoryName(eventRecord.FullPath) ?? "";
+                var fileName = Path.GetFileName(eventRecord.FullPath);
+                var oldFileName = Path.GetFileName(eventRecord.OldFullPath);
+
+                var record = new EventRecordWithDiff(
+                    directory,
+                    fileName,
+                    eventRecord.EventName,
+                    oldFileName,
+                    diff,
+                    diffInMilliseconds);
+                eventsWithDiffs.Add(record);
+            }
 
-        return eventsWithDiffs;
+            return eventsWithDiffs;
+        }
     }
 }

Source/FileSystemEventRecorder/FileSystemEventRecorder.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
@@ -12,7 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="CsvHelper" Version="30.0.1" />
+      <PackageReference Include="CsvHelper" Version="33.1.0" />
     </ItemGroup>
 
 </Project>

Source/FileWatcherEx/FileSystemWatcherEx.cs

@@ -1,25 +1,28 @@
 
+using FileWatcherEx.Helpers;
 using System.Collections.Concurrent;
 using System.ComponentModel;
-using FileWatcherEx.Helpers;
 
 namespace FileWatcherEx;
 
+
 /// <summary>
 /// A wrapper of <see cref="FileSystemWatcher"/> to standardize the events
 /// and avoid false change notifications.
 /// </summary>
-public class FileSystemWatcherEx : IDisposable, IFileSystemWatcherEx
+/// <param name="folderPath"></param>
+/// <param name="logger">Optional Action to log out library internals</param>
+public class FileSystemWatcherEx(string folderPath = "", Action<string>? logger = null) : IDisposable, IFileSystemWatcherEx
 {
     #region Private Properties
 
     private Thread? _thread;
     private EventProcessor? _processor;
-    private readonly BlockingCollection<FileChangedEvent> _fileEventQueue = new();
+    private readonly BlockingCollection<FileChangedEvent> _fileEventQueue = [];
 
     private SymlinkAwareFileWatcher? _watcher;
     private Func<IFileSystemWatcherWrapper>? _fswFactory;
-    private readonly Action<string> _logger;
+    private readonly Action<string> _logger = logger ?? (_ => { });
 
     // Define the cancellation token.
     private CancellationTokenSource? _cancelSource;
@@ -40,13 +43,13 @@ internal Func<IFileSystemWatcherWrapper> FileSystemWatcherFactory
     /// <summary>
     /// Gets or sets the path of the directory to watch.
     /// </summary>
-    public string FolderPath { get; set; } = "";
+    public string FolderPath { get; set; } = folderPath;
 
 
     /// <summary>
     /// Gets the collection of all the filters used to determine what files are monitored in a directory.
     /// </summary>
-    public System.Collections.ObjectModel.Collection<string> Filters { get; } = new();
+    public System.Collections.ObjectModel.Collection<string> Filters { get; } = [];
 
 
     /// <summary>
@@ -131,17 +134,6 @@ public string Filter
     #endregion
 
 
-    /// <summary>
-    /// Initialize new instance of <see cref="FileSystemWatcherEx"/>
-    /// </summary>
-    /// <param name="folderPath"></param>
-    /// <param name="logger">Optional Action to log out library internals</param>
-    public FileSystemWatcherEx(string folderPath = "", Action<string>? logger = null)
-    {
-        FolderPath = folderPath;
-        _logger = logger ?? (_ => {}) ;
-    }
-    
 
     /// <summary>
     /// Start watching files
@@ -164,15 +156,13 @@ void InvokeChangedEvent(object? sender, FileChangedEvent fileEvent)
                     {
                         if (SynchronizingObject != null && SynchronizingObject.InvokeRequired)
                         {
-                            SynchronizingObject.Invoke(new Action<object, FileChangedEvent>(InvokeChangedEvent), new object[] { SynchronizingObject, e });
+                            SynchronizingObject.Invoke(new Action<object, FileChangedEvent>(InvokeChangedEvent), [SynchronizingObject, e]);
                         }
                         else
                         {
                             OnChanged?.Invoke(SynchronizingObject, e);
                         }
                     }
-
-
                     break;
 
                 case ChangeType.CREATED:
@@ -183,15 +173,13 @@ void InvokeCreatedEvent(object? sender, FileChangedEvent fileEvent)
                     {
                         if (SynchronizingObject != null && SynchronizingObject.InvokeRequired)
                         {
-                            SynchronizingObject.Invoke(new Action<object, FileChangedEvent>(InvokeCreatedEvent), new object[] { SynchronizingObject, e });
+                            SynchronizingObject.Invoke(new Action<object, FileChangedEvent>(InvokeCreatedEvent), args: [SynchronizingObject, e]);
                         }
                         else
                         {
                             OnCreated?.Invoke(SynchronizingObject, e);
                         }
                     }
-
-
                     break;
 
                 case ChangeType.DELETED:
@@ -202,15 +190,13 @@ void InvokeDeletedEvent(object? sender, FileChangedEvent fileEvent)
                     {
                         if (SynchronizingObject != null && SynchronizingObject.InvokeRequired)
                         {
-                            SynchronizingObject.Invoke(new Action<object, FileChangedEvent>(InvokeDeletedEvent), new object[] { SynchronizingObject, e });
+                            SynchronizingObject.Invoke(new Action<object, FileChangedEvent>(InvokeDeletedEvent), [SynchronizingObject, e]);
                         }
                         else
                         {
                             OnDeleted?.Invoke(SynchronizingObject, e);
                         }
                     }
-
-
                     break;
 
                 case ChangeType.RENAMED:
@@ -221,23 +207,21 @@ void InvokeRenamedEvent(object? sender, FileChangedEvent fileEvent)
                     {
                         if (SynchronizingObject != null && SynchronizingObject.InvokeRequired)
                         {
-                            SynchronizingObject.Invoke(new Action<object, FileChangedEvent>(InvokeRenamedEvent), new object[] { SynchronizingObject, e });
+                            SynchronizingObject.Invoke(new Action<object, FileChangedEvent>(InvokeRenamedEvent), [SynchronizingObject, e]);
                         }
                         else
                         {
                             OnRenamed?.Invoke(SynchronizingObject, e);
                         }
                     }
-
-
                     break;
 
                 default:
                     break;
             }
         }, (log) =>
         {
-            Console.WriteLine($"{Enum.GetName(typeof(ChangeType), ChangeType.LOG)} | {log}");
+            Console.WriteLine($"{Enum.GetName(ChangeType.LOG)} | {log}");
         });
 
         _cancelSource = new CancellationTokenSource();
@@ -278,7 +262,7 @@ void OnError(ErrorEventArgs e)
 
 
     internal void StartForTesting(
-        Func<string, FileAttributes> getFileAttributesFunc, 
+        Func<string, FileAttributes> getFileAttributesFunc,
         Func<string, DirectoryInfo[]> getDirectoryInfosFunc)
     {
         Start();

Source/FileWatcherEx/FileWatcherEx.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Copyright>Copyright © 2018-2023 Duong Dieu Phap</Copyright>
+    <Copyright>Copyright © 2018-2025 Duong Dieu Phap</Copyright>
     <PackageProjectUrl>https://github.com/d2phap/FileWatcherEx</PackageProjectUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <RepositoryUrl>https://github.com/d2phap/FileWatcherEx</RepositoryUrl>
@@ -13,14 +13,15 @@
     <Description>A wrapper of FileSystemWatcher to standardize the events and avoid false change notifications, used in ImageGlass project (https://imageglass.org). This project is based on the VSCode FileWatcher: https://github.com/Microsoft/vscode-filewatcher-windows.</Description>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <FileVersion>$(Version)</FileVersion>
-    <VersionPrefix>2.6.0</VersionPrefix>
+    <VersionPrefix>2.7.0</VersionPrefix>
     <PackageReleaseNotes>See https://github.com/d2phap/FileWatcherEx/releases</PackageReleaseNotes>
     <Authors>d2phap</Authors>
     <Title>FileWatcherEx - A file system watcher</Title>
     <IncludeSymbols>True</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <SignAssembly>False</SignAssembly>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

Source/FileWatcherEx/Helpers/EventNormalizer.cs

@@ -128,15 +128,15 @@ internal static bool IsParent(FileChangedEvent e, List<string> deletedPaths)
     internal static bool IsParent(string path, string candidatePath)
     {
         // if exists, remove trailing "\" for both paths
-        candidatePath = candidatePath.TrimEnd('\\'); 
+        candidatePath = candidatePath.TrimEnd('\\');
         path = path.TrimEnd('\\');
-        return path.IndexOf(candidatePath + '\\', StringComparison.Ordinal) == 0;
+        return path.StartsWith(candidatePath + '\\', StringComparison.Ordinal);
     }
 
 
     private class FileEventRepository
     {
-        private readonly Dictionary<string, FileChangedEvent> _mapPathToEvents = new();
+        private readonly Dictionary<string, FileChangedEvent> _mapPathToEvents = [];
 
         public void AddOrUpdate(FileChangedEvent newEvent)
         {
@@ -166,7 +166,7 @@ public void Remove(FileChangedEvent ev)
 
         public List<FileChangedEvent> Events()
         {
-            return _mapPathToEvents.Values.ToList();
+            return [.. _mapPathToEvents.Values];
         }
     }
 }