💾 Feat(SyncCodes): Better comparison of FileItem

Author: Dynesshely

Utils/SyncCodes/FileItem.cs

@@ -31,8 +31,18 @@ public FileItem(string path)
             FileLoaded = false;
         }
     }
+}
+
+public class FileItemExistenceComparer : IEqualityComparer<FileItem>
+{
+    public bool Equals(FileItem? x, FileItem? y) => x is not null && y is not null && x.Path.Equals(y.Path);
 
-    public override bool Equals(object? obj) => obj is FileItem item && FileLoaded && item.FileLoaded && Hash.Equals(item.Hash);
+    public int GetHashCode(FileItem obj) => obj.GetHashCode();
+}
+
+public class FileItemComparer : IEqualityComparer<FileItem>
+{
+    public bool Equals(FileItem? x, FileItem? y) => x is not null && y is not null && x.FileLoaded && y.FileLoaded && x.Path.Equals(y.Path) && x.Hash.Equals(y.Hash);
 
-    public override int GetHashCode() => Convert.FromBase64String(Hash).GetHashCode();
+    public int GetHashCode(FileItem obj) => obj.GetHashCode();
 }

Utils/SyncCodes/Program.cs

@@ -126,25 +126,25 @@ await catalogResponse.Content.ReadAsStringAsync()
 
         var localCatalog = context.GetFiles();
 
-        var needToFetch = catalog.Except(localCatalog);
-        var needToDelete = localCatalog.Except(catalog);
-        var needToUpdate = localCatalog.GroupJoin(
-                    catalog,
-                    x => x,
-                    y => y,
-                    (x, y) => new { Original = x, New = y }
-                )
-                .SelectMany(
-                    c => c.New.DefaultIfEmpty(),
-                    (x, y) => new { x.Original, New = y }
-                )
-                .Where(c => c.Original.Hash.Equals(c.New!.Hash) == false)
-                .Select(c => new { Original = c.Original, Difference = c.New })
-            ;
-
-        app.Logger.LogDebug("Need to fetch: {json}", JsonSerializer.Serialize(needToFetch));
-        app.Logger.LogDebug("Need to delete:: {json}", JsonSerializer.Serialize(needToDelete));
-        app.Logger.LogDebug("Need to update: {json}", JsonSerializer.Serialize(needToUpdate));
+        var needToFetch = catalog.Except(localCatalog, new FileItemExistenceComparer());
+        var needToDelete = localCatalog.Except(catalog, new FileItemExistenceComparer());
+        // var needToUpdate = localCatalog.GroupJoin(
+        //             catalog,
+        //             x => x,
+        //             y => y,
+        //             (x, y) => new { Original = x, New = y }
+        //         )
+        //         .SelectMany(
+        //             c => c.New.DefaultIfEmpty(),
+        //             (x, y) => new { x.Original, New = y }
+        //         )
+        //         .Where(c => c.Original.Hash.Equals(c.New!.Hash) == false)
+        //         .Select(c => new { Original = c.Original, Difference = c.New })
+        //     ;
+
+        app.Logger.LogInformation("Need to fetch: {json}", JsonSerializer.Serialize(needToFetch));
+        app.Logger.LogInformation("Need to delete:: {json}", JsonSerializer.Serialize(needToDelete));
+        // app.Logger.LogDebug("Need to update: {json}", JsonSerializer.Serialize(needToUpdate));
     };
     timer.Start();