Merge pull request #2 from sator-imaging/optimize--cli

optimize: cli

Author: sator-imaging

cli/Program.cs

@@ -292,15 +292,9 @@ static int PerformMerge(FileInfo input, DirectoryInfo buildOutputDir, DirectoryI
                 mergedDll.MoveTo(mergedDllPath, overwrite: true);
 
                 // Check if destination exists and handle force flag
-                if (File.Exists(destPath) && !force)
+                if (!Utils.PromptOverwrite(destPath, force))
                 {
-                    Console.Write($"{mergedFileName} already exists in output directory. Overwrite? (y/N): ");
-                    var response = Console.ReadLine()?.Trim().ToLowerInvariant();
-                    if (response != "y")
-                    {
-                        Console.WriteLine($"Skipped: {mergedFileName}");
-                        return 0;
-                    }
+                    return 0;
                 }
 
                 // Copy to actual output directory
@@ -340,15 +334,9 @@ static int MoveDllFiles(DirectoryInfo sourceDir, DirectoryInfo destDir, bool for
                     var destPath = Path.Combine(destDir.FullName, dllFile.Name);
 
                     // Check if destination exists and handle force flag
-                    if (File.Exists(destPath) && !force)
+                    if (!Utils.PromptOverwrite(destPath, force))
                     {
-                        Console.Write($"{dllFile.Name} already exists in output directory. Overwrite? (y/N): ");
-                        var response = Console.ReadLine()?.Trim().ToLowerInvariant();
-                        if (response != "y")
-                        {
-                            Console.WriteLine($"Skipped: {dllFile.Name}");
-                            continue;
-                        }
+                        continue;
                     }
 
                     Console.WriteLine($"Moving: {dllFile.Name}");

cli/Utils.cs

@@ -54,26 +54,37 @@ public static int ExecuteProcess(string exe, string arguments, bool disableSucce
         }
 
 
+        public static bool PromptOverwrite(string filePath, bool force)
+        {
+            if (!File.Exists(filePath))
+            {
+                return true;
+            }
+
+            if (force)
+            {
+                Console.WriteLine($"Overwriting: {Path.GetFileName(filePath)}");
+                return true;
+            }
+
+            Console.Write($"{Path.GetFileName(filePath)} already exists. Overwrite? (y/N): ");
+            var response = Console.ReadLine()?.Trim().ToLowerInvariant();
+            if (response == "y")
+            {
+                return true;
+            }
+
+            Console.WriteLine($"Skipped: {Path.GetFileName(filePath)}");
+            return false;
+        }
+
         public static void GenerateUnityMeta(FileInfo dllFile, bool force)
         {
             var metaPath = dllFile.FullName + ".meta";
 
-            if (File.Exists(metaPath))
+            if (!PromptOverwrite(metaPath, force))
             {
-                if (force)
-                {
-                    Console.WriteLine($"Overwriting: {dllFile.Name}.meta");
-                }
-                else
-                {
-                    Console.Write($"{dllFile.Name}.meta already exists. Overwrite? (y/N): ");
-                    var response = Console.ReadLine()?.Trim().ToLowerInvariant();
-                    if (response != "y")
-                    {
-                        Console.WriteLine($"Skipped: {dllFile.Name}.meta");
-                        return;
-                    }
-                }
+                return;
             }
 
             // 2022.3.12 or newer: https://qiita.com/amenone_games/items/762cbea245f95b212cfa