Skip to content

when deleting mods, delete them to the Recycle Bin #314

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
JohnAFernandez merged 3 commits into from
Mar 19, 2025
Merged

when deleting mods, delete them to the Recycle Bin #314

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88c96dd
when deleting mods, delete them to the Recycle Bin
Goober5000 Mar 10, 2025
502cf60
make it cross-platform
Goober5000 Mar 13, 2025
8b6a8d4
no need for unused variable
Goober5000 Mar 13, 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
23 changes: 21 additions & 2 deletions Knossos.NET/Classes/Knossos.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using Knossos.NET.Models;
using Knossos.NET.ViewModels;
using Knossos.NET.Views;
using Microsoft.VisualBasic.FileIO;
using System.Diagnostics;
using System.Collections.Generic;
using System.Threading.Tasks;
Expand Down Expand Up @@ -1660,7 +1661,16 @@ public static void RemoveMod(string modId)
foreach (var mod in delete)
{
Log.Add(Log.LogSeverity.Information, "Knossos.RemoveMod()", "Deleting mod: "+mod.title + " " +mod.version);
Directory.Delete(mod.fullPath, true);
try
{
// this might only work on Windows
FileSystem.DeleteDirectory(mod.fullPath, UIOption.OnlyErrorDialogs, RecycleOption.SendToRecycleBin);
}
catch (PlatformNotSupportedException)
{
// this should work on all platforms but doesn't use the Recycle Bin / Trash
Directory.Delete(mod.fullPath, true);
}
installedMods.Remove(mod);
}
}
Expand All @@ -1682,7 +1692,16 @@ public static void RemoveMod(Mod mod)
try
{
Log.Add(Log.LogSeverity.Information, "Knossos.RemoveMod()", "Deleting mod: " + mod.title + " " + mod.version);
Directory.Delete(mod.fullPath, true);
try
{
// this might only work on Windows
FileSystem.DeleteDirectory(mod.fullPath, UIOption.OnlyErrorDialogs, RecycleOption.SendToRecycleBin);
}
catch (PlatformNotSupportedException)
{
// this should work on all platforms but doesn't use the Recycle Bin / Trash
Directory.Delete(mod.fullPath, true);
}
installedMods.Remove(mod);
}
catch (Exception ex)
Expand Down