Skip to content

Commit

Permalink
feat(cli): adapt to system.commandline 2.0 beta 4
Browse files Browse the repository at this point in the history
  • Loading branch information
@ToaHartor
ToaHartor committed Jul 11, 2024
1 parent 962caef commit a17afb2
Show file tree
Hide file tree
Showing 2 changed files with 128 additions and 40 deletions.
80 changes: 80 additions & 0 deletions src/Parameters.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
using System;
using System.Collections.Generic;
using System.CommandLine.Binding;
using System.CommandLine;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace GICutscenes
{
internal sealed class DemuxOptions
{
public string? key1;
public string? key2;
public DirectoryInfo? output;
public string? engine;
public bool? merge;
public bool? subs;
public bool? noCleanup;
public string? audioFormat;
public string? videoFormat;
public string? audioLang;
}

internal sealed class DemuxOptionsBinder : BinderBase<DemuxOptions>
{
private Option<string> Key1Option { get; }
private Option<string> Key2Option { get; }
private Option<DirectoryInfo> OutputFolderOption { get; }
private Option<string> MkvEngineOption { get; }
private Option<bool> MergeOption { get; }
private Option<bool> SubsOption { get; }
private Option<bool> NoCleanupOption { get; }
private Option<string> AudioFormatOption { get; }
private Option<string> VideoFormatOption { get; }
private Option<string> AudioLangOption { get; }

public DemuxOptionsBinder(Option<string> key1Option, Option<string> key2Option, Option<DirectoryInfo> outputFolderOption, Option<string> mkvEngineOption, Option<bool> mergeOption, Option<bool> subsOption, Option<bool> noCleanupOption, Option<string> audioFormatOption, Option<string> videoFormatOption, Option<string> audioLangOption)
{
Key1Option = key1Option;
Key2Option = key2Option;
OutputFolderOption = outputFolderOption;
MkvEngineOption = mkvEngineOption;
MergeOption = mergeOption;
SubsOption = subsOption;
NoCleanupOption = noCleanupOption;
AudioFormatOption = audioFormatOption;
VideoFormatOption = videoFormatOption;
AudioLangOption = audioLangOption;
}

protected override DemuxOptions GetBoundValue(BindingContext bindingContext) =>
new DemuxOptions
{
key1 = bindingContext.ParseResult.GetValueForOption(Key1Option),
key2 = bindingContext.ParseResult.GetValueForOption(Key2Option),
output = bindingContext.ParseResult.GetValueForOption(OutputFolderOption),
engine = bindingContext.ParseResult.GetValueForOption(MkvEngineOption),
merge = bindingContext.ParseResult.GetValueForOption(MergeOption),
subs = bindingContext.ParseResult.GetValueForOption(SubsOption),
noCleanup = bindingContext.ParseResult.GetValueForOption(NoCleanupOption),
audioFormat = bindingContext.ParseResult.GetValueForOption(AudioFormatOption),
videoFormat = bindingContext.ParseResult.GetValueForOption(VideoFormatOption),
audioLang = bindingContext.ParseResult.GetValueForOption(AudioLangOption)
};
}

//internal sealed class BatchDemuxOptions
//{
// usmFolderArg,
// subsOption,
// mergeOption,
// mkvEngineOption,
// audioFormatOption,
// videoFormatOption,
// outputFolderOption,
// noCleanupOption,
// audioLangOption
//}
}
88 changes: 48 additions & 40 deletions src/Program.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using GICutscenes.FileTypes;
using GICutscenes.FileTypes;
using GICutscenes.Mergers;
using GICutscenes.Mergers.GIMKV;
using GICutscenes.Utils;
Expand All @@ -21,6 +21,7 @@ internal sealed class Settings
public string? SubsStyle { get; set; }

}

internal sealed class Program
{
public static Settings? settings;
Expand All @@ -30,7 +31,7 @@ private static int Main(string[] args)
{

// CLI Options
var demuxFileOption = new Argument<FileInfo?>(
var demuxFileArg = new Argument<FileInfo>(
name: "Input file",
description: "The file to read and display on the console.");

Expand All @@ -42,17 +43,18 @@ private static int Main(string[] args)
name: "HCA Input",
description: "File or directory to be processed.");

var outputFolderOption = new Option<DirectoryInfo?>(
var outputFolderOption = new Option<DirectoryInfo>(
name: "--output",
description: "Output folder, default is './output'."
description: "Output folder, default is './output'.",
getDefaultValue: () => new DirectoryInfo("./output")
);
outputFolderOption.AddAlias("-o");

var key1Option = new Option<string?>(
var key1Option = new Option<string>(
name: "-a",
description: "4 lower bytes of the key");

var key2Option = new Option<string?>(
var key2Option = new Option<string>(
name: "-b",
description: "4 higher bytes of the key");

Expand Down Expand Up @@ -119,9 +121,9 @@ private static int Main(string[] args)

rootCommand.AddGlobalOption(stackTraceOption);

var demuxUsmCommand = new Command("demuxUsm", "Demuxes a specified .usm file to a specified folder")
var demuxUsmCommand = new Command("demux-usm", "Demuxes a specified .usm file to a specified folder")
{
demuxFileOption,
demuxFileArg,
key1Option,
key2Option,
subsOption,
Expand All @@ -134,7 +136,7 @@ private static int Main(string[] args)
audioLangOption
};

var batchDemuxCommand = new Command("batchDemux", "Tries to demux all .usm files in the specified folder")
var batchDemuxCommand = new Command("batch-demux", "Tries to demux all .usm files in the specified folder")
{
usmFolderArg,
subsOption,
Expand All @@ -149,7 +151,7 @@ private static int Main(string[] args)

//var hcaDecrypt = new Command();

var convertHcaCommand = new Command("convertHca", "Converts input .hca files into .wav files")
var convertHcaCommand = new Command("convert-hca", "Converts input .hca files into .wav files")
{
hcaInputArg,
outputFolderOption,
Expand All @@ -171,25 +173,24 @@ private static int Main(string[] args)


// Command Handlers
demuxUsmCommand.SetHandler((FileInfo file, string key1, string key2, DirectoryInfo? output, string engine, bool merge, bool subs, bool noCleanup, string audioFormat, string videoFormat, string audioLang) =>
demuxUsmCommand.SetHandler((demuxFileArgValue, demuxOptions) =>
{
ReadSetting();
output ??= new DirectoryInfo("./output");
output.Create();
DemuxUsmCommand(file, key1, key2, output, engine, merge, subs, noCleanup, audioFormat, videoFormat, audioLang);
}, demuxFileOption, key1Option, key2Option, outputFolderOption, mkvEngineOption, mergeOption, subsOption, noCleanupOption, audioFormatOption, videoFormatOption, audioLangOption);
demuxOptions.output.Create();
DemuxUsmCommand(demuxFileArgValue, demuxOptions); // key1, key2, output, engine, merge, subs, noCleanup, audioFormat, videoFormat, audioLang);
}, demuxFileArg, new DemuxOptionsBinder(key1Option, key2Option, outputFolderOption, mkvEngineOption, mergeOption, subsOption, noCleanupOption, audioFormatOption, videoFormatOption, audioLangOption));


batchDemuxCommand.SetHandler((DirectoryInfo inputDir, DirectoryInfo? outputDir, string engine, bool merge, bool subs, bool noCleanup, string audioFormat, string videoFormat, string audioLang) =>
// DirectoryInfo? outputDir, string engine, bool merge, bool subs, bool noCleanup, string audioFormat, string videoFormat, string audioLang
batchDemuxCommand.SetHandler((inputDir, batchDemuxOptions) =>
{
ReadSetting();
outputDir ??= new DirectoryInfo("./output");
outputDir.Create();
var timer = Stopwatch.StartNew();
BatchDemuxCommand(inputDir, outputDir, engine, merge, subs, noCleanup, audioFormat, videoFormat, audioLang);
timer.Stop();
Console.WriteLine($"{timer.ElapsedMilliseconds}ms elapsed");
}, usmFolderArg, outputFolderOption, mkvEngineOption, mergeOption, subsOption, noCleanupOption, audioFormatOption, videoFormatOption, audioLangOption);
ReadSetting();
batchDemuxOptions.output ??= new DirectoryInfo("./output");
batchDemuxOptions.output.Create();
var timer = Stopwatch.StartNew();
BatchDemuxCommand(inputDir, batchDemuxOptions);
timer.Stop();
Console.WriteLine($"{timer.ElapsedMilliseconds}ms elapsed");
}, usmFolderArg, new BatchDemuxOptionsBinder(outputFolderOption, mkvEngineOption, mergeOption, subsOption, noCleanupOption, audioFormatOption, videoFormatOption, audioLangOption));

convertHcaCommand.SetHandler((FileSystemInfo input, DirectoryInfo? output) =>
{
Expand Down Expand Up @@ -260,23 +261,28 @@ private static void ReadSetting()
}
}

private static void DemuxUsmCommand(FileInfo file, string key1, string key2, DirectoryInfo? output, string engine, bool merge, bool subs, bool noCleanup, string audioFormat, string videoFormat, string audioLang)
private static void DemuxUsmCommand(FileInfo file, DemuxOptions demuxOptions)
{
if (file == null) throw new ArgumentNullException(nameof(file), "No file provided.");
if (!file.Exists) throw new ArgumentException("File {0} does not exist.", file.Name);
if (!file.Name.EndsWith(".usm"))
throw new ArgumentException($"File {file.Name} provided isn't a .usm file.");
if (key1 != null && key2 != null && (key1.Length != 8 || key2.Length != 8)) throw new ArgumentException("Keys are invalid.");
string outputArg = output == null
if (demuxOptions.key1 != null && demuxOptions.key2 != null && (demuxOptions.key1.Length != 8 || demuxOptions.key2.Length != 8)) throw new ArgumentException("Keys are invalid.");
string outputArg = demuxOptions.output == null
? file.Directory!.FullName
: ((output.Exists) ? output.FullName : throw new ArgumentException("Output directory is invalid."));
: ((demuxOptions.output.Exists) ? demuxOptions.output.FullName : throw new ArgumentException("Output directory is invalid."));
Console.WriteLine($"Output folder : {outputArg}");
byte[] key1Arg = Convert.FromHexString(key1 ?? "");
byte[] key2Arg = Convert.FromHexString(key2 ?? "");
byte[] key1Arg = Convert.FromHexString(demuxOptions.key1 ?? "");
byte[] key2Arg = Convert.FromHexString(demuxOptions.key2 ?? "");
Demuxer.Demux(file.FullName, key1Arg, key2Arg, outputArg);

bool merge = demuxOptions.merge.GetValueOrDefault(false);
bool noCleanup = demuxOptions.noCleanup.GetValueOrDefault(false);
bool mergeSubs = demuxOptions.subs.GetValueOrDefault(false);

if (merge)
{
MergeFiles(outputArg, Path.GetFileNameWithoutExtension(file.FullName), engine, subs, audioFormat, videoFormat, audioLang);
MergeFiles(outputArg, Path.GetFileNameWithoutExtension(file.FullName), demuxOptions.engine, mergeSubs, demuxOptions.audioFormat, demuxOptions.videoFormat, demuxOptions.audioLang);
if (!noCleanup) CleanFiles(outputArg, Path.GetFileNameWithoutExtension(file.FullName));
}
if (!noCleanup && Directory.Exists(Path.Combine(outputArg, "Subs")))
Expand All @@ -285,23 +291,24 @@ private static void DemuxUsmCommand(FileInfo file, string key1, string key2, Dir
}
}

private static void BatchDemuxCommand(DirectoryInfo inputDir, DirectoryInfo? outputDir, string engine, bool merge, bool subs, bool noCleanup, string audioFormat, string videoFormat, string audioLang)
// DirectoryInfo? outputDir, string engine, bool merge, bool subs, bool noCleanup, string audioFormat, string videoFormat, string audioLang
private static void BatchDemuxCommand(DirectoryInfo inputDir, BatchDemuxOptions demuxOptions)

Check failure on line 295 in src/Program.cs

View workflow job for this annotation

GitHub Actions / Develop build (win-x64) 

The type or namespace name 'BatchDemuxOptions' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 295 in src/Program.cs

View workflow job for this annotation

GitHub Actions / Develop build (win-arm64) 

The type or namespace name 'BatchDemuxOptions' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 295 in src/Program.cs

View workflow job for this annotation

GitHub Actions / Develop build (linux-x64) 

The type or namespace name 'BatchDemuxOptions' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 295 in src/Program.cs

View workflow job for this annotation

GitHub Actions / Develop build (linux-arm64) 

The type or namespace name 'BatchDemuxOptions' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 295 in src/Program.cs

View workflow job for this annotation

GitHub Actions / Develop build (osx-x64) 

The type or namespace name 'BatchDemuxOptions' could not be found (are you missing a using directive or an assembly reference?)
{
if (inputDir is not { Exists: true }) throw new DirectoryNotFoundException("Input directory is invalid.");
string outputArg = (outputDir == null)
string outputArg = (demuxOptions.output == null)
? inputDir.FullName
: ((outputDir.Exists) ? outputDir.FullName : throw new ArgumentException("Output directory is invalid."));
: ((demuxOptions.output.Exists) ? demuxOptions.output.FullName : throw new ArgumentException("Output directory is invalid."));
Console.WriteLine($"Output folder : {outputArg}");
foreach (string f in Directory.EnumerateFiles(inputDir.FullName, "*.usm"))
{
bool demuxed = Demuxer.Demux(f, Array.Empty<byte>(), Array.Empty<byte>(), outputArg);
if (!demuxed) continue;
if (!merge) continue;
if (!demuxOptions.merge.GetValueOrDefault(false)) continue;

MergeFiles(outputArg, Path.GetFileNameWithoutExtension(f), engine, subs, audioFormat, videoFormat, audioLang);
if (!noCleanup) CleanFiles(outputArg, Path.GetFileNameWithoutExtension(f));
MergeFiles(outputArg, Path.GetFileNameWithoutExtension(f), demuxOptions.engine, demuxOptions.subs.GetValueOrDefault(false), demuxOptions.audioFormat, demuxOptions.videoFormat, demuxOptions.audioLang);
if (!demuxOptions.noCleanup.GetValueOrDefault(false)) CleanFiles(outputArg, Path.GetFileNameWithoutExtension(f));
}
if (!noCleanup && Directory.Exists(Path.Combine(outputArg, "Subs")))
if (!demuxOptions.noCleanup.GetValueOrDefault(false) && Directory.Exists(Path.Combine(outputArg, "Subs")))
{
Directory.Delete(Path.Combine(outputArg, "Subs"), true);
}
Expand Down Expand Up @@ -335,9 +342,10 @@ private static void ConvertHcaCommand(FileSystemInfo input, DirectoryInfo? outpu
}
}

private static void MergeFiles(string outputPath, string basename, string engine, bool subs, string audioFormat, string videoFormat, string audioLang)
private static void MergeFiles(string outputPath, string basename, string? engine, bool subs, string audioFormat, string videoFormat, string audioLang)
{
Merger merger;
// If either audio or video format is defined, use ffmpeg
if (!string.IsNullOrWhiteSpace(audioFormat) || !string.IsNullOrWhiteSpace(videoFormat))
{
engine = "ffmpeg";
Expand Down

0 comments on commit a17afb2

Please sign in to comment.