Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-16 08:25:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add --input-cryptkey argument (#2714)

Browse Source 
* Add --input-cryptkey argument

* Improve readability of argument parsing

* Make the compiler shut up

* Remove German translation again

* Revert switch expression

* Fix unused cryptkey

It seems to be late
This commit is contained in:
Sebastian Göls
2022-10-07 19:32:58 +02:00
committed by GitHub
parent d73c04a2db
commit 5a182b7522
5 changed files with 1727 additions and 1095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
ArchiSteamFarm/Program.cs
View File

@@ -67,6 +67,7 @@ internal static class Program {
#endif
private static bool IgnoreUnsupportedEnvironment;
private static bool InputCryptkeyManually;
private static bool SystemRequired;
internal static async Task Exit(byte exitCode = 0) {
@@ -307,6 +308,18 @@ internal static class Program {
}
}
if (InputCryptkeyManually) {
string? cryptkey = await Logging.GetUserInput(ASF.EUserInputType.Cryptkey).ConfigureAwait(false);
if (string.IsNullOrEmpty(cryptkey)) {
ASF.ArchiLogger.LogGenericError(string.Format(CultureInfo.CurrentCulture, Strings.ErrorIsInvalid, nameof(cryptkey)));
return false;
}
ArchiCryptoHelper.SetEncryptionKey(cryptkey!);
}
if (!Directory.Exists(SharedInfo.ConfigDirectory)) {
ASF.ArchiLogger.LogGenericError(Strings.ErrorConfigDirectoryNotFound);
await Task.Delay(SharedInfo.InformationDelay).ConfigureAwait(false);
@@ -536,53 +549,59 @@ internal static class Program {
bool networkGroupNext = false;
bool pathNext = false;
bool noArgumentValueNext() => !cryptKeyNext && !cryptKeyFileNext && !networkGroupNext && !pathNext;
foreach (string arg in args) {
switch (arg.ToUpperInvariant()) {
case "--CRYPTKEY" when !cryptKeyNext && !cryptKeyFileNext && !networkGroupNext && !pathNext:
case "--CRYPTKEY" when noArgumentValueNext():
cryptKeyNext = true;
break;
case "--CRYPTKEY-FILE" when !cryptKeyNext && !cryptKeyFileNext && !networkGroupNext && !pathNext:
case "--CRYPTKEY-FILE" when noArgumentValueNext():
cryptKeyFileNext = true;
break;
case "--IGNORE-UNSUPPORTED-ENVIRONMENT" when !cryptKeyNext && !cryptKeyFileNext && !networkGroupNext && !pathNext:
case "--IGNORE-UNSUPPORTED-ENVIRONMENT" when noArgumentValueNext():
IgnoreUnsupportedEnvironment = true;
break;
case "--NETWORK-GROUP" when !cryptKeyNext && !cryptKeyFileNext && !networkGroupNext && !pathNext:
case "--INPUT-CRYPTKEY" when noArgumentValueNext():
InputCryptkeyManually = true;
break;
case "--NETWORK-GROUP" when noArgumentValueNext():
networkGroupNext = true;
break;
case "--NO-CONFIG-MIGRATE" when !cryptKeyNext && !cryptKeyFileNext && !networkGroupNext && !pathNext:
case "--NO-CONFIG-MIGRATE" when noArgumentValueNext():
ConfigMigrate = false;
break;
case "--NO-CONFIG-WATCH" when !cryptKeyNext && !cryptKeyFileNext && !networkGroupNext && !pathNext:
case "--NO-CONFIG-WATCH" when noArgumentValueNext():
ConfigWatch = false;
break;
case "--NO-RESTART" when !cryptKeyNext && !cryptKeyFileNext && !networkGroupNext && !pathNext:
case "--NO-RESTART" when noArgumentValueNext():
RestartAllowed = false;
break;
case "--NO-STEAM-PARENTAL-GENERATION" when !cryptKeyNext && !cryptKeyFileNext && !networkGroupNext && !pathNext:
case "--NO-STEAM-PARENTAL-GENERATION" when noArgumentValueNext():
SteamParentalGeneration = false;
break;
case "--PROCESS-REQUIRED" when !cryptKeyNext && !cryptKeyFileNext && !networkGroupNext && !pathNext:
case "--PROCESS-REQUIRED" when noArgumentValueNext():
ProcessRequired = true;
break;
case "--PATH" when !cryptKeyNext && !cryptKeyFileNext && !networkGroupNext && !pathNext:
case "--PATH" when noArgumentValueNext():
pathNext = true;
break;
case "--SERVICE" when !cryptKeyNext && !cryptKeyFileNext && !networkGroupNext && !pathNext:
case "--SERVICE" when noArgumentValueNext():
Service = true;
break;
case "--SYSTEM-REQUIRED" when !cryptKeyNext && !cryptKeyFileNext && !networkGroupNext && !pathNext:
case "--SYSTEM-REQUIRED" when noArgumentValueNext():
SystemRequired = true;
break;