Mirrors/flowframes
1
0
Fork 0
mirror of https://github.com/n00mkrad/flowframes.git synced 2026-05-18 05:04:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't start up if no args passed in CLI mode (or only help arg)

Browse Source
This commit is contained in:
n00mkrad
2025-12-21 18:06:42 +01:00
parent 395bdf8151
commit eed7ba0c1f
3 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
CodeLegacy/Cli.cs
View File

@@ -15,6 +15,8 @@ namespace Flowframes
public class Cli
{
public static bool Debug = false;
public static bool ShowHelp = false;
public static bool CanStart = false;
public static bool DisablePython = true;
public static bool ShowMdlDownloader = false;
public static bool CloseMdlDownloaderWhenDone = false;
@@ -37,12 +39,17 @@ namespace Flowframes
[DllImport("kernel32.dll", SetLastError = true)]
private static extern int FreeConsole();
public static void HandleCli()
/// <summary> Parses command line args. Returns if the program should continue (true) or exit (false). </summary>
public static bool HandleCli()
{
string GetEnums<T>() => string.Join(", ", Enum.GetNames(typeof(T)));
var optsSet = new OptionSet
{
{
"h|help", "Show CLI help",
v => ShowHelp = v != null
},
{
"d|debug", "Enable debug/developer features and experimental or deprecated options",
v => Debug = v != null
@@ -125,26 +132,34 @@ namespace Flowframes
},
};
var opts = new ArgParseExtensions.Options() { OptionsSet = optsSet, BasicUsage = "<OPTIONS> <FILE(S)>", AddHelpArg = true };
var opts = new ArgParseExtensions.Options() { OptionsSet = optsSet, BasicUsage = "<OPTIONS> <FILE(S)>", AddHelpArg = false };
try
{
if (!opts.TryParseOptions(Environment.GetCommandLineArgs()))
return;
var args = Environment.GetCommandLineArgs();
// if (!ShowConsole)
// FreeConsole();
if (!opts.TryParseOptions(args))
return false;
bool noArgs = args.Select(a => a.TrimStart('-').Lower().Trim('"')).Where(a => !a.EndsWith(".exe") && a != "h" && a != "help").Count() < 1; // No args passed (apart from program exe path and/or help flag)
if (Program.CmdMode && (noArgs || ShowHelp))
{
opts.PrintHelp();
}
Python.DisablePython = DisablePython;
Config.NoWrite = DontSaveConfig;
ValidFiles = ValidFiles.Where(f => File.Exists(f) && Path.GetExtension(f).Lower() != ".exe").Distinct().ToList();
AutoRun = AutoRun && ValidFiles.Any(); // Only AutoRun if valid files are provided
DontSaveConfig = DontSaveConfig || AutoRun; // Never save config in AutoRun mode
return CanStart;
}
catch (OptionException e)
{
Logger.Log($"Error parsing CLI options: {e.Message}", true);
return false;
}
}
}

1
CodeLegacy/Main/Interpolate.cs
View File

@@ -38,7 +38,6 @@ namespace Flowframes
if (!Utils.CheckPathValid(currentSettings.inPath)) return; // Check if input path/file is valid
if (!Utils.CheckAiAvailable(currentSettings.ai, currentSettings.model)) return; // Check if selected AI pkg is installed
if (!AutoEncodeResume.resumeNextRun && !Utils.CheckDeleteOldTempFolder()) return; // Try to delete temp folder if an old one exists
if (!(await Utils.CheckEncoderValid())) return; // Check encoder compat
currentSettings.stepByStep = false;
Program.mainForm.Invoke(() => Program.mainForm.SetStatus("Starting..."));
sw.Restart();

7
CodeLegacy/Program.cs
View File

@@ -40,9 +40,14 @@ namespace Flowframes
Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
CmdMode = Paths.GetExe().EndsWith("Cmd.exe");
Cli.HandleCli();
Debug = Cli.Debug || System.Diagnostics.Debugger.IsAttached;
CmdMode = Paths.GetExe().EndsWith("Cmd.exe");
if(CmdMode && !Cli.CanStart)
{
Environment.Exit(0);
}
// Show splash screen
Application.EnableVisualStyles();