From a058520628395fdfa96fdb03d5daf3731920392d Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Thu, 16 Apr 2020 13:57:01 +0400 Subject: [PATCH] Refactoring: extracted get_mime_type() --- src/server.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index 8b1dff706..39e641a16 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -846,6 +846,15 @@ 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 @@ -866,9 +875,7 @@ Response InternalServer::handle_content(const RequestContext& request) printf("** running handle_content\n"); } - std::string baseUrl; std::string content; - std::string mimeType; kiwix::Entry entry; @@ -904,11 +911,7 @@ Response InternalServer::handle_content(const RequestContext& request) return build_404(request, bookName); } - try { - mimeType = entry.getMimetype(); - } catch (exception& e) { - mimeType = "application/octet-stream"; - } + const std::string mimeType = get_mime_type(entry); if (m_verbose.load()) { printf("Found %s\n", urlStr.c_str());