kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-23 03:52:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename --skipBroken to --skipInvalid

Browse Source
This commit is contained in:
Emmanuel Engelhart 2024-03-10 16:50:34 +01:00
parent 456c77d8fd
commit a3239ea8bc
No known key found for this signature in database
GPG Key ID: 120B30D020B553D3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/kiwix-serve.cpp
View File

@ -77,7 +77,7 @@ void usage()
<< "\t-z, --nodatealiases\tCreate URL aliases for each content by removing the date" << std::endl << "\t-z, --nodatealiases\tCreate URL aliases for each content by removing the date" << std::endl
<< "\t-c, --customIndex\tAdd path to custom index.html for welcome page" << std::endl << "\t-c, --customIndex\tAdd path to custom index.html for welcome page" << std::endl
<< "\t-L, --ipConnectionLimit\tMax number of (concurrent) connections per IP (default: infinite, recommended: >= 6)" << std::endl << "\t-L, --ipConnectionLimit\tMax number of (concurrent) connections per IP (default: infinite, recommended: >= 6)" << std::endl
<< "\t-k, --skipBroken\tStartup the server even when ZIM files are broken (those will be skipped)" << std::endl << "\t-k, --skipInvalid\tStartup even when ZIM files are invalid (those will be skipped)" << std::endl
<< std::endl << std::endl
<< "Documentation:" << std::endl << "Documentation:" << std::endl
@ -218,7 +218,7 @@ int main(int argc, char** argv)
unsigned int PPID = 0; unsigned int PPID = 0;
int ipConnectionLimit = 0; int ipConnectionLimit = 0;
int searchLimit = 0; int searchLimit = 0;
bool skipBroken = false; bool skipInvalid = false;
static struct option long_options[] static struct option long_options[]
= {{"daemon", no_argument, 0, 'd'}, = {{"daemon", no_argument, 0, 'd'},
@ -239,7 +239,7 @@ int main(int argc, char** argv)
{"monitorLibrary", no_argument, 0, 'M'}, {"monitorLibrary", no_argument, 0, 'M'},
{"ipConnectionLimit", required_argument, 0, 'L'}, {"ipConnectionLimit", required_argument, 0, 'L'},
{"searchLimit", required_argument, 0, 's'}, {"searchLimit", required_argument, 0, 's'},
{"skipBroken", no_argument, 0, 'k'}, {"skipInvalid", no_argument, 0, 'k'},
{0, 0, 0, 0}}; {0, 0, 0, 0}};
std::set<int> usedOptions; std::set<int> usedOptions;
@ -311,7 +311,7 @@ int main(int argc, char** argv)
searchLimit = atoi(optarg); searchLimit = atoi(optarg);
break; break;
case 'k': case 'k':
skipBroken = true; skipInvalid = true;
break; break;
case '?': case '?':
usage(); usage();
@ -354,8 +354,8 @@ int main(int argc, char** argv)
std::vector<std::string>::iterator it; std::vector<std::string>::iterator it;
for (it = zimPathes.begin(); it != zimPathes.end(); it++) { for (it = zimPathes.begin(); it != zimPathes.end(); it++) {
if (!manager.addBookFromPath(*it, *it, "", false)) { if (!manager.addBookFromPath(*it, *it, "", false)) {
if ( skipBroken ) { if (skipInvalid) {
std::cerr << "Skipping broken '" << *it << "' ...continuing" << std::endl; std::cerr << "Skipping invalid '" << *it << "' ...continuing" << std::endl;
} else { } else {
std::cerr << "Unable to add the ZIM file '" << *it std::cerr << "Unable to add the ZIM file '" << *it
<< "' to the internal library." << std::endl; << "' to the internal library." << std::endl;