More work on improving perf and reinstating real-time sync.

Author: SteveIves

SFTPSyncLib/Logger.cs

@@ -40,11 +40,11 @@ private static void Log(string message)
             switch (_mode)
             {
                 case LoggerMode.Console:
-                    Console.WriteLine($"{DateTime.Now.ToString()} {message}");
+                    Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")} {message}");
                     break;
 
                 case LoggerMode.RaiseEvent:
-                    LogUpdated?.Invoke($"{DateTime.Now.ToString()} {message}");
+                    LogUpdated?.Invoke($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")} {message}");
                     break;
             }
         }

SFTPSyncLib/RemoteSync.cs

@@ -39,7 +39,6 @@ public RemoteSync(string host, string username, string password,
             _director = director;
             _excludedFolders = excludedFolders ?? new List<string>();
             _sftp = new SftpClient(host, username, password);
-            _sftp.Connect();
 
             //Our first instance is responsible for creating all of the the directories
             //Subsequent instances will not be created until this is done
@@ -69,7 +68,6 @@ public RemoteSync(string host, string username, string password,
             _director = director;
             _excludedFolders = excludedFolders ?? new List<string>();
             _sftp = new SftpClient(host, username, password);
-            _sftp.Connect();
 
             DoneMakingFolders = Task.CompletedTask;
             DoneInitialSync = initialSyncTask;
@@ -424,6 +422,11 @@ private bool EnsureConnectedSafe()
             }
         }
 
+        public Task<bool> ConnectAsync()
+        {
+            return Task.Run(() => EnsureConnectedSafe());
+        }
+
 
         private async void Fsw_Changed(object? sender, FileSystemEventArgs arg)
         {

SFTPSyncUI/SFTPSyncUI.cs

@@ -264,7 +264,18 @@ await Task.Run(async () =>
                         }
                     }
 
+                    var connectTasks = new List<Task>();
+
+                    Logger.LogInfo($"Establishing SFTP connections for {RemoteSyncWorkers.Count} workers");
+
+                    for (int i = 0; i < RemoteSyncWorkers.Count; i++)
+                    {
+                        connectTasks.Add(RemoteSyncWorkers[i].ConnectAsync());
+                    }
+                    await Task.WhenAll(connectTasks);
+
                     Task runInitialSyncTask;
+
                     try
                     {
                         runInitialSyncTask = RemoteSync.RunSharedInitialSyncAsync(
@@ -284,7 +295,7 @@ await Task.Run(async () =>
                         return;
                     }
 
-                    runInitialSyncTask.ContinueWith(t =>
+                    await runInitialSyncTask.ContinueWith(t =>
                     {
                         if (t.IsFaulted && t.Exception != null)
                         {
@@ -301,6 +312,7 @@ await Task.Run(async () =>
                     }, TaskScheduler.Default);
 
                     //Wait for all sync workers to finish initial sync then tell the user
+
                     try
                     {
                         await runInitialSyncTask;