Refactor

Author: SkowronskiAndrew

UnityDataTool/SerializedFileCommands.cs

@@ -10,59 +10,53 @@ public static class SerializedFileCommands
 {
     public static int HandleExternalRefs(FileInfo filename, OutputFormat format)
     {
-        return OpenSerializedFileAndProcess(filename, sf =>
+        if (!ValidateSerializedFile(filename.FullName, out _))
+            return 1;
+
+        try
         {
+            using var sf = UnityFileSystem.OpenSerializedFile(filename.FullName);
             if (format == OutputFormat.Json)
                 OutputExternalRefsJson(sf);
             else
                 OutputExternalRefsText(sf);
-        });
+            return 0;
+        }
+        catch (Exception err) when (err is NotSupportedException || err is FileFormatException)
+        {
+            Console.Error.WriteLine($"Error opening SerializedFile: {filename.FullName}");
+            Console.Error.WriteLine(err.Message);
+            return 1;
+        }
     }
 
     public static int HandleObjectList(FileInfo filename, OutputFormat format)
     {
-        return OpenSerializedFileAndProcess(filename, sf =>
+        if (!ValidateSerializedFile(filename.FullName, out _))
+            return 1;
+
+        try
         {
+            using var sf = UnityFileSystem.OpenSerializedFile(filename.FullName);
             if (format == OutputFormat.Json)
                 OutputObjectListJson(sf);
             else
                 OutputObjectListText(sf);
-        });
-    }
-
-    public static int HandleHeader(FileInfo filename, OutputFormat format)
-    {
-        string filePath = filename.FullName;
-
-        // Check if file exists
-        if (!File.Exists(filePath))
-        {
-            Console.Error.WriteLine($"Error: File not found: {filePath}");
-            return 1;
+            return 0;
         }
-
-        // Detect if it's an archive (not supported for header command)
-        if (ArchiveDetector.IsUnityArchive(filePath))
+        catch (Exception err) when (err is NotSupportedException || err is FileFormatException)
         {
-            Console.Error.WriteLine($"Error: The file is an AssetBundle or other Unity Archive, not a SerializedFile.");
-            Console.Error.WriteLine($"File: {filePath}");
-            Console.Error.WriteLine();
-            Console.Error.WriteLine("Unity Archives do not have a SerializedFile header.");
-            Console.Error.WriteLine("Extract the archive first to access SerializedFiles inside:");
-            Console.Error.WriteLine($"  UnityDataTool archive extract \"{filePath}\" -o <output-directory>");
+            Console.Error.WriteLine($"Error opening SerializedFile: {filename.FullName}");
+            Console.Error.WriteLine(err.Message);
             return 1;
         }
+    }
 
-        // Try to detect the SerializedFile header
-        bool isSerializedFile = SerializedFileDetector.TryDetectSerializedFile(filePath, out var fileInfo);
-        if (!isSerializedFile || fileInfo == null)
-        {
-            Console.Error.WriteLine($"Error: The file does not appear to be a valid Unity SerializedFile.");
-            Console.Error.WriteLine($"File: {filePath}");
+    public static int HandleHeader(FileInfo filename, OutputFormat format)
+    {
+        if (!ValidateSerializedFile(filename.FullName, out var fileInfo))
             return 1;
-        }
 
-        // Output the header information
         if (format == OutputFormat.Json)
             OutputHeaderJson(fileInfo);
         else
@@ -72,56 +66,42 @@ public static int HandleHeader(FileInfo filename, OutputFormat format)
     }
 
     /// <summary>
-    /// Opens a SerializedFile and processes it with the given action.
-    /// Provides helpful error messages if the file is not a valid SerializedFile.
+    /// Validates that a file is a SerializedFile and provides helpful error messages if not.
     /// </summary>
-    private static int OpenSerializedFileAndProcess(FileInfo filename, Action<SerializedFile> processAction)
+    /// <param name="filePath">Path to the file to validate</param>
+    /// <param name="fileInfo">SerializedFile header information if valid, null otherwise</param>
+    /// <returns>True if valid SerializedFile, false otherwise</returns>
+    private static bool ValidateSerializedFile(string filePath, out SerializedFileInfo fileInfo)
     {
-        string filePath = filename.FullName;
+        fileInfo = null;
 
-        // Check if file exists (should already be validated by System.CommandLine, but be defensive)
         if (!File.Exists(filePath))
         {
             Console.Error.WriteLine($"Error: File not found: {filePath}");
-            return 1;
+            return false;
         }
 
-        // Common misuse would be to try to use the command with an AssetBundle
-        // so give an instructive error message for that case.
         if (ArchiveDetector.IsUnityArchive(filePath))
         {
             Console.Error.WriteLine($"Error: The file is an AssetBundle or other Unity Archive, not a SerializedFile.");
             Console.Error.WriteLine($"File: {filePath}");
             Console.Error.WriteLine();
-            Console.Error.WriteLine("Unity Archives can contain SerializedFiles inside them.");
+            Console.Error.WriteLine("Unity Archives contain SerializedFiles inside them.");
             Console.Error.WriteLine("To access the SerializedFiles, first extract the archive using:");
             Console.Error.WriteLine($"  UnityDataTool archive extract \"{filePath}\" -o <output-directory>");
             Console.Error.WriteLine();
             Console.Error.WriteLine("Then you can run serialized-file commands on the extracted files.");
-            return 1;
+            return false;
         }
 
-        bool isSerializedFile = SerializedFileDetector.TryDetectSerializedFile(filePath, out var _);
-        if (!isSerializedFile)
+        if (!SerializedFileDetector.TryDetectSerializedFile(filePath, out fileInfo))
         {
             Console.Error.WriteLine($"Error: The file does not appear to be a valid Unity SerializedFile.");
             Console.Error.WriteLine($"File: {filePath}");
-            return 1;
+            return false;
         }
 
-        // Try to open and process the SerializedFile
-        try
-        {
-            using var sf = UnityFileSystem.OpenSerializedFile(filePath);
-            processAction(sf);
-            return 0;
-        }
-        catch (Exception err) when (err is NotSupportedException || err is FileFormatException)
-        {
-            Console.Error.WriteLine($"Error opening SerializedFile: {filePath}");
-            Console.Error.WriteLine(err.Message);
-            return 1;
-        }
+        return true;
     }
 
     private static void OutputExternalRefsText(SerializedFile sf)
@@ -237,4 +217,3 @@ private static void OutputHeaderJson(SerializedFileInfo info)
         Console.WriteLine(json);
     }
 }
-