💾 Feat(SyncCodes): Better way to compare differences

Author: Dynesshely

Utils/SyncCodes/Context.cs

@@ -12,6 +12,8 @@ public class Context
 
     private readonly ILogger _logger;
 
+    private readonly object _filesLock = new();
+
     public Context(string workBase, ILogger logger)
     {
         WorkBase = workBase;
@@ -53,38 +55,51 @@ public Context InitializeFileSystemWatcher(Action<FileSystemEventArgs> onChanged
         return this;
     }
 
-    public List<FileItem> GetFiles() => Files;
+    public List<FileItem> GetFiles()
+    {
+        lock (_filesLock)
+        {
+            return Files;
+        }
+    }
 
     public void RefreshFiles()
     {
         var folder = new DirectoryInfo(WorkBase);
 
-        Files.Clear();
-        Files.AddRange(
-            folder.GetFiles()
-                .Where(f => Filter.ShouldIgnore(f.FullName) == false)
-                .Select(
-                    f => new FileItem(
-                        Path.GetRelativePath(WorkBase, f.FullName)
-                    )
-                )
-                .Where(f => f.FileLoaded)
-        );
-
-        var foldersToSearch = new Queue<DirectoryInfo>(folder.GetDirectories());
-        while (foldersToSearch.Count > 0)
+        lock (_filesLock)
         {
-            var subFolder = foldersToSearch.Dequeue();
-            foreach (var dir in subFolder.GetDirectories())
-                foldersToSearch.Enqueue(dir);
+            Files.Clear();
             Files.AddRange(
-                subFolder.GetFiles()
+                folder.GetFiles()
                     .Where(f => Filter.ShouldIgnore(f.FullName) == false)
                     .Select(
-                        f => new FileItem(Path.GetRelativePath(WorkBase, f.FullName))
+                        f => new FileItem(
+                            Path.GetRelativePath(WorkBase, f.FullName),
+                            _logger
+                        )
                     )
                     .Where(f => f.FileLoaded)
             );
+
+            var foldersToSearch = new Queue<DirectoryInfo>(folder.GetDirectories());
+            while (foldersToSearch.Count > 0)
+            {
+                var subFolder = foldersToSearch.Dequeue();
+                foreach (var dir in subFolder.GetDirectories())
+                    foldersToSearch.Enqueue(dir);
+                Files.AddRange(
+                    subFolder.GetFiles()
+                        .Where(f => Filter.ShouldIgnore(f.FullName) == false)
+                        .Select(
+                            f => new FileItem(
+                                Path.GetRelativePath(WorkBase, f.FullName),
+                                _logger
+                            )
+                        )
+                        .Where(f => f.FileLoaded)
+                );
+            }
         }
     }
 

Utils/SyncCodes/FileItem.cs

@@ -1,36 +1,43 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.Json.Serialization;
+using Polly;
 
 namespace SyncCodes;
 
 public class FileItem
 {
     public string Path { get; }
 
-    public string Hash { get; }
+    public string Hash { get; set; }
 
     [JsonIgnore] public bool FileLoaded { get; set; }
 
-    public FileItem(string path)
+    private readonly ILogger _logger;
+
+    public FileItem(string path, ILogger logger)
     {
         Path = path;
 
+        _logger = logger;
+
         // Avoid file not exists exception, sometimes IDE creates temporary files
-        try
+        Policy.Handle<Exception>().Retry(3, (exception, retryCount) =>
+        {
+            _logger.LogError(
+                "Error loading sync ignore file: {message}, try times: {retryCount}",
+                exception.Message,
+                retryCount
+            );
+
+        }).Execute(() =>
         {
             var content = File.ReadAllText(Path);
             var hash = SHA256.HashData(Encoding.UTF8.GetBytes(content));
             Hash = Convert.ToBase64String(hash);
 
             FileLoaded = true;
-        }
-        catch (Exception e)
-        {
-            Hash = string.Empty;
-
-            FileLoaded = false;
-        }
+        });
     }
 }
 

Utils/SyncCodes/Program.cs

@@ -2,8 +2,10 @@
 using System.Text.Json;
 using System.Text.RegularExpressions;
 using CommandLine;
+using Polly;
 using Spectre.Console;
 using SyncCodes;
+using Context = SyncCodes.Context;
 using Timer = System.Timers.Timer;
 
 var workBase = Directory.GetCurrentDirectory();
@@ -30,6 +32,21 @@
 
         var context = new Context(workBase, app.Logger);
 
+        context.InitializeFileSystemWatcher(
+            (e) =>
+            {
+                if (context.Filter.ShouldIgnore(e.FullPath) == false)
+                    app.Logger.LogInformation(
+                        "[{time}] FileSystem Modified: {name}, {changeType} | {path}",
+                        DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+                        e.Name,
+                        e.ChangeType,
+                        Path.GetRelativePath(workBase, e.FullPath)
+                    );
+                context.RefreshFiles();
+            }
+        );
+
         switch (options.Job)
         {
             case Jobs.FetchCodes:
@@ -49,21 +66,6 @@
 
 void RunServer(Context context)
 {
-    context.InitializeFileSystemWatcher(
-        (e) =>
-        {
-            if (context.Filter.ShouldIgnore(e.FullPath) == false)
-                app.Logger.LogInformation(
-                    "FileSystem Modified: {name}, {changeType} | {path}, [{time}]",
-                    e.Name,
-                    e.ChangeType,
-                    Path.GetRelativePath(workBase, e.FullPath),
-                    DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
-                );
-            context.RefreshFiles();
-        }
-    );
-
     app.MapGet(
         "/",
         () => Results.Content(
@@ -98,8 +100,6 @@ void RunServer(Context context)
 
 void RunClient(Context context)
 {
-    context.InitializeFileSystemWatcher((_) => context.RefreshFiles());
-
     var address = AnsiConsole.Prompt(new TextPrompt<string>("Please input the server address: ")
     {
         Validator = (s) => ServerAddressRegex().IsMatch(s)
@@ -138,20 +138,32 @@ await catalogResponse.Content.ReadAsStringAsync(),
         var localCatalog = context.GetFiles();
 
         var differences = catalog.Concat(localCatalog).GroupBy(
-            f => f.Path,
+            f => f.Path.RelatedTo(workBase),
             f => f.Hash,
             (path, hashes) => new
             {
                 Path = path,
                 Count = hashes.Count(),
-                LocalHash = localCatalog.FirstOrDefault(f => f.Path.Equals(path))?.Hash,
-                RemoteHash = catalog.FirstOrDefault(f => f.Path.Equals(path))?.Hash,
+                LocalHash = localCatalog.FirstOrDefault(f => f.Path.RelatedTo(workBase).Equals(path))?.Hash,
+                RemoteHash = catalog.FirstOrDefault(f => f.Path.RelatedTo(workBase).Equals(path))?.Hash,
             }
         );
 
-        // app.Logger.LogInformation("Need to fetch: {json}", JsonSerializer.Serialize(needToFetch, jsonSerializerOptions));
-        // app.Logger.LogInformation("Need to delete:: {json}", JsonSerializer.Serialize(needToDelete, jsonSerializerOptions));
-        app.Logger.LogDebug("Differences: {json}", JsonSerializer.Serialize(differences));
+        app.Logger.LogInformation(
+            "Remote: {json1}\n      Local: {json2}\n      Differences: {json3}",
+            JsonSerializer.Serialize(
+                differences.Where(c => c.LocalHash is null && c.RemoteHash is not null),
+                jsonSerializerOptions
+            ),
+            JsonSerializer.Serialize(
+                differences.Where(c => c.RemoteHash is null && c.LocalHash is not null),
+                jsonSerializerOptions
+            ),
+            JsonSerializer.Serialize(
+                differences.Where(c => c.LocalHash is not null && c.RemoteHash is not null && !c.LocalHash.Equals(c.RemoteHash)),
+                jsonSerializerOptions
+            )
+        );
     };
     timer.Start();
 
@@ -165,6 +177,11 @@ await catalogResponse.Content.ReadAsStringAsync(),
         )
     );
 
+    app.MapGet(
+        "/catalog",
+        () => context.GetFiles().Where(f => f.FileLoaded)
+    );
+
     app.Run();
 }
 
@@ -198,3 +215,8 @@ partial class Program
     [GeneratedRegex(@"([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)|(\[[0-9A-Fa-f:.]+\])|([a-zA-Z0-9.-]+)(:\d+)?")]
     private static partial Regex ServerAddressRegex();
 }
+
+public static class Extensions
+{
+    public static string RelatedTo(this string path, string workBase) => Path.GetRelativePath(workBase, Path.Combine(workBase, path));
+}