修复配置修改下次才生效的问题

Jeric-X · Sep 24, 2020 · 945d479 · 945d479
1 parent 02813bc
commit 945d479
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 9 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,3 +1,7 @@
+v1.1.3
+- add mutex when writing/reading remote files
+- optimize architecture
+
 v1.1.2
 - change profile file's syntax
 - update ios workflow

diff --git a/SyncClipboard/Config.cs b/SyncClipboard/Config.cs
@@ -79,6 +79,7 @@ public static void Save()
             Properties.Settings.Default.RetryTimes = RetryTimes;
             Properties.Settings.Default.TimeOut = TimeOut;
             Properties.Settings.Default.Save();
+            Load();
         }
 
         private static string FormatHttpAuthHeader(string user, string password)

diff --git a/SyncClipboard/Program.cs b/SyncClipboard/Program.cs
@@ -13,7 +13,7 @@ static class Program
         public static MainController mainController;
         public static ClipboardListener ClipboardListener;
 
-        public static PullService syncService;
+        public static PullService pullService;
         public static PushService pushService;
 
         /// <summary>
@@ -39,7 +39,7 @@ static void Main()
                 mainController = new MainController();
                 ClipboardListener = new ClipboardListener();
 
-                syncService = new PullService(mainController.GetNotifyFunction());
+                pullService = new PullService(mainController.GetNotifyFunction());
                 pushService = new PushService(mainController.GetNotifyFunction());
 
                 Application.Run();
@@ -56,9 +56,9 @@ private static void CurrentDomain_UnhandledException(object sender, UnhandledExc
         }
         private static void Application_ApplicationExit(object sender, EventArgs e)
         {
-            if (syncService != null)
+            if (pullService != null)
             {
-                syncService.Stop();
+                pullService.Stop();
             }
             if (pushService != null)
             {

diff --git a/SyncClipboard/PullService.cs b/SyncClipboard/PullService.cs
@@ -75,10 +75,21 @@ private void PullLoop()
                     errorTimes += 1;
                     Console.WriteLine(ex.ToString());
                     Notify(false, true, ex.Message.ToString(), Config.GetProfileUrl() + "\n重试次数:" + errorTimes.ToString(), "重试次数:" + errorTimes.ToString(), "erro");
+                    if (errorTimes > Config.RetryTimes)
+                    {
+                        Config.IfPull = false;
+                        Config.Save();
+                        Notify(true, false, "剪切板同步失败，已达到最大重试次数", ex.Message.ToString(), null, "erro");
+                    }
                     continue;
                 }
+                finally
+                {
+                    RemoteClipboardLocker.Unlock();
+                    Thread.Sleep((int)Config.IntervalTime);
+                }
 
-                RemoteClipboardLocker.Unlock();
+
                 errorTimes = 0;
                 Profile remoteProfile = new Profile(strReply);
                 Profile localProfile = Profile.CreateFromLocalClipboard();
@@ -88,8 +99,6 @@ private void PullLoop()
                     Notify(true, false, "剪切板同步成功", remoteProfile.Text, null, "info");
                 }
                 Notify(false, true, "服务器连接成功", null, "正在同步", "info");
-
-                Thread.Sleep((int)Config.IntervalTime);
             }
         }
     }

diff --git a/SyncClipboard/Settings.cs b/SyncClipboard/Settings.cs
@@ -18,8 +18,9 @@ private void SettingChangingEventHandler(object sender, System.Configuration.Set
         }
 
         private void SettingsSavingEventHandler(object sender, System.ComponentModel.CancelEventArgs e) {
-            Program.syncService.Load();
+            Program.pullService.Load();
             Program.pushService.Load();
+            Program.mainController.LoadConfig();
         }
     }
 }
diff --git a/SyncClipboard/UpdateChecker.cs b/SyncClipboard/UpdateChecker.cs
@@ -6,7 +6,7 @@ namespace SyncClipboard
 {
     class UpdateChecker
     {
-        public const string Version = "1.1.2";
+        public const string Version = "1.1.3";
         public const string UpdateUrl = "https://api.github.com/repos/Jeric-X/SyncClipboard/releases/latest";
         public const string ReleaseUrl = "https://github.com/Jeric-X/SyncClipboard/releases/latest";