fix: generalized file overriding on copy-dropping in drop zones

Author: Evan Comtesse

src/RayGUI.cs

@@ -212,29 +212,26 @@ internal static DropZone ImportFiles(DropZone c)
             string fileName = pathArryBySlash.Last();
 
             // Copy file to output directory of the container
-            if (!c.Contains(c.OutputFilePath + "\\" +fileName))
+            if (c.Extensions.Contains(pathArray.Last()) || c.Extensions.Length == 0)
             {
-                if (c.Extensions.Contains(pathArray.Last()) || c.Extensions.Length == 0)
+                try
                 {
-                    try
-                    {
-                        File.Copy(path, c.OutputFilePath + "\\" + fileName, true);
-                        c.AddFile(c.OutputFilePath + "\\" + fileName);
-                        // Add file path to the container
-                        Debugger.Send($"File {fileName} received successfully", ConsoleColor.Green);
-                    }
-                    catch
-                    {
-                        Debugger.Send($"File could not be received, either wrong destination ({c.OutputFilePath}) or unsuitable source file ({path}))", ConsoleColor.Yellow);
-                    }
+                    File.Copy(path, c.OutputFilePath + "\\" + fileName, true);
+                    c.AddFile(c.OutputFilePath + "\\" + fileName);
+                    // Add file path to the container
+                    Debugger.Send($"File {fileName} received successfully", ConsoleColor.Green);
                 }
-                else
-                { 
-                    string err = "File could not be received, required extension(s):";
-                    for (int i = 0; i < c.Extensions.Length; i++) err += $" .{c.Extensions[i]}";
-                    Debugger.Send(err, ConsoleColor.Yellow);
+                catch
+                {
+                    Debugger.Send($"File could not be received, either wrong destination ({c.OutputFilePath}) or unsuitable source file ({path}))", ConsoleColor.Yellow);
                 }
             }
+            else
+            { 
+                string err = "File could not be received, required extension(s):";
+                for (int i = 0; i < c.Extensions.Length; i++) err += $" .{c.Extensions[i]}";
+                Debugger.Send(err, ConsoleColor.Yellow);
+            }
             UnloadDroppedFiles(filePathList);
 
             // Return modified container

src/code/components/DropZone.cs

@@ -3,6 +3,8 @@
     /// <summary>Container component of the library.</summary>
     public class DropZone : Component
     {
+        private readonly List<string> Files;
+
         /// <summary>The abosulte file path for the output directory.</summary>
         public string OutputFilePath;
 
@@ -12,8 +14,8 @@ public class DropZone : Component
         /// <summary>Last dropped file.</summary>
         public string LastFile;
 
-        /// <summary>Paths of the container's files.</summary>
-        private readonly List<string> Files;
+        /// <summary>Returns the number of files contained inside of the output directory.</summary>
+        public int FileCount { get { return Files.Count; } }
 
         /// <summary>Initializes a new instance of <see cref="Container"/>.</summary>
         /// <param name="x">X Position of the container</param>
@@ -23,8 +25,8 @@ public class DropZone : Component
         public DropZone(int x, int y, int width, int height) : base(x, y, width, height)
         {
             Extensions = []; // Accept any file by default
-            Files = new List<string>() { "" };
             OutputFilePath = Directory.GetCurrentDirectory(); // Working directory by default
+            Files = [..Directory.GetFiles(OutputFilePath)]; // Retrieve already present files
             LastFile = "";
         }