Fix the cache update thrown an exception (Issue: #22)

CollapseLauncher · Sep 23, 2022 · acd1968 · acd1968
1 parent be42265
commit acd1968
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/CollapseLauncher/Classes/CachesManagement/CachesCheck.cs b/CollapseLauncher/Classes/CachesManagement/CachesCheck.cs
@@ -279,6 +279,9 @@ private void CleanUpCaches(DataProperties prop, string cachesLocalPath)
             }
         }
 
-        private void DataFetchingProgress(object sender, DownloadEvent e) => CachesTotalStatus.Text = string.Format(Lang._Misc.Speed, SummarizeSizeSimple(e.Speed));
+        private void DataFetchingProgress(object sender, DownloadEvent e)
+        {
+            DispatcherQueue.TryEnqueue(() => { CachesTotalStatus.Text = string.Format(Lang._Misc.Speed, SummarizeSizeSimple(e.Speed)); });
+        }
     }
 }
diff --git a/CollapseLauncher/Classes/CachesManagement/CachesUpdate.cs b/CollapseLauncher/Classes/CachesManagement/CachesUpdate.cs
@@ -159,10 +159,13 @@ private void CachesDownloadProgress(object sender, DownloadEvent e)
                 timeLeftString = string.Format(Lang._Misc.TimeRemainHMSFormat, TimeSpan.FromSeconds((cachesTotalSize - cachesRead) / Unzeroed((long)(cachesRead / SpeedStopwatch.Elapsed.TotalSeconds))));
             }
 
-            CachesTotalStatus.Text = string.Format(Lang._Misc.Downloading + ": {0}/{1} ", cachesCount, cachesTotalCount)
-                                   + string.Format($"({Lang._Misc.SpeedPerSec})", SummarizeSizeSimple(e.Speed))
-                                   + $" | {timeLeftString}";
-            CachesTotalProgressBar.Value = GetPercentageNumber(cachesRead, cachesTotalSize);
+            DispatcherQueue.TryEnqueue(() =>
+            {
+                CachesTotalStatus.Text = string.Format(Lang._Misc.Downloading + ": {0}/{1} ", cachesCount, cachesTotalCount)
+                                       + string.Format($"({Lang._Misc.SpeedPerSec})", SummarizeSizeSimple(e.Speed))
+                                       + $" | {timeLeftString}";
+                CachesTotalProgressBar.Value = GetPercentageNumber(cachesRead, cachesTotalSize);
+            });
         }
     }
 }
diff --git a/Hi3Helper.Core/Classes/Shared/ClassStruct/StructsEnums.cs b/Hi3Helper.Core/Classes/Shared/ClassStruct/StructsEnums.cs
@@ -42,7 +42,7 @@ public enum CachesType
 
     public enum CachesDataStatus
     {
-        Missing = 0,
+        New = 0,
         Obsolete = 1,
         Unecessary = 2
     }