Merge pull request #1757 from VictoriousRaptor/ClearLog

Refactor clear log folder logic
Flow-Launcher · Jan 3, 2023 · 6615d5e · 6615d5e
2 parents c53fdc1 + 4d10089
commit 6615d5e
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 18 deletions.
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
@@ -3041,7 +3041,7 @@
                                                 Name="ClearLogFolderBtn"
                                                 Margin="0,0,12,0"
                                                 Click="ClearLogFolder"
-                                                Content="{Binding CheckLogFolder, UpdateSourceTrigger=PropertyChanged}" />
+                                                Content="{Binding CheckLogFolder, Mode=OneWay}" />
                                             <Button
                                                 Margin="0,0,8,0"
                                                 Content="&#xec7a;"

diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
@@ -250,7 +250,7 @@ private void OpenWelcomeWindow(object sender, RoutedEventArgs e)
         }
         private void OpenLogFolder(object sender, RoutedEventArgs e)
         {
-            PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Logs, Constant.Version));
+            viewModel.OpenLogFolder();
         }
         private void ClearLogFolder(object sender, RoutedEventArgs e)
         {
@@ -262,8 +262,6 @@ private void ClearLogFolder(object sender, RoutedEventArgs e)
             if (confirmResult == MessageBoxResult.Yes)
             {
                 viewModel.ClearLogFolder();
-
-                ClearLogFolderBtn.Content = viewModel.CheckLogFolder;
             }
         }
 

diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -863,31 +863,48 @@ public string CheckLogFolder
         {
             get
             {
-                var dirInfo = new DirectoryInfo(Path.Combine(DataLocation.DataDirectory(), Constant.Logs, Constant.Version));
-                long size = dirInfo.EnumerateFiles("*", SearchOption.AllDirectories).Sum(file => file.Length);
-
-                return _translater.GetTranslation("clearlogfolder") + " (" + FormatBytes(size) + ")";
+                var logFiles = GetLogFiles();
+                long size = logFiles.Sum(file => file.Length);
+                return string.Format("{0} ({1})", _translater.GetTranslation("clearlogfolder"), BytesToReadableString(size));
             }
         }
 
+        private static DirectoryInfo GetLogDir(string version = "")
+        {
+            return new DirectoryInfo(Path.Combine(DataLocation.DataDirectory(), Constant.Logs, version));
+        }
+
+        private static List<FileInfo> GetLogFiles(string version = "")
+        {
+            return GetLogDir(version).EnumerateFiles("*", SearchOption.AllDirectories).ToList();
+        }
+
         internal void ClearLogFolder()
         {
-            var directory = new DirectoryInfo(
-                Path.Combine(
-                    DataLocation.DataDirectory(),
-                    Constant.Logs,
-                    Constant.Version));
+            var logDirectory = GetLogDir();
+            var logFiles = GetLogFiles();
 
-            directory.EnumerateFiles()
+            logFiles.ForEach(f => f.Delete());
+
+            logDirectory.EnumerateDirectories("*", SearchOption.TopDirectoryOnly)
+                .Where(dir => !Constant.Version.Equals(dir.Name))
                 .ToList()
-                .ForEach(x => x.Delete());
+                .ForEach(dir => dir.Delete());
+
+            OnPropertyChanged(nameof(CheckLogFolder));
+        }
+
+        internal void OpenLogFolder()
+        {
+            App.API.OpenDirectory(GetLogDir(Constant.Version).FullName);
         }
-        internal string FormatBytes(long bytes)
+
+        internal static string BytesToReadableString(long bytes)
         {
             const int scale = 1024;
             string[] orders = new string[]
             {
-                "GB", "MB", "KB", "Bytes"
+                "GB", "MB", "KB", "B"
             };
             long max = (long)Math.Pow(scale, orders.Length - 1);
 
@@ -898,7 +915,7 @@ internal string FormatBytes(long bytes)
 
                 max /= scale;
             }
-            return "0 Bytes";
+            return "0 B";
         }
 
         #endregion