diff --git a/src/c#/GeneralUpdate.Client/MySample.cs b/src/c#/GeneralUpdate.Client/MySample.cs index cdd6a1719f4b83126e7023421334e1da4deeca44..26f4fde71c15baef5b22622faa4377729d57c449 100644 --- a/src/c#/GeneralUpdate.Client/MySample.cs +++ b/src/c#/GeneralUpdate.Client/MySample.cs @@ -11,6 +11,7 @@ using System.Threading.Tasks; using GeneralUpdate.Core.Domain.Enum; using GeneralUpdate.Core.Events.CommonArgs; using GeneralUpdate.Differential; +using System.IO; namespace GeneralUpdate.Client { @@ -225,6 +226,13 @@ namespace GeneralUpdate.Client 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 index f46a15ed9a8c88aeb05e25865c95e1a1262f57cd..3e37065a5e3de04d36fad74784c8b43f663c25d2 100644 --- a/src/c#/GeneralUpdate.Client/Program.cs +++ b/src/c#/GeneralUpdate.Client/Program.cs @@ -7,7 +7,8 @@ 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 index 5f1a5b322d45ba4775c57fe6880191afd1314b61..bf15a96155a8e61a45b36f7dcb763e58d1d32097 100644 --- a/src/c#/GeneralUpdate.Differential/ContentProvider/FileProvider.cs +++ b/src/c#/GeneralUpdate.Differential/ContentProvider/FileProvider.cs @@ -48,23 +48,12 @@ namespace GeneralUpdate.Differential.ContentProvider { var leftFileNodes = Read(leftPath); var rightFileNodes = Read(rightPath); - Dictionary dictB = rightFileNodes.ToDictionary(x => x.Name, x => x); - List 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 index 0ca8dd2d4bd95d8e2c7e932e5422ab3aa314b7ef..44ec20b88fdd91c54dbdc294eb468ba17e7b33a5 100644 --- a/src/c#/GeneralUpdate.Differential/DifferentialCore.cs +++ b/src/c#/GeneralUpdate.Differential/DifferentialCore.cs @@ -34,8 +34,6 @@ namespace GeneralUpdate.Differential /// private const string DELETE_FILES_NAME = "generalupdate_delete_files.json"; - private Action _compressProgressCallback; - #endregion Private Members #region Public Properties