Skip to content

Fix clean cache issue #3499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 30, 2025
Merged

Fix clean cache issue #3499

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a964150
Fix clean cache issue
Jack251970 Apr 30, 2025
c9e85a1
Use recursive false
Jack251970 Apr 30, 2025
7762c79
Explictly add recursive & Fix build
Jack251970 Apr 30, 2025
541e198
Fix code comments
Jack251970 Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@
{
try
{
dir.Delete(true);
// Log folders are the last level of folders
dir.Delete(false);
Copy link
Member

@jjw24 jjw24 Apr 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you show the parameter name so we know what option is set to false.

Copy link
Member Author

@Jack251970 Jack251970 Apr 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay

}
catch (Exception e)
{
Expand Down Expand Up @@ -214,6 +215,7 @@
{
var success = true;
var cacheDirectory = GetCacheDir();
var pluginCacheDirectory = GetPluginCacheDir();
var cacheFiles = GetCacheFiles();

cacheFiles.ForEach(f =>
Expand All @@ -229,12 +231,14 @@
}
});

cacheDirectory.EnumerateDirectories("*", SearchOption.TopDirectoryOnly)
// Firstly, delete plugin cache directories
pluginCacheDirectory.EnumerateDirectories("*", SearchOption.TopDirectoryOnly)
.ToList()
.ForEach(dir =>
{
try
{
// Plugin may create directories in its cache directory
dir.Delete(true);
}
catch (Exception e)
Expand All @@ -244,6 +248,18 @@
}
});

// Then, delete plugin directory
try
{
// Log folders are the last level of folders
GetPluginCacheDir().Delete(false);
Copy link
Member

@jjw24 jjw24 Apr 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here please

}
catch (Exception e)
{
App.API.LogException(ClassName, $"Failed to delete cache directory: {dir.Name}", e);

Check failure on line 259 in Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs

View workflow job for this annotation

GitHub Actions / build 

The name 'dir' does not exist in the current context

Check failure on line 259 in Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs

View workflow job for this annotation

GitHub Actions / build 

The name 'dir' does not exist in the current context
success = false;
}

OnPropertyChanged(nameof(CacheFolderSize));

return success;
Expand All @@ -254,6 +270,11 @@
return new DirectoryInfo(DataLocation.CacheDirectory);
}

private static DirectoryInfo GetPluginCacheDir()
{
return new DirectoryInfo(DataLocation.PluginCacheDirectory);
}

private static List<FileInfo> GetCacheFiles()
{
return GetCacheDir().EnumerateFiles("*", SearchOption.AllDirectories).ToList();
Expand Down
Loading