From 14d8583c8315eca6e27e7d21852866d4d3573afc Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Thu, 16 Apr 2020 18:07:51 +0400 Subject: [PATCH] Refactoring in InternalServer::handle_content() Deduplicated common code found in the two branches of the last if(){}else{} statement in InternalServer::handle_content(). --- src/server.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index dd50afcd3..4a383e468 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -933,29 +933,25 @@ Response InternalServer::handle_content(const RequestContext& request) printf("mimeType: %s\n", mimeType.c_str()); } + auto response = get_default_response(); + 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()); - auto response = get_default_response(); if (mimeType.find("text/html") != string::npos) response.set_taskbar(bookName, reader->getTitle()); - response.set_mimeType(mimeType); response.set_content(content); response.set_compress(true); - response.set_cache(true); - return response; } else { const int range_len = get_range_len(entry, request.get_range()); - auto response = get_default_response(); response.set_entry(entry); - response.set_mimeType(mimeType); response.set_range_first(request.get_range().first); response.set_range_len(range_len); - response.set_cache(true); - return response; } + return response; } }