Mirrors/lgogdownloader
2
0
Fork 0
mirror of https://github.com/Sude-/lgogdownloader.git synced 2025-02-02 05:52:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow unrecognized options in config file

Browse Source
This commit is contained in:
Sude 2014-09-05 14:02:08 +03:00
parent b33ffbcee3
commit 83ef937089
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
main.cpp
View File

@ -98,6 +98,7 @@ int main(int argc, char *argv[])
std::string orphans_regex_default = ".*\\.(zip|exe|bin|dmg|old|deb|tar\\.gz|pkg)$"; // Limit to files with these extensions (".old" is for renamed older version files) std::string orphans_regex_default = ".*\\.(zip|exe|bin|dmg|old|deb|tar\\.gz|pkg)$"; // Limit to files with these extensions (".old" is for renamed older version files)
std::string check_orphans_text = "Check for orphaned files (files found on local filesystem that are not found on GOG servers). Sets regular expression filter (Perl syntax) for files to check. If no argument is given then the regex defaults to '" + orphans_regex_default + "'"; std::string check_orphans_text = "Check for orphaned files (files found on local filesystem that are not found on GOG servers). Sets regular expression filter (Perl syntax) for files to check. If no argument is given then the regex defaults to '" + orphans_regex_default + "'";
std::vector<std::string> unrecognized_options_cfg;
bpo::variables_map vm; bpo::variables_map vm;
bpo::options_description options_cli_all("Options"); bpo::options_description options_cli_all("Options");
bpo::options_description options_cli_no_cfg; bpo::options_description options_cli_no_cfg;
@ -187,9 +188,11 @@ int main(int argc, char *argv[])
} }
else else
{ {
bpo::store(bpo::parse_config_file(ifs, options_cfg_all), vm); bpo::parsed_options parsed = bpo::parse_config_file(ifs, options_cfg_all, true);
bpo::store(parsed, vm);
bpo::notify(vm); bpo::notify(vm);
ifs.close(); ifs.close();
unrecognized_options_cfg = bpo::collect_unrecognized(parsed.options, bpo::include_positional);
} }
} }
if (boost::filesystem::exists(config.sBlacklistFilePath)) if (boost::filesystem::exists(config.sBlacklistFilePath))
@ -306,6 +309,16 @@ int main(int argc, char *argv[])
if (config.sDirectory.at(config.sDirectory.length()-1)!='/') if (config.sDirectory.at(config.sDirectory.length()-1)!='/')
config.sDirectory += "/"; config.sDirectory += "/";
if (!unrecognized_options_cfg.empty() && (!config.bSaveConfig || !config.bResetConfig))
{
std::cerr << "Unrecognized options in " << config.sConfigFilePath << std::endl;
for (unsigned int i = 0; i < unrecognized_options_cfg.size(); i+=2)
{
std::cerr << unrecognized_options_cfg[i] << " = " << unrecognized_options_cfg[i+1] << std::endl;
}
std::cerr << std::endl;
}
Downloader downloader(config); Downloader downloader(config);
int initResult = downloader.init(); int initResult = downloader.init();