Replaced UrlNotFoundMsg with UrlNotFoundResponse

src/server/internalServer.cpp

@@ -593,8 +593,7 @@ std::unique_ptr<Response> InternalServer::handle_request(const RequestContext& r
 {
   try {
     if (! request.is_valid_url()) {
-      return HTTP404Response(*this, request)
+      return UrlNotFoundResponse(*this, request);
-             + urlNotFoundMsg;
     }
 
     if ( request.get_url() == "" ) {
@@ -697,8 +696,7 @@ std::unique_ptr<Response> InternalServer::handle_suggest(const RequestContext& r
   }
 
   if ( startsWith(request.get_url(), "/suggest/") ) {
-    return HTTP404Response(*this, request)
+    return UrlNotFoundResponse(*this, request);
-           + urlNotFoundMsg;
   }
 
   std::string bookName, bookId;
@@ -817,12 +815,10 @@ std::unique_ptr<Response> InternalServer::handle_no_js(const RequestContext& req
       const auto bookId = mp_nameMapper->getIdForName(urlParts[2]);
       content = getNoJSDownloadPageHTML(bookId, userLang);
     } catch (const std::out_of_range&) {
-      return HTTP404Response(*this, request)
+      return UrlNotFoundResponse(*this, request);
-           + urlNotFoundMsg;
     }
   } else {
-    return HTTP404Response(*this, request)
+    return UrlNotFoundResponse(*this, request);
-           + urlNotFoundMsg;
   }
 
   return ContentResponse::build(
@@ -873,8 +869,7 @@ std::unique_ptr<Response> InternalServer::handle_skin(const RequestContext& requ
     response->set_kind(accessType);
     return std::move(response);
   } catch (const ResourceNotFound& e) {
-    return HTTP404Response(*this, request)
+    return UrlNotFoundResponse(*this, request);
-           + urlNotFoundMsg;
   }
 }
 
@@ -892,8 +887,7 @@ std::unique_ptr<Response> InternalServer::handle_search(const RequestContext& re
         get_default_data(),
         "application/opensearchdescription+xml");
     }
-    return HTTP404Response(*this, request)
+    return UrlNotFoundResponse(*this, request);
-           + urlNotFoundMsg;
   }
 
   try {
@@ -1001,8 +995,7 @@ std::unique_ptr<Response> InternalServer::handle_random(const RequestContext& re
   }
 
   if ( startsWith(request.get_url(), "/random/") ) {
-    return HTTP404Response(*this, request)
+    return UrlNotFoundResponse(*this, request);
-           + urlNotFoundMsg;
   }
 
   std::string bookName;
@@ -1037,8 +1030,7 @@ std::unique_ptr<Response> InternalServer::handle_captured_external(const Request
   } catch (const std::out_of_range& e) {}
 
   if (source.empty()) {
-    return HTTP404Response(*this, request)
+    return UrlNotFoundResponse(*this, request);
-           + urlNotFoundMsg;
   }
 
   auto data = get_default_data();
@@ -1056,8 +1048,7 @@ std::unique_ptr<Response> InternalServer::handle_catch(const RequestContext& req
     return handle_captured_external(request);
   }
 
-  return HTTP404Response(*this, request)
+  return UrlNotFoundResponse(*this, request);
-         + urlNotFoundMsg;
 }
 
 std::vector<std::string>
@@ -1141,8 +1132,7 @@ std::unique_ptr<Response> InternalServer::handle_content(const RequestContext& r
 
   if (archive == nullptr) {
     const std::string searchURL = m_root + "/search?pattern=" + kiwix::urlEncode(pattern);
-    return HTTP404Response(*this, request)
+    return UrlNotFoundResponse(*this, request)
-           + urlNotFoundMsg
            + suggestSearchMsg(searchURL, kiwix::urlDecode(pattern));
   }
 
@@ -1189,8 +1179,7 @@ std::unique_ptr<Response> InternalServer::handle_content(const RequestContext& r
       printf("Failed to find %s\n", urlStr.c_str());
 
     std::string searchURL = m_root + "/search?content=" + bookName + "&pattern=" + kiwix::urlEncode(pattern);
-    return HTTP404Response(*this, request)
+    return UrlNotFoundResponse(*this, request)
-           + urlNotFoundMsg
            + suggestSearchMsg(searchURL, kiwix::urlDecode(pattern));
   }
 }
@@ -1208,13 +1197,11 @@ std::unique_ptr<Response> InternalServer::handle_raw(const RequestContext& reque
      bookName = request.get_url_part(1);
      kind = request.get_url_part(2);
   } catch (const std::out_of_range& e) {
-    return HTTP404Response(*this, request)
+    return UrlNotFoundResponse(*this, request);
-           + urlNotFoundMsg;
   }
 
   if (kind != "meta" && kind!= "content") {
-    return HTTP404Response(*this, request)
+    return UrlNotFoundResponse(*this, request)
-           + urlNotFoundMsg
            + invalidRawAccessMsg(kind);
   }
 
@@ -1225,8 +1212,7 @@ std::unique_ptr<Response> InternalServer::handle_raw(const RequestContext& reque
   } catch (const std::out_of_range& e) {}
 
   if (archive == nullptr) {
-    return HTTP404Response(*this, request)
+    return UrlNotFoundResponse(*this, request)
-           + urlNotFoundMsg
            + noSuchBookErrorMsg(bookName);
   }
 
@@ -1260,8 +1246,7 @@ std::unique_ptr<Response> InternalServer::handle_raw(const RequestContext& reque
     if (m_verbose.load()) {
       printf("Failed to find %s\n", itemPath.c_str());
     }
-    return HTTP404Response(*this, request)
+    return UrlNotFoundResponse(*this, request)
-           + urlNotFoundMsg
            + rawEntryNotFoundMsg(kind, itemPath);
   }
 }

src/server/internalServer_catalog.cpp

@@ -63,8 +63,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog(const RequestContext& r
     host = request.get_header("Host");
     url  = request.get_url_part(1);
   } catch (const std::out_of_range&) {
-    return HTTP404Response(*this, request)
+    return UrlNotFoundResponse(*this, request);
-           + urlNotFoundMsg;
   }
 
   if (url == "v2") {
@@ -72,8 +71,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog(const RequestContext& r
   }
 
   if (url != "searchdescription.xml" && url != "root.xml" && url != "search") {
-    return HTTP404Response(*this, request)
+    return UrlNotFoundResponse(*this, request);
-           + urlNotFoundMsg;
   }
 
   if (url == "searchdescription.xml") {
@@ -111,8 +109,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2(const RequestContext
   try {
     url  = request.get_url_part(2);
   } catch (const std::out_of_range&) {
-    return HTTP404Response(*this, request)
+    return UrlNotFoundResponse(*this, request);
-           + urlNotFoundMsg;
   }
 
   if (url == "root.xml") {
@@ -138,8 +135,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2(const RequestContext
   } else if (url == "illustration") {
     return handle_catalog_v2_illustration(request);
   } else {
-    return HTTP404Response(*this, request)
+    return UrlNotFoundResponse(*this, request);
-           + urlNotFoundMsg;
   }
 }
 
@@ -181,8 +177,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2_complete_entry(const
   try {
     mp_library->getBookById(entryId);
   } catch (const std::out_of_range&) {
-    return HTTP404Response(*this, request)
+    return UrlNotFoundResponse(*this, request);
-           + urlNotFoundMsg;
   }
 
   OPDSDumper opdsDumper(mp_library.get(), mp_nameMapper.get());
@@ -233,8 +228,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2_illustration(const R
                illustration->mimeType
     );
   } catch(...) {
-    return HTTP404Response(*this, request)
+    return UrlNotFoundResponse(*this, request);
-           + urlNotFoundMsg;
   }
 }
 

src/server/response.cpp

@@ -152,7 +152,6 @@ std::unique_ptr<Response> Response::build_304(const InternalServer& server, cons
   return response;
 }
 
-const UrlNotFoundMsg urlNotFoundMsg;
 const InvalidUrlMsg invalidUrlMsg;
 
 std::string ContentResponseBlueprint::getMessage(const std::string& msgId) const
@@ -198,10 +197,12 @@ HTTP404Response::HTTP404Response(const InternalServer& server,
 {
 }
 
-HTTPErrorResponse& HTTP404Response::operator+(UrlNotFoundMsg /*unused*/)
+UrlNotFoundResponse::UrlNotFoundResponse(const InternalServer& server,
+                                         const RequestContext& request)
+    : HTTP404Response(server, request)
 {
   const std::string requestUrl = urlDecode(m_request.get_full_url(), false);
-  return *this + ParameterizedMessage("url-not-found", {{"url", requestUrl}});
+  *this += ParameterizedMessage("url-not-found", {{"url", requestUrl}});
 }
 
 HTTPErrorResponse& HTTPErrorResponse::operator+(const std::string& msg)

src/server/response.h

@@ -174,17 +174,18 @@ struct HTTPErrorResponse : ContentResponseBlueprint
   HTTPErrorResponse& operator+=(const ParameterizedMessage& errorDetails);
 };
 
-class UrlNotFoundMsg {};
-
-extern const UrlNotFoundMsg urlNotFoundMsg;
-
 struct HTTP404Response : HTTPErrorResponse
 {
   HTTP404Response(const InternalServer& server,
                   const RequestContext& request);
 
   using HTTPErrorResponse::operator+;
-  HTTPErrorResponse& operator+(UrlNotFoundMsg /*unused*/);
+};
+
+struct UrlNotFoundResponse : HTTP404Response
+{
+  UrlNotFoundResponse(const InternalServer& server,
+                      const RequestContext& request);
 };
 
 class InvalidUrlMsg {};