Merge pull request #267 from kiwix/new_version

Version 1.1.0
2026-01-28 15:52:54 -05:00 · 2019-03-19 17:36:57 +01:00 · 2019-03-19 17:32:58 +01:00 · 2019-03-19 17:32:58 +01:00 · 2019-03-08 15:11:05 +01:00 · 2019-03-07 17:22:16 +01:00
4 changed files with 48 additions and 11 deletions
--- a/23
+++ b/23
@@ -1,3 +1,26 @@
+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
+=================
+
+ * [CI] Use the new deps archive xz
+ * Move version 1.0.0. There is no need to stay in pre 1.0 version.
+
+kiwix-serve
+-----------
+
+ * Correctly implement redirection.
+   kiwix-serve now return a 302 http status code instead of resolving the
+   redirection internally and return the content.
+
+
 kiwix-tools 0.9.0
 =================

--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('kiwix-tools', 'cpp',
-  version : '0.9.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)

--- a/src/server/kiwix-serve.cpp
+++ b/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) {
@@ -766,10 +773,22 @@ static struct MHD_Response* handle_content(RequestContext* request)
  }

  auto urlStr = request->get_url().substr(humanReadableBookId.size()+1);
+  if (urlStr[0] == '/') {
+    urlStr = urlStr.substr(1);
+  }

  try {
    entry = reader->getEntryFromPath(urlStr);
-    entry = entry.getFinalEntry();
+    if (entry.isRedirect() || urlStr.empty()) {
+      // If urlStr is empty, we want to mainPage.
+      // We must do a redirection to the real page.
+      entry = entry.getFinalEntry();
+      std::string httpRedirection = (
+        rootLocation + "/" + humanReadableBookId + "/" +
+        kiwix::urlEncode(entry.getPath()));
+      request->httpResponseCode = MHD_HTTP_FOUND;
+      return build_response("", 0, httpRedirection, "", false, false);
+    }
  } catch(kiwix::NoEntry& e) {
    if (isVerbose.load())
      printf("Failed to find %s\n", urlStr.c_str());
@@ -797,7 +816,6 @@ static struct MHD_Response* handle_content(RequestContext* request)
    /* Special rewrite URL in case of ZIM file use intern *asbolute* url like
     * /A/Kiwix */
    if (mimeType.find("text/html") != string::npos) {
-      baseUrl = "/" + entry.getPath();
      pthread_mutex_lock(&regexLock);
      content = replaceRegex(content,
                             "$1$2" + rootLocation + "/" + humanReadableBookId + "/$3/",
@@ -805,10 +823,6 @@ static struct MHD_Response* handle_content(RequestContext* request)
      content = replaceRegex(content,
                             "$1$2" + rootLocation + "/" + humanReadableBookId + "/$3/",
                             "(@import[ ]+)([\"|\']{0,1})/([A-Z|\\-])/");
-      content = replaceRegex(
-          content,
-          "<head><base href=\"" + rootLocation + "/" + humanReadableBookId + baseUrl + "\" />",
-          "<head>");
      pthread_mutex_unlock(&regexLock);
      introduceTaskbar(content, humanReadableBookId);
    } else if (mimeType.find("text/css") != string::npos) {
--- a/travis/install_deps.sh
+++ b/travis/install_deps.sh
@@ -3,7 +3,7 @@
 set -e

 REPO_NAME=${TRAVIS_REPO_SLUG#*/}
-ARCHIVE_NAME=deps_${TRAVIS_OS_NAME}_${PLATFORM}_${REPO_NAME}.tar.gz
+ARCHIVE_NAME=deps_${TRAVIS_OS_NAME}_${PLATFORM}_${REPO_NAME}.tar.xz

 # Packages.
 case ${PLATFORM} in
@@ -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
Author	SHA1	Message	Date
Matthieu Gautier	472de06e6d	Merge pull request #267 from kiwix/new_version Version 1.1.0	2019-03-19 17:36:57 +01:00
Matthieu Gautier	51a4a4e8ef	Version 1.1.0	2019-03-19 17:32:58 +01:00
Matthieu Gautier	6e310c7147	Force use of meson 0.49.2	2019-03-19 17:32:58 +01:00
Matthieu Gautier	790bd03bd7	Merge pull request #266 from kiwix/filter_by_tag Allow to search the catalog by tags.	2019-03-08 15:11:05 +01:00
Matthieu Gautier	15c6252db4	Allow to search the catalog by tags. This way a client may filter the catalog by category.	2019-03-07 17:22:16 +01:00
Matthieu Gautier	6fd22dec61	Merge pull request #264 from kiwix/fix_absolute_urls Fix handling of absolute url in kiwix-serve.	2019-03-07 17:20:37 +01:00
Matthieu Gautier	c332c123fe	Fix handling of absolute url in kiwix-serve. We still need to change the html content to handle absolute url in zims. Issue has been introduced by commit `978dc47`. Some code was not related to redirection but to absolute url. I have made a clean a bit too more aggressive. Fix #262	2019-03-04 14:54:03 +01:00
Matthieu Gautier	e4eafd7459	Merge pull request #260 from kiwix/new_version New version 1.0.0	2019-02-22 11:19:03 +01:00
Matthieu Gautier	16a29127a1	New version 1.0.0	2019-02-22 10:50:33 +01:00
Matthieu Gautier	7fa0579ea1	Merge pull request #258 from kiwix/redirect [server] Correctly implement 302 redirection if the entry is a redirection	2019-02-20 17:14:52 +01:00
Matthieu Gautier	978dc47865	[server] Correctly implement 302 redirection if the entry is a redirection. If the entry is a redirection, we should redirect the client to the right entry instead of serving the target content. As we are doing a redirection, urls are good and we don't have to change link inside the html or css content. Fix #192	2019-02-20 16:57:10 +01:00
Matthieu Gautier	b7793f6e75	Merge pull request #259 from kiwix/use_correct_dep_archive Use new xz archive	2019-02-20 16:46:19 +01:00
Matthieu Gautier	8095ae9ea8	Use new xz archive	2019-02-20 16:06:04 +01:00