kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-22 11:22:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add --nodatealiases command line option #269

Browse Source
This commit is contained in:
Kelson 2019-03-29 12:42:36 +01:00
parent 8a64083d5b
commit c337cf174e
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -5,6 +5,7 @@ kiwix-serve
----------- -----------
* New Dockerfile of kiwix-serve * New Dockerfile of kiwix-serve
* New --nodatealiases option
kiwix-manage kiwix-manage
------------ ------------

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

@ -93,6 +93,7 @@ using namespace std;
static bool noLibraryButtonFlag = false; static bool noLibraryButtonFlag = false;
static bool noSearchBarFlag = false; static bool noSearchBarFlag = false;
static bool noDateAliasesFlag = false;
static string welcomeHTML; static string welcomeHTML;
static string catalogOpenSearchDescription; static string catalogOpenSearchDescription;
static std::atomic_bool isVerbose(false); static std::atomic_bool isVerbose(false);
@ -923,6 +924,19 @@ static int accessHandlerCallback(void* cls,
return ret; return ret;
} }
bool hasHumanReadableIdCollision(const string &humanReadableId,
const string &zimPath)
{
if (readers.find(humanReadableId) != readers.end()) {
cerr << "Path collision: " << readers[humanReadableId]->getZimFilePath()
<< " and " << zimPath << " can't share the same URL path /"
<< humanReadableId << "/. Therefore, only "
<< zimPath << " will be served." << endl;
return true;
}
return false;
}
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
struct MHD_Daemon* daemon; struct MHD_Daemon* daemon;
@ -942,6 +956,7 @@ int main(int argc, char** argv)
{"verbose", no_argument, 0, 'v'}, {"verbose", no_argument, 0, 'v'},
{"library", no_argument, 0, 'l'}, {"library", no_argument, 0, 'l'},
{"nolibrarybutton", no_argument, 0, 'm'}, {"nolibrarybutton", no_argument, 0, 'm'},
{"nodatealiases", no_argument, 0, 'z'},
{"nosearchbar", no_argument, 0, 'n'}, {"nosearchbar", no_argument, 0, 'n'},
{"attachToProcess", required_argument, 0, 'a'}, {"attachToProcess", required_argument, 0, 'a'},
{"port", required_argument, 0, 'p'}, {"port", required_argument, 0, 'p'},
@ -970,6 +985,9 @@ int main(int argc, char** argv)
case 'n': case 'n':
noSearchBarFlag = true; noSearchBarFlag = true;
break; break;
case 'z':
noDateAliasesFlag = true;
break;
case 'm': case 'm':
noLibraryButtonFlag = true; noLibraryButtonFlag = true;
break; break;
@ -1017,13 +1035,13 @@ int main(int argc, char** argv)
/* Print usage)) if necessary */ /* Print usage)) if necessary */
if (zimPathes.empty() && libraryPath.empty()) { if (zimPathes.empty() && libraryPath.empty()) {
cerr << "Usage: kiwix-serve [--index=INDEX_PATH] [--port=PORT] [--verbose] " cerr << "Usage: kiwix-serve [--index=INDEX_PATH] [--port=PORT] [--verbose] "
"[--nosearchbar] [--nolibrarybutton] [--daemon] " "[--nosearchbar] [--nolibrarybutton] [--nodatealiases] [--daemon] "
"[--attachToProcess=PID] [--interface=IF_NAME] " "[--attachToProcess=PID] [--interface=IF_NAME] "
"[--urlRootLocation=/URL_ROOT] " "[--urlRootLocation=/URL_ROOT] "
"[--threads=NB_THREAD(" << nb_threads << ")] ZIM_PATH+" "[--threads=NB_THREAD(" << nb_threads << ")] ZIM_PATH+"
<< endl; << endl;
cerr << " kiwix-serve --library [--port=PORT] [--verbose] [--daemon] " cerr << " kiwix-serve --library [--port=PORT] [--verbose] [--daemon] "
"[--nosearchbar] [--nolibrarybutton] [--attachToProcess=PID] " "[--nosearchbar] [--nolibrarybutton] [--nodatealiases] [--attachToProcess=PID] "
"[--interface=IF_NAME] [--urlRootLocation=/URL_ROOT] " "[--interface=IF_NAME] [--urlRootLocation=/URL_ROOT] "
"[--threads=NB_THREAD(" << nb_threads << ")] LIBRARY_PATH " "[--threads=NB_THREAD(" << nb_threads << ")] LIBRARY_PATH "
<< endl; << endl;
@ -1096,6 +1114,7 @@ int main(int argc, char** argv)
} }
auto humanReadableId = currentBook.getHumanReadableIdFromPath(); auto humanReadableId = currentBook.getHumanReadableIdFromPath();
hasHumanReadableIdCollision(humanReadableId, currentBook.getPath());
readers[humanReadableId] = reader; readers[humanReadableId] = reader;
if (reader->hasFulltextIndex()) { if (reader->hasFulltextIndex()) {
@ -1106,7 +1125,15 @@ int main(int argc, char** argv)
globalSearcher->add_reader(reader, humanReadableId); globalSearcher->add_reader(reader, humanReadableId);
searchers[humanReadableId] = searcher; searchers[humanReadableId] = searcher;
} else { } else {
searchers[humanReadableId] = nullptr; searchers[humanReadableId] = nullptr;
}
/* Deal with noDateAliases */
if (noDateAliasesFlag) {
string alias = replaceRegex(humanReadableId, "", "_[[:digit:]]{4}-[[:digit:]]{2}$");
hasHumanReadableIdCollision(alias, currentBook.getPath());
readers[alias] = readers[humanReadableId];
searchers[alias] = searchers[humanReadableId];
} }
} }