功能：可以设置重试次数，失败超过重试次数下载/上传会暂停

Jeric-X · Jul 21, 2024 · 4f7f562 · 4f7f562
1 parent fc1529e
commit 4f7f562
Show file tree

Hide file tree

Showing 13 changed files with 50 additions and 12 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,3 +1,7 @@
+v2.8.3.1
+- 功能：可以设置重试次数，失败超过重试次数下载/上传会暂停(#100)
+- 功能：可以设置剪切文件时不上传(#107)
+
 v2.8.3
 - 修复：不设置hash上传图片/文件到服务器后，桌面客户端会无限重复设置剪贴板
 - 修复：远程文件不存在时，只报错一次，不再无限弹窗、图标错乱(#87)

diff --git a/build/macos/Info.plist b/build/macos/Info.plist
@@ -19,8 +19,8 @@
 	<key>NSHighResolutionCapable</key>
 	<true/>
 	<key>CFBundleVersion</key>
-	<string>0.7.4</string>
+	<string>0.7.4.1</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.7.4</string>
+	<string>0.7.4.1</string>
 </dict>
 </plist>
diff --git a/src/SyncClipboard.Core/I18n/Strings.Designer.cs b/src/SyncClipboard.Core/I18n/Strings.Designer.cs
diff --git a/src/SyncClipboard.Core/I18n/Strings.resx b/src/SyncClipboard.Core/I18n/Strings.resx
@@ -522,4 +522,7 @@
   <data name="DoNotUploadWhenCut" xml:space="preserve">
     <value>Don't Upload When Cutting Files</value>
   </data>
+  <data name="RetryTimes" xml:space="preserve">
+    <value>Retry Times</value>
+  </data>
 </root>
diff --git a/src/SyncClipboard.Core/I18n/Strings.zh-CN.resx b/src/SyncClipboard.Core/I18n/Strings.zh-CN.resx
@@ -522,4 +522,7 @@
   <data name="DoNotUploadWhenCut" xml:space="preserve">
     <value>剪切文件时不上传</value>
   </data>
+  <data name="RetryTimes" xml:space="preserve">
+    <value>重试次数</value>
+  </data>
 </root>
diff --git a/src/SyncClipboard.Core/Models/UserConfigs/SyncConfig.cs b/src/SyncClipboard.Core/Models/UserConfigs/SyncConfig.cs
@@ -16,6 +16,6 @@ public record class SyncConfig
     public bool TrustInsecureCertificate { get; set; } = false;
     public uint MaxFileByte { get; set; } = 1024 * 1024 * 20;  // 20MB 
     public uint IntervalTime { get; set; } = 3;
-    public int RetryTimes { get; set; } = 3;
+    public uint RetryTimes { get; set; } = 3;
     public uint TimeOut { get; set; } = 100;
 }
diff --git a/src/SyncClipboard.Core/UserServices/SyncService/DownloadService.cs b/src/SyncClipboard.Core/UserServices/SyncService/DownloadService.cs
@@ -231,6 +231,10 @@ private async void StartPullLoop()
             _toastReporter = null;
             _logger.Write(LOG_TAG, "Canceled");
         }
+        catch (Exception ex)
+        {
+            _logger.Write(LOG_TAG, ex.Message);
+        }
     }
 
     private void StopPullLoop()
@@ -272,18 +276,15 @@ public void PushStoppedHandler()
     private void SetStatusOnError(ref int errorTimes, Exception ex)
     {
         errorTimes++;
-        if (errorTimes == 2)
-        {
-            _trayIcon.SetStatusString(SERVICE_NAME, $"Error. Failed times: {errorTimes}.\n{ex.Message}", true);
-        }
+        _trayIcon.SetStatusString(SERVICE_NAME, $"Error. Failed times: {errorTimes}.\n{ex.Message}", true);
 
         _logger.Write(ex.ToString());
-        if (errorTimes == _syncConfig.RetryTimes)
+        if (errorTimes > _syncConfig.RetryTimes)
         {
             _notificationManager.SendText(I18n.Strings.FailedToDownloadClipboard, ex.Message);
+            throw new Exception("Download retry times reach limit");
         }
     }
-
     private async Task PullLoop(CancellationToken cancelToken)
     {
         int errorTimes = 0;
@@ -304,9 +305,9 @@ private async Task PullLoop(CancellationToken cancelToken)
                     ex = new Exception("Request timeout");
                 }
 
-                SetStatusOnError(ref errorTimes, ex);
                 _toastReporter?.Cancel();
                 _toastReporter = null;
+                SetStatusOnError(ref errorTimes, ex);
             }
             finally
             {

diff --git a/src/SyncClipboard.Core/ViewModels/SyncSettingViewModel.cs b/src/SyncClipboard.Core/ViewModels/SyncSettingViewModel.cs
@@ -44,6 +44,10 @@ partial void OnServerConfigChanged(ServerConfig value)
     private uint intervalTime;
     partial void OnIntervalTimeChanged(uint value) => ClientConfig = ClientConfig with { IntervalTime = value };
 
+    [ObservableProperty]
+    private uint retryTimes;
+    partial void OnRetryTimesChanged(uint value) => ClientConfig = ClientConfig with { RetryTimes = value };
+
     [ObservableProperty]
     private uint timeOut;
     partial void OnTimeOutChanged(uint value) => ClientConfig = ClientConfig with { TimeOut = value };
@@ -78,6 +82,7 @@ partial void OnServerConfigChanged(ServerConfig value)
     partial void OnClientConfigChanged(SyncConfig value)
     {
         IntervalTime = value.IntervalTime;
+        RetryTimes = value.RetryTimes;
         SyncEnable = value.SyncSwitchOn;
         UseLocalServer = value.UseLocalServer;
         TimeOut = value.TimeOut;
@@ -144,6 +149,7 @@ public SyncSettingViewModel(ConfigManager configManager, MainViewModel mainViewM
         _configManager.ListenConfig<SyncConfig>(config => ClientConfig = config);
         clientConfig = _configManager.GetConfig<SyncConfig>();
         intervalTime = clientConfig.IntervalTime;
+        retryTimes = clientConfig.RetryTimes;
         syncEnable = clientConfig.SyncSwitchOn;
         useLocalServer = clientConfig.UseLocalServer;
         timeOut = clientConfig.TimeOut;

diff --git a/src/SyncClipboard.Desktop/AppConfig.cs b/src/SyncClipboard.Desktop/AppConfig.cs
@@ -6,7 +6,7 @@ internal class AppConfig : IAppConfig
 {
     public string AppId => Env.AppId;
     public string AppStringId => "SyncClipboard.Desktop";
-    public string AppVersion => "0.7.4";
+    public string AppVersion => "0.7.4.1";
     public string UpdateApiUrl => "https://api.github.com/repos/Jeric-X/SyncClipboard.Desktop/releases";
     public string UpdateUrl => "https://github.com/Jeric-X/SyncClipboard.Desktop/releases/latest";
 }
diff --git a/src/SyncClipboard.Desktop/Changes.md b/src/SyncClipboard.Desktop/Changes.md
@@ -1,3 +1,7 @@
+0.7.4.1
+- 功能：可以设置重试次数，失败超过重试次数下载/上传会暂停(https://github.com/Jeric-X/SyncClipboard/issues/100)
+- 功能：可以设置剪切文件时不上传(https://github.com/Jeric-X/SyncClipboard/issues/107)
+
 0.7.4
 - 修复：不设置hash上传图片/文件到服务器后，桌面客户端会无限重复设置剪贴板
 - 修复：在一些场景复制图片时，无法触发上传(https://github.com/Jeric-X/SyncClipboard/issues/88)

diff --git a/src/SyncClipboard.Desktop/Views/SyncSettingPage.axaml b/src/SyncClipboard.Desktop/Views/SyncSettingPage.axaml
@@ -118,6 +118,11 @@
                         <ui:NumberBox Minimum="0" Maximum="100000" Value="{Binding IntervalTime, Mode=TwoWay}" />
                     </ui:SettingsExpanderItem.Footer>
                 </ui:SettingsExpanderItem>
+                <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.RetryTimes}">
+                    <ui:SettingsExpanderItem.Footer>
+                        <ui:NumberBox Minimum="0" Maximum="100000" Value="{Binding RetryTimes, Mode=TwoWay}" />
+                    </ui:SettingsExpanderItem.Footer>
+                </ui:SettingsExpanderItem>
                 <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.TimeoutPeriod}">
                     <ui:SettingsExpanderItem.Footer>
                         <ui:NumberBox Minimum="0" Maximum="100000" Value="{Binding TimeOut, Mode=TwoWay}" />

diff --git a/src/SyncClipboard.WinUI3/AppConfig.cs b/src/SyncClipboard.WinUI3/AppConfig.cs
@@ -6,7 +6,7 @@ internal class AppConfig : IAppConfig
 {
     public string AppId => Env.AppId;
     public string AppStringId => "SyncClipboard.WinUI";
-    public string AppVersion => "2.8.3";
+    public string AppVersion => "2.8.3.1";
     public string UpdateApiUrl => "https://api.github.com/repos/Jeric-X/SyncClipboard/releases";
     public string UpdateUrl => "https://github.com/Jeric-X/SyncClipboard/releases/latest";
 }
diff --git a/src/SyncClipboard.WinUI3/Views/SyncSettingPage.xaml b/src/SyncClipboard.WinUI3/Views/SyncSettingPage.xaml
@@ -111,6 +111,9 @@
                 <ui:SettingsCard Header="{x:Bind i18n:Strings.QueryInterval}">
                     <NumberBox Minimum="0" Maximum="100000" Value="{x:Bind _viewModel.IntervalTime, Mode=TwoWay}" />
                 </ui:SettingsCard>
+                <ui:SettingsCard Header="{x:Bind i18n:Strings.RetryTimes}">
+                    <NumberBox Minimum="0" Maximum="100000" Value="{x:Bind _viewModel.RetryTimes, Mode=TwoWay}" />
+                </ui:SettingsCard>
                 <ui:SettingsCard Header="{x:Bind i18n:Strings.TimeoutPeriod}">
                     <NumberBox Minimum="0" Maximum="100000" Value="{x:Bind _viewModel.TimeOut, Mode=TwoWay}" />
                 </ui:SettingsCard>