Mirrors/flowframes
1
0
Fork 0
mirror of https://github.com/n00mkrad/flowframes.git synced 2026-08-29 10:08:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Re-implement and fix CLI args using Ndesk.Options

Browse Source
This commit is contained in:
N00MKRAD
2024-08-21 20:46:28 +02:00
parent 713c64e6ec
commit 46f1ec652a
2 changed files with 64 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
CodeLegacy/Forms/Main/Form1.cs
View File

@@ -1,5 +1,4 @@
using Flowframes.Forms;
using Flowframes.IO;
using Flowframes.IO;
using Flowframes.Main;
using Flowframes.Os;
using Flowframes.Ui;
@@ -57,7 +56,6 @@ namespace Flowframes.Forms.Main
// Main Tab
UiUtils.InitCombox(interpFactorCombox, 0);
UiUtils.InitCombox(outSpeedCombox, 0);
UiUtils.InitCombox(aiModel, 2);
// Video Utils
UiUtils.InitCombox(trimCombox, 0);
@@ -177,28 +175,35 @@ namespace Flowframes.Forms.Main
void HandleArgs()
{
if (Program.fileArgs.Length > 0)
DragDropHandler(Program.fileArgs.Where(x => IoUtils.IsFileValid(x)).ToArray());
if (Program.Cli.ValidFiles.Any())
DragDropHandler(Program.Cli.ValidFiles.ToArray());
foreach (string arg in Program.args)
if (Program.Cli.InterpAi != (Implementations.Ai)(-1))
{
if (arg.StartsWith("out="))
outputTbox.Text = arg.Split('=').Last().Trim();
string name = Implementations.GetAi(Program.Cli.InterpAi).NameInternal;
aiCombox.SelectedIndex = Implementations.NetworksAvailable.IndexOf(Implementations.NetworksAvailable.Where(ai => ai.NameInternal == name).FirstOrDefault());
}
if (arg.StartsWith("factor="))
{
float factor = arg.Split('=').Last().GetFloat();
interpFactorCombox.Text = factor.ToString();
}
if (Program.Cli.InterpFactor > 0)
{
interpFactorCombox.Text = Program.Cli.InterpFactor.ToString();
ValidateFactor();
}
if (arg.StartsWith("ai="))
aiCombox.SelectedIndex = arg.Split('=').Last().GetInt();
if(Program.Cli.OutputFormat != (Enums.Output.Format)(-1))
{
SetFormat(Program.Cli.OutputFormat);
}
if (arg.StartsWith("model="))
aiModel.SelectedIndex = arg.Split('=').Last().GetInt();
if (Program.Cli.InterpModel.IsNotEmpty())
{
aiModel.SelectedIndex = aiModel.Items.Cast<string>().Select((item, index) => new { item, index }).FirstOrDefault(x => x.item.Contains(Program.Cli.InterpModel))?.index ?? -1;
}
if (arg.StartsWith("output-mode="))
comboxOutputFormat.SelectedIndex = arg.Split('=').Last().GetInt();
if (Program.Cli.OutputDir.IsNotEmpty())
{
outputTbox.Text = Program.Cli.OutputDir;
Directory.CreateDirectory(Program.Cli.OutputDir);
}
}
@@ -326,7 +331,7 @@ namespace Flowframes.Forms.Main
public void CompletionAction()
{
if (Program.args.Contains("quit-when-done"))
if (Program.Cli.ExitWhenDone)
Application.Exit();
if (completionAction.SelectedIndex == 1)
@@ -601,7 +606,7 @@ namespace Flowframes.Forms.Main
{
if (Program.busy) return;
bool start = Program.initialRun && Program.args.Contains("start");
bool start = Program.initialRun && Program.Cli.InterpStart;
if (files.Length > 1)
{
@@ -806,6 +811,10 @@ namespace Flowframes.Forms.Main
{
float inFps = fpsInTbox.GetFloat();
float outFps = fpsOutTbox.GetFloat();
if(inFps == 0 || outFps == 0)
return;
var targetFactorRounded = Math.Round((Decimal)(outFps / inFps), 3, MidpointRounding.AwayFromZero);
interpFactorCombox.Text = $"{targetFactorRounded}";
ValidateFactor();

43
CodeLegacy/Program.cs
View File

@@ -1,5 +1,4 @@
using Flowframes.Data;
using Flowframes.Forms;
using Flowframes.Forms.Main;
using Flowframes.IO;
using Flowframes.MiscUtils;
@@ -37,6 +36,14 @@ namespace Flowframes
public static class Cli
{
public static bool ShowMdlDownloader = false;
public static bool ExitWhenDone = false;
public static bool InterpStart = false;
public static float InterpFactor = -1f;
public static Implementations.Ai InterpAi = (Implementations.Ai)(-1);
public static Enums.Output.Format OutputFormat = Enums.Output.Format.Mp4;
public static string InterpModel = "";
public static string OutputDir = "";
public static List<string> ValidFiles = new List<string>();
}
[STAThread]
@@ -68,25 +75,43 @@ namespace Flowframes
Logger.Log($"Files: {(fileArgs.Length > 0 ? string.Join(", ", fileArgs) : "None")}", true);
Logger.Log($"Args: {(args.Length > 0 ? string.Join(", ", args) : "None")}", true);
HandleCli();
LaunchGui();
}
private static void HandleCli ()
{
string ais = string.Join(", ", Enum.GetNames(typeof(Implementations.Ai)));
string formats = string.Join(", ", Enum.GetNames(typeof(Enums.Output.Format)));
var opts = new OptionSet
{
{ "np|no_python", "Disable Python implementations", v => Python.DisablePython = v != null },
{ "md|open_model_downloader", "Open model downloader GUI on startup", v => Cli.ShowMdlDownloader = v != null },
{ "e|exit", "Exit automatically after interpolation has finished", v => Cli.ExitWhenDone = v != null },
{ "s|start", "Start interpolation automatically if valid parameters are provided", v => Cli.InterpStart = v != null },
{ "f|factor=", "Interpolation factor", v => Cli.InterpFactor = v.GetFloat() },
{ "a|ai=", $"Interpolation AI implementation to use (Option: {ais})", v => Cli.InterpAi = ParseUtils.GetEnum<Implementations.Ai>(v.Trim().Replace("_", "")) },
{ "m|model=", $"AI model to use", v => Cli.InterpModel = v.Trim() },
{ "v|video_format=", $"Output video format to use (Options: {formats})", v => Cli.OutputFormat = ParseUtils.GetEnum<Enums.Output.Format>(v.Trim()) },
{ "o|output_dir=", $"Output folder to save the interpolated video in", v => Cli.OutputDir = v.Trim() },
{ "<>", "Input file(s)", Cli.ValidFiles.Add },
};
try
{
opts.Parse(Environment.GetCommandLineArgs());
Cli.ValidFiles = Cli.ValidFiles.Skip(1).Where(f => File.Exists(f)).ToList();
Logger.Log($"Parsed CLI: Start {Cli.InterpStart}, Exit {Cli.ExitWhenDone}, Factor {Cli.InterpFactor}, AI {Cli.InterpAi}, Model '{Cli.InterpModel}', " +
$"Video Format {Cli.OutputFormat}, Output Dir '{Cli.OutputDir}', No Python {Python.DisablePython}, MdlDl {Cli.ShowMdlDownloader}", true);
}
catch (OptionException e)
{
Logger.Log($"Error parsing CLI option: {e.Message}", true);
Logger.Log($"Error parsing CLI options: {e.Message}", true);
}
LaunchGui();
}
static void LaunchGui()
private static void LaunchGui()
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
@@ -97,14 +122,14 @@ namespace Flowframes
Application.Run(mainForm);
}
static void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
private static void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
{
string text = $"Unhandled Thread Exception!\n\n{e.Exception.Message}\n\nStack Trace:\n{e.Exception.StackTrace}\n\n" +
$"The error has been copied to the clipboard. Please inform the developer about this.";
ShowUnhandledError(text);
}
static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
{
Exception ex = e.ExceptionObject as Exception;
string text = $"Unhandled UI Exception!\n\n{ex.Message}\n\nStack Trace:\n{ex.StackTrace}\n\n" +
@@ -112,7 +137,7 @@ namespace Flowframes
ShowUnhandledError(text);
}
static void ShowUnhandledError(string text)
private static void ShowUnhandledError(string text)
{
UiUtils.ShowMessageBox(text, UiUtils.MessageType.Error);
Clipboard.SetText(text);
@@ -165,7 +190,7 @@ namespace Flowframes
/// <summary>
/// Continuously checks disk space in order to pause interpolation if disk space is running low. Is quite fast (sub 1ms)
/// </summary>
static async Task DiskSpaceCheckLoop()
private static async Task DiskSpaceCheckLoop()
{
while (true)
{