fix: Identify bugs that require files to be deleted

GeneralLibrary · Dec 28, 2023 · 90da933 · 90da933
1 parent 3ac3d93
commit 90da933
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/src/c#/GeneralUpdate.Client/MySample.cs b/src/c#/GeneralUpdate.Client/MySample.cs
@@ -11,6 +11,7 @@
 using GeneralUpdate.Core.Domain.Enum;
 using GeneralUpdate.Core.Events.CommonArgs;
 using GeneralUpdate.Differential;
+using System.IO;
 
 namespace GeneralUpdate.Client
 {
@@ -225,6 +226,13 @@ public async Task TestDifferentialClean()
             await DifferentialCore.Instance.Clean(path1, path2, path3);
         }
 
+        public async Task TestDifferentialDirty() 
+        {
+            var path1 = "D:\\packet\\source";
+            var path2 = "D:\\packet\\patchs";
+            await DifferentialCore.Instance.Dirty(path1, path2);
+        }
+
         #endregion
     }
 }
diff --git a/src/c#/GeneralUpdate.Client/Program.cs b/src/c#/GeneralUpdate.Client/Program.cs
@@ -7,7 +7,8 @@ static void Main(string[] args)
             Task.Run(async() => 
             {
                 MySample sample = new MySample();
-                await sample.TestDifferentialClean();
+                //await sample.TestDifferentialClean();
+                //await sample.TestDifferentialDirty();
             });
             Console.Read();
         }

diff --git a/src/c#/GeneralUpdate.Differential/ContentProvider/FileProvider.cs b/src/c#/GeneralUpdate.Differential/ContentProvider/FileProvider.cs
@@ -48,23 +48,12 @@ public async Task<IEnumerable<FileNode>> Except(string leftPath, string rightPat
             {
                 var leftFileNodes = Read(leftPath);
                 var rightFileNodes = Read(rightPath);
-                Dictionary<string, FileNode> dictB = rightFileNodes.ToDictionary(x => x.Name, x => x);
-                List<FileNode> filesOnlyInA = leftFileNodes.Where(f => !dictB.ContainsKey(f.Name)).ToList();
-                return filesOnlyInA;
+                var rightNodeDic = rightFileNodes.ToDictionary(x => x.Name, x => x);
+                var filesOnlyInLeft = leftFileNodes.Where(f => !rightNodeDic.ContainsKey(f.Name)).ToList();
+                return filesOnlyInLeft;
             });
         }
 
-        private void Get(string leftPath, string rightPath)
-        {
-            var leftFileNodes = Directory.GetFiles(leftPath, "*", SearchOption.AllDirectories)
-                                                 .Select(f => f.Substring(leftPath.Length)).ToList();
-
-            var rightFileNodes = Directory.GetFiles(rightPath, "*", SearchOption.AllDirectories)
-                                              .Select(f => f.Substring(rightPath.Length)).ToList();
-
-            leftFileNodes.Except(rightFileNodes).Select(x => leftPath + x).ToList();
-        }
-
         #endregion Public Methods
 
         #region Private Methods

diff --git a/src/c#/GeneralUpdate.Differential/DifferentialCore.cs b/src/c#/GeneralUpdate.Differential/DifferentialCore.cs
@@ -34,8 +34,6 @@ public sealed class DifferentialCore
         /// </summary>
         private const string DELETE_FILES_NAME = "generalupdate_delete_files.json";
 
-        private Action<object, BaseCompressProgressEventArgs> _compressProgressCallback;
-
         #endregion Private Members
 
         #region Public Properties