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

Simplify string parsing for downloading with file ids

Browse Source
This commit is contained in:
Sude 2015-09-03 13:18:30 +03:00
parent 16b14d091b
commit 63145eef0d
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
main.cpp
View File

@ -109,6 +109,7 @@ int main(int argc, char *argv[])
// Help text for priority options // Help text for priority options
std::string priority_help_text = "\nIf set, only the first matching one will be downloaded. If unset, all matching combinations will be downloaded.\nSyntax: use a string separated by \",\""; std::string priority_help_text = "\nIf set, only the first matching one will be downloaded. If unset, all matching combinations will be downloaded.\nSyntax: use a string separated by \",\"";
std::vector<std::string> vFileIdStrings;
std::vector<std::string> unrecognized_options_cfg; std::vector<std::string> unrecognized_options_cfg;
std::vector<std::string> unrecognized_options_cli; std::vector<std::string> unrecognized_options_cli;
bpo::variables_map vm; bpo::variables_map vm;
@ -331,7 +332,16 @@ int main(int argc, char *argv[])
if (i->compare(0, GlobalConstants::PROTOCOL_PREFIX.length(), GlobalConstants::PROTOCOL_PREFIX) == 0) if (i->compare(0, GlobalConstants::PROTOCOL_PREFIX.length(), GlobalConstants::PROTOCOL_PREFIX) == 0)
config.sFileIdString = *i; config.sFileIdString = *i;
if (!config.sOutputFilename.empty() && config.sFileIdString.find(',') != std::string::npos) if (!config.sFileIdString.empty())
{
if (config.sFileIdString.compare(0, GlobalConstants::PROTOCOL_PREFIX.length(), GlobalConstants::PROTOCOL_PREFIX) == 0)
{
config.sFileIdString.replace(0, GlobalConstants::PROTOCOL_PREFIX.length(), "");
}
vFileIdStrings = Util::tokenize(config.sFileIdString, ",");
}
if (!config.sOutputFilename.empty() && vFileIdStrings.size() > 1)
{ {
std::cerr << "Cannot specify an output file name when downloading multiple files." << std::endl; std::cerr << "Cannot specify an output file name when downloading multiple files." << std::endl;
return 1; return 1;
@ -521,21 +531,12 @@ int main(int argc, char *argv[])
downloader.updateCache(); downloader.updateCache();
else if (config.bUpdateCheck) // Update check has priority over download and list else if (config.bUpdateCheck) // Update check has priority over download and list
downloader.updateCheck(); downloader.updateCheck();
else if (!config.sFileIdString.empty()) else if (!vFileIdStrings.empty())
{ {
if (config.sFileIdString.compare(0, GlobalConstants::PROTOCOL_PREFIX.length(), GlobalConstants::PROTOCOL_PREFIX) == 0) for (std::vector<std::string>::iterator it = vFileIdStrings.begin(); it != vFileIdStrings.end(); it++)
{ {
size_t front = GlobalConstants::PROTOCOL_PREFIX.length(); downloader.downloadFileWithId(*it, config.sOutputFilename);
do {
size_t back = config.sFileIdString.find(',', front);
if (back == (size_t) -1)
back = config.sFileIdString.length();
downloader.downloadFileWithId(config.sFileIdString.substr(front, back-front), config.sOutputFilename);
front = back + 1;
} while(front < config.sFileIdString.length());
} }
else
downloader.downloadFileWithId(config.sFileIdString, config.sOutputFilename);
} }
else if (config.bRepair) // Repair file else if (config.bRepair) // Repair file
downloader.repair(); downloader.repair();