implement -o (--output) for PsBuild and EmtConvert

Author: UlyssesWu

FreeMote.PsBuild/PsbCompiler.cs

@@ -454,15 +454,14 @@ public static MemoryStream InplaceReplace(string psbPath, string jsonPath)
         /// <summary>
         /// <inheritdoc cref="InplaceReplace"/>
         /// </summary>
-        public static string InplaceReplaceToFile(string psbPath, string jsonPath)
+        public static void InplaceReplaceToFile(string psbPath, string jsonPath, string outputPath)
         {
             var ms = InplaceReplace(psbPath, jsonPath);
-            var outputPath = Path.ChangeExtension(psbPath, "IR.psb");
+            //var outputPath = Path.ChangeExtension(psbPath, "IR.psb");
             using var fs = File.Create(outputPath);
             ms.WriteTo(fs);
             fs.Close();
             ms.Close();
-            return outputPath;
         }
 
         /// <summary>
@@ -476,10 +475,20 @@ public static string InplaceReplaceToFile(string psbPath, string jsonPath)
         /// <param name="enableParallel">parallel process</param>
         /// <param name="keyLen">key length</param>
         /// <param name="keepRaw">Do not try to compile json or pack MDF</param>
+        /// <param name="outputFolder">output folder</param>
         public static void PackArchive(string jsonPath, string key, bool intersect, bool preferPacked, Dictionary<string, object> extraContext = null, bool enableParallel = true,
-            int keyLen = 131, bool keepRaw = false)
+            int keyLen = 131, bool keepRaw = false, string outputFolder = null)
         {
-            if (!File.Exists(jsonPath)) return;
+            if (!File.Exists(jsonPath)) 
+            {
+                Logger.LogError($"Input file does not exist: {jsonPath}");
+                return;
+            }
+            if (!string.IsNullOrEmpty(outputFolder) && !Directory.Exists(outputFolder))
+            {
+                Logger.LogError($"Output folder does not exist: {outputFolder}");
+                return;
+            }
             PSB infoPsb = LoadPsbFromJsonFile(jsonPath);
             if (infoPsb.Type != PsbType.ArchiveInfo)
             {
@@ -708,7 +717,8 @@ void AddFileInfo(PsbDictionary fileInfoDic, string relativePathWithoutSuffix, lo
 
             //using var mmFile =
             //    MemoryMappedFile.CreateFromFile(bodyBinFileName, FileMode.Create, coreName, );
-            using var bodyFs = File.OpenWrite(bodyBinFileName);
+            string bodyBinFilePath = string.IsNullOrEmpty(outputFolder) ? bodyBinFileName : Path.Combine(outputFolder, Path.GetFileName(bodyBinFileName));
+            using var bodyFs = File.OpenWrite(bodyBinFilePath);
             var fileInfoDic = new PsbDictionary(files.Count);
             var fmContext = FreeMount.CreateContext(context);
             //byte[] bodyBin = null;
@@ -926,8 +936,8 @@ void AddFileInfo(PsbDictionary fileInfoDic, string relativePathWithoutSuffix, lo
             }
 
             using var infoMdf = fmContext.PackToShell(infoPsb.ToStream(), fmContext.HasShell ? fmContext.Shell.ToUpperInvariant() : "MDF");
-            File.WriteAllBytes(packageName, infoMdf.ToArray());
-            infoMdf.Dispose();
+            string infoMdfFilePath = string.IsNullOrEmpty(outputFolder) ? packageName : Path.Combine(outputFolder, Path.GetFileName(packageName));
+            File.WriteAllBytes(infoMdfFilePath, infoMdf.ToArray());
 
             //File.WriteAllBytes(bodyBinFileName, bodyBin);
         }

FreeMote.Tests/PsBuildTest.cs

@@ -75,7 +75,7 @@ public void TestInplaceReplace()
             //var path = Path.Combine(resPath, "dx_ふかみ_駅員服.psb");
             var path = Path.Combine(ResPath, "dx_ふかみ_駅員服.lz4.psb");
             var jsonPath = Path.Combine(ResPath, "dx_ふかみ_駅員服.json");
-            PsbCompiler.InplaceReplaceToFile(path, jsonPath);
+            PsbCompiler.InplaceReplaceToFile(path, jsonPath, path + ".IR.psb");
         }