Merge #3865 Fix deletion of unmanaged files

KSP-CKAN · Jul 24, 2023 · 812119b · 812119b
2 parents a8e3ce3 + 2ad7981
commit 812119b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
 
 - [GUI] Updated Chinese translation to reduce misunderstandings (#3864 by: Fierce-Cat; reviewed: HebaruSan)
 - [Multiple] Translation updates from Crowdin (#3866 by: Nikita, Вячеслав Бучин, vinix, WujekFoliarz; reviewed: HebaruSan)
+- [Multiple] Fix deletion of unmanaged files (#3865 by: HebaruSan; reviewed: techman83)
 
 ## v1.33.2 (Laplace)
 

diff --git a/Core/GameInstance.cs b/Core/GameInstance.cs
@@ -466,8 +466,9 @@ public IEnumerable<string> UnmanagedFiles(Registry registry)
         /// <returns>true if any descendants of given path were installed by CKAN, false otherwise</returns>
         public bool HasManagedFiles(Registry registry, string absPath)
             => registry.FileOwner(ToRelativeGameDir(absPath)) != null
-               || Directory.EnumerateFileSystemEntries(absPath, "*", SearchOption.AllDirectories)
-                           .Any(f => registry.FileOwner(ToRelativeGameDir(f)) != null);
+               || (Directory.Exists(absPath)
+                   && Directory.EnumerateFileSystemEntries(absPath, "*", SearchOption.AllDirectories)
+                               .Any(f => registry.FileOwner(ToRelativeGameDir(f)) != null));
 
         public override string ToString()
             => string.Format(Properties.Resources.GameInstanceToString, game.ShortName, gameDir);

diff --git a/GUI/Controls/UnmanagedFiles.cs b/GUI/Controls/UnmanagedFiles.cs
@@ -7,6 +7,8 @@
 using System.IO;
 using System.Threading.Tasks;
 
+using log4net;
+
 using CKAN.Games;
 
 namespace CKAN.GUI
@@ -19,9 +21,10 @@ public UnmanagedFiles()
             GameFolderTree.TreeViewNodeSorter = new DirsFirstSorter();
         }
 
-        public void LoadFiles(GameInstance inst)
+        public void LoadFiles(GameInstance inst, IUser user)
         {
             this.inst = inst;
+            this.user = user;
             this.registry = RegistryManager.Instance(inst).registry;
             Util.Invoke(this, _UpdateGameFolderTree);
         }
@@ -151,6 +154,7 @@ private void DeleteButton_Click(object sender, EventArgs e)
         {
             var relPath = GameFolderTree.SelectedNode?.Name;
             var absPath = inst.ToAbsoluteGameDir(relPath);
+            log.DebugFormat("Trying to delete {0}", absPath);
             if (inst.HasManagedFiles(registry, absPath))
             {
                 Main.Instance.ErrorDialog(Properties.Resources.FolderContainsManagedFiles, relPath);
@@ -161,15 +165,22 @@ private void DeleteButton_Click(object sender, EventArgs e)
                 Properties.Resources.DeleteUnmanagedFileDelete,
                 Properties.Resources.DeleteUnmanagedFileCancel))
             {
-                if (File.Exists(absPath))
+                try
                 {
-                    File.Delete(absPath);
+                    if (File.Exists(absPath))
+                    {
+                        File.Delete(absPath);
+                    }
+                    else if (Directory.Exists(absPath))
+                    {
+                        Directory.Delete(absPath, true);
+                    }
+                    GameFolderTree.Nodes.Remove(GameFolderTree.SelectedNode);
                 }
-                else if (Directory.Exists(absPath))
+                catch (Exception exc)
                 {
-                    Directory.Delete(absPath, true);
+                    user.RaiseError(exc.Message);
                 }
-                GameFolderTree.Nodes.Remove(GameFolderTree.SelectedNode);
             }
         }
 
@@ -213,7 +224,9 @@ private void OpenFileBrowser(TreeNode node)
         }
 
         private GameInstance inst;
+        private IUser        user;
         private Registry     registry;
+        private static readonly ILog log = LogManager.GetLogger(typeof(UnmanagedFiles));
     }
 
     internal class DirsFirstSorter : IComparer, IComparer<TreeNode>

diff --git a/GUI/Main/MainUnmanaged.cs b/GUI/Main/MainUnmanaged.cs
@@ -9,7 +9,7 @@ public partial class Main
     {
         private void viewUnmanagedFilesStripMenuItem_Click(object sender, EventArgs e)
         {
-            UnmanagedFiles.LoadFiles(manager.CurrentInstance);
+            UnmanagedFiles.LoadFiles(manager.CurrentInstance, currentUser);
             tabController.ShowTab("UnmanagedFilesTabPage", 2);
             DisableMainWindow();
         }