smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make InternalServer use the NameMapper of the configuration. 

This move the defaulting to IdNameMapper in the configuration instead of
in the InternalServer.

This also create a default shared_ptr per Configuration instead of
using a static default one.
This commit is contained in:
Matthieu Gautier 2022-10-07 11:18:57 +02:00
parent 92c0e145d4
commit 422e71a017
4 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/server.h
View File

@ -34,10 +34,7 @@ namespace kiwix
public: public:
class Configuration { class Configuration {
public: public:
explicit Configuration(std::shared_ptr<Library> library, std::shared_ptr<NameMapper> nameMapper=nullptr) explicit Configuration(std::shared_ptr<Library> library, std::shared_ptr<NameMapper> nameMapper=nullptr);
: mp_library(library),
mp_nameMapper(nameMapper)
{}
Configuration& setRoot(const std::string& root); Configuration& setRoot(const std::string& root);
Configuration& setAddress(const std::string& addr) { Configuration& setAddress(const std::string& addr) {

17
src/server.cpp
View File

@ -30,6 +30,17 @@
namespace kiwix { namespace kiwix {
Server::Configuration::Configuration(std::shared_ptr<Library> library, std::shared_ptr<NameMapper> nameMapper) :
mp_library(library),
mp_nameMapper(nameMapper ? nameMapper : std::make_shared<IdNameMapper>())
{}
Server::Configuration& Server::Configuration::setRoot(const std::string& root)
{
m_root = normalizeRootUrl(root);
return *this;
}
Server::Server(const Server::Configuration& configuration) : Server::Server(const Server::Configuration& configuration) :
m_configuration(configuration), m_configuration(configuration),
mp_server(nullptr) mp_server(nullptr)
@ -50,12 +61,6 @@ void Server::stop() {
} }
} }
Server::Configuration& Server::Configuration::setRoot(const std::string& root)
{
m_root = normalizeRootUrl(root);
return *this;
}
int Server::getPort() int Server::getPort()
{ {
return mp_server->getPort(); return mp_server->getPort();

27
src/server/internalServer.cpp
View File

@ -216,7 +216,7 @@ std::pair<std::string, Library::BookIdSet> InternalServer::selectBooks(const Req
try { try {
auto bookName = request.get_argument("content"); auto bookName = request.get_argument("content");
try { try {
const auto bookIds = Library::BookIdSet{mp_nameMapper->getIdForName(bookName)}; const auto bookIds = Library::BookIdSet{m_configuration.mp_nameMapper->getIdForName(bookName)};
const auto queryString = request.get_query([&](const std::string& key){return key == "content";}, true); const auto queryString = request.get_query([&](const std::string& key){return key == "content";}, true);
return {queryString, bookIds}; return {queryString, bookIds};
} catch (const std::out_of_range&) { } catch (const std::out_of_range&) {
@ -236,7 +236,7 @@ std::pair<std::string, Library::BookIdSet> InternalServer::selectBooks(const Req
for(const auto& bookId: id_vec) { for(const auto& bookId: id_vec) {
try { try {
// This is a silly way to check that bookId exists // This is a silly way to check that bookId exists
mp_nameMapper->getNameForId(bookId); m_configuration.mp_nameMapper->getNameForId(bookId);
} catch (const std::out_of_range&) { } catch (const std::out_of_range&) {
throw Error(noSuchBookErrorMsg(bookId)); throw Error(noSuchBookErrorMsg(bookId));
} }
@ -255,7 +255,7 @@ std::pair<std::string, Library::BookIdSet> InternalServer::selectBooks(const Req
Library::BookIdSet bookIds; Library::BookIdSet bookIds;
for(const auto& bookName: name_vec) { for(const auto& bookName: name_vec) {
try { try {
bookIds.insert(mp_nameMapper->getIdForName(bookName)); bookIds.insert(m_configuration.mp_nameMapper->getIdForName(bookName));
} catch(const std::out_of_range&) { } catch(const std::out_of_range&) {
throw Error(noSuchBookErrorMsg(bookName)); throw Error(noSuchBookErrorMsg(bookName));
} }
@ -323,8 +323,6 @@ zim::Query SearchInfo::getZimQuery(bool verbose) const {
return query; return query;
} }
static std::shared_ptr<NameMapper> defaultNameMapper = std::make_shared<IdNameMapper>();
static MHD_Result staticHandlerCallback(void* cls, static MHD_Result staticHandlerCallback(void* cls,
struct MHD_Connection* connection, struct MHD_Connection* connection,
const char* url, const char* url,
@ -359,7 +357,6 @@ public:
InternalServer::InternalServer(const Server::Configuration& configuration) : InternalServer::InternalServer(const Server::Configuration& configuration) :
m_configuration(configuration), m_configuration(configuration),
m_indexTemplateString(configuration.m_indexTemplateString.empty() ? RESOURCE::templates::index_html : configuration.m_indexTemplateString), m_indexTemplateString(configuration.m_indexTemplateString.empty() ? RESOURCE::templates::index_html : configuration.m_indexTemplateString),
mp_nameMapper(configuration.mp_nameMapper ? configuration.mp_nameMapper : defaultNameMapper),
mp_daemon(nullptr), mp_daemon(nullptr),
searchCache(getEnvVar<int>("KIWIX_SEARCH_CACHE_SIZE", DEFAULT_CACHE_SIZE)), searchCache(getEnvVar<int>("KIWIX_SEARCH_CACHE_SIZE", DEFAULT_CACHE_SIZE)),
suggestionSearcherCache(getEnvVar<int>("KIWIX_SUGGESTION_SEARCHER_CACHE_SIZE", std::max((unsigned int) (m_configuration.mp_library->getBookCount(true, true)*0.1), 1U))), suggestionSearcherCache(getEnvVar<int>("KIWIX_SUGGESTION_SEARCHER_CACHE_SIZE", std::max((unsigned int) (m_configuration.mp_library->getBookCount(true, true)*0.1), 1U))),
@ -631,7 +628,7 @@ std::unique_ptr<Response> InternalServer::handle_suggest(const RequestContext& r
std::shared_ptr<zim::Archive> archive; std::shared_ptr<zim::Archive> archive;
try { try {
bookName = request.get_argument("content"); bookName = request.get_argument("content");
bookId = mp_nameMapper->getIdForName(bookName); bookId = m_configuration.mp_nameMapper->getIdForName(bookName);
archive = m_configuration.mp_library->getArchiveById(bookId); archive = m_configuration.mp_library->getArchiveById(bookId);
} catch (const std::out_of_range&) { } catch (const std::out_of_range&) {
// error handled by the archive == nullptr check below // error handled by the archive == nullptr check below
@ -785,7 +782,7 @@ std::unique_ptr<Response> InternalServer::handle_search(const RequestContext& re
/* /*
if(bookIds.size() == 1) { if(bookIds.size() == 1) {
auto bookId = *bookIds.begin(); auto bookId = *bookIds.begin();
auto bookName = mp_nameMapper->getNameForId(bookId); auto bookName = m_configuration.mp_nameMapper->getNameForId(bookId);
response += TaskbarInfo(bookName, m_configuration.mp_library->getArchiveById(bookId).get()); response += TaskbarInfo(bookName, m_configuration.mp_library->getArchiveById(bookId).get());
} }
*/ */
@ -810,7 +807,7 @@ std::unique_ptr<Response> InternalServer::handle_search(const RequestContext& re
} }
/* Get the results */ /* Get the results */
SearchRenderer renderer(search->getResults(start-1, pageLength), mp_nameMapper, m_configuration.mp_library, start, SearchRenderer renderer(search->getResults(start-1, pageLength), m_configuration.mp_nameMapper, m_configuration.mp_library, start,
search->getEstimatedMatches()); search->getEstimatedMatches());
renderer.setSearchPattern(searchInfo.pattern); renderer.setSearchPattern(searchInfo.pattern);
renderer.setSearchBookQuery(searchInfo.bookFilterQuery); renderer.setSearchBookQuery(searchInfo.bookFilterQuery);
@ -826,7 +823,7 @@ std::unique_ptr<Response> InternalServer::handle_search(const RequestContext& re
/* /*
if(bookIds.size() == 1) { if(bookIds.size() == 1) {
auto bookId = *bookIds.begin(); auto bookId = *bookIds.begin();
auto bookName = mp_nameMapper->getNameForId(bookId); auto bookName = m_configuration.mp_nameMapper->getNameForId(bookId);
response->set_taskbar(bookName, m_configuration.mp_library->getArchiveById(bookId).get()); response->set_taskbar(bookName, m_configuration.mp_library->getArchiveById(bookId).get());
} }
*/ */
@ -853,7 +850,7 @@ std::unique_ptr<Response> InternalServer::handle_random(const RequestContext& re
std::shared_ptr<zim::Archive> archive; std::shared_ptr<zim::Archive> archive;
try { try {
bookName = request.get_argument("content"); bookName = request.get_argument("content");
const std::string bookId = mp_nameMapper->getIdForName(bookName); const std::string bookId = m_configuration.mp_nameMapper->getIdForName(bookName);
archive = m_configuration.mp_library->getArchiveById(bookId); archive = m_configuration.mp_library->getArchiveById(bookId);
} catch (const std::out_of_range&) { } catch (const std::out_of_range&) {
// error handled by the archive == nullptr check below // error handled by the archive == nullptr check below
@ -935,8 +932,8 @@ std::unique_ptr<Response> InternalServer::handle_catalog(const RequestContext& r
} }
zim::Uuid uuid; zim::Uuid uuid;
kiwix::OPDSDumper opdsDumper(m_configuration.mp_library, mp_nameMapper); kiwix::OPDSDumper opdsDumper(m_configuration.mp_library, m_configuration.mp_nameMapper);
opdsDumper.setRootLocation(m_root); opdsDumper.setRootLocation(m_configuration.m_root);
opdsDumper.setLibraryId(m_library_id); opdsDumper.setLibraryId(m_library_id);
std::vector<std::string> bookIdsToDump; std::vector<std::string> bookIdsToDump;
if (url == "root.xml") { if (url == "root.xml") {
@ -1009,7 +1006,7 @@ std::unique_ptr<Response> InternalServer::handle_content(const RequestContext& r
std::shared_ptr<zim::Archive> archive; std::shared_ptr<zim::Archive> archive;
try { try {
const std::string bookId = mp_nameMapper->getIdForName(bookName); const std::string bookId = m_configuration.mp_nameMapper->getIdForName(bookName);
archive = m_configuration.mp_library->getArchiveById(bookId); archive = m_configuration.mp_library->getArchiveById(bookId);
} catch (const std::out_of_range& e) {} } catch (const std::out_of_range& e) {}
@ -1081,7 +1078,7 @@ std::unique_ptr<Response> InternalServer::handle_raw(const RequestContext& reque
std::shared_ptr<zim::Archive> archive; std::shared_ptr<zim::Archive> archive;
try { try {
const std::string bookId = mp_nameMapper->getIdForName(bookName); const std::string bookId = m_configuration.mp_nameMapper->getIdForName(bookName);
archive = m_configuration.mp_library->getArchiveById(bookId); archive = m_configuration.mp_library->getArchiveById(bookId);
} catch (const std::out_of_range& e) {} } catch (const std::out_of_range& e) {}

2
src/server/internalServer.h
View File

@ -26,7 +26,6 @@ extern "C" {
} }
#include "library.h" #include "library.h"
#include "name_mapper.h"
#include "server.h" #include "server.h"
#include <zim/search.h> #include <zim/search.h>
@ -152,7 +151,6 @@ class InternalServer {
Server::Configuration m_configuration; Server::Configuration m_configuration;
std::string m_addr; std::string m_addr;
std::string m_indexTemplateString; std::string m_indexTemplateString;
std::shared_ptr<NameMapper> mp_nameMapper;
struct MHD_Daemon* mp_daemon; struct MHD_Daemon* mp_daemon;
SearchCache searchCache; SearchCache searchCache;