🔧 Fix(SyncCodes): Some errors in the code

Author: Dynesshely

Utils/SyncCodes/Context.cs

@@ -72,11 +72,11 @@ public void RefreshFiles()
             Files.Clear();
             Files.AddRange(
                 folder.GetFiles()
-                    .Where(f => Filter.ShouldIgnore(f.FullName) == false)
+                    .Where(f => Filter.Include(f.FullName))
                     .Select(
                         f => new FileItem(
                             Path.GetRelativePath(WorkBase, f.FullName)
-                        ).Read(_logger)
+                        ).Read(WorkBase, _logger)
                     )
                     .Where(f => f.Hash is not null)
             );
@@ -89,11 +89,11 @@ public void RefreshFiles()
                     foldersToSearch.Enqueue(dir);
                 Files.AddRange(
                     subFolder.GetFiles()
-                        .Where(f => Filter.ShouldIgnore(f.FullName) == false)
+                        .Where(f => Filter.Include(f.FullName))
                         .Select(
                             f => new FileItem(
                                 Path.GetRelativePath(WorkBase, f.FullName)
-                            ).Read(_logger)
+                            ).Read(WorkBase, _logger)
                         )
                         .Where(f => f.Hash is not null)
                 );

Utils/SyncCodes/FileItem.cs

@@ -15,21 +15,21 @@ public FileItem(string path)
         Path = path;
     }
 
-    public FileItem Read(ILogger logger)
+    public FileItem Read(string workBase, ILogger 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}",
+                    "Error loading file: {message}, try times: {retryCount}",
                     exception.Message,
                     retryCount
                 );
             }).Execute(() =>
             {
-                var content = File.ReadAllText(Path);
+                var content = File.ReadAllText(System.IO.Path.Combine(workBase, Path));
                 var hash = SHA256.HashData(Encoding.UTF8.GetBytes(content));
                 Hash = Convert.ToBase64String(hash);
             });

Utils/SyncCodes/FilesFilter.cs

@@ -8,7 +8,7 @@ public class FilesFilter
 
     public readonly List<string> IgnoredPaths = [];
 
-    public string WorkBase { get; init; }
+    public string WorkBase { get; }
 
     private bool _configFileExists = true;
 
@@ -20,7 +20,7 @@ public FilesFilter(string workBase, ILogger logger)
 
         WorkBase = workBase;
 
-        LoadIgnoreConfig();
+        _ = LoadIgnoreConfig();
     }
 
     public FilesFilter LoadIgnoreConfig()
@@ -30,7 +30,7 @@ public FilesFilter LoadIgnoreConfig()
 
         var path = Path.Combine(WorkBase, ".sync-ignore");
 
-        if (!File.Exists(path))
+        if (File.Exists(path) == false)
         {
             _configFileExists = false;
             return this;
@@ -71,7 +71,7 @@ public FilesFilter LoadIgnoreConfig()
         return this;
     }
 
-    public bool ShouldIgnore(string path)
+    private bool ShouldIgnore(string path)
     {
         if (_configFileExists == false) return false;
 
@@ -87,4 +87,6 @@ public bool ShouldIgnore(string path)
 
         return false;
     }
+
+    public bool Include(string path) => !ShouldIgnore(path);
 }

Utils/SyncCodes/Program.cs

@@ -35,7 +35,7 @@
         context.InitializeFileSystemWatcher(
             (e) =>
             {
-                if (context.Filter.ShouldIgnore(e.FullPath) == false)
+                if (context.Filter.Include(e.FullPath))
                     app.Logger.LogInformation(
                         "[{time}] FileSystem Modified: {name}, {changeType} | {path}",
                         DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
@@ -88,10 +88,14 @@ void RunServer(Context context)
 
     app.MapGet(
         "/file/{path}",
-        (string path) => context.GetFile(
-            Encoding.UTF8.GetString(
-                Convert.FromBase64String(path)
-            )
+        (string path) => Results.Content(
+            context.GetFile(
+                Encoding.UTF8.GetString(
+                    Convert.FromBase64String(path)
+                )
+            ),
+            "text/plain",
+            Encoding.UTF8
         )
     );