General cleanup

aelassas · Jul 5, 2023 · 9aeb360 · 9aeb360
1 parent 846b99a
commit 9aeb360
Show file tree

Hide file tree

Showing 83 changed files with 227 additions and 334 deletions.
diff --git a/src/net/Wexflow.Tasks.CsvToJson/CsvToJson.cs b/src/net/Wexflow.Tasks.CsvToJson/CsvToJson.cs
@@ -29,7 +29,7 @@ public override TaskStatus Run()
         {
             Info("Converting CSV files to JSON files...");
 
-            var success = true;
+            bool success;
             var atLeastOneSuccess = false;
 
             try

diff --git a/src/net/Wexflow.Tasks.CsvToYaml/CsvToYaml.cs b/src/net/Wexflow.Tasks.CsvToYaml/CsvToYaml.cs
@@ -29,7 +29,7 @@ public override TaskStatus Run()
         {
             Info("Converting CSV files to YAML files...");
 
-            var success = true;
+            bool success;
             var atLeastOneSuccess = false;
 
             try

diff --git a/src/net/Wexflow.Tasks.FileContentMatch/FileContentMatch.cs b/src/net/Wexflow.Tasks.FileContentMatch/FileContentMatch.cs
@@ -34,7 +34,7 @@ public override TaskStatus Run()
         {
             Info("Checking file...");
 
-            var success = true;
+            bool success;
             TaskStatus status = null;
 
             try
@@ -90,15 +90,7 @@ private bool CheckFile(ref TaskStatus status)
                 // Checking folders
                 foreach (var folder in FoldersToCheck)
                 {
-                    var files = Array.Empty<string>();
-                    if (Recursive)
-                    {
-                        files = Directory.GetFiles(folder, "*.*", SearchOption.AllDirectories);
-                    }
-                    else
-                    {
-                        files = Directory.GetFiles(folder);
-                    }
+                    var files = Recursive ? Directory.GetFiles(folder, "*.*", SearchOption.AllDirectories) : Directory.GetFiles(folder);
 
                     foreach (var file in files)
                     {

diff --git a/src/net/Wexflow.Tasks.FileExists/FileExists.cs b/src/net/Wexflow.Tasks.FileExists/FileExists.cs
@@ -26,7 +26,7 @@ public override TaskStatus Run()
         {
             Info("Checking file...");
 
-            var success = false;
+            bool success;
 
             try
             {
@@ -73,14 +73,7 @@ private bool CheckFile()
         {
             var success = System.IO.File.Exists(File);
 
-            if (success)
-            {
-                InfoFormat("The file {0} exist.", File);
-            }
-            else
-            {
-                InfoFormat("The file {0} does not exist.", File);
-            }
+            InfoFormat(success ? "The file {0} exist." : "The file {0} does not exist.", File);
 
             return success;
         }

diff --git a/src/net/Wexflow.Tasks.FileMatch/FileMatch.cs b/src/net/Wexflow.Tasks.FileMatch/FileMatch.cs
@@ -32,7 +32,7 @@ public override TaskStatus Run()
         {
             Info("Checking file...");
 
-            var success = false;
+            bool success;
             TaskStatus status = null;
 
             try

diff --git a/src/net/Wexflow.Tasks.FilesConcat/FilesConcat.cs b/src/net/Wexflow.Tasks.FilesConcat/FilesConcat.cs
@@ -26,7 +26,7 @@ public override TaskStatus Run()
         {
             Info("Concatenating files...");
 
-            var success = true;
+            bool success;
             var atLeastOneSucceed = false;
 
             try

diff --git a/src/net/Wexflow.Tasks.FilesCopier/FilesCopier.cs b/src/net/Wexflow.Tasks.FilesCopier/FilesCopier.cs
@@ -33,7 +33,7 @@ public override TaskStatus Run()
         {
             Info("Copying files...");
 
-            var success = true;
+            bool success;
             var atLeastOneSuccess = false;
 
             try
@@ -85,7 +85,7 @@ private bool CopyFiles(ref bool atLeastOneSuccess)
                 if (!string.IsNullOrWhiteSpace(PreserveFolderStructFrom) &&
                     file.Path.StartsWith(PreserveFolderStructFrom, StringComparison.InvariantCultureIgnoreCase))
                 {
-                    var preservedFolderStruct = Path.GetDirectoryName(file.Path);
+                    var preservedFolderStruct = Path.GetDirectoryName(file.Path) ?? throw new InvalidOperationException();
                     preservedFolderStruct = preservedFolderStruct.Length > PreserveFolderStructFrom.Length
                         ? preservedFolderStruct.Remove(0, PreserveFolderStructFrom.Length)
                         : string.Empty;
@@ -107,7 +107,7 @@ private bool CopyFiles(ref bool atLeastOneSuccess)
                     if (AllowCreateDirectory && !Directory.Exists(Path.GetDirectoryName(destPath)))
                     {
                         InfoFormat("Creating directory: {0}", Path.GetDirectoryName(destPath));
-                        _ = Directory.CreateDirectory(Path.GetDirectoryName(destPath));
+                        _ = Directory.CreateDirectory(Path.GetDirectoryName(destPath)??throw new InvalidOperationException());
                     }
 
                     File.Copy(file.Path, destPath, Overwrite);

diff --git a/src/net/Wexflow.Tasks.FilesDecryptor/FilesDecryptor.cs b/src/net/Wexflow.Tasks.FilesDecryptor/FilesDecryptor.cs
@@ -27,7 +27,7 @@ public override TaskStatus Run()
         {
             Info("Decrypting files...");
 
-            var success = true;
+            bool success;
             var atLeastOneSuccess = false;
 
             try

diff --git a/src/net/Wexflow.Tasks.FilesEncryptor/FilesEncryptor.cs b/src/net/Wexflow.Tasks.FilesEncryptor/FilesEncryptor.cs
@@ -27,7 +27,7 @@ public override TaskStatus Run()
         {
             Info("Encrypting files...");
 
-            var success = true;
+            bool success;
             var atLeastOneSuccess = false;
 
             try

diff --git a/src/net/Wexflow.Tasks.FilesEqual/FilesEqual.cs b/src/net/Wexflow.Tasks.FilesEqual/FilesEqual.cs
@@ -29,7 +29,7 @@ public override TaskStatus Run()
         {
             Info("Checking...");
 
-            var success = true;
+            bool success;
 
             try
             {

diff --git a/src/net/Wexflow.Tasks.FilesInfo/FilesInfo.cs b/src/net/Wexflow.Tasks.FilesInfo/FilesInfo.cs
@@ -15,13 +15,17 @@ public class FilesInfo : Task
 
         public FilesInfo(XElement xe, Workflow wf) : base(xe, wf)
         {
+            SmbComputerName = GetSetting("smbComputerName");
+            SmbDomain = GetSetting("smbDomain");
+            SmbUsername = GetSetting("smbUsername");
+            SmbPassword = GetSetting("smbPassword");
         }
 
         public override TaskStatus Run()
         {
             Info("Generating files informations...");
 
-            var success = true;
+            bool success;
             var atLeastOneSucceed = false;
 
             try

diff --git a/src/net/Wexflow.Tasks.FilesJoiner/FilesJoiner.cs b/src/net/Wexflow.Tasks.FilesJoiner/FilesJoiner.cs
@@ -86,7 +86,7 @@ public override TaskStatus Run()
         {
             Info("Concatenating files...");
 
-            var success = true;
+            bool success;
             var atLeastOneSucceed = false;
 
             try

diff --git a/src/net/Wexflow.Tasks.FilesLoader/FilesLoader.cs b/src/net/Wexflow.Tasks.FilesLoader/FilesLoader.cs
@@ -34,7 +34,7 @@ public override TaskStatus Run()
         {
             Info("Loading files...");
 
-            var success = true;
+            bool success;
 
             try
             {

diff --git a/src/net/Wexflow.Tasks.FilesMover/FilesMover.cs b/src/net/Wexflow.Tasks.FilesMover/FilesMover.cs
@@ -34,7 +34,7 @@ public override TaskStatus Run()
         {
             Info("Moving files...");
 
-            var success = true;
+            bool success;
             var atLeastOneSuccess = false;
 
             try
@@ -90,7 +90,7 @@ private bool MoveFiles(ref bool atLeastOneSucceed)
                     if (!string.IsNullOrWhiteSpace(PreserveFolderStructFrom) &&
                         file.Path.StartsWith(PreserveFolderStructFrom, StringComparison.InvariantCultureIgnoreCase))
                     {
-                        var preservedFolderStruct = Path.GetDirectoryName(file.Path);
+                        var preservedFolderStruct = Path.GetDirectoryName(file.Path) ?? throw new InvalidOperationException();
                         preservedFolderStruct = preservedFolderStruct.Length > PreserveFolderStructFrom.Length
                             ? preservedFolderStruct.Remove(0, PreserveFolderStructFrom.Length)
                             : string.Empty;
@@ -118,7 +118,7 @@ private bool MoveFiles(ref bool atLeastOneSucceed)
                     if (AllowCreateDirectory && !Directory.Exists(Path.GetDirectoryName(destFilePath)))
                     {
                         InfoFormat("Creating directory: {0}", Path.GetDirectoryName(destFilePath));
-                        _ = Directory.CreateDirectory(Path.GetDirectoryName(destFilePath));
+                        _ = Directory.CreateDirectory(Path.GetDirectoryName(destFilePath) ?? throw new InvalidOperationException());
                     }
 
                     if (File.Exists(destFilePath))

diff --git a/src/net/Wexflow.Tasks.FilesRemover/FilesRemover.cs b/src/net/Wexflow.Tasks.FilesRemover/FilesRemover.cs
@@ -25,7 +25,7 @@ public override TaskStatus Run()
         {
             Info("Removing files...");
 
-            var success = true;
+            bool success;
             var atLeastOneSuccess = false;
 
             try

diff --git a/src/net/Wexflow.Tasks.FilesRenamer/FilesRenamer.cs b/src/net/Wexflow.Tasks.FilesRenamer/FilesRenamer.cs
@@ -28,7 +28,7 @@ public override TaskStatus Run()
         {
             Info("Renaming files...");
 
-            var success = true;
+            bool success;
             var atLeastOneSuccess = false;
 
             try

diff --git a/src/net/Wexflow.Tasks.FilesSplitter/FilesSplitter.cs b/src/net/Wexflow.Tasks.FilesSplitter/FilesSplitter.cs
@@ -27,7 +27,7 @@ public override TaskStatus Run()
         {
             Info("Splitting files into chunks...");
 
-            var success = true;
+            bool success;
             var atLeastOneSucceed = false;
 
             try

diff --git a/src/net/Wexflow.Tasks.FolderExists/FolderExists.cs b/src/net/Wexflow.Tasks.FolderExists/FolderExists.cs
@@ -26,7 +26,7 @@ public override TaskStatus Run()
         {
             Info("Checking folder...");
 
-            var success = false;
+            bool success;
             TaskStatus status = null;
 
             try
@@ -65,14 +65,7 @@ private bool CheckFolder(ref TaskStatus status)
             {
                 success = System.IO.Directory.Exists(Folder);
 
-                if (success)
-                {
-                    InfoFormat("The folder {0} exists.", Folder);
-                }
-                else
-                {
-                    InfoFormat("The folder {0} does not exist.", Folder);
-                }
+                InfoFormat(success ? "The folder {0} exists." : "The folder {0} does not exist.", Folder);
             }
             catch (ThreadAbortException)
             {

diff --git a/src/net/Wexflow.Tasks.Ftp/Ftp.cs b/src/net/Wexflow.Tasks.Ftp/Ftp.cs
@@ -67,7 +67,7 @@ public override TaskStatus Run()
         {
             Info("Processing files...");
 
-            var success = true;
+            bool success;
             var atLeastOneSuccess = false;
 
             try

diff --git a/src/net/Wexflow.Tasks.Ftp/PluginFTP.cs b/src/net/Wexflow.Tasks.Ftp/PluginFTP.cs
@@ -103,7 +103,7 @@ public override void Upload(FileInf file)
         public static void UploadFile(FtpClient client, FileInf file)
         {
             using (Stream istream = File.Open(file.Path, FileMode.Open, FileAccess.Read))
-            using (var ostream = client.OpenWrite(file.RenameToOrName, FtpDataType.Binary))
+            using (var ostream = client.OpenWrite(file.RenameToOrName))
             {
                 var buffer = new byte[BufferSize];
                 int r;

diff --git a/src/net/Wexflow.Tasks.Ftp/PluginFTPS.cs b/src/net/Wexflow.Tasks.Ftp/PluginFTPS.cs
@@ -66,7 +66,7 @@ public override FileInf[] List()
             client.Config.DataConnectionType = FtpDataConnectionType.PASV;
             client.Config.EncryptionMode = _encryptionMode;
             client.Config.ValidateAnyCertificate = true;
-            client.ValidateCertificate += new FtpSslValidation(OnValidateCertificate);
+            client.ValidateCertificate += OnValidateCertificate;
             client.Connect();
             client.SetWorkingDirectory(Path);
 
@@ -92,7 +92,7 @@ public override void Upload(FileInf file)
                 client.LegacyLogger = OnLogEvent;
             }
 
-            client.ValidateCertificate += new FtpSslValidation(OnValidateCertificate);
+            client.ValidateCertificate += OnValidateCertificate;
             client.Config.DataConnectionType = FtpDataConnectionType.PASV;
             client.Config.EncryptionMode = _encryptionMode;
 
@@ -126,7 +126,7 @@ public override void Download(FileInf file)
                 client.LegacyLogger = OnLogEvent;
             }
 
-            client.ValidateCertificate += new FtpSslValidation(OnValidateCertificate);
+            client.ValidateCertificate += OnValidateCertificate;
             client.Connect();
             client.SetWorkingDirectory(Path);
 
@@ -151,7 +151,7 @@ public override void Delete(FileInf file)
                 client.LegacyLogger = OnLogEvent;
             }
 
-            client.ValidateCertificate += new FtpSslValidation(OnValidateCertificate);
+            client.ValidateCertificate += OnValidateCertificate;
             client.Connect();
             client.SetWorkingDirectory(Path);
 

diff --git a/src/net/Wexflow.Tasks.HtmlToPdf/HtmlToPdf.cs b/src/net/Wexflow.Tasks.HtmlToPdf/HtmlToPdf.cs
@@ -28,7 +28,7 @@ public override TaskStatus Run()
         {
             Info("Generating PDF files from HTML files...");
 
-            var success = true;
+            bool success;
             var atLeastOneSuccess = false;
 
             try

diff --git a/src/net/Wexflow.Tasks.HtmlToText/HtmlToText.cs b/src/net/Wexflow.Tasks.HtmlToText/HtmlToText.cs
@@ -27,7 +27,7 @@ public override TaskStatus Run()
         {
             Info("Extracting text from HTML files...");
 
-            var success = true;
+            bool success;
             var atLeastOneSuccess = false;
 
             try

diff --git a/src/net/Wexflow.Tasks.ImagesConcat/ImagesConcat.cs b/src/net/Wexflow.Tasks.ImagesConcat/ImagesConcat.cs
@@ -27,7 +27,7 @@ public override TaskStatus Run()
         {
             Info("Concatenating images...");
 
-            var success = true;
+            bool success;
 
             try
             {

diff --git a/src/net/Wexflow.Tasks.ImagesCropper/ImagesCropper.cs b/src/net/Wexflow.Tasks.ImagesCropper/ImagesCropper.cs
@@ -34,7 +34,7 @@ public override TaskStatus Run()
         {
             Info("Cropping images...");
 
-            var success = true;
+            bool success;
             var atLeastOneSuccess = false;
 
             try

diff --git a/src/net/Wexflow.Tasks.ImagesOverlay/ImagesOverlay.cs b/src/net/Wexflow.Tasks.ImagesOverlay/ImagesOverlay.cs
@@ -26,7 +26,7 @@ public ImagesOverlay(XElement xe, Workflow wf) : base(xe, wf)
         public override TaskStatus Run()
         {
             Info("Overlaying images...");
-            var success = true;
+            bool success;
 
             try
             {

diff --git a/src/net/Wexflow.Tasks.ImagesResizer/ImagesResizer.cs b/src/net/Wexflow.Tasks.ImagesResizer/ImagesResizer.cs
@@ -32,7 +32,7 @@ public override TaskStatus Run()
         {
             Info("Resizing images...");
 
-            var success = true;
+            bool success;
             var atLeastOneSuccess = false;
 
             try

diff --git a/src/net/Wexflow.Tasks.ImagesTransformer/ImagesTransformer.cs b/src/net/Wexflow.Tasks.ImagesTransformer/ImagesTransformer.cs
@@ -8,19 +8,6 @@
 
 namespace Wexflow.Tasks.ImagesTransformer
 {
-    public enum ImgFormat
-    {
-        Bmp,
-        Emf,
-        Exif,
-        Gif,
-        Icon,
-        Jpeg,
-        Png,
-        Tiff,
-        Wmf
-    }
-
     public class ImagesTransformer : Task
     {
         public string OutputFilePattern { get; }
@@ -44,7 +31,7 @@ public override TaskStatus Run()
         {
             Info("Transforming images...");
 
-            var success = true;
+            bool success;
             var atLeastOneSuccess = false;
 
             try