同步粒度开关，UI部分

Jeric-X · Aug 9, 2024 · 9a76284 · 9a76284
1 parent d45514b
commit 9a76284
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 4 deletions.
diff --git a/src/SyncClipboard.Core/Clipboard/ClipboardFactoryBase.cs b/src/SyncClipboard.Core/Clipboard/ClipboardFactoryBase.cs
@@ -80,9 +80,9 @@ ex is JsonException ||
         {
             return await UploadAndReturnBlankProfile(cancelToken);
         }
-        catch
+        catch (Exception ex)
         {
-            Logger.Write("CreateFromRemote failed");
+            Logger.Write($"CreateFromRemote failed {ex}");
             throw;
         }
     }

diff --git a/src/SyncClipboard.Core/UserServices/SyncService/DownloadService.cs b/src/SyncClipboard.Core/UserServices/SyncService/DownloadService.cs
@@ -288,6 +288,7 @@ private void SetStatusOnError(ref int errorTimes, Exception ex)
     private async Task PullLoop(CancellationToken cancelToken)
     {
         int errorTimes = 0;
+        await Task.Delay(TimeSpan.FromSeconds(0.5), cancelToken);
         while (!cancelToken.IsCancellationRequested && (_isQuickDownload || SwitchOn))
         {
             await SyncService.remoteProfilemutex.WaitAsync(cancelToken);

diff --git a/src/SyncClipboard.Core/ViewModels/SyncSettingViewModel.cs b/src/SyncClipboard.Core/ViewModels/SyncSettingViewModel.cs
@@ -207,6 +207,11 @@ public SyncSettingViewModel(ConfigManager configManager, MainViewModel mainViewM
         notifyOnManualUpload = clientConfig.NotifyOnManualUpload;
         doNotUploadWhenCut = clientConfig.DoNotUploadWhenCut;
         trustInsecureCertificate = clientConfig.TrustInsecureCertificate;
+        uploadEnable = clientConfig.PushSwitchOn;
+        downloadEnable = clientConfig.PullSwitchOn;
+        textEnable = clientConfig.EnableUploadText;
+        singleFileEnable = clientConfig.EnableUploadSingleFile;
+        multiFileEnable = clientConfig.EnableUploadMultiFile;
     }
 
     public string? SetServerConfig(string portString, string username, string password)

diff --git a/src/SyncClipboard.Desktop/Views/SyncSettingPage.axaml b/src/SyncClipboard.Desktop/Views/SyncSettingPage.axaml
@@ -147,6 +147,31 @@
                         <ToggleSwitch OnContent="{x:Static i18n:Strings.On}" OffContent="{x:Static i18n:Strings.Off}" IsChecked="{Binding NotifyOnDownloaded, Mode=TwoWay}" />
                     </ui:SettingsExpanderItem.Footer>
                 </ui:SettingsExpanderItem>
+                <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.EnableDownload}">
+                    <ui:SettingsExpanderItem.Footer>
+                        <ToggleSwitch OnContent="{x:Static i18n:Strings.On}" OffContent="{x:Static i18n:Strings.Off}" IsChecked="{Binding DownloadEnable, Mode=TwoWay}" />
+                    </ui:SettingsExpanderItem.Footer>
+                </ui:SettingsExpanderItem>
+                <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.EnableUpload}">
+                    <ui:SettingsExpanderItem.Footer>
+                        <ToggleSwitch OnContent="{x:Static i18n:Strings.On}" OffContent="{x:Static i18n:Strings.Off}" IsChecked="{Binding UploadEnable, Mode=TwoWay}" />
+                    </ui:SettingsExpanderItem.Footer>
+                </ui:SettingsExpanderItem>
+                <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.EnableUploadText}">
+                    <ui:SettingsExpanderItem.Footer>
+                        <ToggleSwitch OnContent="{x:Static i18n:Strings.On}" OffContent="{x:Static i18n:Strings.Off}" IsChecked="{Binding TextEnable, Mode=TwoWay}" />
+                    </ui:SettingsExpanderItem.Footer>
+                </ui:SettingsExpanderItem>
+                <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.EnableUploadFile}">
+                    <ui:SettingsExpanderItem.Footer>
+                        <ToggleSwitch OnContent="{x:Static i18n:Strings.On}" OffContent="{x:Static i18n:Strings.Off}" IsChecked="{Binding SingleFileEnable, Mode=TwoWay}" />
+                    </ui:SettingsExpanderItem.Footer>
+                </ui:SettingsExpanderItem>
+                <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.EnableUploadMultiFile}">
+                    <ui:SettingsExpanderItem.Footer>
+                        <ToggleSwitch OnContent="{x:Static i18n:Strings.On}" OffContent="{x:Static i18n:Strings.Off}" IsChecked="{Binding MultiFileEnable, Mode=TwoWay}" />
+                    </ui:SettingsExpanderItem.Footer>
+                </ui:SettingsExpanderItem>
                 <ui:SettingsExpanderItem IsVisible="{OnPlatform Default=True, macOS=False}" Content="{x:Static i18n:Strings.DoNotUploadWhenCut}">
                     <ui:SettingsExpanderItem.Footer>
                         <ToggleSwitch OnContent="{x:Static i18n:Strings.On}" OffContent="{x:Static i18n:Strings.Off}" IsChecked="{Binding DoNotUploadWhenCut, Mode=TwoWay}" />

diff --git a/src/SyncClipboard.WinUI3/Views/SyncSettingPage.xaml b/src/SyncClipboard.WinUI3/Views/SyncSettingPage.xaml
@@ -75,12 +75,15 @@
             <ui:SettingsExpander.HeaderIcon>
                 <FontIcon Glyph="&#xE117;" />
             </ui:SettingsExpander.HeaderIcon>
-            <ToggleSwitch OnContent="{x:Bind i18n:Strings.On}" OffContent="{x:Bind i18n:Strings.Off}" IsOn="{x:Bind _viewModel.ClientEnabled, Mode=TwoWay}" IsEnabled="{x:Bind _viewModel.IsNormalClientEnable, Mode=OneWay}"/>
+            <ToggleSwitch OnContent="{x:Bind i18n:Strings.On}"
+                          OffContent="{x:Bind i18n:Strings.Off}"
+                          IsOn="{x:Bind _viewModel.ClientEnabled, Mode=TwoWay}"
+                          IsEnabled="{x:Bind _viewModel.IsNormalClientEnable, Mode=OneWay}" />
             <ui:SettingsExpander.Items>
                 <ui:SettingsCard Description="{x:Bind i18n:Strings.UseBuiltInServerDescription}" Header="{x:Bind i18n:Strings.UseSelfHostServer}" Visibility="{x:Bind vc:ConvertMethod.BoolToVisibility(_viewModel.IsNormalClientEnable), Mode=OneWay}">
                     <ToggleSwitch OnContent="{x:Bind i18n:Strings.On}" OffContent="{x:Bind i18n:Strings.Off}" IsOn="{x:Bind _viewModel.UseLocalServer, Mode=TwoWay}" />
                 </ui:SettingsCard>
-                <ui:SettingsCard Visibility="{x:Bind vc:ConvertMethod.BoolToVisibility(_viewModel.UseManulServer)}" Description="{x:Bind _viewModel.ClientConfigDescription, Mode=OneWay}">
+                <ui:SettingsCard Visibility="{x:Bind vc:ConvertMethod.BoolToVisibility(_viewModel.UseManulServer), Mode=OneWay}" Description="{x:Bind _viewModel.ClientConfigDescription, Mode=OneWay}">
                     <StackPanel Orientation="Horizontal" Spacing="5">
                         <ToggleButton IsChecked="{x:Bind _viewModel.ShowClientPassword, Mode=TwoWay}">
                             <FontIcon Glyph="{x:Bind _viewModel.ShowClientPassword, Mode=OneWay, Converter={StaticResource BoolToPasswordIconConverter}}" />
@@ -126,6 +129,21 @@
                 <ui:SettingsCard Header="{x:Bind i18n:Strings.SendNotificationAfterUpdateLocalClipboard}">
                     <ToggleSwitch OnContent="{x:Bind i18n:Strings.On}" OffContent="{x:Bind i18n:Strings.Off}" IsOn="{x:Bind _viewModel.NotifyOnDownloaded, Mode=TwoWay}" />
                 </ui:SettingsCard>
+                <ui:SettingsCard Header="{x:Bind i18n:Strings.EnableDownload}" Visibility="{x:Bind vc:ConvertMethod.BoolToVisibility(_viewModel.IsNormalClientEnable), Mode=OneWay}">
+                    <ToggleSwitch OnContent="{x:Bind i18n:Strings.On}" OffContent="{x:Bind i18n:Strings.Off}" IsOn="{x:Bind _viewModel.DownloadEnable, Mode=TwoWay}" />
+                </ui:SettingsCard>
+                <ui:SettingsCard Header="{x:Bind i18n:Strings.EnableUpload}" Visibility="{x:Bind vc:ConvertMethod.BoolToVisibility(_viewModel.IsNormalClientEnable), Mode=OneWay}">
+                    <ToggleSwitch OnContent="{x:Bind i18n:Strings.On}" OffContent="{x:Bind i18n:Strings.Off}" IsOn="{x:Bind _viewModel.UploadEnable, Mode=TwoWay}" />
+                </ui:SettingsCard>
+                <ui:SettingsCard Header="{x:Bind i18n:Strings.EnableUploadText}">
+                    <ToggleSwitch OnContent="{x:Bind i18n:Strings.On}" OffContent="{x:Bind i18n:Strings.Off}" IsOn="{x:Bind _viewModel.TextEnable, Mode=TwoWay}" />
+                </ui:SettingsCard>
+                <ui:SettingsCard Header="{x:Bind i18n:Strings.EnableUploadFile}">
+                    <ToggleSwitch OnContent="{x:Bind i18n:Strings.On}" OffContent="{x:Bind i18n:Strings.Off}" IsOn="{x:Bind _viewModel.SingleFileEnable, Mode=TwoWay}" />
+                </ui:SettingsCard>
+                <ui:SettingsCard Header="{x:Bind i18n:Strings.EnableUploadMultiFile}">
+                    <ToggleSwitch OnContent="{x:Bind i18n:Strings.On}" OffContent="{x:Bind i18n:Strings.Off}" IsOn="{x:Bind _viewModel.MultiFileEnable, Mode=TwoWay}" />
+                </ui:SettingsCard>
                 <ui:SettingsCard Header="{x:Bind i18n:Strings.DoNotUploadWhenCut}">
                     <ToggleSwitch OnContent="{x:Bind i18n:Strings.On}" OffContent="{x:Bind i18n:Strings.Off}" IsOn="{x:Bind _viewModel.DoNotUploadWhenCut, Mode=TwoWay}" />
                 </ui:SettingsCard>