Added UnixFileMode check on purge for files - need to add recursive c…

…heck for directories and on empty
jorystewart · Sep 9, 2024 · c9c24c2 · c9c24c2
1 parent 2312950
commit c9c24c2
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/Trashman/src/Trash.cs b/Trashman/src/Trash.cs
@@ -699,7 +699,7 @@ public static void EmptyTrashContents()
     ConsoleKeyInfo confirmKey = Console.ReadKey(true);
     if (confirmKey.Key == ConsoleKey.Y)
     {
-      Console.WriteLine("Deleting...")
+      Console.WriteLine("Deleting...");
       foreach (FileSystemInfo item in trashFilesDir.EnumerateFileSystemInfos())
       {
         switch (item)
@@ -906,6 +906,19 @@ where starReplace.IsMatch(item.Item2.Name)
         {
           try
           {
+            UnixFileMode mode = File.GetUnixFileMode(trashFilesDir + "/" + item.Item2.Name);
+            if ((mode & UnixFileMode.UserWrite) != UnixFileMode.UserWrite)
+            {
+              try
+              {
+                File.SetUnixFileMode(trashFilesDir + "/" + item.Item2.Name, UnixFileMode.UserWrite);
+              }
+              catch
+              {
+                Console.WriteLine("File " + item.Item2.Name + " lacks the user write flag. Attempting to set it failed. Skipping...");
+                continue;
+              }
+            }
             File.Delete(trashFilesDir + "/" + item.Item2.Name);
           }
           catch (Exception e) when (e is ArgumentException or ArgumentNullException)