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

Changed the signature of ContentResponse::set_taskbar()

This commit is contained in:
Veloman Yunkan 2022-01-30 19:32:04 +04:00 committed by Matthieu Gautier
parent 40e9a19c48
commit 6d16d7386d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/internalServer.cpp
View File

@ -816,7 +816,7 @@ std::unique_ptr<Response> InternalServer::handle_content(const RequestContext& r
} }
auto response = ItemResponse::build(*this, request, entry.getItem()); auto response = ItemResponse::build(*this, request, entry.getItem());
try { try {
dynamic_cast<ContentResponse&>(*response).set_taskbar(bookName, getArchiveTitle(*archive)); dynamic_cast<ContentResponse&>(*response).set_taskbar(bookName, archive.get());
} catch (std::bad_cast& e) {} } catch (std::bad_cast& e) {}
if (m_verbose.load()) { if (m_verbose.load()) {

6
src/server/response.cpp
View File

@ -333,10 +333,10 @@ MHD_Result Response::send(const RequestContext& request, MHD_Connection* connect
return ret; return ret;
} }
void ContentResponse::set_taskbar(const std::string& bookName, const std::string& bookTitle) void ContentResponse::set_taskbar(const std::string& bookName, const zim::Archive* archive)
{ {
m_bookName = bookName; m_bookName = bookName;
m_bookTitle = bookTitle; m_bookTitle = archive ? getArchiveTitle(*archive) : "";
} }
@ -389,7 +389,7 @@ std::unique_ptr<ContentResponse> withTaskbarInfo(
const zim::Archive* archive, const zim::Archive* archive,
std::unique_ptr<ContentResponse> r) std::unique_ptr<ContentResponse> r)
{ {
r->set_taskbar(bookName, archive ? getArchiveTitle(*archive) : ""); r->set_taskbar(bookName, archive);
return r; return r;
} }

2
src/server/response.h
View File

@ -104,7 +104,7 @@ class ContentResponse : public Response {
const std::string& mimetype, const std::string& mimetype,
bool isHomePage = false); bool isHomePage = false);
void set_taskbar(const std::string& bookName, const std::string& bookTitle); void set_taskbar(const std::string& bookName, const zim::Archive* archive);
private: private:
MHD_Response* create_mhd_response(const RequestContext& request); MHD_Response* create_mhd_response(const RequestContext& request);