smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: ArgParser, simplify arg parsing by combining duplicate checks into one

Browse source
This commit is contained in:
sithlord48 2025-07-11 13:10:24 -04:00 committed by Nick Bolton
parent 1079c22736
commit c2eae36650
1 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/lib/deskflow/ArgParser.cpp
View file

@ -30,21 +30,13 @@ bool ArgParser::parseServerArgs(deskflow::ServerArgs &args, int argc, const char
updateCommonArgs(argv); updateCommonArgs(argv);
int i = 1; int i = 1;
while (i < argc) { while (i < argc) {
if (parsePlatformArgs(args, argc, argv, i, true)) { if (parsePlatformArgs(args, argc, argv, i, true) || parseGenericArgs(argc, argv, i) ||
++i; parseDeprecatedArgs(argc, argv, i) || isArg(i, argc, argv, nullptr, "server")) {
continue;
} else if (parseGenericArgs(argc, argv, i)) {
++i;
continue;
} else if (parseDeprecatedArgs(argc, argv, i)) {
++i; ++i;
continue; continue;
} else if (isArg(i, argc, argv, "-c", "--config", 1)) { } else if (isArg(i, argc, argv, "-c", "--config", 1)) {
// save configuration file path // save configuration file path
args.m_configFile = argv[++i]; args.m_configFile = argv[++i];
} else if (isArg(i, argc, argv, nullptr, "server")) {
++i;
continue;
} else if (isArg(i, argc, argv, nullptr, "--disable-client-cert-check")) { } else if (isArg(i, argc, argv, nullptr, "--disable-client-cert-check")) {
args.m_chkPeerCert = false; args.m_chkPeerCert = false;
} else { } else {
@ -68,18 +60,11 @@ bool ArgParser::parseClientArgs(deskflow::ClientArgs &args, int argc, const char
int i{1}; int i{1};
while (i < argc) { while (i < argc) {
if (parsePlatformArgs(args, argc, argv, i, false)) { if (parsePlatformArgs(args, argc, argv, i, false) || parseGenericArgs(argc, argv, i) ||
parseDeprecatedArgs(argc, argv, i) || isArg(i, argc, argv, nullptr, "client")) {
++i; ++i;
continue; continue;
} else if (parseGenericArgs(argc, argv, i)) { } else if (isArg(i, argc, argv, nullptr, "--camp") || isArg(i, argc, argv, nullptr, "--no-camp")) {
++i;
continue;
} else if (parseDeprecatedArgs(argc, argv, i)) {
++i;
continue;
} else if (isArg(i, argc, argv, nullptr, "--camp")) {
// ignore -- included for backwards compatibility
} else if (isArg(i, argc, argv, nullptr, "--no-camp")) {
// ignore -- included for backwards compatibility // ignore -- included for backwards compatibility
} else if (isArg(i, argc, argv, nullptr, "--yscroll", 1)) { } else if (isArg(i, argc, argv, nullptr, "--yscroll", 1)) {
// define scroll // define scroll
@ -88,9 +73,6 @@ bool ArgParser::parseClientArgs(deskflow::ClientArgs &args, int argc, const char
args.m_enableLangSync = true; args.m_enableLangSync = true;
} else if (isArg(i, argc, argv, nullptr, "--invert-scroll")) { } else if (isArg(i, argc, argv, nullptr, "--invert-scroll")) {
args.m_clientScrollDirection = deskflow::ClientScrollDirection::Inverted; args.m_clientScrollDirection = deskflow::ClientScrollDirection::Inverted;
} else if (isArg(i, argc, argv, nullptr, "client")) {
++i;
continue;
} else { } else {
if (i + 1 == argc) { if (i + 1 == argc) {
args.m_serverAddress = argv[i]; args.m_serverAddress = argv[i];