cliencore and core adapt to the blacklist.

Author: JusterZhu

src/c#/GeneralUpdate.ClientCore/GeneralClientBootstrap.cs

@@ -167,6 +167,11 @@ private async Task ExecuteWorkflowAsync()
             var isForcibly = CheckForcibly(mainResp.Body) || CheckForcibly(upgradeResp.Body);
             if (CanSkip(isForcibly)) return;
 
+            //black list initialization.
+            BlackListManager.Instance?.AddBlackFiles(_configInfo.BlackFiles);
+            BlackListManager.Instance?.AddBlackFileFormats(_configInfo.BlackFormats);
+            BlackListManager.Instance?.AddSkipDirectorys(_configInfo.SkipDirectorys);
+            
             _configInfo.Encoding = GetOption(UpdateOption.Encoding) ?? Encoding.Default;
             _configInfo.Format = GetOption(UpdateOption.Format) ?? Format.ZIP;
             _configInfo.DownloadTimeOut = GetOption(UpdateOption.DownloadTimeOut) == 0
@@ -200,17 +205,18 @@ private async Task ExecuteWorkflowAsync()
                     , _configInfo.BackupDirectory
                     , _configInfo.Bowl
                     , _configInfo.Scheme
-                    , _configInfo.Token);
+                    , _configInfo.Token
+                    , BlackListManager.Instance.BlackFileFormats.ToList()
+                    , BlackListManager.Instance.BlackFiles.ToList()
+                    , BlackListManager.Instance.SkipDirectorys.ToList());
 
                 _configInfo.ProcessInfo =
                     JsonSerializer.Serialize(processInfo, ProcessInfoJsonContext.Default.ProcessInfo);
             }
 
-            var skipDirectorys = StorageManager.SkipDirectorys;
-            skipDirectorys.AddRange(_configInfo.SkipDirectorys);
             StorageManager.Backup(_configInfo.InstallPath
                 , _configInfo.BackupDirectory
-                , skipDirectorys);
+                , BlackListManager.Instance.SkipDirectorys);
 
             StrategyFactory();
             switch (_configInfo.IsUpgradeUpdate)

src/c#/GeneralUpdate.ClientCore/Pipeline/PatchMiddleware.cs

@@ -18,13 +18,6 @@ public async Task InvokeAsync(PipelineContext context)
         {
             var sourcePath = context.Get<string>("SourcePath");
             var targetPath = context.Get<string>("PatchPath");
-            var blackFiles = context.Get<List<string>>("BlackFiles");
-            var blackFileFormats = context.Get<List<string>>("BlackFileFormats");
-            var skipDirectorys = context.Get<List<string>>("SkipDirectorys");
-
-            BlackListManager.Instance.AddBlackFiles(blackFiles);
-            BlackListManager.Instance.AddBlackFileFormats(blackFileFormats);
-            BlackListManager.Instance.AddSkipDirectorys(skipDirectorys);
             await DifferentialCore.Instance.Dirty(sourcePath, targetPath);
         }
         catch (Exception exception)

src/c#/GeneralUpdate.ClientCore/Strategys/WindowsStrategy.cs

@@ -46,9 +46,6 @@ public override async Task ExecuteAsync()
                     //patch middleware
                     context.Add("SourcePath", _configinfo.InstallPath);
                     context.Add("PatchPath", patchPath);
-                    context.Add("BlackFiles", _configinfo.BlackFiles);
-                    context.Add("BlackFileFormats", _configinfo.BlackFormats);
-                    context.Add("SkipDirectorys", _configinfo.SkipDirectorys);
 
                     var pipelineBuilder = new PipelineBuilder(context)
                         .UseMiddleware<PatchMiddleware>()

src/c#/GeneralUpdate.Common/FileBasic/BlackListManager.cs

@@ -22,7 +22,7 @@ public class BlackListManager
 
     private static readonly List<string> _blackFiles = ["Newtonsoft.Json.dll"];
 
-    private static readonly List<string> _skipDirectorys = [];
+    private static readonly List<string> _skipDirectorys = ["app-", "fail"];
 
     private BlackListManager() { }
 
@@ -98,6 +98,7 @@ public void AddSkipDirectorys(List<string>? directorys)
     {
         if (directorys == null)
             return;
+        
         foreach (var directory in directorys)
         {
             AddSkipDirectory(directory);
@@ -108,6 +109,7 @@ public void AddSkipDirectory(string directory)
     {
         if (string.IsNullOrWhiteSpace(directory))
             return;
+        
         if (!_skipDirectorys.Contains(directory))
         {
             _skipDirectorys.Add(directory);

src/c#/GeneralUpdate.Common/FileBasic/StorageManager.cs

@@ -13,7 +13,7 @@ public sealed class StorageManager
     {
         private long _fileCount = 0;
         public const string DirectoryName = "app-";
-        public static readonly List<string> SkipDirectorys = ["fail", DirectoryName];
+        
         private ComparisonResult ComparisonResult { get; set; }
 
         #region Public Methods
@@ -171,7 +171,7 @@ public static bool HashEquals(string leftPath, string rightPath)
         /// <param name="backupPath"></param>
         /// <param name="sourcePath"></param>
         /// <param name="directoryName"></param>
-        public static void Backup(string sourcePath, string backupPath, List<string> directoryNames)
+        public static void Backup(string sourcePath, string backupPath, IReadOnlyList<string> directoryNames)
         {
             if (Directory.Exists(backupPath))
             {
@@ -181,7 +181,7 @@ public static void Backup(string sourcePath, string backupPath, List<string> dir
             CopyDirectory(sourcePath, backupPath, directoryNames);
         }
 
-        private static void CopyDirectory(string sourceDir, string targetDir, List<string> directoryNames)
+        private static void CopyDirectory(string sourceDir, string targetDir, IReadOnlyList<string> directoryNames)
         {
             foreach (string dirPath in Directory.GetDirectories(sourceDir, "*", SearchOption.TopDirectoryOnly))
             {

src/c#/GeneralUpdate.Common/Shared/Object/ProcessInfo.cs

@@ -24,7 +24,10 @@ public ProcessInfo(string appName
             , string backupDirectory
             , string bowl
             , string scheme
-            , string token)
+            , string token
+            , List<string> blackFileFormats
+            , List<string> blackFiles
+            , List<string> skipDirectories)
         {
             AppName = appName ?? throw new ArgumentNullException(nameof(appName));
             if (!Directory.Exists(installPath)) throw new ArgumentException($"{nameof(installPath)} path does not exist ! {installPath}.");
@@ -44,6 +47,9 @@ public ProcessInfo(string appName
             Bowl = bowl;
             Scheme = scheme;
             Token = token;
+            BlackFileFormats = blackFileFormats;
+            BlackFiles = blackFiles;
+            SkipDirectorys = skipDirectories;
         }
 
         /// <summary>
@@ -126,5 +132,14 @@ public ProcessInfo(string appName
 
         [JsonPropertyName("Token")]
         public string Token { get; set; }
+        
+        [JsonPropertyName("BlackFileFormats")]
+        public List<string> BlackFileFormats { get; set; }
+        
+        [JsonPropertyName("BlackFiles")]
+        public List<string> BlackFiles { get; set; }
+
+        [JsonPropertyName("SkipDirectorys")]
+        public List<string> SkipDirectorys { get; set; }
     }
 }

src/c#/GeneralUpdate.Core/Driver/DriverCommand.cs

@@ -16,7 +16,7 @@ public abstract class DriverCommand
         /// <returns></returns>
         protected static IEnumerable<FileInfo> SearchDrivers(string patchPath, string fileExtension)
         {
-            var files = StorageManager.GetAllFiles(patchPath, StorageManager.SkipDirectorys);
+            var files = StorageManager.GetAllFiles(patchPath, BlackListManager.Instance.SkipDirectorys.ToList());
             return files.Where(x => x.FullName.EndsWith(fileExtension)).ToList();
         }
     }

src/c#/GeneralUpdate.Core/Driver/RestoreDriverCommand.cs

@@ -11,7 +11,7 @@ public void Execute()
         {
             try
             {
-                var backupFiles = StorageManager.GetAllFiles(information.OutPutDirectory, StorageManager.SkipDirectorys);
+                var backupFiles = StorageManager.GetAllFiles(information.OutPutDirectory, BlackListManager.Instance.SkipDirectorys.ToList());
                 var fileExtension = information.DriverFileExtension;
                 var drivers = backupFiles.Where(x => x.FullName.EndsWith(fileExtension)).ToList();
 

src/c#/GeneralUpdate.Core/GeneralUpdateBootstrap.cs

@@ -33,6 +33,10 @@ public GeneralUpdateBootstrap()
             if (processInfo == null)
                 throw new ArgumentException("ProcessInfo object cannot be null!");
 
+            BlackListManager.Instance?.AddBlackFileFormats(processInfo.BlackFileFormats);
+            BlackListManager.Instance?.AddBlackFiles(processInfo.BlackFiles);
+            BlackListManager.Instance?.AddSkipDirectorys(processInfo.SkipDirectorys);
+            
             _configInfo = new()
             {
                 MainAppName = processInfo.AppName,

src/c#/GeneralUpdate.Core/Pipeline/PatchMiddleware.cs

@@ -18,11 +18,6 @@ public async Task InvokeAsync(PipelineContext context)
         {
             var sourcePath = context.Get<string>("SourcePath");
             var targetPath = context.Get<string>("PatchPath");
-            var blackFiles = context.Get<List<string>>("BlackFiles");
-            var blackFileFormats = context.Get<List<string>>("BlackFileFormats");
-
-            BlackListManager.Instance.AddBlackFiles(blackFiles);
-            BlackListManager.Instance.AddBlackFileFormats(blackFileFormats);
             await DifferentialCore.Instance?.Dirty(sourcePath, targetPath);
         }
         catch (Exception exception)