Skip to content

Fix empty directories cleanup #75

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
paoloambrosio merged 1 commit into from
Jul 1, 2023
Merged

Fix empty directories cleanup #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/Core/Mods/JsgmeFileInstaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ public static void UninstallFiles(string dstPath, IEnumerable<string> files, Act
/// <param name="skip">Function to decide if a file should be skipped</param>
public static void UninstallFiles(string dstPath, IEnumerable<string> files, Action<string> fileUninstalledCallback, ShouldSkipFile skip)
{
foreach (var file in files)
var fileList = files.ToList(); // It must be enumerated twice
foreach (var file in fileList)
{
var path = Path.Combine(dstPath, file);
// Some mods have duplicate entries, so files might have been removed already
Expand All @@ -120,7 +121,7 @@ public static void UninstallFiles(string dstPath, IEnumerable<string> files, Act
RestoreFile(path);
fileUninstalledCallback(file);
}
DeleteEmptyDirectories(dstPath, files);
DeleteEmptyDirectories(dstPath, fileList);
}

private static void DeleteEmptyDirectories(string dstRootPath, IEnumerable<string> filePaths) {
Expand Down