💾 Feat(SyncCodes): Better FileItem constructor

Author: Dynesshely

Utils/SyncCodes/Context.cs

@@ -75,11 +75,10 @@ public void RefreshFiles()
                     .Where(f => Filter.ShouldIgnore(f.FullName) == false)
                     .Select(
                         f => new FileItem(
-                            Path.GetRelativePath(WorkBase, f.FullName),
-                            _logger
-                        )
+                            Path.GetRelativePath(WorkBase, f.FullName)
+                        ).Read(_logger)
                     )
-                    .Where(f => f.FileLoaded)
+                    .Where(f => f.Hash is not null)
             );
 
             var foldersToSearch = new Queue<DirectoryInfo>(folder.GetDirectories());
@@ -93,11 +92,10 @@ public void RefreshFiles()
                         .Where(f => Filter.ShouldIgnore(f.FullName) == false)
                         .Select(
                             f => new FileItem(
-                                Path.GetRelativePath(WorkBase, f.FullName),
-                                _logger
-                            )
+                                Path.GetRelativePath(WorkBase, f.FullName)
+                            ).Read(_logger)
                         )
-                        .Where(f => f.FileLoaded)
+                        .Where(f => f.Hash is not null)
                 );
             }
         }

Utils/SyncCodes/FileItem.cs

@@ -1,6 +1,5 @@
 using System.Security.Cryptography;
 using System.Text;
-using System.Text.Json.Serialization;
 using Polly;
 
 namespace SyncCodes;
@@ -9,48 +8,50 @@ public class FileItem
 {
     public string Path { get; }
 
-    public string Hash { get; set; }
+    public string? Hash { get; private set; }
 
-    [JsonIgnore] public bool FileLoaded { get; set; }
-
-    private readonly ILogger _logger;
-
-    public FileItem(string path, ILogger logger)
+    public FileItem(string path)
     {
         Path = path;
+    }
 
-        _logger = logger;
-
+    public FileItem Read(ILogger logger)
+    {
         // Avoid file not exists exception, sometimes IDE creates temporary files
-        Policy.Handle<Exception>().Retry(3, (exception, retryCount) =>
+        try
         {
-            _logger.LogError(
-                "Error loading sync ignore file: {message}, try times: {retryCount}",
-                exception.Message,
-                retryCount
-            );
-
-        }).Execute(() =>
+            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);
+            });
+        }
+        catch (Exception _)
         {
-            var content = File.ReadAllText(Path);
-            var hash = SHA256.HashData(Encoding.UTF8.GetBytes(content));
-            Hash = Convert.ToBase64String(hash);
+        }
 
-            FileLoaded = true;
-        });
+        return this;
     }
 }
 
 public class FileItemExistenceComparer : IEqualityComparer<FileItem>
 {
-    public bool Equals(FileItem? x, FileItem? y) => x?.Path?.Equals(y?.Path) ?? false;
+    public bool Equals(FileItem? x, FileItem? y) => x?.Path.Equals(y?.Path) ?? false;
 
     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 bool Equals(FileItem? x, FileItem? y) => x is not null && y is not null && x.Path.Equals(y.Path) && (x.Hash?.Equals(y.Hash) ?? false);
 
     public int GetHashCode(FileItem obj) => obj.GetHashCode();
 }

Utils/SyncCodes/Program.cs

@@ -83,7 +83,7 @@ void RunServer(Context context)
 
     app.MapGet(
         "/catalog",
-        () => context.GetFiles().Where(f => f.FileLoaded)
+        () => context.GetFiles().Where(f => f.Hash is not null)
     );
 
     app.MapGet(
@@ -179,7 +179,7 @@ await catalogResponse.Content.ReadAsStringAsync(),
 
     app.MapGet(
         "/catalog",
-        () => context.GetFiles().Where(f => f.FileLoaded)
+        () => context.GetFiles().Where(f => f.Hash is not null)
     );
 
     app.Run();