Code cleanup

Author: SteveIves

SFTPSyncLib/RemoteSync.cs

@@ -33,21 +33,25 @@ public RemoteSync(string host, string username, string password,
             _username = username;
             _password = password;
             _searchPattern = searchPattern;
-            _localRootDirectory = Path.TrimEndingDirectorySeparator(
-                Path.GetFullPath(localRootDirectory));
+            _localRootDirectory = Path.TrimEndingDirectorySeparator(Path.GetFullPath(localRootDirectory));
             _remoteRootDirectory = remoteRootDirectory.TrimEnd('/', '\\');
             _director = director;
             _excludedFolders = excludedFolders ?? new List<string>();
             _sftp = new SftpClient(host, username, password);
 
-            //Our first instance is responsible for creating all of the the directories
-            //Subsequent instances will not be created until this is done
-            DoneMakingFolders = createFolders ? CreateDirectories(_localRootDirectory, _remoteRootDirectory) : Task.CompletedTask;
+            //The first instance is responsible for creating ALL of the the directories.
+            //Subsequent instances will not be created until this one completes.
+
+            DoneMakingFolders = createFolders
+                ? CreateDirectories(_localRootDirectory, _remoteRootDirectory)
+                : Task.CompletedTask;
 
             //Now perform the initial sync for the pattern this instance is responsible for
+
             DoneInitialSync = InitialSync(_localRootDirectory, _remoteRootDirectory);
 
             //Once the initial sync is done, we can start watching the file system for changes
+
             DoneInitialSync.ContinueWith((tmp) =>
             {
                 _director.AddCallback(searchPattern, (args) => Fsw_Changed(null, args));
@@ -62,14 +66,14 @@ public RemoteSync(string host, string username, string password,
             _username = username;
             _password = password;
             _searchPattern = searchPattern;
-            _localRootDirectory = Path.TrimEndingDirectorySeparator(
-                Path.GetFullPath(localRootDirectory));
+            _localRootDirectory = Path.TrimEndingDirectorySeparator(Path.GetFullPath(localRootDirectory));
             _remoteRootDirectory = remoteRootDirectory.TrimEnd('/', '\\');
             _director = director;
             _excludedFolders = excludedFolders ?? new List<string>();
             _sftp = new SftpClient(host, username, password);
 
             DoneMakingFolders = Task.CompletedTask;
+
             DoneInitialSync = initialSyncTask;
 
             DoneInitialSync.ContinueWith((tmp) =>
@@ -79,14 +83,9 @@ public RemoteSync(string host, string username, string password,
         }
 
         public static async Task RunSharedInitialSyncAsync(
-            string host,
-            string username,
-            string password,
-            string localRootDirectory,
-            string remoteRootDirectory,
-            string[] searchPatterns,
-            List<string>? excludedFolders,
-            int workerCount)
+            string host, string username, string password,
+            string localRootDirectory, string remoteRootDirectory,
+            string[] searchPatterns, List<string>? excludedFolders, int workerCount)
         {
             if (workerCount <= 0 || searchPatterns.Length == 0)
             {
@@ -108,6 +107,7 @@ public static async Task RunSharedInitialSyncAsync(
             }
 
             var workQueue = new ConcurrentQueue<SyncWorkItem>();
+
             foreach (var pair in EnumerateLocalDirectories(localRootDirectory, remoteRootDirectory, excludedFolders))
             {
                 foreach (var pattern in searchPatterns)
@@ -117,6 +117,7 @@ public static async Task RunSharedInitialSyncAsync(
             }
 
             var workers = new List<Task>();
+
             for (int i = 0; i < workerCount; i++)
             {
                 workers.Add(Task.Run(async () =>

SFTPSyncLib/SyncDirector.cs

@@ -18,15 +18,23 @@ public SyncDirector(string rootFolder)
                 InternalBufferSize = 64 * 1024
             };
 
-            _fsw.Changed += Fsw_Changed;
             _fsw.Created += Fsw_Created;
+            _fsw.Changed += Fsw_Changed;
             _fsw.Renamed += Fsw_Renamed;
             _fsw.Error += Fsw_Error;
 
             _fsw.EnableRaisingEvents = true;
         }
 
-        private void Fsw_Renamed(object sender, RenamedEventArgs e)
+        public void AddCallback(string match, Action<FileSystemEventArgs> handler)
+        {
+            string regexPattern = "^" + Regex.Escape(match)
+                .Replace("\\*", ".*")
+                .Replace("\\?", ".") + "$";
+            callbacks.Add((new Regex(regexPattern, RegexOptions.IgnoreCase), handler));
+        }
+
+        private void Fsw_Created(object sender, FileSystemEventArgs e)
         {
             var name = Path.GetFileName(e.FullPath);
             foreach (var (regex, callback) in callbacks)
@@ -38,7 +46,7 @@ private void Fsw_Renamed(object sender, RenamedEventArgs e)
             }
         }
 
-        private void Fsw_Created(object sender, FileSystemEventArgs e)
+        private void Fsw_Changed(object sender, FileSystemEventArgs e)
         {
             var name = Path.GetFileName(e.FullPath);
             foreach (var (regex, callback) in callbacks)
@@ -50,15 +58,7 @@ private void Fsw_Created(object sender, FileSystemEventArgs e)
             }
         }
 
-        public void AddCallback(string match, Action<FileSystemEventArgs> handler)
-        {
-            string regexPattern = "^" + Regex.Escape(match)
-                .Replace("\\*", ".*")
-                .Replace("\\?", ".") + "$";
-            callbacks.Add((new Regex(regexPattern, RegexOptions.IgnoreCase), handler));
-        }
-
-        private void Fsw_Changed(object sender, FileSystemEventArgs e)
+        private void Fsw_Renamed(object sender, RenamedEventArgs e)
         {
             var name = Path.GetFileName(e.FullPath);
             foreach (var (regex, callback) in callbacks)