Added DeleteFile method

MrGongqi · May 3, 2022 · 23061aa · 23061aa
1 parent 855ddd6
commit 23061aa
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 18 deletions.
diff --git a/ShareX.HelpersLib/Helpers/Helpers.cs b/ShareX.HelpersLib/Helpers/Helpers.cs
@@ -1048,6 +1048,32 @@ public static string RenameFile(string filePath, string newFileName)
             return filePath;
         }
 
+        public static bool DeleteFile(string filePath, bool sendToRecycleBin = false)
+        {
+            if (!string.IsNullOrEmpty(filePath) && File.Exists(filePath))
+            {
+                try
+                {
+                    if (sendToRecycleBin)
+                    {
+                        FileSystem.DeleteFile(filePath, UIOption.OnlyErrorDialogs, RecycleOption.SendToRecycleBin);
+                    }
+                    else
+                    {
+                        File.Delete(filePath);
+                    }
+
+                    return true;
+                }
+                catch (Exception e)
+                {
+                    DebugHelper.WriteException(e);
+                }
+            }
+
+            return false;
+        }
+
         public static string BackupFileWeekly(string filePath, string destinationFolder)
         {
             if (!string.IsNullOrEmpty(filePath) && File.Exists(filePath))
@@ -1689,23 +1715,6 @@ public static Task ForEachAsync<T>(IEnumerable<T> inputEnumerable, Func<T, Task>
             return Task.WhenAll(tasks);
         }
 
-        public static bool SendFileToRecycleBin(string filePath)
-        {
-            if (!string.IsNullOrEmpty(filePath) && File.Exists(filePath))
-            {
-                try
-                {
-                    FileSystem.DeleteFile(filePath, UIOption.OnlyErrorDialogs, RecycleOption.SendToRecycleBin);
-                    return true;
-                }
-                catch
-                {
-                }
-            }
-
-            return false;
-        }
-
         public static void LockCursorToWindow(Form form)
         {
             form.Activated += (sender, e) => Cursor.Clip = form.Bounds;

diff --git a/ShareX/UploadInfoManager.cs b/ShareX/UploadInfoManager.cs
@@ -353,7 +353,7 @@ public void DeleteFiles()
             {
                 foreach (string filePath in SelectedItems.Select(x => x.Info.FilePath))
                 {
-                    Helpers.SendFileToRecycleBin(filePath);
+                    Helpers.DeleteFile(filePath, true);
                 }
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -353,7 +353,7 @@ public void DeleteFiles() @@
                 {
                     foreach (string filePath in SelectedItems.Select(x => x.Info.FilePath))
                     {
-                        Helpers.SendFileToRecycleBin(filePath);
+                        Helpers.DeleteFile(filePath, true);
                     }
                 }
             }
@@ Expand Down @@