Mirrors/lgogdownloader
2
0
Fork 0
mirror of https://github.com/Sude-/lgogdownloader.git synced 2024-11-20 11:49:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove numeric option values from help text

Browse Source
This commit is contained in:
Sude 2018-05-14 11:25:52 +03:00
parent ef1a344610
commit c6e5214910
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
main.cpp
View File

@ -63,12 +63,11 @@ int main(int argc, char *argv[])
std::string priority_help_text = "Set priority by separating values with \",\"\nCombine values by separating with \"+\""; std::string priority_help_text = "Set priority by separating values with \",\"\nCombine values by separating with \"+\"";
// Create help text for --platform option // Create help text for --platform option
std::string platform_text = "Select which installers are downloaded\n"; std::string platform_text = "Select which installers are downloaded\n";
unsigned int platform_all = Util::getOptionValue("all", GlobalConstants::PLATFORMS);
for (unsigned int i = 0; i < GlobalConstants::PLATFORMS.size(); ++i) for (unsigned int i = 0; i < GlobalConstants::PLATFORMS.size(); ++i)
{ {
platform_text += GlobalConstants::PLATFORMS[i].str + " = " + GlobalConstants::PLATFORMS[i].regexp + "|" + std::to_string(GlobalConstants::PLATFORMS[i].id) + "\n"; platform_text += GlobalConstants::PLATFORMS[i].str + " = " + GlobalConstants::PLATFORMS[i].regexp + "\n";
} }
platform_text += "All = all|" + std::to_string(platform_all); platform_text += "All = all";
platform_text += "\n\n" + priority_help_text; platform_text += "\n\n" + priority_help_text;
platform_text += "\nExample: Linux if available otherwise Windows and Mac: l,w+m"; platform_text += "\nExample: Linux if available otherwise Windows and Mac: l,w+m";
@ -76,18 +75,16 @@ int main(int argc, char *argv[])
std::string galaxy_platform_text = "Select platform\n"; std::string galaxy_platform_text = "Select platform\n";
for (unsigned int i = 0; i < GlobalConstants::PLATFORMS.size(); ++i) for (unsigned int i = 0; i < GlobalConstants::PLATFORMS.size(); ++i)
{ {
galaxy_platform_text += GlobalConstants::PLATFORMS[i].str + " = " + GlobalConstants::PLATFORMS[i].regexp + "|" + std::to_string(GlobalConstants::PLATFORMS[i].id) + "\n"; galaxy_platform_text += GlobalConstants::PLATFORMS[i].str + " = " + GlobalConstants::PLATFORMS[i].regexp + "\n";
} }
// Create help text for --language option // Create help text for --language option
std::string language_text = "Select which language installers are downloaded\n"; std::string language_text = "Select which language installers are downloaded\n";
unsigned int language_all = Util::getOptionValue("all", GlobalConstants::LANGUAGES);
for (unsigned int i = 0; i < GlobalConstants::LANGUAGES.size(); ++i) for (unsigned int i = 0; i < GlobalConstants::LANGUAGES.size(); ++i)
{ {
language_text += GlobalConstants::LANGUAGES[i].str + " = " + GlobalConstants::LANGUAGES[i].regexp + "|" + std::to_string(GlobalConstants::LANGUAGES[i].id) + "\n"; language_text += GlobalConstants::LANGUAGES[i].str + " = " + GlobalConstants::LANGUAGES[i].regexp + "\n";
} }
language_text += "Add the values to download multiple languages\nAll = all|" + std::to_string(language_all) + "\n" language_text += "All = all";
+ "French + Polish = \"fr+pl\"|" + std::to_string(GlobalConstants::LANGUAGE_FR | GlobalConstants::LANGUAGE_PL) + " (" + std::to_string(GlobalConstants::LANGUAGE_FR) + "+" + std::to_string(GlobalConstants::LANGUAGE_PL) + "=" + std::to_string(GlobalConstants::LANGUAGE_FR | GlobalConstants::LANGUAGE_PL) + ")";
language_text += "\n\n" + priority_help_text; language_text += "\n\n" + priority_help_text;
language_text += "\nExample: German if available otherwise English and French: de,en+fr"; language_text += "\nExample: German if available otherwise English and French: de,en+fr";
@ -95,7 +92,7 @@ int main(int argc, char *argv[])
std::string galaxy_language_text = "Select language\n"; std::string galaxy_language_text = "Select language\n";
for (unsigned int i = 0; i < GlobalConstants::LANGUAGES.size(); ++i) for (unsigned int i = 0; i < GlobalConstants::LANGUAGES.size(); ++i)
{ {
galaxy_language_text += GlobalConstants::LANGUAGES[i].str + " = " + GlobalConstants::LANGUAGES[i].regexp + "|" + std::to_string(GlobalConstants::LANGUAGES[i].id) + "\n"; galaxy_language_text += GlobalConstants::LANGUAGES[i].str + " = " + GlobalConstants::LANGUAGES[i].regexp + "\n";
} }
// Create help text for --galaxy-arch option // Create help text for --galaxy-arch option
@ -116,7 +113,7 @@ int main(int argc, char *argv[])
std::string include_options_text; std::string include_options_text;
for (unsigned int i = 0; i < INCLUDE_OPTIONS.size(); ++i) for (unsigned int i = 0; i < INCLUDE_OPTIONS.size(); ++i)
{ {
include_options_text += INCLUDE_OPTIONS[i].str + " = " + INCLUDE_OPTIONS[i].regexp + "|" + std::to_string(INCLUDE_OPTIONS[i].id) + "\n"; include_options_text += INCLUDE_OPTIONS[i].str + " = " + INCLUDE_OPTIONS[i].regexp + "\n";
} }
include_options_text += "Separate with \",\" to use multiple values"; include_options_text += "Separate with \",\" to use multiple values";
@ -507,13 +504,13 @@ int main(int argc, char *argv[])
return 1; return 1;
} }
if (Globals::globalConfig.dlConf.iInstallerPlatform < GlobalConstants::PLATFORMS[0].id || Globals::globalConfig.dlConf.iInstallerPlatform > platform_all) if (Globals::globalConfig.dlConf.iInstallerPlatform < GlobalConstants::PLATFORMS[0].id || Globals::globalConfig.dlConf.iInstallerPlatform > Util::getOptionValue("all", GlobalConstants::PLATFORMS))
{ {
std::cerr << "Invalid value for --platform" << std::endl; std::cerr << "Invalid value for --platform" << std::endl;
return 1; return 1;
} }
if (Globals::globalConfig.dlConf.iInstallerLanguage < GlobalConstants::LANGUAGES[0].id || Globals::globalConfig.dlConf.iInstallerLanguage > language_all) if (Globals::globalConfig.dlConf.iInstallerLanguage < GlobalConstants::LANGUAGES[0].id || Globals::globalConfig.dlConf.iInstallerLanguage > Util::getOptionValue("all", GlobalConstants::LANGUAGES))
{ {
std::cerr << "Invalid value for --language" << std::endl; std::cerr << "Invalid value for --language" << std::endl;
return 1; return 1;