Added content ZIM home button on 404

src/server/internalServer.cpp

@@ -253,7 +253,7 @@ std::unique_ptr<Response> InternalServer::handle_request(const RequestContext& r
 {
   try {
     if (! request.is_valid_url())
-      return Response::build_404(*this, request, "");
+      return Response::build_404(*this, request, "", "");
 
     const ETag etag = get_matching_if_none_match_etag(request);
     if ( etag )
@@ -335,11 +335,11 @@ std::unique_ptr<Response> InternalServer::handle_meta(const RequestContext& requ
     meta_name = request.get_argument("name");
     reader = mp_library->getReaderById(bookId);
   } catch (const std::out_of_range& e) {
-    return Response::build_404(*this, request, bookName);
+    return Response::build_404(*this, request, bookName, "");
   }
 
   if (reader == nullptr) {
-    return Response::build_404(*this, request, bookName);
+    return Response::build_404(*this, request, bookName, "");
   }
 
   std::string content;
@@ -364,7 +364,7 @@ std::unique_ptr<Response> InternalServer::handle_meta(const RequestContext& requ
   } else if (meta_name == "favicon") {
     reader->getFavicon(content, mimeType);
   } else {
-    return Response::build_404(*this, request, bookName);
+    return Response::build_404(*this, request, bookName, "");
   }
 
   auto response = ContentResponse::build(*this, content, mimeType);
@@ -393,7 +393,7 @@ std::unique_ptr<Response> InternalServer::handle_suggest(const RequestContext& r
     term = request.get_argument("term");
     reader = mp_library->getReaderById(bookId);
   } catch (const std::out_of_range&) {
-    return Response::build_404(*this, request, bookName);
+    return Response::build_404(*this, request, bookName, "");
   }
 
   if (m_verbose.load()) {
@@ -457,7 +457,7 @@ std::unique_ptr<Response> InternalServer::handle_skin(const RequestContext& requ
     response->set_cacheable();
     return std::move(response);
   } catch (const ResourceNotFound& e) {
-    return Response::build_404(*this, request, "");
+    return Response::build_404(*this, request, "", "");
   }
 }
 
@@ -577,18 +577,18 @@ std::unique_ptr<Response> InternalServer::handle_random(const RequestContext& re
     bookId = mp_nameMapper->getIdForName(bookName);
     reader = mp_library->getReaderById(bookId);
   } catch (const std::out_of_range&) {
-    return Response::build_404(*this, request, bookName);
+    return Response::build_404(*this, request, bookName, "");
   }
 
   if (reader == nullptr) {
-    return Response::build_404(*this, request, bookName);
+    return Response::build_404(*this, request, bookName, "");
   }
 
   try {
     auto entry = reader->getRandomPage();
     return build_redirect(bookName, entry.getFinalEntry());
   } catch(kiwix::NoEntry& e) {
-    return Response::build_404(*this, request, bookName);
+    return Response::build_404(*this, request, bookName, "");
   }
 }
 
@@ -600,7 +600,7 @@ std::unique_ptr<Response> InternalServer::handle_captured_external(const Request
   } catch (const std::out_of_range& e) {}
 
   if (source.empty())
-    return Response::build_404(*this, request, "");
+    return Response::build_404(*this, request, "", "");
 
   auto data = get_default_data();
   data.set("source", source);
@@ -619,7 +619,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 Response::build_404(*this, request, "");
+    return Response::build_404(*this, request, "", "");
   }
 
   if (url == "v2") {
@@ -627,7 +627,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog(const RequestContext& r
   }
 
   if (url != "searchdescription.xml" && url != "root.xml" && url != "search") {
-    return Response::build_404(*this, request, "");
+    return Response::build_404(*this, request, "", "");
   }
 
   if (url == "searchdescription.xml") {
@@ -770,7 +770,7 @@ std::unique_ptr<Response> InternalServer::handle_content(const RequestContext& r
     std::string searchURL = m_root+"/search?pattern="+pattern; // Make a full search on the entire library.
     const std::string details = searchSuggestionHTML(searchURL, kiwix::urlDecode(pattern));
 
-    return Response::build_404(*this, request, bookName, details);
+    return Response::build_404(*this, request, bookName, "", details);
   }
 
   auto urlStr = request.get_url().substr(bookName.size()+1);
@@ -803,7 +803,7 @@ std::unique_ptr<Response> InternalServer::handle_content(const RequestContext& r
     std::string searchURL = m_root+"/search?content="+bookName+"&pattern="+pattern; // Make a search on this specific book only.
     const std::string details = searchSuggestionHTML(searchURL, kiwix::urlDecode(pattern));
 
-    return Response::build_404(*this, request, bookName, details);
+    return Response::build_404(*this, request, bookName, reader->getTitle(), details);
   }
 }