Merge pull request #297 from kiwix/new_version

New version 2.0.0

.travis.yml

@@ -1,23 +1,12 @@
 language: cpp
-dist: trusty
-sudo: required
+dist: xenial
+sudo: true
 cache: ccache
-before_install:
-- eval "${MATRIX_EVAL}"
-- ${CXX} --version
 install: travis/install_deps.sh
 script: travis/compile.sh
 env:
-  global:
-    - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
   matrix:
     - PLATFORM="native_static"
     - PLATFORM="native_dyn"
     - PLATFORM="win32_static"
     - PLATFORM="win32_dyn"
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-5

Changelog

@@ -1,3 +1,140 @@
+kiwix-tools 2.0.0
+=================
+
+kiwix-manage
+-----------
+
+ * Better usage()
+ * Adding multiple files bug fix
+ * Remove download command.
+
+kiwix-serve
+-----------
+
+ * Better usage()
+ * Display properly welcome page on 3 columns
+ * New welcome page footer "Powered by Kiwix"
+
+kiwix-tools 1.2.1
+=================
+
+kiwix-serve
+-----------
+
+ * Always use POLL when avaible.
+
+kiwix-tools 1.2.0
+=================
+
+ * Remove rpath for installed binaries.
+
+kiwix-serve
+-----------
+
+ * New Dockerfile of kiwix-serve
+ * New --nodatealiases option
+ * Do not use POLL on windows
+
+kiwix-manage
+------------
+
+ * Do not show all books if book ids has been provided.
+ * Be able to add several zim files in the same time in a library.
+
+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
+=================
+
+ * Update README
+ * Update man pages
+ * Remove support of external indexes (manage, search, serve)
+ * Update build system as we don't use ctpp2 anymore
+ * Update to last kiwix-lib API.
+
+kiwix-manage
+------------
+
+ * Update usage.
+
+
+kiwix-tools 0.8.0
+=================
+
+kiwix-manage
+------------
+
+ * Be able to remove several books from the library in one command.
+
+kiwix-tools 0.7.0
+=================
+
+ * Adapt to kiwix-lib new API
+
+kiwix-serve
+-----------
+
+ * Dumps only valid books in the opdsfeed.
+ * Allow the opds feed to be filtered by lang and paginated.
+
+kiwix-manage
+------------
+
+ * Add a download command to download a remote book locally
+ * Book are referenced by bookId not index.
+ * No more indexType option as it is always XAPIAN.
+
+kiwix-tools 0.6.1
+=================
+
+kiwix-serve
+-----------
+
+ * Update README.
+ * Fix crash when `--library` flag is provided without value.
+ * Correctly handle mimetype of file without extension on 64bits.
+ * Minor fixes
+
+kiwix-tools 0.6.0
+=================
+
+ * remove kiwix-install tool.
+
+kiwix-serve
+-----------
+
+ * Improved taskbar #160
+ * Fix global page when using the option `--nosearchbar`
+ * Return 404 for missing resources
+ * Fix compilation for gcc 4.8.
+
+kiwix-manage
+------------
+
+ * Returns proper exit code (not always 0)
+
+
 kiwix-tools 0.5.0
 =================
 
@@ -5,7 +142,7 @@ kiwix-tools 0.5.0
  * Compile without warning.
 
 
-kiwix-server
+kiwix-serve
 ------------
 
  * Serve metadata information using the "/meta" url.

README.md

@@ -1,14 +1,14 @@
 Kiwix tools
 ===========
 
-The Kiwix tools gathers kiwix command line tools.
+The Kiwix tools is a collection of Kiwix related command line tools.
 
 Disclaimer
 ----------
 
 This document assumes you have a little knowledge about software
 compilation. If you experience difficulties with the dependencies or
-with the Kiwix libary compilation itself, we recommend to have a look
+with the Kiwix tools compilation itself, we recommend to have a look
 to [kiwix-build](https://github.com/kiwix/kiwix-build).
 
 Preamble
@@ -16,24 +16,19 @@ Preamble
 
 Although the Kiwix tools can be compiled/cross-compiled on/for many
 sytems, the following documentation explains how to do it on POSIX
-ones. It is primarly though for GNU/Linux systems and has been tested
+ones. It is primarly thought for GNU/Linux systems and has been tested
 on recent releases of Ubuntu and Fedora.
 
 Dependencies
 ------------
 
-The Kiwix tools rely on a few third parts software libraries. They
-are prerequisites to the Kiwix library compilation. Following
+The Kiwix tools rely on a few third party software libraries. They are
+prerequisites to the Kiwix tools compilation. Therefore, following
 libraries need to be available:
 
-* Kiwix lib ....................... https://github.com/kiwix/kiwix-lib
-(no package for now)
-* Libmicrohttpd .......... https://www.gnu.org/software/libmicrohttpd/
-(package libmicrohttpd-dev on Ubuntu)
-* CTPP2 ..................................... http://ctpp.havoc.ru/en/
-(package libctpp2-dev on Ubuntu)
-* Zlib .......................................... http://www.zlib.net/
-(package zlib1g-dev on Ubuntu)
+* [Kiwix lib](https://github.com/kiwix/kiwix-lib) (no package so far)
+* [Libmicrohttpd](https://www.gnu.org/software/libmicrohttpd/) (package libmicrohttpd-dev on Ubuntu)
+* [Zlib](https://www.zlib.net/) (package zlib1g-dev on Ubuntu)
 
 These dependencies may or may not be packaged by your operating
 system. They may also be packaged but only in an older version. They
@@ -46,54 +41,33 @@ If you want to install these dependencies locally, then use the
 kiwix-tools directory as install prefix.
 
 If you want to compile Kiwix tools statically, the dependencies should
-be compile statically (provide a lib...a library), for example by
+be compiled statically (provide a lib...a library), for example by
 using "--enable-static" with "./configure".
 
 If you compile manually Libmicrohttpd, you might need to compile it
 without GNU TLS, a bug here will empeach further compilation of Kiwix
 tools otherwise.
 
-Environnement
+Environment
 -------------
 
-The Kiwix library builds using [Meson](http://mesonbuild.com/) version
-0.34 or higher. Meson relies itself on Ninja, pkg-config and few other
-compilation tools.
-
-Install first the few common compilation tools:
-* Automake
-* Libtool
-* Virtualenv
+The Kiwix tools build using [Meson](http://mesonbuild.com/) version
+0.43 or higher. Meson relies itself on Ninja, pkg-config and few other
+compilation tools. Install them first:
+* Meson
+* Ninja
 * Pkg-config
 
-Then install Meson itself:
-```
-virtualenv -p python3 ./ # Create virtualenv
-source bin/activate      # Activate the virtualenv
-pip install meson        # Install Meson
-hash -r                  # Refresh bash paths
-```
-
-Finally download and build Ninja locally:
-```
-git clone git://github.com/ninja-build/ninja.git
-cd ninja
-git checkout release
-./configure.py --bootstrap
-mkdir ../bin                      
-cp ninja ../bin
-cd ..
-```
+These tools should be packaged if you use a cutting edge operating
+system. If not, have a look to the "Troubleshooting" section.
 
 Compilation
 -----------
 
-Once all dependencies are installed, you can compile kiwix-lib with:
+Once all dependencies are installed, you can compile Kiwix tools with:
 ```
-mkdir build
 meson . build
-cd build
-ninja
+ninja -C build
 ```
 
 By default, it will compile dynamic linked libraries. If you want
@@ -105,16 +79,61 @@ Depending of you system, `ninja` may be called `ninja-build`.
 Installation
 ------------
 
-If you want to install the Kiwix tools you just have compiled on your
-system, here we go:
+If you want to install the Kiwix tools, here we go:
 
 ```
-ninja install
+ninja -C build install
+```
+
+You might need to run the command as root (or using 'sudo'), depending
+where you want to install the Kiwix tools. After the installation
+succeeded, you may need to run ldconfig (as root).
+
+Uninstallation
+------------
+
+If you want to uninstall the Kiwix tools:
+
+```
+ninja -C build uninstall
+```
+
+Like for the installation, you might need to run the command as root
+(or using 'sudo').
+
+Docker
+------
+
+An official Docker image of `kiwix-serve` can be found at
+https://hub.docker.com/r/kiwix/kiwix-serve.
+
+Troubleshooting
+---------------
+
+If you need to install Meson "manually":
+```
+virtualenv -p python3 ./ # Create virtualenv
+source bin/activate      # Activate the virtualenv
+pip3 install meson       # Install Meson
+hash -r                  # Refresh bash paths
+```
+
+If you need to install Ninja "manually":
+```
+git clone git://github.com/ninja-build/ninja.git
+cd ninja
+git checkout release
+./configure.py --bootstrap
+mkdir ../bin
+cp ninja ../bin
 cd ..
 ```
 
-You might need to run the command as root, depending where you want to
-install the libraries.
+If the compilation still fails, you might need to get a more recent
+version of a dependency than the one packaged by your Linux
+distribution. Try then with a source tarball distributed by the
+problematic upstream project or even directly from the source code
+repository.
 
 License
 -------

docker/server/Dockerfile

@@ -0,0 +1,15 @@
+FROM alpine:latest
+LABEL maintainer Emmanuel Engelhart <kelson@kiwix.org>
+
+# Install kiwix-serve
+WORKDIR /
+RUN apk add --no-cache curl bzip2
+RUN curl -kL https://download.kiwix.org/release/kiwix-tools/kiwix-tools_linux-x86_64-1.2.1.tar.gz | tar -xz && \
+    mv kiwix-tools*/kiwix-serve /usr/local/bin && \
+    rm -r kiwix-tools*
+
+# Run kiwix-serve
+EXPOSE 80
+VOLUME /data
+WORKDIR /data
+ENTRYPOINT ["/usr/local/bin/kiwix-serve", "--port", "80"]

docker/server/README.md

@@ -0,0 +1,13 @@
+kiwix-serve Docker image
+========================
+
+* Download a ZIM file from <https://wiki.kiwix.org/wiki/Content>
+
+* Given `wikipedia.zim` resides in `/tmp/zim/`, execute the following:
+
+```
+docker run -v /tmp/zim:/data -p 8080:80 kiwix/kiwix-serve wikipedia.zim
+```
+
+![screenshot_1.png](https://github.com/kiwix/kiwix-tools/raw/master/docker/server/pictures/screenshot_1.png)
+![screenshot_2.png](https://github.com/kiwix/kiwix-tools/raw/master/docker/server/pictures/screenshot_2.png)

meson.build

@@ -1,5 +1,5 @@
 project('kiwix-tools', 'cpp',
-  version : '0.5.0',
+  version : '2.0.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:'>=2.0.0', static:static_linkage)
+kiwixlib_dep = dependency('kiwix', version:'>=5.1.0', static:static_linkage)
 microhttpd_dep = dependency('libmicrohttpd', static:static_linkage)
 z_dep = dependency('zlib', static:static_linkage)
 

src/installer/kiwix-install.cpp

@@ -1,173 +0,0 @@
-/*
- * Copyright 2011-2014 Emmanuel Engelhart <kelson@kiwix.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU  General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include <getopt.h>
-#include <kiwix/common/pathTools.h>
-#include <kiwix/manager.h>
-#include <kiwix/reader.h>
-
-enum supportedAction { NONE, ADDCONTENT };
-
-void usage()
-{
-  cout << "Usage: kiwix-install [--verbose] addcontent ZIM_PATH KIWIX_PATH"
-       << endl;
-  exit(1);
-}
-
-int main(int argc, char** argv)
-{
-  /* Init the variables */
-  const char* contentPath = NULL;
-  const char* kiwixPath = NULL;
-  supportedAction action = NONE;
-  bool verboseFlag = false;
-  int option_index = 0;
-  int c = 0;
-
-  /* Argument parsing */
-  while (42) {
-    static struct option long_options[]
-        = {{"verbose", no_argument, 0, 'v'}, {0, 0, 0, 0}};
-
-    if (c != -1) {
-      c = getopt_long(argc, argv, "vi", long_options, &option_index);
-
-      switch (c) {
-        case 'v':
-          verboseFlag = true;
-          break;
-      }
-    } else {
-      if (optind < argc) {
-        if (action == NONE) {
-          string actionString = argv[optind++];
-          if (actionString == "addcontent" || actionString == "ADDCONTENT") {
-            action = ADDCONTENT;
-          }
-        } else if (contentPath == NULL) {
-          contentPath = argv[optind++];
-        } else if (kiwixPath == NULL) {
-          kiwixPath = argv[optind++];
-        } else {
-          usage();
-        }
-      } else {
-        break;
-      }
-    }
-  }
-
-  /* Check if we have enough arguments */
-  if (contentPath == NULL || kiwixPath == NULL) {
-    usage();
-  }
-
-  /* Make the action */
-  if (action == ADDCONTENT) {
-    /* Check if the content path exists and is readable */
-    if (verboseFlag) {
-      std::cout << "Check if the ZIM file exists..." << std::endl;
-    }
-    if (!fileExists(contentPath)) {
-      cerr << "The content path '" << contentPath
-           << "' does not exist or is not readable." << endl;
-      exit(1);
-    }
-
-    /* Check if this is a ZIM file */
-    try {
-      if (verboseFlag) {
-        std::cout << "Check if the ZIM file is valid..." << std::endl;
-      }
-      kiwix::Reader* reader = new kiwix::Reader(contentPath);
-      delete reader;
-    } catch (exception& e) {
-      cerr << "The content available at '" << contentPath
-           << "' is not a ZIM file." << endl;
-      exit(1);
-    }
-    string contentFilename = getLastPathElement(contentPath);
-
-    /* Check if kiwixPath/kiwix/kiwix.exe exists */
-    if (verboseFlag) {
-      std::cout << "Check if the Kiwix path is valid..." << std::endl;
-    }
-    string kiwixBinaryPath = computeAbsolutePath(kiwixPath, "kiwix/kiwix.exe");
-    if (!fileExists(kiwixBinaryPath)) {
-      kiwixBinaryPath = computeAbsolutePath(kiwixPath, "kiwix/kiwix");
-      if (!fileExists(kiwixBinaryPath)) {
-        cerr << "Unable to find the Kiwix binary at '" << kiwixBinaryPath
-             << "[.exe]'." << endl;
-        exit(1);
-      }
-    }
-
-    /* Check if the directory "data" structure exists */
-    if (verboseFlag) {
-      std::cout << "Check the target data directory structure..." << std::endl;
-    }
-    string dataPath = computeAbsolutePath(kiwixPath, "data/");
-    if (!fileExists(dataPath)) {
-      makeDirectory(dataPath);
-    }
-
-    /* Check if the directory "data/content" structure exists */
-    string dataContentPath = computeAbsolutePath(kiwixPath, "data/content/");
-    if (!fileExists(dataContentPath)) {
-      makeDirectory(dataContentPath);
-    }
-
-    /* Check if the directory "data/library" structure exists */
-    string dataLibraryPath = computeAbsolutePath(kiwixPath, "data/library/");
-    if (!fileExists(dataLibraryPath)) {
-      makeDirectory(dataLibraryPath);
-    }
-
-    /* Copy the file to the data/content directory */
-    if (verboseFlag) {
-      std::cout << "Copy ZIM file to the target directory..." << std::endl;
-    }
-    string newContentPath
-        = computeAbsolutePath(dataContentPath, contentFilename);
-    if (!fileExists(newContentPath)
-        || getFileSize(contentPath) != getFileSize(newContentPath)) {
-      copyFile(contentPath, newContentPath);
-    }
-
-    /* Add the file to the library.xml */
-    if (verboseFlag) {
-      std::cout << "Create the library XML file..." << std::endl;
-    }
-    kiwix::Manager libraryManager;
-    string libraryPath
-        = computeAbsolutePath(dataLibraryPath, contentFilename + ".xml");
-    string bookId = libraryManager.addBookFromPathAndGetId(
-        newContentPath, "../content/" + contentFilename, "", false);
-    if (!bookId.empty()) {
-      libraryManager.setCurrentBookId(bookId);
-      libraryManager.writeFile(libraryPath);
-    } else {
-      cerr << "Unable to build or save library file '" << libraryPath << "'"
-           << endl;
-    }
-  }
-
-  exit(0);
-}

src/installer/meson.build

@@ -1,4 +0,0 @@
-executable('kiwix-install', ['kiwix-install.cpp'],
-  dependencies:all_deps,
-  install:true,
-  install_rpath: join_paths(get_option('prefix'), get_option('libdir')))

src/man/fr/kiwix-install.1

@@ -1,40 +0,0 @@
-.TH KIWIX 1 "21 May 2012"
-.SH NAME
-kiwix\-install \- Installeur de fichiers ZIM
-.SH SYNOPSIS
-.IX Header SYNOPSIS
-kiwix\-install [\-\-verbose|-v] [\-\-backend|\-b=xapian|clucene] [\-\-buildIndex|\-i] addcontent ZIM_PATH KIWIX_PATH
-.SH DESCRIPTION
-.PP
-Créé une arborescence contenant Kiwix et des données pour redistribution.
-.br
-Si demandé, créé aussi un index plein texte.
-
-.TP
-\fB\-\-verbose\fR
-Active le mode verbeux de la sortie.
-
-.TP
-\fB\-\-backend=xapian|clucene\fR
-Séléctionne un moteur d'indexation.
-
-.TP
-\fB\-\-buildIndex\fR
-Créer un index plein texte pour le fichier ZIM.
-
-.TP
-\fBZIM_PATH\fR
-Chemin du fichier de contenu ZIM.
-
-.TP
-\fBKIWIX_PATH\fR
-Chemin d'accès dossier kiwix/.
-.br
-Le chemin doit contenit le binaire statique de Kiwix.
-
-.SH SEE ALSO
-kiwix(1) kiwix\-serve(1) kiwix\-manage(1)
-.SH AUTHOR
-Emmanuel Engelhart <kelson@kiwix.org>
-.br
-Vasudev Kamath <kamathvasudev@gmail.com> (Manual)

src/man/fr/kiwix.1

@@ -1,52 +0,0 @@
-.TH KIWIX 1 "12 juin 2012"
-.SH NAME
-Kiwix \- Lecteur hors-ligne de fichiers ZIM
-.SH SYNOPSIS
-.B kiwix [-jsconsole] [-articleByUrl] [-articleByTitle] [FILE]
-.SH DESCRIPTION
-.PP
-Kiwix est un lecteur de content au format ZIM.
-.br
-Les fichiers ZIM sont des archives de contenus compressés (généralement HTML)
-.br
-Les fichiers ZIM les plus populaires sont ceux de Wikipédia et Wikileaks.
-
-.TP
-\fB\-jsconsole\fR
-Active la console de debogage JavaScript de Xulrunner.
-\fB\-articleByUrl url\fR
-Ouvre un article en particulier en renseignant son url. FILE doit être donné.
-.TP
-\fB\-articleByTitle title\fR
-Ouvre un article en particulier en renseignant son titre. FILE doit être donné.
-
-.PP
-Fonctionnalités:
- * Lecteur de ZIM natif
- * Moteur de recherche plein texte
- * Signets et Notes
- * Serveur Web pour diffuser les fichiers ZIM sur le réseau
- * Export HTML et PDF
- * Traduits dans de nombreuses langues
- * Suggestions de recherche
- * Indexation des fichiers ZIM
- * Onglets de navigation
- * Bibliothèque de contenus intégrée
-
-.SH SEE ALSO
-kiwix\-install(1) kiwix\-serve(1)
-.br
-kiwix\-manage(1)
-
-
-.SH TROUBLESHOOTING
-Aller à http://reportabug.kiwix.org pour plus de détails sur comment rapporter un bogue.
-
-.SH AUTHORS
- Emmanuel Engelhart <kelson@kiwix.org>
- Guillaume Duhamel <gduhamel@linterweb.com>
- Fabien Coullon <fcoulon@linterweb.com>
- Renaud Gaudin <rgaudin@gmail.com>
- Wilfredo Rodriguez <wilfredor@kiwix.org>
-.br
- Vasudev Kamath <kamathvasudev@gmail.com> (Manual)

src/man/fr/meson.build

@@ -1,4 +1,3 @@
-install_man('kiwix-install.1',
-            'kiwix-manage.1',
+install_man('kiwix-manage.1',
             'kiwix-serve.1',
-            install_dir:get_option('mandir')+'/fr/man1')
+            install_dir:get_option('mandir')+'/fr/man1')

src/man/kiwix-install.1

@@ -1,40 +0,0 @@
-.TH KIWIX 1 "21 May 2012"
-.SH NAME
-kiwix\-install \- Kiwix ZIM Installer
-.SH SYNOPSIS
-.IX Header SYNOPSIS
-kiwix\-install [\-\-verbose|-v] [\-\-backend|\-b=xapian|clucene] [\-\-buildIndex|\-i] addcontent ZIM_PATH KIWIX_PATH
-.SH DESCRIPTION
-.PP
-Creates a standalone Kiwix + data hierarchy.
-.br
-If specified, also creates a full\-text index.
-
-.TP
-\fB\-\-verbose\fR
-Enable verbose output.
-
-.TP
-\fB\-\-backend=xapian|clucene\fR
-Select an indexing backend.
-
-.TP
-\fB\-\-buildIndex\fR
-Build an index for the ZIM file.
-
-.TP
-\fBZIM_PATH\fR
-ZIM content file path.
-
-.TP
-\fBKIWIX_PATH\fR
-Path to the kiwix/ folder.
-.br
-The path must contain the kiwix standalone binary.
-
-.SH SEE ALSO
-kiwix(1) kiwix\-serve(1) kiwix\-manage(1)
-.SH AUTHOR
-Emmanuel Engelhart <kelson@kiwix.org>
-.br
-Vasudev Kamath <kamathvasudev@gmail.com> (Manual)

src/man/kiwix-manage.1

@@ -15,12 +15,12 @@ kiwix\-manage LIBRARY_PATH add ZIM_PATH ...
 .PP
 \fBkiwix\-manage\fP tool for managing a kiwix library.
 .PP
-Allows one to manage the content of the kiwix library. Library file is an XML flat file
-listing ZIM files with all necessary information like favicon, date, creator,
-description, indexpath, filepath, title, source/metalink etc.
+Allows one to manage the content of the kiwix library. The library file is a
+flat XML file listing ZIM files with all necessary information like favicon,
+date, creator, description, indexpath, filepath, title, source/metalink, etc.
 .
 .PP
- Example library file can be found at http://www.kiwix.org/library\.xml
+ Example library file can be found at https://www.kiwix.org/library\.xml
 .br
 .TP
 \fBadd\fR
@@ -55,7 +55,7 @@ Path to full-text index for that ZIM file.
 Set the content location of the ZIM file over the network for in\-kiwix download.
 
 .SH SEE ALSO
-kiwix(1) kiwix\-install(1) kiwix\-serve(1)
+kiwix(1) kiwix\-serve(1)
 .SH AUTHOR
 Emmanuel Engelhart <kelson@kiwix.org>
 .br

src/man/kiwix-serve.1

@@ -9,7 +9,7 @@ kiwix\-serve [\-\-index=INDEX_PATH] [\-\-port=PORT] [\-\-verbose] [\-\-daemon] [
 kiwix\-serve \-\-library [\-\-port=PORT] [\-\-verbose] [\-\-daemon] [\-\-attachToProcess=PID] LIBRARY_PATH
 .SH DESCRIPTION
 .PP
-Stand\-alone HTTP server for serving ZIM content over the network.
+Stand\-alone HTTP server for serving ZIM contents over the network.
 
 .TP
 \fB\-\-index=INDEX_PATH\fR
@@ -27,7 +27,7 @@ Enable verbose output.
 
 .TP
 \fB\-\-daemon\fR
-Run the server as a daemon
+Run the server as a daemon.
 
 .TP
 \fB\-\-attachToProcess=PID\fR
@@ -49,12 +49,11 @@ Serves the contents of a library file instead of a single ZIM file.
 \fBLIBRARY_PATH\fR
 Kiwix library file path.
 .br
-Library is XML file created using \fBkiwix-manage\fB.
+Library is an XML file created using \fBkiwix-manage\fB.
 
 .SH SEE ALSO
 kiwix(1) kiwix\-manage(1)
-.br
-kiwix\-install(1)
+
 .SH AUTHOR
 Emmanuel Engelhart <kelson@kiwix.org>
 .br

src/man/meson.build

@@ -1,4 +1,3 @@
-install_man('kiwix-install.1',
-            'kiwix-manage.1',
+install_man('kiwix-manage.1',
             'kiwix-serve.1')
 subdir('fr')

src/manager/kiwix-manage.cpp

@@ -21,7 +21,7 @@
 #include <unistd.h>
 #endif
 #include <getopt.h>
-#include <kiwix/common/pathTools.h>
+#include <kiwix/tools/stringTools.h>
 #include <kiwix/manager.h>
 #include <cstdlib>
 #include <iostream>
@@ -30,165 +30,195 @@ using namespace std;
 
 enum supportedAction { NONE, ADD, SHOW, REMOVE };
 
-void show(kiwix::Library library)
+void show(kiwix::Library* library, const std::string& bookId)
 {
-  std::vector<kiwix::Book>::iterator itr;
-  unsigned int inc = 1;
-  for (itr = library.books.begin(); itr != library.books.end(); ++itr) {
-    std::cout << "#" << inc++ << std::endl
-              << "id:\t\t" << itr->id << std::endl
-              << "path:\t\t" << itr->path << std::endl
-              << "indexpath:\t" << itr->indexPath << std::endl
-              << "url:\t\t" << itr->url << std::endl
-              << "title:\t\t" << itr->title << std::endl
-              << "name:\t\t" << itr->name << std::endl
-              << "tags:\t\t" << itr->tags << std::endl
-              << "description:\t" << itr->description << std::endl
-              << "creator:\t" << itr->creator << std::endl
-              << "date:\t\t" << itr->date << std::endl
-              << "articleCount:\t" << itr->articleCount << std::endl
-              << "mediaCount:\t" << itr->mediaCount << std::endl
-              << "size:\t\t" << itr->size << " KB" << std::endl
-              << std::endl;
+  try {
+    auto& book = library->getBookById(bookId);
+    std::cout << "id:\t\t" << book.getId() << std::endl
+              << "path:\t\t" << book.getPath() << std::endl
+              << "url:\t\t" << book.getUrl() << std::endl
+              << "title:\t\t" << book.getTitle() << std::endl
+              << "name:\t\t" << book.getName() << std::endl
+              << "tags:\t\t" << book.getTags() << std::endl
+              << "description:\t" << book.getDescription() << std::endl
+              << "creator:\t" << book.getCreator() << std::endl
+              << "date:\t\t" << book.getDate() << std::endl
+              << "articleCount:\t" << book.getArticleCount() << std::endl
+              << "mediaCount:\t" << book.getMediaCount() << std::endl
+              << "size:\t\t" << book.getSize() << " KB" << std::endl;
+  } catch (std::out_of_range&) {
+     std::cout << "No book " << bookId << " in the library" << std::endl;
   }
+  std::cout << std::endl;
 }
 
+/* Print correct console usage options */
 void usage()
 {
-  cerr << "Usage:" << endl;
-  cerr << "\tkiwix-manage LIBRARY_PATH add ZIM_PATH "
-          "[--zimPathToSave=../content/foobar.zim] [--current] "
-          "[--indexBackend=xapian] [--indexPath=FULLTEXT_IDX_PATH] "
-          "[--url=http://...metalink]"
-       << endl;
-  cerr << "\tkiwix-manage LIBRARY_PATH show [CONTENTID1] [CONTENTID2] ... "
-          "(show everything if no param.)"
-       << endl;
-  cerr << "\tkiwix-manage LIBRARY_PATH remove CONTENTID1 [CONTENTID2]" << endl;
+  std::cout << "Usage:" << std::endl
+            << "\tkiwix-manage LIBRARY_PATH add ZIM_PATH [OPTIONS]" << std::endl
+            << "\tkiwix-manage LIBRARY_PATH remove ZIM_ID [ZIM_ID]..." << std::endl
+            << "\tkiwix-manage LIBRARY_PATH show [ZIM_ID]..." << std::endl
+            << std::endl
+
+            << "Purpose:" << std::endl
+            << "\tManipulates the Kiwix library XML file"
+            << std::endl << std::endl
+
+            << "Arguments:" << std::endl
+            << "\tLIBRARY_PATH\tis the XML library file path."
+            << std::endl << std::endl
+            << "\tACTION\t\tis the pre-defined string to specify the action to run on the XML library file."
+            << std::endl << std::endl
+            << "\t\t\tMust be one of the following values:" << std::endl
+            << "\t\t\t* add: add a ZIM file to the library" << std::endl
+            << "\t\t\t* remove: remove a ZIM file from the library" << std::endl
+            << "\t\t\t* show: show the content of the library"
+            << std::endl << std::endl
+            << "\tZIM_ID\t\tZIM file unique ID"
+            << std::endl << std::endl
+            << "\tOPTIONS\t\tCustom options for \"add\" action:" << std::endl
+            << "\t\t\t--zimPathToSave=CUSTOM_ZIM_PATH to replace the current ZIM file path" << std::endl
+            << "\t\t\t--url=HTTP_ZIM_URL to create an \"url\" attribute for the online version of the ZIM file" << std::endl
+            << std::endl
+
+            << "Examples:" << std::endl
+            << "\tAdd ZIM files to library: kiwix-manage my_library.xml add first.zim second.zim" << std::endl
+            << "\tRemove ZIM files from library: kiwix-manage my_library.xml remove e5c2c003-b49e-2756-5176-5d9c86393dd9" << std::endl
+            << "\tShow all library ZIM files: kiwix-manage my_library.xml show" << std::endl
+            << std::endl
+
+            << "Documentation:" << std::endl
+            << "\tSource code\thttps://github.com/kiwix/kiwix-tools" << std::endl
+            << "\tMore info\thttps://wiki.kiwix.org/wiki/Kiwix-manage" << std::endl
+            << std::endl;
 }
 
-
-void handle_show(kiwix::Manager* libraryManager, const std::string& libraryPath,
+bool handle_show(kiwix::Library* library, const std::string& libraryPath,
                  int argc, char* argv[])
 {
-  show(libraryManager->cloneLibrary());
+  if (argc > 3 ) {
+    for(auto i=3; i<argc; i++) {
+       std::string bookId = argv[i];
+       show(library, bookId);
+    }
+  } else {
+    auto booksIds = library->getBooksIds();
+    for(auto& bookId: booksIds) {
+      show(library, bookId);
+    }
+  }
+  return(0);
 }
 
-void handle_add(kiwix::Manager* libraryManager, const std::string& libraryPath,
+bool handle_add(kiwix::Library* library, const std::string& libraryPath,
                 int argc, char* argv[])
 {
   string zimPath;
   string zimPathToSave = ".";
-  string indexPath;
-  kiwix::supportedIndexType indexBackend = kiwix::XAPIAN;
   string url;
   string origID = "";
-  bool setCurrent = false;
   int option_index = 0;
   int c = 0;
+  bool resultCode = 0;
 
-  if (argc > 3) {
-    zimPath = argv[3];
+  if (argc <= 3) {
+    std::cerr << "Path to zim file to add is missing in the command line" << std::endl;
+    return (-1);
   }
 
   /* Options parsing */
-  optind = 2;
-  while (42) {
-    static struct option long_options[]
-        = {{"url", required_argument, 0, 'u'},
-           {"origId", required_argument, 0, 'o'},
-           {"indexPath", required_argument, 0, 'i'},
-           {"indexBackend", required_argument, 0, 'b'},
-           {"zimPathToSave", required_argument, 0, 'z'},
-           {"current", no_argument, 0, 'c'},
-           {0, 0, 0, 0}};
+  optind = 3;
+  static struct option long_options[] = {
+    {"url", required_argument, 0, 'u'},
+    {"origId", required_argument, 0, 'o'},
+    {"zimPathToSave", required_argument, 0, 'z'},
+    {0, 0, 0, 0}
+  };
 
-    c = getopt_long(argc, argv, "cz:u:i:b:", long_options, &option_index);
-
-    if (c != -1) {
-      switch (c) {
-        case 'u':
-          url = optarg;
-          break;
-
-        case 'o':
-          origID = optarg;
-          break;
-
-        case 'c':
-          setCurrent = true;
-          break;
-
-        case 'i':
-          indexPath = optarg;
-          break;
-
-        case 'b':
-          if (!strcmp(optarg, "xapian")) {
-            indexBackend = kiwix::XAPIAN;
-          } else {
-            usage();
-          }
-          break;
-
-        case 'z':
-          zimPathToSave = optarg;
-          break;
-      }
-    } else {
+  bool has_option = false;
+  while (true) {
+    c = getopt_long(argc, argv, "cz:u:", long_options, &option_index);
+    if (c == -1)
       break;
+
+    has_option = true;
+    switch (c) {
+      case 'u':
+        url = optarg;
+        break;
+
+      case 'o':
+        origID = optarg;
+        break;
+
+      case 'z':
+        zimPathToSave = optarg;
+        break;
     }
   }
 
-  if (!zimPath.empty()) {
-    zimPathToSave = zimPathToSave == "." ? zimPath : zimPathToSave;
-    string bookId = libraryManager->addBookFromPathAndGetId(
-        zimPath, zimPathToSave, url, false);
-     if (!bookId.empty()) {
-      if (setCurrent)
-        libraryManager->setCurrentBookId(bookId);
-      /* Save the index infos if necessary */
-      if (!indexPath.empty())
-        libraryManager->setBookIndex(bookId, indexPath, indexBackend);
-     } else {
-      cerr << "Unable to build or save library file '" << libraryPath << "'"
-           << endl;
-    }
-  } else {
-    std::cerr << "Invalid zim file path" << std::endl;
+  if (optind >= argc) {
+    std::cerr << "Path to zim file to add is missing in the command line" << std::endl;
+    return (-1);
   }
+
+  if (has_option && argc-optind > 1) {
+    std::cerr << "You cannot give option and several zim files to add" << std::endl;
+    return (-1);
+  }
+
+  kiwix::Manager manager(library);
+
+  for(auto i=optind; i<argc; i++) {
+    std::string zimPath = argv[i];
+    if (!zimPath.empty()) {
+      auto _zimPathToSave = zimPathToSave == "." ? zimPath : zimPathToSave;
+      manager.addBookFromPathAndGetId(zimPath, _zimPathToSave, url, false);
+    } else {
+      std::cerr << "Invalid zim file path" << std::endl;
+      resultCode = 1;
+    }
+  }
+
+  return(resultCode);
 }
 
-void handle_remove(kiwix::Manager* libraryManager, const std::string& libraryPath,
+bool handle_remove(kiwix::Library* library, const std::string& libraryPath,
                    int argc, char* argv[])
 {
-  unsigned int bookIndex = 0;
-  const unsigned int totalBookCount = libraryManager->getBookCount(true, true);
+  std::string bookId;
+  const unsigned int totalBookCount = library->getBookCount(true, true);
+  bool exitCode = 0;
 
-  if (argc > 3) {
-    bookIndex = atoi(argv[3]);
+  if (argc <= 3) {
+    std::cerr << "BookId to remove missing in the command line" << std::endl;
+    return (-1);
   }
 
-  if (bookIndex > 0 && bookIndex <= totalBookCount) {
-    libraryManager->removeBookByIndex(bookIndex - 1);
-  } else {
-    if (totalBookCount > 0) {
-      std::cerr
-          << "Invalid book index number. Please give a number between 1 and "
-          << totalBookCount << std::endl;
-    } else {
-      std::cerr
-          << "Invalid book index number. Library is empty, no book to delete."
-          << std::endl;
+  if (!totalBookCount) {
+    std::cerr << "Library is empty, no book to delete."
+              << std::endl;
+    return 1;
+  }
+
+  for (int i = 3; i<argc; i++) {
+    bookId = argv[i];
+
+    if (!library->removeBookById(bookId)) {
+      std::cerr << "Invalid book id '" << bookId << "'." << std::endl;
+      exitCode = 1;
     }
   }
+
+  return(exitCode);
 }
 
 int main(int argc, char** argv)
 {
   string libraryPath = "";
   supportedAction action = NONE;
-  kiwix::Manager libraryManager;
+  kiwix::Library library;
 
   /* Argument parsing */
   if (argc > 2) {
@@ -213,21 +243,29 @@ int main(int argc, char** argv)
   libraryPath = isRelativePath(libraryPath)
                     ? computeAbsolutePath(getCurrentDirectory(), libraryPath)
                     : libraryPath;
-  libraryManager.readFile(libraryPath, false);
+  kiwix::Manager manager(&library);
+  manager.readFile(libraryPath, false);
 
   /* SHOW */
-  if (action == SHOW) {
-    handle_show(&libraryManager, libraryPath, argc, argv);
-  } else if (action == ADD) {
-    handle_add(&libraryManager, libraryPath, argc, argv);
-  } else if (action == REMOVE) {
-    handle_remove(&libraryManager, libraryPath, argc, argv);
+  bool exitCode = 0;
+  switch (action) {
+    case SHOW:
+      exitCode = handle_show(&library, libraryPath, argc, argv);
+      break;
+    case ADD:
+      exitCode = handle_add(&library, libraryPath, argc, argv);
+      break;
+    case REMOVE:
+      exitCode = handle_remove(&library, libraryPath, argc, argv);
+      break;
+    case NONE:
+      break;
   }
 
   /* Rewrite the library file */
   if (action == REMOVE || action == ADD) {
-    libraryManager.writeFile(libraryPath);
+    library.writeToFile(libraryPath);
   }
 
-  exit(0);
+  exit(exitCode);
 }

src/manager/meson.build

@@ -1,4 +1,3 @@
 executable('kiwix-manage', ['kiwix-manage.cpp'],
   dependencies:all_deps,
-  install:true,
-  install_rpath: join_paths(get_option('prefix'), get_option('libdir')))
+  install:true)

src/meson.build

@@ -1,5 +1,4 @@
 
-subdir('installer')
 subdir('manager')
 subdir('reader')
 subdir('searcher')

src/reader/meson.build

@@ -1,4 +1,3 @@
 executable('kiwix-read', ['kiwix-read.cpp'],
   dependencies:all_deps,
-  install:true,
-  install_rpath: join_paths(get_option('prefix'), get_option('libdir')))
+  install:true)

src/searcher/kiwix-search.cpp

@@ -27,8 +27,7 @@ void usage()
 {
   cout << "Usage: kiwix-search [OPTIONS] ZIM PATTERN" << endl << endl
        << "  kiwix-search allows to find articles based on the a fulltext search pattern." << endl << endl
-       << "  ZIM is the full path of the ZIM file. This can also be a disctinct fulltext" << endl
-       << "  index directory (usually distributed with the *.idx extension)." << endl
+       << "  ZIM is the full path of the ZIM file." << endl
        << "  PATTERN is/are word(s) - or part of - to search in the ZIM." << endl << endl
        << "  -s, --suggestion\tSuggest article titles based on the few letters of the PATTERN instead of making a fulltext search. Work a bit like a completion solution." << endl
        << "  -v, --verbose\t\tGive details about the search process" << endl;
@@ -102,12 +101,8 @@ int main(int argc, char** argv)
     searcher = new kiwix::Searcher();
     searcher->add_reader(reader, "");
   } else {
-    try {
-      searcher = new kiwix::Searcher(zimPath, NULL, "");
-    } catch (...) {
-      cerr << "Unable to search through zim '" << zimPath << "'." << endl;
-      exit(1);
-    }
+    cerr << "Unable to search through zim '" << zimPath << "'." << endl;
+    exit(1);
   }
 
   /* Start the indexing */

src/searcher/meson.build

@@ -1,4 +1,3 @@
 executable('kiwix-search', ['kiwix-search.cpp'],
   dependencies:all_deps,
-  install:true,
-  install_rpath: join_paths(get_option('prefix'), get_option('libdir')))
+  install:true)

src/server/kiwix-serve.cpp

@@ -44,10 +44,10 @@ extern "C" {
 #endif
 
 #include <getopt.h>
-#include <kiwix/common/otherTools.h>
-#include <kiwix/common/pathTools.h>
-#include <kiwix/common/regexTools.h>
-#include <kiwix/common/stringTools.h>
+#include <kiwix/tools/otherTools.h>
+#include <kiwix/tools/pathTools.h>
+#include <kiwix/tools/regexTools.h>
+#include <kiwix/tools/stringTools.h>
 #include <kiwix/manager.h>
 #include <kiwix/reader.h>
 #include <kiwix/searcher.h>
@@ -67,7 +67,6 @@ extern "C" {
 #include <iostream>
 #include <map>
 #include <sstream>
-#include <thread>
 #include <string>
 #include <vector>
 #include "server-resources.h"
@@ -79,6 +78,7 @@ extern "C" {
 #include <netdb.h>
 #include <stdint.h>
 #include <sys/socket.h>
+#include <netinet/in.h>
 #include <unistd.h>
 #endif
 
@@ -92,6 +92,7 @@ using namespace std;
 
 static bool noLibraryButtonFlag = false;
 static bool noSearchBarFlag = false;
+static bool noDateAliasesFlag = false;
 static string welcomeHTML;
 static string catalogOpenSearchDescription;
 static std::atomic_bool isVerbose(false);
@@ -100,16 +101,29 @@ static std::map<std::string, std::string> extMimeTypes;
 static std::map<std::string, kiwix::Reader*> readers;
 static std::map<std::string, kiwix::Searcher*> searchers;
 static kiwix::Searcher* globalSearcher = nullptr;
-static kiwix::Manager libraryManager;
+static kiwix::Library library;
 static pthread_mutex_t searchLock = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t compressorLock = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t regexLock = PTHREAD_MUTEX_INITIALIZER;
+static unsigned int nb_threads = 4;
+
+std::pair<kiwix::Reader*, kiwix::Searcher*>
+get_from_humanReadableBookId(const std::string& humanReadableBookId) {
+  kiwix::Searcher* searcher
+        = searchers.find(humanReadableBookId) != searchers.end()
+              ? searchers.find(humanReadableBookId)->second
+              : globalSearcher;
+  kiwix::Reader* reader = readers.find(humanReadableBookId) != readers.end()
+                                ? readers.find(humanReadableBookId)->second
+                                : NULL;
+  return std::pair<kiwix::Reader*, kiwix::Searcher*>(reader, searcher);
+}
 
 /* Try to get the mimeType from the file extension */
 static std::string getMimeTypeForFile(const std::string& filename)
 {
   std::string mimeType = "text/plain";
-  unsigned int pos = filename.find_last_of(".");
+  auto pos = filename.find_last_of(".");
 
   if (pos != std::string::npos) {
     std::string extension = filename.substr(pos + 1);
@@ -138,7 +152,10 @@ static bool startswith(const std::string& base, const std::string& start)
 
 void introduceTaskbar(string& content, const string& humanReadableBookId)
 {
+  string zimTitle;
+
   pthread_mutex_lock(&regexLock);
+
   if (!noSearchBarFlag) {
     content = appendToFirstOccurence(
         content,
@@ -160,10 +177,18 @@ void introduceTaskbar(string& content, const string& humanReadableBookId)
              RESOURCE::taskbar_html_part,
              humanReadableBookId,
              "__CONTENT__"));
+
+      auto reader = get_from_humanReadableBookId(humanReadableBookId).first;
+      if (reader != nullptr) {
+        zimTitle = reader->getTitle();
+      }
     }
-    content = replaceRegex(content, rootLocation, "__ROOT_LOCATION__");
-    content = replaceRegex(content, replaceRegex(humanReadableBookId, "%26", "&"), "__CONTENT_ESCAPED__");
   }
+
+  content = replaceRegex(content, rootLocation, "__ROOT_LOCATION__");
+  content = replaceRegex(content, replaceRegex(zimTitle, "%26", "&"), "__ZIM_TITLE__");
+  content = replaceRegex(content, replaceRegex(humanReadableBookId, "%26", "&"), "__CONTENT_ESCAPED__");
+
   pthread_mutex_unlock(&regexLock);
 }
 
@@ -352,7 +377,7 @@ static struct MHD_Response* build_callback_response_from_entry(
   MHD_add_response_header(response, MHD_HTTP_HEADER_CONTENT_RANGE, oss.str().c_str());
 
   MHD_add_response_header(response, MHD_HTTP_HEADER_CONTENT_LENGTH,
-    std::to_string(range_len).c_str());
+    kiwix::to_string(range_len).c_str());
 
   /* Specify the mime type */
   MHD_add_response_header(
@@ -369,18 +394,6 @@ static struct MHD_Response* build_callback_response_from_entry(
   return response;
 }
 
-std::pair<kiwix::Reader*, kiwix::Searcher*>
-get_from_humanReadableBookId(const std::string& humanReadableBookId) {
-  kiwix::Searcher* searcher
-        = searchers.find(humanReadableBookId) != searchers.end()
-              ? searchers.find(humanReadableBookId)->second
-              : globalSearcher;
-  kiwix::Reader* reader = readers.find(humanReadableBookId) != readers.end()
-                                ? readers.find(humanReadableBookId)->second
-                                : NULL;
-  return std::pair<kiwix::Reader*, kiwix::Searcher*>(reader, searcher);
-}
-
 static struct MHD_Response* handle_meta(RequestContext* request)
 {
   std::string humanReadableBookId;
@@ -443,7 +456,7 @@ static struct MHD_Response* handle_suggest(RequestContext* request)
     humanReadableBookId = request->get_argument("content");
     term = request->get_argument("term");
   } catch (const std::out_of_range&) {
-    return build_homepage(request);
+    return build_404(request, "");
   }
 
   if (isVerbose.load()) {
@@ -526,9 +539,9 @@ static struct MHD_Response* handle_search(RequestContext* request)
 
   /* Retrive geo search */
   bool has_geo_query = false;
-  float latitude;
-  float longitude;
-  float distance;
+  float latitude = 0;
+  float longitude = 0;
+  float distance = 0;
   try {
     latitude = request->get_argument<float>("latitude");
     longitude = request->get_argument<float>("longitude");
@@ -628,12 +641,12 @@ static struct MHD_Response* handle_random(RequestContext* request)
   try {
     humanReadableBookId = request->get_argument("content");
   } catch (const std::out_of_range&) {
-    return build_homepage(request);
+    return build_404(request, "");
   }
 
   auto reader = get_from_humanReadableBookId(humanReadableBookId).first;
   if (reader == nullptr) {
-    return build_homepage(request);
+    return build_404(request, "");
   }
 
   try {
@@ -673,33 +686,58 @@ static struct MHD_Response* handle_catalog(RequestContext* request)
     kiwix::OPDSDumper opdsDumper;
     opdsDumper.setRootLocation(rootLocation);
     opdsDumper.setSearchDescriptionUrl("catalog/searchdescription.xml");
+    opdsDumper.setId(kiwix::to_string(uuid));
+    opdsDumper.setLibrary(&library);
     mimeType = "application/atom+xml;profile=opds-catalog;kind=acquisition; charset=utf-8";
-    kiwix::Library library_to_dump;
+    std::vector<std::string> bookIdsToDump;
     if (url == "root.xml") {
       opdsDumper.setTitle("All zims");
       uuid = zim::Uuid::generate(host);
-      library_to_dump = libraryManager.cloneLibrary();
+
+      bookIdsToDump = library.listBooksIds(
+        kiwix::VALID|kiwix::LOCAL|kiwix::REMOTE);
     } else if (url == "search") {
       std::string query;
+      std::string language;
+      std::vector<std::string> tags;
+      size_t count(10);
+      size_t startIndex(0);
       try {
         query = request->get_argument("q");
-      } catch (const std::out_of_range&) {
-        return build_404(request, "");
-      }
+      } catch (const std::out_of_range&) {}
+      try {
+        language = request->get_argument("lang");
+      } catch (const std::out_of_range&) {}
+      try {
+        count = stoul(request->get_argument("count"));
+      } catch (...) {}
+      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();
-      library_to_dump = libraryManager.filter(query);
+      bookIdsToDump = library.listBooksIds(
+        kiwix::VALID|kiwix::LOCAL|kiwix::REMOTE,
+        kiwix::UNSORTED,
+        query,
+        language,
+        "", // creator
+        "", // publisher
+        tags);
+      auto totalResults = bookIdsToDump.size();
+      bookIdsToDump.erase(bookIdsToDump.begin(), bookIdsToDump.begin()+startIndex);
+      if (count>0 && bookIdsToDump.size() > count) {
+        bookIdsToDump.resize(count);
+      }
+      opdsDumper.setOpenSearchInfo(totalResults, startIndex, bookIdsToDump.size());
     } else {
       return build_404(request, "");
     }
 
-    {
-      std::stringstream ss;
-      ss << uuid;
-      opdsDumper.setId(ss.str());
-    }
-    opdsDumper.setLibrary(library_to_dump);
-    content = opdsDumper.dumpOPDSFeed();
+    content = opdsDumper.dumpOPDSFeed(bookIdsToDump);
   }
 
   bool deflated = request->can_compress() && compress_content(content, mimeType);
@@ -728,14 +766,30 @@ static struct MHD_Response* handle_content(RequestContext* request)
 
   auto reader = get_from_humanReadableBookId(humanReadableBookId).first;
   if (reader == nullptr) {
-    return build_homepage(request);
+    if (humanReadableBookId.size() == 0){
+        return build_homepage(request);
+    } else {
+        return build_404(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());
@@ -763,7 +817,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/",
@@ -771,10 +824,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) {
@@ -842,7 +891,7 @@ static int accessHandlerCallback(void* cls,
   request.httpResponseCode = request.has_range() ? MHD_HTTP_PARTIAL_CONTENT : MHD_HTTP_OK;
 
   if (! request.is_valid_url()) {
-    response = build_homepage(&request);
+    response = build_404(&request, "");
   } else {
     if (startswith(request.get_url(), "/skin/")) {
       response = handle_skin(&request);
@@ -875,12 +924,60 @@ static int accessHandlerCallback(void* cls,
   return ret;
 }
 
+bool hasHumanReadableIdCollision(const string &humanReadableId,
+                                 const string &zimPath)
+{
+  if (readers.find(humanReadableId) != readers.end()) {
+    cerr << "Path collision: " << readers[humanReadableId]->getZimFilePath()
+         << " and " << zimPath << " can't share the same URL path /"
+         << humanReadableId << "/. Therefore, only "
+         << zimPath << " will be served." << endl;
+    return true;
+  }
+  return false;
+}
+
+void usage()
+{
+  std::cout << "Usage:" << std::endl
+            << "\tkiwix-serve [OPTIONS] ZIM_PATH+" << std::endl
+            << "\tkiwix-serve --library [OPTIONS] LIBRARY_PATH" << std::endl
+            << std::endl
+
+            << "Purpose:" << std::endl
+            << "\tDeliver ZIM file articles via HTTP"
+            << std::endl << std::endl
+
+            << "Mandatory arguments:" << std::endl
+            << "\tLIBRARY_PATH\t\tis the XML library file path listing ZIM file to serve. To be used only with the --library argument."
+            << std::endl
+            << "\tZIM_PATH\t\tis the path of a ZIM file."
+            << std::endl << std::endl
+
+            << "Optional arguments:" << std::endl
+            << "\t-a, --attachToProcess\texit if given process id is not running anymore" << std::endl
+            << "\t-d, --daemon\t\tdetach the HTTP server daemon from the main process" << std::endl
+            << "\t-f, --interface\t\tlisten only on this interface, all available ones otherwise (POSIX only)" << std::endl
+            << "\t-m, --nolibrarybutton\tdo not print the builtin home button in the builtin top bar overlay" << std::endl
+            << "\t-n, --nosearchbar\tdo not print the builtin bar overlay on the top of each served page" << std::endl
+            << "\t-p, --port\t\tTCP port on which to listen to HTTP requests (default: 80)" << std::endl
+            << "\t-r, --urlRootLocation\tURL prefix on which the content should be made available (default: /)" << std::endl
+            << "\t-t, --threads\t\tnumber of threads to run in parallel (default: " << nb_threads << ")" << std::endl
+            << "\t-v, --verbose\t\tprint debug log to STDOUT" << std::endl
+            << "\t-z, --nodatealiases\tcreate URL aliases for each content by removing the date" << std::endl
+            << std::endl
+
+            << "Documentation:" << std::endl
+            << "\tSource code\t\thttps://github.com/kiwix/kiwix-tools" << std::endl
+            << "\tMore info\t\thttps://wiki.kiwix.org/wiki/Kiwix-serve" << std::endl
+            << std::endl;
+}
+
 int main(int argc, char** argv)
 {
   struct MHD_Daemon* daemon;
   vector<string> zimPathes;
   string libraryPath;
-  string indexPath;
   string rootPath;
   string interface;
   int serverPort = 80;
@@ -888,15 +985,14 @@ int main(int argc, char** argv)
   int libraryFlag = false;
   string PPIDString;
   unsigned int PPID = 0;
-  unsigned int nb_threads = std::thread::hardware_concurrency();
 
   static struct option long_options[]
       = {{"daemon", no_argument, 0, 'd'},
          {"verbose", no_argument, 0, 'v'},
          {"library", no_argument, 0, 'l'},
          {"nolibrarybutton", no_argument, 0, 'm'},
+         {"nodatealiases", no_argument, 0, 'z'},
          {"nosearchbar", no_argument, 0, 'n'},
-         {"index", required_argument, 0, 'i'},
          {"attachToProcess", required_argument, 0, 'a'},
          {"port", required_argument, 0, 'p'},
          {"interface", required_argument, 0, 'f'},
@@ -908,7 +1004,7 @@ int main(int argc, char** argv)
   while (true) {
     int option_index = 0;
     int c
-        = getopt_long(argc, argv, "mndvli:a:p:f:t:r:", long_options, &option_index);
+        = getopt_long(argc, argv, "mndvla:p:f:t:r:", long_options, &option_index);
 
     if (c != -1) {
       switch (c) {
@@ -924,12 +1020,12 @@ int main(int argc, char** argv)
         case 'n':
           noSearchBarFlag = true;
           break;
+        case 'z':
+          noDateAliasesFlag = true;
+          break;
         case 'm':
           noLibraryButtonFlag = true;
           break;
-        case 'i':
-          indexPath = optarg;
-          break;
         case 'p':
           serverPort = atoi(optarg);
           break;
@@ -959,43 +1055,26 @@ int main(int argc, char** argv)
           break;
       }
     } else {
-      if (optind <= argc) {
+      if (optind < argc) {
         if (libraryFlag) {
           libraryPath = argv[optind++];
         } else {
           while (optind < argc)
             zimPathes.push_back(std::string(argv[optind++]));
         }
-        break;
       }
+      break;
     }
   }
 
   /* Print usage)) if necessary */
   if (zimPathes.empty() && libraryPath.empty()) {
-    cerr << "Usage: kiwix-serve [--index=INDEX_PATH] [--port=PORT] [--verbose] "
-            "[--nosearchbar] [--nolibrarybutton] [--daemon] "
-            "[--attachToProcess=PID] [--interface=IF_NAME] "
-            "[--urlRootLocation=/URL_ROOT] "
-            "[--threads=NB_THREAD(" << nb_threads << ")] ZIM_PATH+"
-         << endl;
-    cerr << "       kiwix-serve --library [--port=PORT] [--verbose] [--daemon] "
-            "[--nosearchbar] [--nolibrarybutton] [--attachToProcess=PID] "
-            "[--interface=IF_NAME] [--urlRootLocation=/URL_ROOT] "
-            "[--threads=NB_THREAD(" << nb_threads << ")] LIBRARY_PATH "
-         << endl;
-    cerr << "\n      If you set more than one ZIM_PATH, you cannot set a "
-            "INDEX_PATH."
-         << endl;
-    exit(1);
-  }
-
-  if ((zimPathes.size() > 1) && !indexPath.empty()) {
-    cerr << "You cannot set a indexPath if you also set several zimPathes";
+    usage();
     exit(1);
   }
 
   /* Setup the library manager and get the list of books */
+  kiwix::Manager manager(&library);
   if (libraryFlag) {
     vector<string> libraryPaths = kiwix::split(libraryPath, ";");
     vector<string>::iterator itr;
@@ -1009,7 +1088,7 @@ int main(int argc, char** argv)
               = isRelativePath(*itr)
                     ? computeAbsolutePath(getCurrentDirectory(), *itr)
                     : *itr;
-          retVal = libraryManager.readFile(libraryPath, true);
+          retVal = manager.readFile(libraryPath, true);
         } catch (...) {
           retVal = false;
         }
@@ -1023,74 +1102,60 @@ int main(int argc, char** argv)
     }
 
     /* Check if the library is not empty (or only remote books)*/
-    if (libraryManager.getBookCount(true, false) == 0) {
+    if (library.getBookCount(true, false) == 0) {
       cerr << "The XML library file '" << libraryPath
            << "' is empty (or has only remote books)." << endl;
     }
   } else {
     std::vector<std::string>::iterator it;
     for (it = zimPathes.begin(); it != zimPathes.end(); it++) {
-      if (!libraryManager.addBookFromPath(*it, *it, "", false)) {
+      if (!manager.addBookFromPath(*it, *it, "", false)) {
         cerr << "Unable to add the ZIM file '" << *it
              << "' to the internal library." << endl;
         exit(1);
       }
     }
-    if (!indexPath.empty()) {
-      libraryManager.setBookIndex(libraryManager.getBooksIds()[0], indexPath);
-    }
   }
 
   /* Instance the readers and searcher and build the corresponding maps */
-  vector<string> booksIds = libraryManager.getBooksIds();
-  vector<string>::iterator itr;
-  kiwix::Book currentBook;
+  vector<string> booksIds = library.listBooksIds(kiwix::LOCAL);
   globalSearcher = new kiwix::Searcher();
   globalSearcher->setProtocolPrefix(rootLocation + "/");
   globalSearcher->setSearchProtocolPrefix(rootLocation + "/" + "search?");
-  for (itr = booksIds.begin(); itr != booksIds.end(); ++itr) {
-    bool zimFileOk = false;
-    libraryManager.getBookById(*itr, currentBook);
-    std::string zimPath = currentBook.pathAbsolute;
+  for (auto& bookId: booksIds) {
+    auto& currentBook = library.getBookById(bookId);
+    auto zimPath = currentBook.getPath();
 
-    if (!zimPath.empty()) {
-      indexPath = currentBook.indexPathAbsolute;
+    /* Instanciate the ZIM file handler */
+    kiwix::Reader* reader = NULL;
+    try {
+      reader = new kiwix::Reader(zimPath);
+    } catch (...) {
+      cerr << "Unable to open the ZIM file '" << zimPath << "'." << endl;
+      continue;
+    }
 
-      /* Instanciate the ZIM file handler */
-      kiwix::Reader* reader = NULL;
-      try {
-        reader = new kiwix::Reader(zimPath);
-        zimFileOk = true;
-      } catch (...) {
-        cerr << "Unable to open the ZIM file '" << zimPath << "'." << endl;
-      }
+    auto humanReadableId = currentBook.getHumanReadableIdFromPath();
+    hasHumanReadableIdCollision(humanReadableId, currentBook.getPath());
+    readers[humanReadableId] = reader;
 
-      if (zimFileOk) {
-        string humanReadableId = currentBook.getHumanReadableIdFromPath();
-        readers[humanReadableId] = reader;
+    if (reader->hasFulltextIndex()) {
+      kiwix::Searcher* searcher = new kiwix::Searcher(humanReadableId);
+      searcher->setProtocolPrefix(rootLocation + "/");
+      searcher->setSearchProtocolPrefix(rootLocation + "/" + "search?");
+      searcher->add_reader(reader, humanReadableId);
+      globalSearcher->add_reader(reader, humanReadableId);
+      searchers[humanReadableId] = searcher;
+    } else {
+      searchers[humanReadableId] = nullptr;
+    }
 
-        if ( reader->hasFulltextIndex()) {
-          kiwix::Searcher* searcher = new kiwix::Searcher(humanReadableId);
-          searcher->setProtocolPrefix(rootLocation + "/");
-          searcher->setSearchProtocolPrefix(rootLocation + "/" + "search?");
-          searcher->add_reader(reader, humanReadableId);
-          globalSearcher->add_reader(reader, humanReadableId);
-          searchers[humanReadableId] = searcher;
-        } else if ( !indexPath.empty() ) {
-          try {
-            kiwix::Searcher* searcher = new kiwix::Searcher(indexPath, reader, humanReadableId);
-            searcher->setProtocolPrefix(rootLocation + "/");
-            searcher->setSearchProtocolPrefix(rootLocation + "/" + "search?");
-            searchers[humanReadableId] = searcher;
-          } catch (...) {
-            cerr << "Unable to open the search index '" << indexPath << "'."
-                 << endl;
-            searchers[humanReadableId] = nullptr;
-          }
-        } else {
-            searchers[humanReadableId] = nullptr;
-        }
-      }
+    /* Deal with noDateAliases */
+    if (noDateAliasesFlag) {
+      string alias = replaceRegex(humanReadableId, "", "_[[:digit:]]{4}-[[:digit:]]{2}$");
+      hasHumanReadableIdCollision(alias, currentBook.getPath());
+      readers[alias] = readers[humanReadableId];
+      searchers[alias] = searchers[humanReadableId];
     }
   }
 
@@ -1098,24 +1163,25 @@ int main(int argc, char** argv)
   string welcomeBooksHtml
       = ""
         "<div class='book__list'>";
-  for (itr = booksIds.begin(); itr != booksIds.end(); ++itr) {
-    libraryManager.getBookById(*itr, currentBook);
+  for (auto& bookId: booksIds) {
+    auto& currentBook = library.getBookById(bookId);
 
-    if (!currentBook.path.empty()
+    if (!currentBook.getPath().empty()
         && readers.find(currentBook.getHumanReadableIdFromPath())
                != readers.end()) {
       welcomeBooksHtml += ""
 "<a href='" + rootLocation + "/" + currentBook.getHumanReadableIdFromPath() + "/'>"
     "<div class='book'>"
-        "<div class='book__background' style='background-image: url(data:" + currentBook.faviconMimeType+ ";base64," + currentBook.favicon + ");'>"
-            "<div class='book__title' title='" + currentBook.title + "'>" + currentBook.title + "</div>"
-            "<div class='book__description' title='" + currentBook.description + "'>" + currentBook.description + "</div>"
+        "<div class='book__background' style=\"background-image: url('/meta?content="
+             + currentBook.getHumanReadableIdFromPath() + "&name=favicon');\">"
+            "<div class='book__title' title='" + currentBook.getTitle() + "'>" + currentBook.getTitle() + "</div>"
+            "<div class='book__description' title='" + currentBook.getDescription() + "'>" + currentBook.getDescription() + "</div>"
             "<div class='book__info'>"
-                "" + kiwix::beautifyInteger(atoi(currentBook.articleCount.c_str())) + " articles, " + kiwix::beautifyInteger(atoi(currentBook.mediaCount.c_str())) + " medias"
+                "" + kiwix::beautifyInteger(currentBook.getArticleCount()) + " articles, " + kiwix::beautifyInteger(currentBook.getMediaCount()) + " medias"
             "</div>"
         "</div>"
     "</div>"
-"</a>";
+"</a>\n";
     }
   }
   welcomeBooksHtml += ""
@@ -1226,7 +1292,10 @@ int main(int argc, char** argv)
       exit(1);
     }
 
-    daemon = MHD_start_daemon(MHD_USE_POLL_INTERNALLY,
+    int flags = MHD_USE_POLL_INTERNALLY;
+    if (isVerbose.load())
+        flags |= MHD_USE_DEBUG;
+    daemon = MHD_start_daemon(flags,
                               serverPort,
                               NULL,
                               NULL,
@@ -1241,7 +1310,15 @@ int main(int argc, char** argv)
 #endif
 
   } else {
-    daemon = MHD_start_daemon(MHD_USE_POLL_INTERNALLY,
+#ifdef _WIN32
+    int flags = MHD_USE_SELECT_INTERNALLY;
+#else
+    int flags = MHD_USE_POLL_INTERNALLY;
+#endif
+    if (isVerbose.load())
+        flags |= MHD_USE_DEBUG;
+
+    daemon = MHD_start_daemon(flags,
                               serverPort,
                               NULL,
                               NULL,

src/server/meson.build

@@ -4,5 +4,4 @@ sources += server_resources
 
 executable('kiwix-serve', sources,
   dependencies:all_deps,
-  install:true,
-  install_rpath: join_paths(get_option('prefix'), get_option('libdir')))
+  install:true)

src/server/request_context.cpp

@@ -23,13 +23,13 @@
 #include <string.h>
 #include <stdexcept>
 #include <sstream>
+#include <cstdio>
 
 RequestContext::RequestContext(struct MHD_Connection* connection,
                                std::string rootLocation,
                                const std::string& _url,
                                const std::string& method,
                                const std::string& version) :
-  connection(connection),
   full_url(_url),
   url(_url),
   valid_url(true),
@@ -196,16 +196,6 @@ std::string RequestContext::get_argument(const std::string& name) {
   return arguments.at(name);
 }
 
-template<>
-unsigned int RequestContext::get_argument(const std::string& name) {
-  return std::stoi(arguments.at(name).c_str());
-}
-
-template<>
-float RequestContext::get_argument(const std::string& name) {
-  return std::stof(arguments.at(name).c_str());
-}
-
 std::string RequestContext::get_header(const std::string& name) {
   return headers.at(name);
 }

src/server/request_context.h

@@ -23,6 +23,7 @@
 #define REQUEST_CONTEXT_H
 
 #include <string>
+#include <sstream>
 #include <map>
 #include <stdexcept>
 
@@ -62,7 +63,13 @@ class RequestContext {
 
     std::string get_header(const std::string& name);
     template<typename T=std::string>
-    T get_argument(const std::string& name);
+    T get_argument(const std::string& name) {
+        std::istringstream stream(arguments.at(name));
+        T v;
+        stream >> v;
+        return v;
+    }
+
 
     RequestMethod get_method();
     std::string get_url();
@@ -78,7 +85,6 @@ class RequestContext {
     int httpResponseCode;
 
   private:
-    struct MHD_Connection* connection;
     std::string full_url;
     std::string url;
     bool valid_url;
@@ -96,5 +102,7 @@ class RequestContext {
     static int fill_argument(void *, enum MHD_ValueKind, const char*, const char*);
 };
 
+template<> std::string RequestContext::get_argument(const std::string& name);
+
 
 #endif //REQUEST_CONTEXT_H

static/server/global_taskbar.html.part

@@ -4,7 +4,7 @@
       <div class="kiwix_searchform">
         <form class="kiwixsearch" method="GET" action="__ROOT_LOCATION__/search" id="kiwixsearchform">
           <input autocomplete="off" class="ui-autocomplete-input" id="kiwixsearchbox" name="pattern" type="text">
-          <input type="submit" value="Search">
+          <input type="submit" value="&#x1f50d;">
         </form>
       </div>
     </div>

static/server/home.html.tmpl

@@ -18,7 +18,7 @@
 	        background-size:16px 16px;
           	margin-left: auto;
         	margin-right: auto;
-        	max-width: 65.8em;
+        	max-width: 1100px;
 	}
 	.book__list { text-align: center; }
 	.book {
@@ -40,16 +40,16 @@
 	}
 	.book__info { line-height: 18px; color: #777; font-weight: bold; font-size: 13px; }
   </style>
-<script>
-$(function() {
-$( "#accordion" ).accordion();
-});
-</script>
 </head>
 <body class="kiwix">
 
 <div class="kiwix">
   __BOOKS__
 </div>
+
+<div id="kiwixfooter">
+  Powered by <a href="https://kiwix.org">Kiwix</a>
+</div>
+
 </body>
 </html>

static/server/opensearchdescription.xml

@@ -4,5 +4,6 @@
   <Description>Search zim files in the catalog.</Description>
   <Url type="application/atom+xml;profile=opds-catalog" 
        xmlns:atom="http://www.w3.org/2005/Atom"
-       template="/__ROOT_LOCATION__/catalog/search?q={searchTerms}"/>
+       indexOffset="0"
+       template="/__ROOT_LOCATION__/catalog/search?q={searchTerms}&lang={language}&count={count}&start={startIndex}"/>
 </OpenSearchDescription>

static/server/taskbar.css

@@ -11,6 +11,11 @@
     float: left;
 }
 
+#kiwixfooter {
+    text-align: center;
+    margin-top: 1em;
+}
+
 .height_separator {
     height: 3em;
 }

static/server/taskbar.html.part

@@ -2,15 +2,15 @@
   <span id="kiwixtoolbar" class="ui-widget-header">
     <div class="kiwix_centered">
       <div class="kiwix_button_wrapper">
-        <a id="kiwix_serve_taskbar_library_button" href="__ROOT_LOCATION__/"><button>Library</button></a>
-        <a id="kiwix_serve_taskbar_home_button" href="__ROOT_LOCATION__/__CONTENT__/"><button>Home</button></a>
-        <a id="kiwix_serve_taskbar_random_button" href="__ROOT_LOCATION__/random?content=__CONTENT_ESCAPED__"><button>Random</button></a>
+        <a id="kiwix_serve_taskbar_library_button" href="__ROOT_LOCATION__/"><button>&#x1f3e0;</button></a>
+        <a id="kiwix_serve_taskbar_home_button" href="__ROOT_LOCATION__/__CONTENT__/"><button>__ZIM_TITLE__</button></a>
+        <a id="kiwix_serve_taskbar_random_button" href="__ROOT_LOCATION__/random?content=__CONTENT_ESCAPED__"><button>&#x1F3B2;</button></a>
       </div>
       <div class="kiwix_searchform">
         <form class="kiwixsearch" method="GET" action="__ROOT_LOCATION__/search" id="kiwixsearchform">
           <input type="hidden" name="content" value="__CONTENT__" />
           <input autocomplete="off" class="ui-autocomplete-input" id="kiwixsearchbox" name="pattern" type="text">
-          <input type="submit" value="Search">
+          <input type="submit" value="&#x1f50d;">
         </form>
       </div>
     </div>

travis/compile.sh

@@ -24,6 +24,6 @@ esac
 cd ${TRAVIS_BUILD_DIR}
 export PKG_CONFIG_PATH=${INSTALL_DIR}/lib/x86_64-linux-gnu/pkgconfig
 export PATH=${INSTALL_DIR}/bin:$PATH
-meson . build -Dctpp2-install-prefix=${INSTALL_DIR} ${MESON_OPTION}
+meson . build ${MESON_OPTION}
 cd build
 ninja

travis/install_deps.sh

@@ -3,33 +3,36 @@
 set -e
 
 REPO_NAME=${TRAVIS_REPO_SLUG#*/}
-ARCHIVE_NAME=deps_${TRAVIS_OS_NAME}_${PLATFORM}_${REPO_NAME}.tar.gz
+ARCHIVE_NAME=deps_linux_xenial_${PLATFORM}_${REPO_NAME}.tar.xz
 
 # Packages.
 case ${PLATFORM} in
      "native_static")
-         PACKAGES="gcc cmake libbz2-dev ccache zlib1g-dev uuid-dev libctpp2-dev"
+         PACKAGES="gcc python3.5 cmake libbz2-dev ccache zlib1g-dev uuid-dev"
          ;;
      "native_dyn")
-         PACKAGES="gcc cmake libbz2-dev ccache zlib1g-dev uuid-dev libctpp2-dev libmicrohttpd-dev"
+         PACKAGES="gcc python3.5 cmake libbz2-dev ccache zlib1g-dev uuid-dev libmicrohttpd-dev"
          ;;
      "win32_static")
-         PACKAGES="g++-mingw-w64-i686 gcc-mingw-w64-i686 gcc-mingw-w64-base mingw-w64-tools ccache"
+         PACKAGES="g++-mingw-w64-i686 gcc-mingw-w64-i686 gcc-mingw-w64-base mingw-w64-tools ccache python3.5"
          ;;
      "win32_dyn")
-         PACKAGES="g++-mingw-w64-i686 gcc-mingw-w64-i686 gcc-mingw-w64-base mingw-w64-tools ccache"
+         PACKAGES="g++-mingw-w64-i686 gcc-mingw-w64-i686 gcc-mingw-w64-base mingw-w64-tools ccache python3.5"
          ;;
      "android_arm")
-         PACKAGES="gcc cmake ccache"
+         PACKAGES="gcc python3.5 cmake ccache"
          ;;
      "android_arm64")
-         PACKAGES="gcc cmake ccache"
+         PACKAGES="gcc python3.5 cmake ccache"
          ;;
 esac
 
 sudo apt-get update -qq
 sudo apt-get install -qq python3-pip ${PACKAGES}
-sudo pip3 install meson==0.43.0
+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==0.49.2
 
 # Ninja
 cd $HOME
@@ -42,6 +45,5 @@ sudo cp ninja /bin
 # Dependencies comming from kiwix-build.
 cd ${HOME}
 wget http://tmp.kiwix.org/ci/${ARCHIVE_NAME}
-mkdir -p BUILD_${PLATFORM}
-cd BUILD_${PLATFORM}
 tar xf ${HOME}/${ARCHIVE_NAME}
+sudo ln -s travis ../ci_builder