Merge remote-tracking branch 'origin/filecleanup-improvement' into fi…

…lecleanup-improvement
CollapseLauncher · Dec 19, 2024 · 5edc9c6 · 5edc9c6
2 parents 442fcf4 + a65b937
commit 5edc9c6
Showing 1 changed file with 21 additions and 18 deletions.
diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/FileCleanupPage.xaml.cs b/CollapseLauncher/XAMLs/MainApp/Pages/FileCleanupPage.xaml.cs
@@ -88,30 +88,34 @@ await Task.Run(() =>
                                                                                sI.Stop();
                                                                                Logger.LogWriteLine($"[FileCleanupPage::InjectFileInfoSource] Finished batch #{b} with {batch.Count} items after {s.ElapsedMilliseconds} ms", LogType.Scheme);
                                                                                b++;
+                                                                               sI = null;
                                                                            }));
 
                                }
                            });
             await Task.WhenAll(tasks);
 
-            await EnqueueOnDispatcherQueueAsync(() =>
-                                                {
-                                                    var i  = 0;
-                                                    var sI = new Stopwatch();
-                                                    sI.Start();
-                                                    while (_localFileCollection.Count > 0)
+            if (_localFileCollection.Count > 0)
+            {
+                await EnqueueOnDispatcherQueueAsync(() =>
                                                     {
-                                                        FileInfoSource.Add(_localFileCollection[0]);
-                                                        _localFileCollection.RemoveAt(0);
-                                                        i++;
-                                                    }
-
-                                                    sI.Stop();
-                                                    Logger
-                                                       .LogWriteLine($"[FileCleanupPage::InjectFileInfoSource] Finished last batch at #{b} after {i} items",
-                                                                     LogType.Scheme);
-                                                });
-
+                                                        var i  = 0;
+                                                        var sI = new Stopwatch();
+                                                        sI.Start();
+                                                        while (_localFileCollection.Count > 0)
+                                                        {
+                                                            FileInfoSource.Add(_localFileCollection[0]);
+                                                            _localFileCollection.RemoveAt(0);
+                                                            i++;
+                                                        }
+
+                                                        sI.Stop();
+                                                        Logger
+                                                        .LogWriteLine($"[FileCleanupPage::InjectFileInfoSource] Finished last batch at #{b} after {i} items in {sI.ElapsedMilliseconds} ms",
+                                                                        LogType.Scheme);
+                                                    });
+            }
+
             while (_localFileCollection.Count != 0)
             {
                 FileInfoSource.Add(_localFileCollection[0]);
@@ -133,7 +137,6 @@ await EnqueueOnDispatcherQueueAsync(() =>
                 DeleteSelectedFilesText.Text =
                     string.Format(Locale.Lang._FileCleanupPage.BottomButtonDeleteSelectedFiles, 0);
             }
-
         }
 
         private void UpdateUIOnCollectionChange(object? sender, NotifyCollectionChangedEventArgs? args)