Update Improvement

Taiizor · Oct 10, 2023 · 0c2b373 · 0c2b373
1 parent e183c6d
commit 0c2b373
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/src/Bundle/Sucrose.Bundle/Main.xaml.cs b/src/Bundle/Sucrose.Bundle/Main.xaml.cs
@@ -114,8 +114,8 @@ private static async Task InstallRedist()
                 FileName = Executable,
                 CreateNoWindow = true,
                 UseShellExecute = false,
-                RedirectStandardError = true,
-                RedirectStandardOutput = true
+                RedirectStandardError = false,
+                RedirectStandardOutput = false
             };
 
             using (Process Installer = new())
@@ -197,8 +197,6 @@ private static async Task ControlDirectoryStable(string Location)
             }
 
             await Task.Delay(MinDelay);
-
-            await Task.CompletedTask;
         }
 
         private static async Task ExtractResources(string SourcePath, string ExtractPath)

diff --git a/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/OtherSettingViewModel.cs b/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/OtherSettingViewModel.cs
@@ -284,7 +284,22 @@ private void InitializeViewModel()
 
             foreach (SEST Type in Enum.GetValues(typeof(SEST)))
             {
-                UpdateLimitType.Items.Add(Type);
+                if (Type >= SEST.Megabyte)
+                {
+                    UpdateLimitType.Items.Add(new ComboBoxItem()
+                    {
+                        IsEnabled = true,
+                        Content = Type
+                    });
+                }
+                else
+                {
+                    UpdateLimitType.Items.Add(new ComboBoxItem()
+                    {
+                        IsEnabled = false,
+                        Content = Type
+                    });
+                }
             }
 
             UpdateLimitType.SelectedIndex = (int)SMMM.DownloadType;

diff --git a/src/Update/Sucrose.Update/App.xaml.cs b/src/Update/Sucrose.Update/App.xaml.cs
@@ -262,6 +262,7 @@ protected async void Configure()
                                     SUMI.DownloadService.DownloadStarted += OnDownloadStarted;
                                     SUMI.DownloadService.DownloadFileCompleted += OnDownloadFileCompleted;
                                     SUMI.DownloadService.DownloadProgressChanged += OnDownloadProgressChanged;
+                                    SUMI.DownloadService.ChunkDownloadProgressChanged += OnChunkDownloadProgressChanged;
 
                                     await SUMI.DownloadService.DownloadFileTaskAsync(SUMI.Source, Bundle);
 
@@ -416,5 +417,10 @@ private static void OnDownloadProgressChanged(object sender, DownloadProgressCha
 
             UpdateLimit();
         }
+
+        private static void OnChunkDownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
+        {
+            UpdateLimit();
+        }
     }
 }