Merge pull request #267 from kiwix/new_version

Version 1.1.0

Changelog

@@ -1,3 +1,12 @@
+kiwix-tools 1.1.0
+=================
+
+kiwix-serve
+-----------
+
+ * Fix bug about handling of absolute url in old zim file.
+ * All the catalog to be searched by tags.
+
 kiwix-tools 1.0.0
 =================
 

meson.build

@@ -1,5 +1,5 @@
 project('kiwix-tools', 'cpp',
-  version : '1.0.0',
+  version : '1.1.0',
   license : 'GPL',
   default_options: ['c_std=c11', 'cpp_std=c++11', 'werror=true'])
 
@@ -11,7 +11,7 @@ if static_linkage
 endif
 
 thread_dep = dependency('threads')
-kiwixlib_dep = dependency('kiwix', version:'>=4.0.0', static:static_linkage)
+kiwixlib_dep = dependency('kiwix', version:'>=4.1.0', static:static_linkage)
 microhttpd_dep = dependency('libmicrohttpd', static:static_linkage)
 z_dep = dependency('zlib', static:static_linkage)
 

src/server/kiwix-serve.cpp

@@ -698,6 +698,7 @@ static struct MHD_Response* handle_catalog(RequestContext* request)
     } else if (url == "search") {
       std::string query;
       std::string language;
+      std::vector<std::string> tags;
       size_t count(10);
       size_t startIndex(0);
       try {
@@ -712,13 +713,19 @@ static struct MHD_Response* handle_catalog(RequestContext* request)
       try {
         startIndex = stoul(request->get_argument("start"));
       } catch (...) {}
+      try {
+        tags.push_back(request->get_argument("tag"));
+      } catch (...) {}
       opdsDumper.setTitle("Search result for " + query);
       uuid = zim::Uuid::generate();
       bookIdsToDump = library.listBooksIds(
         kiwix::VALID|kiwix::LOCAL|kiwix::REMOTE,
         kiwix::UNSORTED,
         query,
-        language);
+        language,
+        "", // creator
+        "", // publisher
+        tags);
       auto totalResults = bookIdsToDump.size();
       bookIdsToDump.erase(bookIdsToDump.begin(), bookIdsToDump.begin()+startIndex);
       if (count>0 && bookIdsToDump.size() > count) {
@@ -806,8 +813,24 @@ static struct MHD_Response* handle_content(RequestContext* request)
     zim::Blob raw_content = entry.getBlob();
     content = string(raw_content.data(), raw_content.size());
 
+    /* Special rewrite URL in case of ZIM file use intern *asbolute* url like
+     * /A/Kiwix */
     if (mimeType.find("text/html") != string::npos) {
+      pthread_mutex_lock(&regexLock);
+      content = replaceRegex(content,
+                             "$1$2" + rootLocation + "/" + humanReadableBookId + "/$3/",
+                             "(href|src)(=[\"|\']{0,1})/([A-Z|\\-])/");
+      content = replaceRegex(content,
+                             "$1$2" + rootLocation + "/" + humanReadableBookId + "/$3/",
+                             "(@import[ ]+)([\"|\']{0,1})/([A-Z|\\-])/");
+      pthread_mutex_unlock(&regexLock);
       introduceTaskbar(content, humanReadableBookId);
+    } else if (mimeType.find("text/css") != string::npos) {
+      pthread_mutex_lock(&regexLock);
+      content = replaceRegex(content,
+                             "$1$2" + rootLocation + "/" + humanReadableBookId + "/$3/",
+                             "(url|URL)(\\([\"|\']{0,1})/([A-Z|\\-])/");
+      pthread_mutex_unlock(&regexLock);
     }
 
     bool deflated

travis/install_deps.sh

@@ -32,7 +32,7 @@ sudo apt-get install -qq python3-pip ${PACKAGES}
 wget https://bootstrap.pypa.io/get-pip.py
 python3.5 get-pip.py --user
 python3.5 -m pip install --user --upgrade pip
-python3.5 -m pip install --user meson
+python3.5 -m pip install --user meson==0.49.2
 
 # Ninja
 cd $HOME