improve syncing of files with CLI

Author: clemensott

FileSystemCLI/Program.cs

@@ -119,9 +119,9 @@ private static SyncPairsModel GetSyncPair(ParsedArgs args)
         };
     }
 
-    private static async Task DoWatchSyncs(bool isTestRun, bool initialSync, SyncPairsModel syncPairs, Api api)
+    private static async Task DoWatchSyncs(bool isTestRun, SyncPairsModel syncPairs, Api api)
     {
-        SyncPairHandler? initialHandler = null;
+        SemaphoreSlim syncSem = new SemaphoreSlim(1, 1);
         List<SyncFileWatcher> watchers = new List<SyncFileWatcher>();
 
         bool isCanceled = false;
@@ -130,34 +130,13 @@ private static async Task DoWatchSyncs(bool isTestRun, bool initialSync, SyncPai
             if (isCanceled) return;
 
             Console.WriteLine("Cancel sync!");
-            initialHandler?.Cancel();
             foreach (SyncFileWatcher watcher in watchers) watcher.Stop();
             e.Cancel = true;
         };
 
         foreach (SyncPairModel syncPair in syncPairs.Pairs)
         {
-            SyncPairState syncPairState = await SyncPairState.LoadSyncPairState(syncPair.StateFilePath);
-            if (initialSync || syncPairState.LastFullSync + syncPair.FullSyncInterval < DateTime.UtcNow)
-            {
-                try
-                {
-                    await api.Ensure();
-                    initialHandler = new SyncPairHandler(isTestRun, syncPair, api, syncPairState);
-                    await initialHandler.Run();
-
-                    if (initialHandler.IsCancelled) return;
-
-                    syncPairState = initialHandler.CurrentState;
-                    if (!isTestRun) await syncPairState.WriteSyncPairState(syncPair.StateFilePath);
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine($"Error on initial sync before watch: {e.Message}");
-                }
-            }
-
-            SyncFileWatcher watcher = new SyncFileWatcher(isTestRun, syncPair, api, syncPairState);
+            SyncFileWatcher watcher = new SyncFileWatcher(isTestRun, syncPair, api, syncSem);
             watchers.Add(watcher);
             watcher.Start();
         }
@@ -202,7 +181,7 @@ public static async Task Main(string[] args)
 
         using Api api = new(syncPairs.Api.BaseUrl, syncPairs.Api.Username, syncPairs.Api.Password);
 
-        if (parsedArgs.Watch) await DoWatchSyncs(parsedArgs.IsTestRun, parsedArgs.InitialSync, syncPairs, api);
+        if (parsedArgs.Watch) await DoWatchSyncs(parsedArgs.IsTestRun, syncPairs, api);
         else await DoSingleCompleteSyncs(parsedArgs.IsTestRun, syncPairs, api);
     }
 }

FileSystemCLI/ProgramArguments/ParsedArgs.cs

@@ -8,8 +8,6 @@ public class ParsedArgs
     public bool IsTestRun { get; init; }
 
     public bool Watch  { get; init; }
-    
-    public bool InitialSync { get; init; }
 
     public string? ConfigFilePath { get; init; }
 
@@ -41,8 +39,6 @@ public static ParsedArgs Parse(string[] args)
     {
         Option isTestRunOption = new Option("t", "test-run", "Do a test run that doesn't change anything", false, 0, 0);
         Option watchOption = new Option("w", "watch", "Watch for changes in file system", false, 0, 0);
-        Option initialSyncOption = Option.GetLongOnly("inital-sync",
-            "Does complete sync before starting file system water (only works with --watch)", false, 0, 0);
         Option configFilePathOption =
             new Option("c", "config-file", "Uses the config from file at given path", false, 1, 1);
 
@@ -61,7 +57,7 @@ public static ParsedArgs Parse(string[] args)
         Option stateFilePathOption = new Option("state", "state-file",
             "File to save synced state in and only needed for two way mode", false, 1, 1);
 
-        Options options = new Options(isTestRunOption, watchOption, initialSyncOption, configFilePathOption,
+        Options options = new Options(isTestRunOption, watchOption, configFilePathOption,
             serverUrlOption, serverUsernameOption, serverPasswordOption, withSubfoldersOption, localFolderPathOption,
             serverFolderPathOption, modeOption, compareTypeOption, conflictHandlingOption, allowListOption,
             denyListsOption, stateFilePathOption);
@@ -74,7 +70,6 @@ public static ParsedArgs Parse(string[] args)
         {
             IsTestRun = result.HasValidOptionParseds(isTestRunOption),
             Watch = result.HasValidOptionParseds(watchOption),
-            InitialSync = result.HasValidOptionParseds(initialSyncOption),
             ConfigFilePath = result.TryGetFirstValidOptionParseds(configFilePathOption, out parsed)
                 ? parsed.Values[0]
                 : null,