From 7bd7ec493759c42d9623ca90a435c0e81b6c728d Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Thu, 16 Apr 2020 18:29:44 +0400 Subject: [PATCH] Refactoring: preparing to move some code --- src/server.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index 4a383e468..72541d408 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -934,15 +934,16 @@ Response InternalServer::handle_content(const RequestContext& request) } auto response = get_default_response(); + + /////////////////////////////////////////////////////////// + // This chunk of code should go into Response::set_entry() response.set_mimeType(mimeType); response.set_cache(true); + if ( is_compressible_mime_type(mimeType) ) { zim::Blob raw_content = entry.getBlob(); const std::string content = string(raw_content.data(), raw_content.size()); - if (mimeType.find("text/html") != string::npos) - response.set_taskbar(bookName, reader->getTitle()); - response.set_content(content); response.set_compress(true); } else { @@ -951,6 +952,12 @@ Response InternalServer::handle_content(const RequestContext& request) response.set_range_first(request.get_range().first); response.set_range_len(range_len); } + // This chunk of code should go into Response::set_entry() + /////////////////////////////////////////////////////////// + + if (mimeType.find("text/html") != string::npos) + response.set_taskbar(bookName, reader->getTitle()); + return response; }