Reuse code

This commit is contained in:
Michiel Hazelhof 2025-08-12 15:03:48 +02:00
parent 0b0512570f
commit c72fbf5b1c
No known key found for this signature in database
GPG Key ID: EECB9B96355B5EBF

View File

@ -16,36 +16,16 @@ internal class Program
private static Int32 Main(String[] args)
{
App.HelpOption("-? | -h | --help");
if (!File.Exists(Cert.Value()))
{
App.Error.WriteLine($"Can't find certificate at: {Cert.Value()}");
App.ShowHelp();
return 1;
}
if (!File.Exists(CoreDll.Value()))
{
App.Error.WriteLine($"Can't find core dll at: {CoreDll.Value()}");
App.ShowHelp();
return 1;
}
if (Cert == null || String.IsNullOrWhiteSpace(Cert.Value()) || CoreDll == null || String.IsNullOrWhiteSpace(CoreDll.Value()))
{
App.ShowHelp();
return 1;
}
App.Command("interactive", config =>
{
String buff, licenseType = "", name = "", email = "", businessName="";
Int16 storage = 0;
Boolean validGuid = false, validInstallid = false;
Guid guid = Guid.Empty, installid = Guid.Empty;
config.OnExecute(() =>
{
Check();
Console.WriteLine("Interactive license mode...");
while (licenseType == "")
@ -188,6 +168,8 @@ internal class Program
config.OnExecute(() =>
{
Check();
if (String.IsNullOrWhiteSpace(name.Value) || String.IsNullOrWhiteSpace(email.Value))
{
config.Error.WriteLine($"Some arguments are missing: Name='{name.Value}' Email='{email.Value}'");
@ -231,6 +213,8 @@ internal class Program
config.OnExecute(() =>
{
Check();
if (String.IsNullOrWhiteSpace(name.Value) || String.IsNullOrWhiteSpace(email.Value) || String.IsNullOrWhiteSpace(installId.Value))
{
config.Error.WriteLine($"Some arguments are missing: Name='{name.Value}' Email='{email.Value}' InstallId='{installId.Value}'");
@ -273,15 +257,37 @@ internal class Program
try
{
App.HelpOption("-? | -h | --help");
return App.Execute(args);
}
catch (Exception e)
catch (Exception exception)
{
Console.Error.WriteLine("Oops: {0}", e);
Console.Error.WriteLine("Oops: {0}", exception);
return 100;
}
}
private static void Check()
{
if (!File.Exists(Cert.Value()))
{
App.Error.WriteLine($"Can't find certificate at: {Cert.Value()}");
App.ShowHelp();
Environment.Exit(1);
}
if (!File.Exists(CoreDll.Value()))
{
App.Error.WriteLine($"Can't find core dll at: {CoreDll.Value()}");
App.ShowHelp();
Environment.Exit(1);
}
if (Cert == null || String.IsNullOrWhiteSpace(Cert.Value()) || CoreDll == null || String.IsNullOrWhiteSpace(CoreDll.Value()))
{
App.ShowHelp();
Environment.Exit(1);
}
}
// checkUsername Checks that the username is a valid username
private static Boolean CheckUsername(String s)
{
@ -384,7 +390,6 @@ internal class Program
type.GetProperty(name)?.SetValue(license, value);
}
}
private static void GenerateOrgLicense(X509Certificate2 cert, String corePath, String userName, String email, Int16 storage, Guid instalId, String businessName, String key)
{
Assembly core = AssemblyLoadContext.Default.LoadFromAssemblyPath(corePath);