small touchups

Author: LoneWandererProductions

CommonLibraryTests/IoFileHandler.cs

@@ -600,7 +600,7 @@ public async Task CutFilesValidSourceAndTargetCutsFilesAsync()
         File.WriteAllText(sourceFilePath, "Test Content");
 
         // Act
-        var result = FileHandleCut.CutFiles(TestSourceDir, TestTargetDir, true);
+        var result = await FileHandleCut.CutFiles(TestSourceDir, TestTargetDir, true);
 
         // Assert
         Assert.IsTrue(result);
@@ -615,9 +615,9 @@ public async Task CutFilesValidSourceAndTargetCutsFilesAsync()
     /// </summary>
     [TestMethod]
     [ExpectedException(typeof(FileHandlerException))]
-    public void CutFilesSourceAndTargetEqualThrowsFileHandlerException()
+    public async Task CutFilesSourceAndTargetEqualThrowsFileHandlerExceptionAsync()
     {
-        _ = FileHandleCut.CutFiles(TestSourceDir, TestSourceDir, true);
+        await FileHandleCut.CutFiles(TestSourceDir, TestSourceDir, true);
     }
 
     /// <summary>
@@ -626,7 +626,7 @@ public void CutFilesSourceAndTargetEqualThrowsFileHandlerException()
     [TestMethod]
     public async Task CutFilesNonExistentSourceReturnsFalseAsync()
     {
-        var result = FileHandleCut.CutFiles("NonExistentSource", TestTargetDir, true);
+        var result = await FileHandleCut.CutFiles("NonExistentSource", TestTargetDir, true);
         Assert.IsFalse(result);
     }
 
@@ -686,7 +686,7 @@ public async Task CutFilesWithOverwriteCutsFilesSuccessfullyAsync()
         File.WriteAllText(targetFilePath, "Old Content");
 
         // Act
-        var result = FileHandleCut.CutFiles(TestSourceDir, TestTargetDir, true);
+        var result = await FileHandleCut.CutFiles(TestSourceDir, TestTargetDir, true);
 
         // Assert
         Assert.IsTrue(result);
@@ -708,7 +708,7 @@ public async Task CutFilesWithoutOverwriteExistingFilesNotOverwrittenAsync()
         File.WriteAllText(targetFilePath, "Old Content");
 
         // Act
-        var result = FileHandleCut.CutFiles(TestSourceDir, TestTargetDir, false);
+        var result = await FileHandleCut.CutFiles(TestSourceDir, TestTargetDir, false);
 
         // Assert, show false, since we have not moved all files
         Assert.IsFalse(result);
@@ -730,7 +730,7 @@ public async Task CutFilesHandlesSubdirectoriesAsync()
         File.WriteAllText(sourceFilePath, "Test Content");
 
         // Act
-        var result = FileHandleCut.CutFiles(TestSourceDir, TestTargetDir, true);
+        var result = await FileHandleCut.CutFiles(TestSourceDir, TestTargetDir, true);
 
         // Assert
         Assert.IsTrue(result);

FileHandler/FileHandleCut.cs

@@ -14,6 +14,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace FileHandler;
 
@@ -31,75 +32,58 @@ public static class FileHandleCut
     /// <param name="overwrite">Is overwrite allowed</param>
     /// <returns>Status if we encountered any problems</returns>
     /// <exception cref="FileHandlerException">No Correct Path was provided</exception>
-    public static bool CutFiles(string source, string target, bool overwrite)
+    public static async Task<bool> CutFiles(string source, string target, bool overwrite)
     {
         FileHandlerProcessing.ValidatePaths(source, target);
 
-        //if nothing exists we can return anyways
         if (!Directory.Exists(source))
-        {
             return false;
-        }
 
         var check = true;
         var dir = new DirectoryInfo(source);
         var dirs = dir.GetDirectories();
         var files = dir.GetFiles();
 
-        //Give the User Optional Infos about the Amount we Copy
-        var lstFiles = (from file in files
-            select file.Name).ToList();
+        // Inform user
+        var lstFiles = files.Select(f => f.Name).ToList();
+        FileHandlerRegister.SendOverview?.Invoke(nameof(CutFiles),
+            new FileItems { Elements = new List<string>(lstFiles), Message = FileHandlerResources.InformationFileDeletion });
 
-        var itm = new FileItems
+        // Move files
+        foreach (var file in files)
         {
-            Elements = new List<string>(lstFiles), Message = FileHandlerResources.InformationFileDeletion
-        };
-
-        FileHandlerRegister.SendOverview?.Invoke(nameof(CutFiles), itm);
-
-        //do the actual work
-        if (files.Length > 0)
-        {
-            if (!Directory.Exists(target))
+            var tempPath = Path.Combine(target, file.Name);
+            try
             {
-                _ = Directory.CreateDirectory(target);
-            }
+                if (!Directory.Exists(target))
+                    _ = Directory.CreateDirectory(target);
 
-            foreach (var file in files)
+                await Task.Run(() => file.MoveTo(tempPath, overwrite)).ConfigureAwait(false);
+                FileHandlerRegister.SendStatus?.Invoke(nameof(CutFiles), file.Name);
+            }
+            catch (Exception ex) when (ex is UnauthorizedAccessException or ArgumentException or IOException
+                                           or NotSupportedException)
             {
-                var tempPath = Path.Combine(target, file.Name);
-
-                try
-                {
-                    file.MoveTo(tempPath, overwrite);
-
-                    FileHandlerRegister.SendStatus?.Invoke(nameof(CutFiles), file.Name);
-                }
-                catch (Exception ex) when (ex is UnauthorizedAccessException or ArgumentException or IOException
-                                               or NotSupportedException)
-                {
-                    FileHandlerRegister.AddError(nameof(CutFiles), file.Name, ex);
-                    Trace.WriteLine(ex);
-                    check = false;
-                }
+                FileHandlerRegister.AddError(nameof(CutFiles), file.Name, ex);
+                Trace.WriteLine(ex);
+                check = false;
             }
         }
 
+        // Recurse subdirectories
         foreach (var subDir in dirs)
         {
             var tempPath = Path.Combine(target, subDir.Name);
 
             if (!Directory.Exists(target))
-            {
                 _ = Directory.CreateDirectory(target);
-            }
 
             if (Directory.Exists(tempPath))
-            {
                 continue;
-            }
 
-            _ = CutFiles(subDir.FullName, tempPath, overwrite);
+            var subCheck = await CutFiles(subDir.FullName, tempPath, overwrite).ConfigureAwait(false);
+            if (!subCheck)
+                check = false;
         }
 
         return check;

FileHandler/FileHandlerRessources.cs

@@ -88,7 +88,6 @@ internal static class FileHandlerResources
     /// </summary>
     internal const string ErrorEqualPath = "Paths are equal Input.";
 
-
     /// <summary>
     ///     The error file already exists (const). Value: "Error File already exists:".
     /// </summary>