From 5184623354c4778bb41b56eb84173624b538f390 Mon Sep 17 00:00:00 2001
From: Ben Parsons <9parsonsb@gmail.com>
Date: Sun, 5 May 2024 23:04:54 +1000
Subject: [PATCH] Fix FileWatcherService

---
 Pulsar/Features/FileWatcherService.cs | 49 ++++++++++++++++-----------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/Pulsar/Features/FileWatcherService.cs b/Pulsar/Features/FileWatcherService.cs
index 518434a..cdaf26f 100644
--- a/Pulsar/Features/FileWatcherService.cs
+++ b/Pulsar/Features/FileWatcherService.cs
@@ -1,35 +1,46 @@
 namespace Pulsar.Features;
 
+using System.Collections.Concurrent;
+using Microsoft.Extensions.FileProviders;
+
 public class FileWatcherService(IOptions<PulsarConfiguration> options, IFileHandlerService fileHandlerService) : IHostedService
 {
-    private FileSystemWatcher watcher = null!;
+    private PhysicalFileProvider watcher = null!;
     
     public Task StartAsync(CancellationToken cancellationToken)
     {
-        watcher = new FileSystemWatcher(options.Value.JournalDirectory)
+        if (!Directory.Exists(options.Value.JournalDirectory))
         {
-            EnableRaisingEvents = true,
-            IncludeSubdirectories = true
-        };
-        
-        watcher.BeginInit();
-        
-        watcher.Created += HandleFileChanged;
-        watcher.Changed += HandleFileChanged;
-        watcher.Renamed += HandleFileChanged; // ?
-        
-        watcher.IncludeSubdirectories = false;
-        watcher.EnableRaisingEvents = true;
-        watcher.NotifyFilter = NotifyFilters.LastWrite & NotifyFilters.Size & NotifyFilters.FileName;
-        
-        watcher.EndInit();
+            throw new Exception($"Directory {options.Value.JournalDirectory} does not exist.");
+        }
         
+        watcher = new PhysicalFileProvider(options.Value.JournalDirectory);
+        Watch();
+
         return Task.CompletedTask;
     }
+    
+    ConcurrentDictionary<string, DateTimeOffset> FileDates = new();
 
-    private void HandleFileChanged(object sender, FileSystemEventArgs e)
+    private void HandleFileChanged(object? sender)
     {
-        fileHandlerService.HandleFile(e.FullPath);   
+        foreach (var file in watcher.GetDirectoryContents(""))
+        {
+            if (!file.Name.EndsWith(".json") || file.IsDirectory) continue;
+            
+            var existing = FileDates.GetOrAdd(file.PhysicalPath, file.LastModified);
+            
+            if (existing != file.LastModified)
+            {
+                fileHandlerService.HandleFile(file.PhysicalPath);
+            }
+        }
+        Watch();
+    }
+    
+    private void Watch()
+    {
+        watcher.Watch("**/*.json").RegisterChangeCallback(HandleFileChanged, null);
     }
 
     public Task StopAsync(CancellationToken cancellationToken)