Cleanup a bit more.

Author: LoneWandererProductions

FileHandler/DirectoryInformation.cs

@@ -3,7 +3,7 @@
 * PROJECT:     FileHandler
 * FILE:        FileHandler/DirectoryInformation.cs
 * PURPOSE:     Generic System Functions for Directories
-* PROGRAMER:   Peter Geinitz (Wayfarer) – Refactor by ChatGPT
+* PROGRAMER:   Peter Geinitz (Wayfarer) 
 */
 
 using System;

FileHandler/FileHandleRenameExtension.cs

@@ -3,7 +3,7 @@
  * PROJECT:     FileHandler
  * FILE:        FileHandler/FileHandleRenameExtension.cs
  * PURPOSE:     Unified safe rename helpers (append/remove/replace/reorder)
- * PROGRAMER:   Peter Geinitz (Wayfarer) – Refactor by ChatGPT
+ * PROGRAMER:   Peter Geinitz (Wayfarer) 
  */
 
 using System;

FileHandler/FileHandleSearch.cs

@@ -2,113 +2,103 @@
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     FileHandler
  * FILE:        FileHandler/FileHandleSearch.cs
- * PURPOSE:     Does all types of File Operations, search Files
- * PROGRAMER:   Peter Geinitz (Wayfarer)
+ * PURPOSE:     Handles all types of file searches (refactored for clarity and safety)
+ * PROGRAMER:   Peter Geinitz (Wayfarer) 
  */
 
-// ReSharper disable MemberCanBeInternal, we use it external
-// ReSharper disable UnusedMember.Global, it is a library
-
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace FileHandler;
 
 /// <summary>
-///     Handles most File Searches
+///     Handles most file searches.
 /// </summary>
 public static class FileHandleSearch
 {
     /// <summary>
-    ///     Collects all files with a specific Extension
+    /// Collects all files with specific extensions (full path).
     /// </summary>
-    /// <param name="path">Target Folder</param>
-    /// <param name="appendix">List of File Extension</param>
-    /// <param name="subdirectories">Include Sub-folders</param>
-    /// <returns>List of Files with Path and extensions<see cref="T:List{string}" />.</returns>
-    public static List<string>? GetFilesByExtensionFullPath(string path, IEnumerable<string> appendix,
-        bool subdirectories)
+    /// <param name="path">The path.</param>
+    /// <param name="appendix">The appendix.</param>
+    /// <param name="subdirectories">if set to <c>true</c> [subdirectories].</param>
+    /// <returns>File by criteria</returns>
+    public static List<string> GetFilesByExtensionFullPath(string path, IEnumerable<string> appendix, bool subdirectories)
     {
-        var lst = new List<string>();
-
         if (string.IsNullOrEmpty(path) || !Directory.Exists(path))
-        {
-            return null;
-        }
+            return new List<string>();
 
-        foreach (var file in appendix.Select(app =>
-                     FileHandlerProcessing.GetFilesByExtension(path, app, subdirectories)))
-        {
-            if (file == null)
-            {
-                return null;
-            }
+        var lst = new List<string>();
 
-            lst.AddRange(file);
+        foreach (var app in appendix)
+        {
+            var files = FileHandlerProcessing.GetFilesByExtension(path, app, subdirectories) ?? new List<string>();
+            lst.AddRange(files);
         }
 
         return lst;
     }
 
     /// <summary>
-    ///     Collects all files with a specific Extension
+    /// Collects all files with a specific extension (full path).
     /// </summary>
-    /// <param name="path">Target Folder</param>
-    /// <param name="appendix">File Extension</param>
-    /// <param name="subdirectories">Include Sub-folders</param>
-    /// <returns>List of Files with Path and extension<see cref="T:List{string}" />.</returns>
-    public static List<string>? GetFilesByExtensionFullPath(string path, string appendix, bool subdirectories)
+    /// <param name="path">The path.</param>
+    /// <param name="appendix">The appendix.</param>
+    /// <param name="subdirectories">if set to <c>true</c> [subdirectories].</param>
+    /// <returns>File by criteria</returns>
+    public static List<string> GetFilesByExtensionFullPath(string path, string appendix, bool subdirectories)
     {
-        return FileHandlerProcessing.GetFilesByExtension(path, appendix, subdirectories);
+        return FileHandlerProcessing.GetFilesByExtension(path, appendix, subdirectories) ?? new List<string>();
     }
 
     /// <summary>
-    ///     Collects all files with a specific Extension
+    /// Collects file names with extension only.
     /// </summary>
-    /// <param name="path">Target Folder</param>
-    /// <param name="appendix">File Extension</param>
-    /// <param name="subdirectories">Include Sub-folders</param>
-    /// <returns>List of Name of Files, with extension<see cref="T:List{string}" />.</returns>
-    public static List<string>? GetFileByExtensionWithExtension(string path, string appendix, bool subdirectories)
+    /// <param name="path">The path.</param>
+    /// <param name="appendix">The appendix.</param>
+    /// <param name="subdirectories">if set to <c>true</c> [subdirectories].</param>
+    /// <returns>File by criteria</returns>
+    public static List<string> GetFileByExtensionWithExtension(string path, string appendix, bool subdirectories)
     {
-        var files = FileHandlerProcessing.GetFilesByExtension(path, appendix, subdirectories);
-
-        if (files == null)
-        {
-            return null;
-        }
-
-        var lst = new List<string>();
-        lst.AddRange(files.Select(Path.GetFileName));
+        var files = FileHandlerProcessing.GetFilesByExtension(path, appendix, subdirectories) ?? new List<string>();
+        return files.Select(Path.GetFileName).ToList();
+    }
 
-        return lst;
+    /// <summary>
+    /// Collects file names without path, with extension.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    /// <param name="appendix">The appendix.</param>
+    /// <param name="subdirectories">if set to <c>true</c> [subdirectories].</param>
+    /// <returns>File by criteria</returns>
+    public static List<string> GetFileByExtensionWithoutExtension(string path, string appendix, bool subdirectories)
+    {
+        var files = FileHandlerProcessing.GetFilesByExtension(path, appendix, subdirectories) ?? new List<string>();
+        return files.Select(Path.GetFileNameWithoutExtension).ToList();
     }
 
     /// <summary>
-    ///     Get the all files.
+    /// Get all files in a folder (optionally including subfolders).
     /// </summary>
     /// <param name="path">The path.</param>
-    /// <param name="subdirectories">The subdirectories.</param>
-    /// <returns>List of Name of Files, with extension and Path<see cref="T:List{string}" />.</returns>
-    public static List<string>? GetAllFiles(string path, bool subdirectories)
+    /// <param name="subdirectories">if set to <c>true</c> [subdirectories].</param>
+    /// <returns>File by criteria</returns>
+    public static List<string> GetAllFiles(string path, bool subdirectories)
     {
-        return FileHandlerProcessing.GetFilesByExtension(path, null, subdirectories);
+        return FileHandlerProcessing.GetFilesByExtension(path, null, subdirectories) ?? new List<string>();
     }
 
     /// <summary>
-    ///     Gets the file detail.
+    /// Get details of a single file.
     /// </summary>
     /// <param name="path">The path.</param>
-    /// <returns>The Details of a File, to be extended<see cref="T:List{FileDetails}" /> can return null.</returns>
+    /// <returns>File Details</returns>
     public static FileDetails? GetFileDetails(string path)
     {
         if (!File.Exists(path))
-        {
             return null;
-        }
 
         var fileInfo = FileVersionInfo.GetVersionInfo(path);
         var fi = new FileInfo(path);
@@ -129,131 +119,73 @@ public static class FileHandleSearch
     }
 
     /// <summary>
-    ///     Get the file details.
+    /// Get details of multiple files.
     /// </summary>
     /// <param name="files">The files.</param>
-    /// <returns>The Details of the File, to be extended<see cref="T:List{FileDetails}" />.</returns>
-    public static List<FileDetails>? GetFilesDetails(List<string> files)
+    /// <returns>File Details</returns>
+    public static List<FileDetails> GetFilesDetails(List<string> files)
     {
         if (files == null || files.Count == 0)
-        {
-            return null;
-        }
+            return new List<FileDetails>();
 
-        var data = new List<FileDetails>(files.Count);
-
-        data.AddRange(from file in files where File.Exists(file) select GetFileDetails(file));
-
-        return data;
+        return files.Select(GetFileDetails).Where(f => f != null)!.ToList()!;
     }
 
     /// <summary>
-    ///     Collects all files with a specific Extension
+    /// Get immediate subfolders.
     /// </summary>
-    /// <param name="path">Target Folder</param>
-    /// <param name="appendix">File Extension</param>
-    /// <param name="subdirectories">Include Sub-folders</param>
-    /// <returns>List of Name of Files, without extension and Path</returns>
-    public static List<string>? GetFileByExtensionWithoutExtension(string path, string appendix, bool subdirectories)
-    {
-        var files = FileHandlerProcessing.GetFilesByExtension(path, appendix, subdirectories);
-
-        if (files == null)
-        {
-            return null;
-        }
-
-        var lst = new List<string>();
-        lst.AddRange(files.Select(Path.GetFileNameWithoutExtension));
-
-        return lst;
-    }
-
-    /// <summary>
-    ///     Mostly used for Save Game Operations
-    /// </summary>
-    /// <param name="path">Target Folder</param>
-    /// <returns>Returns all Subfolders</returns>
-    /// <exception cref="FileHandlerException">No Correct Path was provided</exception>
-    public static List<string>? GetAllSubfolders(string path)
+    /// <param name="path">The path.</param>
+    /// <returns>Subfolders</returns>
+    /// <exception cref="FileHandler.FileHandlerException"></exception>
+    public static List<string> GetAllSubfolders(string path)
     {
         if (string.IsNullOrEmpty(path))
-        {
             throw new FileHandlerException(FileHandlerResources.ErrorEmptyString);
-        }
 
         if (!Directory.Exists(path))
-        {
-            return null;
-        }
-
-        var list = Directory.GetDirectories(path).ToList();
+            return new List<string>();
 
-        return list.ConvertAll(Path.GetFileName);
+        return Directory.GetDirectories(path).Select(Path.GetFileName).ToList();
     }
 
     /// <summary>
-    ///     Simple Check if Folder Contains something
+    /// Check if a folder contains any file or folder.
     /// </summary>
-    /// <param name="path">Target Path</param>
-    /// <returns>True if we find Something</returns>
-    /// <exception cref="FileHandlerException">No Correct Path was provided</exception>
-    public static async Task<bool> CheckIfFolderContainsElement(string path)
+    /// <param name="path">The path.</param>
+    /// <returns>Check if folder is empty.</returns>
+    /// <exception cref="FileHandler.FileHandlerException"></exception>
+    public static bool CheckIfFolderContainsElement(string path)
     {
         if (string.IsNullOrEmpty(path))
-        {
             throw new FileHandlerException(FileHandlerResources.ErrorEmptyString);
-        }
 
         if (!Directory.Exists(path))
-        {
             return false;
-        }
 
-        return await Task.Run(() =>
-        {
-            var fileCheck = Directory.GetFiles(path).FirstOrDefault();
-            return fileCheck != null;
-        });
+        return Directory.EnumerateFileSystemEntries(path).Any();
     }
 
-
     /// <summary>
-    ///     Get the files that contain this sub string. If Invert is true, files that don't contain it.
+    /// Get files containing a specific substring (or inverse).
     /// </summary>
     /// <param name="path">The path.</param>
     /// <param name="appendix">The appendix.</param>
     /// <param name="subdirectories">if set to <c>true</c> [subdirectories].</param>
     /// <param name="subString">The sub string.</param>
-    /// <param name="invert">if set to <c>true</c> [invert], does not contain [subString].</param>
-    /// <returns>List of files with Extension and Path that contain this string</returns>
-    public static List<string>? GetFilesWithSubString(string path, IEnumerable<string> appendix, bool subdirectories,
+    /// <param name="invert">if set to <c>true</c> [invert].</param>
+    /// <returns>All files with a specific substring.</returns>
+    public static List<string> GetFilesWithSubString(string path, IEnumerable<string> appendix, bool subdirectories,
         string subString, bool invert)
     {
         var lst = GetFilesByExtensionFullPath(path, appendix, subdirectories);
 
-        if (lst == null || lst.Count == 0)
-        {
-            return null;
-        }
-
-        var list = new List<string>();
+        if (lst.Count == 0)
+            return new List<string>();
 
-        if (invert)
+        return lst.Where(element =>
         {
-            list.AddRange(from element in lst
-                let file = Path.GetFileName(element)
-                where !file.Contains(subString)
-                select element);
-
-            return list;
-        }
-
-        list.AddRange(from element in lst
-            let file = Path.GetFileName(element)
-            where file.Contains(subString)
-            select element);
-
-        return list;
+            var file = Path.GetFileName(element);
+            return invert ? !file.Contains(subString) : file.Contains(subString);
+        }).ToList();
     }
 }