prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1757 from VictoriousRaptor/ClearLog

Browse source 
Refactor clear log folder logic
This commit is contained in:
VictoriousRaptor 2023-01-03 11:44:56 +08:00 committed by GitHub
commit 6615d5e90b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Flow.Launcher/SettingWindow.xaml
View file

@ -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;"

4
Flow.Launcher/SettingWindow.xaml.cs
View file

@ -250,7 +250,7 @@ namespace Flow.Launcher
}
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 @@ namespace Flow.Launcher
if (confirmResult == MessageBoxResult.Yes)
{
viewModel.ClearLogFolder();
ClearLogFolderBtn.Content = viewModel.CheckLogFolder;
}
}

45
Flow.Launcher/ViewModel/SettingWindowViewModel.cs
View file

@ -863,31 +863,48 @@ namespace Flow.Launcher.ViewModel
{
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 string FormatBytes(long bytes)
internal void OpenLogFolder()
{
App.API.OpenDirectory(GetLogDir(Constant.Version).FullName);
}
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 @@ namespace Flow.Launcher.ViewModel
max /= scale;
}
return "0 Bytes";
return "0 B";
}
#endregion