diff --git a/src/server.cpp b/src/server.cpp index d3845f2e4..4a99a9609 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -844,15 +844,6 @@ std::string get_book_name(const RequestContext& request) } } -std::string get_mime_type(const kiwix::Entry& entry) -{ - try { - return entry.getMimetype(); - } catch (exception& e) { - return "application/octet-stream"; - } -} - } // unnamed namespace std::shared_ptr @@ -912,18 +903,16 @@ Response InternalServer::handle_content(const RequestContext& request) return build_404(request, bookName); } - const std::string mimeType = get_mime_type(entry); - - if (m_verbose.load()) { - printf("Found %s\n", urlStr.c_str()); - printf("mimeType: %s\n", mimeType.c_str()); - } - auto response = get_default_response(); response.set_entry(entry, request); - if (mimeType.find("text/html") != string::npos) + if (m_verbose.load()) { + printf("Found %s\n", entry.getPath().c_str()); + printf("mimeType: %s\n", response.get_mimeType().c_str()); + } + + if (response.get_mimeType().find("text/html") != string::npos) response.set_taskbar(bookName, reader->getTitle()); return response; diff --git a/src/server/response.h b/src/server/response.h index 9ae0b8854..71364c638 100644 --- a/src/server/response.h +++ b/src/server/response.h @@ -62,6 +62,7 @@ class Response { void set_range_len(uint64_t len) { m_lenRange = len; } int getReturnCode() { return m_returnCode; } + std::string get_mimeType() const { return m_mimeType; } void introduce_taskbar(); void inject_externallinks_blocker();