Moved file related methods to FileHelpers class

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

Hide file tree

Showing 78 changed files with 991 additions and 930 deletions.
diff --git a/ShareX.HelpersLib/Extensions/StreamExtensions.cs b/ShareX.HelpersLib/Extensions/StreamExtensions.cs
@@ -107,7 +107,7 @@ public static bool WriteToFile(this Stream stream, string filePath)
         {
             if (stream.Length > 0 && !string.IsNullOrEmpty(filePath))
             {
-                Helpers.CreateDirectoryFromFilePath(filePath);
+                FileHelpers.CreateDirectoryFromFilePath(filePath);
 
                 using (FileStream fileStream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.Read))
                 {

diff --git a/ShareX.HelpersLib/ExternalProgram.cs b/ShareX.HelpersLib/ExternalProgram.cs
@@ -56,7 +56,7 @@ public ExternalProgram(string name, string path) : this()
 
         public string GetFullPath()
         {
-            return Helpers.ExpandFolderVariables(Path);
+            return FileHelpers.ExpandFolderVariables(Path);
         }
 
         public string Run(string inputPath)
@@ -107,7 +107,7 @@ public string Run(string inputPath)
                                 CreateNoWindow = HiddenWindow
                             };
 
-                            DebugHelper.WriteLine($"Action input: \"{inputPath}\" [{Helpers.GetFileSizeReadable(inputPath)}]");
+                            DebugHelper.WriteLine($"Action input: \"{inputPath}\" [{FileHelpers.GetFileSizeReadable(inputPath)}]");
                             DebugHelper.WriteLine($"Action run: \"{psi.FileName}\" {psi.Arguments}");
 
                             process.StartInfo = psi;
@@ -117,7 +117,7 @@ public string Run(string inputPath)
 
                         if (!string.IsNullOrEmpty(outputPath) && File.Exists(outputPath))
                         {
-                            DebugHelper.WriteLine($"Action output: \"{outputPath}\" [{Helpers.GetFileSizeReadable(outputPath)}]");
+                            DebugHelper.WriteLine($"Action output: \"{outputPath}\" [{FileHelpers.GetFileSizeReadable(outputPath)}]");
 
                             if (DeleteInputFile && !inputPath.Equals(outputPath, StringComparison.OrdinalIgnoreCase))
                             {

diff --git a/ShareX.HelpersLib/Forms/DebugForm.cs b/ShareX.HelpersLib/Forms/DebugForm.cs
@@ -57,7 +57,7 @@ private DebugForm(Logger logger)
 
             string startupPath = AppDomain.CurrentDomain.BaseDirectory;
             llRunningFrom.Text = startupPath;
-            llRunningFrom.LinkClicked += (sender, e) => Helpers.OpenFolder(startupPath);
+            llRunningFrom.LinkClicked += (sender, e) => FileHelpers.OpenFolder(startupPath);
 
             Logger.MessageAdded += logger_MessageAdded;
             Activated += (sender, e) => btnUploadLog.Visible = HasUploadRequested;
@@ -101,7 +101,7 @@ private void btnCopyAll_Click(object sender, EventArgs e)
 
         private void btnOpenLogFile_Click(object sender, EventArgs e)
         {
-            Helpers.OpenFile(Logger.LogFilePath);
+            FileHelpers.OpenFile(Logger.LogFilePath);
         }
 
         private void btnLoadedAssemblies_Click(object sender, EventArgs e)

diff --git a/ShareX.HelpersLib/Forms/ErrorForm.cs b/ShareX.HelpersLib/Forms/ErrorForm.cs
@@ -76,7 +76,7 @@ private void btnSendBugReport_Click(object sender, EventArgs e)
 
         private void btnOpenLogFile_Click(object sender, EventArgs e)
         {
-            Helpers.OpenFile(LogPath);
+            FileHelpers.OpenFile(LogPath);
         }
 
         private void btnContinue_Click(object sender, EventArgs e)

diff --git a/ShareX.HelpersLib/Forms/HashCheckForm.cs b/ShareX.HelpersLib/Forms/HashCheckForm.cs
@@ -99,12 +99,12 @@ private void UpdateCompareControls()
 
         private void btnFilePathBrowse_Click(object sender, EventArgs e)
         {
-            Helpers.BrowseFile(txtFilePath);
+            FileHelpers.BrowseFile(txtFilePath);
         }
 
         private void btnFilePathBrowse2_Click(object sender, EventArgs e)
         {
-            Helpers.BrowseFile(txtFilePath2);
+            FileHelpers.BrowseFile(txtFilePath2);
         }
 
         private void cbCompareTwoFiles_CheckedChanged(object sender, EventArgs e)

diff --git a/ShareX.HelpersLib/Forms/ImageViewer.cs b/ShareX.HelpersLib/Forms/ImageViewer.cs
@@ -118,7 +118,7 @@ private void FilterImageFiles()
             {
                 string imageFilePath = Images[i];
 
-                bool isImageFile = !string.IsNullOrEmpty(imageFilePath) && Helpers.IsImageFile(imageFilePath);
+                bool isImageFile = !string.IsNullOrEmpty(imageFilePath) && FileHelpers.IsImageFile(imageFilePath);
 
                 if (i == CurrentImageIndex)
                 {
@@ -150,7 +150,7 @@ private void UpdateStatus()
                 AppendStatus($"{CurrentImageIndex + 1} / {Images.Length}");
             }
 
-            string fileName = Helpers.GetFileNameSafe(CurrentImageFilePath);
+            string fileName = FileHelpers.GetFileNameSafe(CurrentImageFilePath);
 
             if (!string.IsNullOrEmpty(fileName))
             {