Merge pull request #15 from zacharied/feat.cli-convert-standardize

Add standardize option to fumen generate CLI
NyagekiFumenProject · Oct 11, 2024 · 4a4e685 · 4a4e685
2 parents 4c59735 + 7ea0487
commit 4a4e685
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 13 deletions.
diff --git a/OngekiFumenEditor/Kernel/ArgProcesser/DefaultImp/DefaultArgProcessManager.cs b/OngekiFumenEditor/Kernel/ArgProcesser/DefaultImp/DefaultArgProcessManager.cs
@@ -152,12 +152,9 @@ private async Task ProcessConvertCommand(FumenConvertOption opt)
             if (CheckRelativePaths(opt.InputFumenFilePath, opt.OutputFumenFilePath))
                 return;
 
-            var converter = IoC.Get<IFumenConverter>();
-            var parserManager = IoC.Get<IFumenParserManager>();
-
             var result = await FumenConverterWrapper.Generate(opt);
             if (!result.IsSuccess) {
-                await Console.Error.WriteLineAsync($"{Resources.ConvertFail}: {result.Message}");
+                await Console.Error.WriteLineAsync($"{Resources.ConvertFail} {result.Message}");
                 Exit(1);
                 return;
             }
@@ -179,7 +176,7 @@ private async Task ProcessJacketCommand(JacketGenerateOption arg)
             }
 
             if (!result.IsSuccess) {
-                await Console.Error.WriteLineAsync($"Failed to generate jacket: {result.Message}");
+                await Console.Error.WriteLineAsync($"{Resources.GenerateJacketFileFail} {result.Message}");
                 Exit(1);
                 return;
             }
@@ -201,7 +198,7 @@ private async Task ProcessAcbCommand(AcbGenerateOption arg)
             }
 
             if (!result.IsSuccess) {
-                await Console.Error.WriteLineAsync($"Failed to generate audio: {result.Message}");
+                await Console.Error.WriteLineAsync($"{Resources.GenerateAudioFileFail} {result.Message}");
                 Exit(1);
                 return;
             }

diff --git a/OngekiFumenEditor/Modules/FumenConverter/FumenConvertOption.cs b/OngekiFumenEditor/Modules/FumenConverter/FumenConvertOption.cs
@@ -6,8 +6,11 @@ namespace OngekiFumenEditor.Modules.FumenConverter;
 public class FumenConvertOption
 {
     [LocalizableOptionBinding<string>("inputFile", nameof(Resources.ProgramOptionInputFile), default, Require = true)]
-    public string InputFumenFilePath { get; set; }
-
+    public string InputFumenFilePath { get; set; }
+
     [LocalizableOptionBinding<string>("outputFile", nameof(Resources.ProgramOptionOutputFile), default, Require = true)]
     public string OutputFumenFilePath { get; set; }
+
+    [LocalizableOptionBinding<bool>("standardize", nameof(Resources.ProgramOptionStandardizeFumen), default)]
+    public bool IsStandarizeFumen { get; set; } = false;
 }
diff --git a/OngekiFumenEditor/Modules/FumenConverter/Kernel/FumenConverterWrapper.cs b/OngekiFumenEditor/Modules/FumenConverter/Kernel/FumenConverterWrapper.cs
@@ -7,6 +7,7 @@
 using OngekiFumenEditor.Parser;
 using OngekiFumenEditor.Parser.DefaultImpl;
 using OngekiFumenEditor.Properties;
+using OngekiFumenEditor.Utils.Ogkr;
 
 namespace OngekiFumenEditor.Modules.FumenConverter.Kernel;
 
@@ -35,6 +36,19 @@ public static async Task<GenerateResult> Generate(FumenConvertOption option, Ong
         if (string.IsNullOrWhiteSpace(option.OutputFumenFilePath)) 
             return new(false, Resources.OutputFumenFileNotSelect);
 
+        if (option.IsStandarizeFumen) {
+            if (Path.GetExtension(option.OutputFumenFilePath) != ".ogkr") {
+                return new(false, Resources.OutputFumenStandardizeFormatNotSupported);
+            }
+
+            var res = await StandardizeFormat.Process(fumen);
+            if (!res.IsSuccess) {
+                return new(false, res.Message);
+            }
+
+            fumen = res.SerializedFumen;
+        }
+
         var converter = IoC.Get<IFumenConverter>();
         try {
             var output = await converter.ConvertFumenAsync(fumen, option.OutputFumenFilePath);

diff --git a/OngekiFumenEditor/Properties/Resources.Designer.cs b/OngekiFumenEditor/Properties/Resources.Designer.cs
diff --git a/OngekiFumenEditor/Properties/Resources.resx b/OngekiFumenEditor/Properties/Resources.resx
@@ -793,13 +793,13 @@
     <value>Generate .dll file fail:</value>
   </data>
   <data name="GenerateAudioFileFail" xml:space="preserve">
-    <value>Generate audio file failed:</value>
+    <value>Failed to generate audio file:</value>
   </data>
   <data name="GenerateAudioSuccess" xml:space="preserve">
     <value>Generate audio file successfully, open output folder?</value>
   </data>
   <data name="GenerateJacketFileFail" xml:space="preserve">
-    <value>Generate jacket files fail:</value>
+    <value>Failed to generate jacket files:</value>
   </data>
   <data name="GenerateJacketFileSuccess" xml:space="preserve">
     <value>Generate jacket files successfully, open output folder?</value>
@@ -1665,4 +1665,10 @@
   <data name="Save" xml:space="preserve">
     <value>Save</value>
   </data>
+  <data name="ProgramOptionStandardizeFumen" xml:space="preserve">
+    <value>standardize the fumen output (only for .ogkr)</value>
+  </data>
+  <data name="OutputFumenStandardizeFormatNotSupported" xml:space="preserve">
+    <value>Cannot standardize for the selected output format</value>
+  </data>
 </root>