Run the CI on pull request.

This is needed to have the CI run on pull request created from of fork respository. We don't need to launch the CI on push : - It will also be build on pull_request. - The CI does check code only (no publication,...)
2026-02-23 01:35:54 -05:00 · 2020-08-12 11:17:08 +02:00
147 changed files with 3285 additions and 12239 deletions
--- a/.github/workflows/check_pr.yml
+++ b/.github/workflows/check_pr.yml
@@ -1,6 +1,6 @@
-name: CI
+name: Check PR

-on: [push]
+on: [pull_request]

 jobs:
  Macos:
@@ -8,20 +8,20 @@ jobs:
    steps:
      - name: Checkout code
        uses: actions/checkout@v1
-      - name: Setup python 3.10
-        uses: actions/setup-python@v2
+      - name: Setup python 3.5
+        uses: actions/setup-python@v1
        with:
-          python-version: '3.10'
+          python-version: '3.5'
      - name: Install packages
-        run: |
-          brew update
-          brew install gcovr pkg-config ninja
+        uses: mstksg/get-package@v1
+        with:
+          brew: gcovr pkg-config ninja
      - name: Install python modules
        run: pip3 install meson==0.49.2 pytest
      - name: Install deps
        shell: bash
        run: |
-          ARCHIVE_NAME=deps2_osx_native_dyn_libkiwix.tar.xz
+          ARCHIVE_NAME=deps2_osx_native_dyn_kiwix-lib.tar.xz
          wget -O- http://tmp.kiwix.org/ci/${ARCHIVE_NAME} | tar -xJ -C $HOME
      - name: Compile
        shell: bash
@@ -37,8 +37,17 @@ jobs:
          export LD_LIBRARY_PATH=$HOME/BUILD_native_dyn/INSTALL/lib:$HOME/BUILD_native_dyn/INSTALL/lib64
          cd build
          meson test --verbose
+          ninja coverage
        env:
          SKIP_BIG_MEMORY_TEST: 1
+      - name: Publish coverage
+        shell: bash
+        run: |
+          curl https://codecov.io/bash -o codecov.sh
+          bash codecov.sh -n osx_native_dyn -Z
+          rm codecov.sh
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

  Linux:
    strategy:
@@ -85,7 +94,7 @@ jobs:
      HOME: /home/runner
    runs-on: ubuntu-latest
    container:
-      image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-31"
+      image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-26"
    steps:
    - name: Extract branch name
      shell: bash
@@ -106,7 +115,7 @@ jobs:
    - name: Install deps
      shell: bash
      run: |
-        ARCHIVE_NAME=deps2_${OS_NAME}_${{matrix.target}}_libkiwix.tar.xz
+        ARCHIVE_NAME=deps2_${OS_NAME}_${{matrix.target}}_kiwix-lib.tar.xz
        wget -O- http://tmp.kiwix.org/ci/${ARCHIVE_NAME} | tar -xJ -C /home/runner
    - name: Compile
      shell: bash
@@ -125,7 +134,7 @@ jobs:
        if [[ "${{matrix.target}}" =~ android_.* ]]; then
          MESON_OPTION="$MESON_OPTION -Dandroid=true"
        fi
-        cd $HOME/libkiwix
+        cd $HOME/kiwix-lib
        meson . build ${MESON_OPTION}
        cd build
        ninja
@@ -136,7 +145,7 @@ jobs:
      if: startsWith(matrix.target, 'native_')
      shell: bash
      run: |
-        cd $HOME/libkiwix/build
+        cd $HOME/kiwix-lib/build
        meson test --verbose
        ninja coverage
      env:
@@ -145,7 +154,7 @@ jobs:
    - name: Publish coverage
      shell: bash
      run: |
-        cd $HOME/libkiwix
+        cd $HOME/kiwix-lib
        curl https://codecov.io/bash -o codecov.sh
        bash codecov.sh -n "${OS_NAME}_${{matrix.target}}" -Z
        rm codecov.sh
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -7,11 +7,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        distro:
-          - ubuntu-jammy
-          - ubuntu-impish
-          - ubuntu-focal
-          - ubuntu-bionic
+        distro: [ubuntu-groovy, ubuntu-focal]
    steps:
      - uses: actions/checkout@v2

@@ -34,18 +30,10 @@ jobs:
          email: release+launchpad@kiwix.org
          distro: ${{ matrix.distro }}

-      - uses: legoktm/gh-action-build-deb@ubuntu-jammy
-        if: matrix.distro == 'ubuntu-jammy'
-        name: Build package for ubuntu-jammy
-        id: build-ubuntu-jammy
-        with:
-          args: --no-sign
-          ppa: ${{ steps.ppa.outputs.ppa }}
-
-      - uses: legoktm/gh-action-build-deb@ubuntu-impish
-        if: matrix.distro == 'ubuntu-impish'
-        name: Build package for ubuntu-impish
-        id: build-ubuntu-impish
+      - uses: legoktm/gh-action-build-deb@ubuntu-groovy
+        if: matrix.distro == 'ubuntu-groovy'
+        name: Build package for ubuntu-groovy
+        id: build-ubuntu-groovy
        with:
          args: --no-sign
          ppa: ${{ steps.ppa.outputs.ppa }}
@@ -58,14 +46,6 @@ jobs:
          args: --no-sign
          ppa: ${{ steps.ppa.outputs.ppa }}

-      - uses: legoktm/gh-action-build-deb@ubuntu-bionic
-        if: matrix.distro == 'ubuntu-bionic'
-        name: Build package for ubuntu-bionic
-        id: build-ubuntu-bionic
-        with:
-          args: --no-sign
-          ppa: ${{ steps.ppa.outputs.ppa }}
-
      - uses: actions/upload-artifact@v2
        with:
          name: Packages for ${{ matrix.distro }}
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,3 @@ subprojects/googletest-release*
 *.class
 build/
 .vscode/
-builddir/
-.cache/
-.clangd/
--- a/107
+++ b/107
@@ -1,110 +1,3 @@
-libkiwix 10.0.1
-===============
-
- * [server] The catalog search interpret `count=0` as no limit.
-   This was the case for a long time. This was changed unintentionally
-   (@veloman-yunkan #686)
- * [server] Correctly generere a human friendly title in the server frontend.
-   (@juuz0 #687, @kelson42 #689)
- * [server] Fix download button if there is no url do download from.
-   (@juuz0 #691)
- * Add non-minified isotope.pkdg.js
-   Needed for debian packaging as we need the source and minified version is
-   not the source (@legoktm #693)
- * [server] Add a tooltip with the full language for the lang tag.
- * CI fixes (@kelson42 @legoktm)
-
-libkiwix 10.0.0
-===============
-
- This release is huge release.
- The project has been renamed to libkiwix, it is more coherent with the library name.
-
- * Server front page :
-  - Use js in the front page to display the available book,
-     using the OPDS stream as source. The front page is now populated only with
-     the visible books and user can search for books. (@MananJethwany #530, #541, #534)
-     (@kelson42 #628)
-  - Revamp css (@MananJethwany #559)
-  - Correctly Convert 3iso language code to 2iso (@juuz0 #672)
-
- * Server suggestions search :
-  - Add pagination for suggestion search (@maneeshpm #591)
-  - Fix suggestion system (@MananJethwany #498)
-  - Provide the kind and path (when adapted) to the suggestion answer (@MananJethwany #464)
-  - The displayed suggestion have now highligth on the searched terms (@maneeshpm #505)
-  - Properly handle html encoding of suggestions (@veloman-yunkan #458)
-
- * Server improvements :
-  - Remove meta endpoints (@mgautier #669)
-  - Add raw endpoints to get the raw content of a zim (@mgautierfr #646)
-  - Add details on 404 error pages (@soumyankar #490)
-  - Fix headbar insertion when `<head>` tag has attributes (@kelson42 #440)
-  - Better headbar insertion (after charset definition) (@kelson42 #442)
-
- * New OPDS Stream v2 :
-  - Add a list of categories (@veloman-yunkan)
-  - Support for partial entries (@veloman-yunkan #602)
-  - Support multiple icons size in the OPDS stream (@veloman-yunkan #577 #630)
-  - Add language endpoint to catalog (@veloman-yunkan #553)
-  - Add illustration API to get the illustration of a book (@mgautierfr #645)
-  - OPDS search can now filter books by category (@veloman-yunkan #459)
-
- * Library improvements :
-  - Allow the libray to be live reloaded when the library.xml changes (@veloman-yunkan #636)
-  - Properly handle removing of book from the library (@veloman-yunkan #485)
-  - Use xapian to search for books in the library (@veloman-yunkan #460, #488)
-
- * Added methods/functions :
-  - Fix `fileExist` and introduce `fileReadable` (@juuz0 #668)
-  - Add `getVersions` and `printVersions` functions (@kelson42 #665)
-  - Add `getNetworkInterfaces()` and `getBestPublicIP()` functions (@juuz0 #622)
-  - Add `get_zimid()` method to the search result (@maneeshpm #510)
-
- * Various improvements :
-  - Better secret value for aria2c rpc (@juuz0 #666)
-  - Avoid duplicated Archive/Reader in the Searcher (@veloman-yunkan #648)
-  - Add basic documentation (@mgautierfr #640)
-  - Do not use Reader internally (@maneeshpm #536 #576)
-  - Remove dependency headers from our public headers (@mgautierfr #574)
-  - Downloader now don't write metalink on the filesystem (@kelson42 #502)
-  - Support opening a zim file using a fd (@veloman-yukan #429)
-  - Use C++11 std::thread instead of pthread (@mgautierfr #445)
-  - [READER] Do not crash if zim file has no `Counter` metadata (@mgautierfr #449)
-  - Ensure libzim dependency is compiled with xapian (@mgautierfr #434)
-  - Support video and audio mimetype in `getMediaCount` (@kelson42 #439)
-  - Better parsing of the counterMap (@kelson42 #437)
-  - Adapt libkiwix to libzim 7.0.0 (@mgautierfr #428)
-  - Remove deprecated methods (@mgautierfr)
-  - CI: Build package for Ubuntu Hirsute, Impish and Jammy (@legoktm #431 #568) and remove Groovy
-  - Fix compilation for FreeBSD (@swills g#432)
-  - Many fixes and improvement (@MananJethwany, @maneeshpm, @veloman-yunkan, @mgautierfr)
-
-kiwix-lib 9.4.1
-===============
-
- * Fix `M/Counter` parsing.
- * [SERVER] Adjust body padding-top for taskbar
- * Fix potential crash when stoping a server not started.
- * Various fix in build system and the CI.
-
-kiwix-lib 9.4.0
-===============
-
- * [SERVER] Make the headers handling case insensitive.
- * [SERVER] Make server answer 204 http status code for empty search
- * [PACKAGING] Made CI build deb packages.
- * [SERVER] Add a way to prevent taskbar and external link bloquer at article
-   level.
- * Fix meson file to be compatible with meson 0.45
- * [SERVER] Update search requests to use pageStart/pageLength instead of
-   pageStart/pageEnd arguments.
- * [SERVER] Set a fixed favicon size in the main page.
- * [SERVER] Refactor the response system code to better handling future new
-   libzim api.
- * Fix segmentation fault around exchange with aria2 process making
-   kiwix-desktop crash at exit.
-
 kiwix-lib 9.3.1
 ===============

--- a/README.md
+++ b/README.md
@@ -1,14 +1,15 @@
-Libkiwix
-========
+Kiwix library
+=============

-The Libkiwix provides the [Kiwix](https://kiwix.org) software suite
-core. It contains the code shared by all Kiwix ports (Windows,
+The Kiwix library provides the [Kiwix](https://kiwix.org) software
+suite core. It contains the code shared by all Kiwix ports (Windows,
 GNU/Linux, macOS, Android, iOS, ...).

-[![Repositories](https://img.shields.io/repology/repositories/libkiwix?label=repositories)](https://github.com/kiwix/libkiwix/wiki/Repology)
-[![Build Status](https://github.com/kiwix/libkiwix/workflows/CI/badge.svg?query=branch%3Amaster)](https://github.com/kiwix/libkiwix/actions?query=branch%3Amaster)
-[![CodeFactor](https://www.codefactor.io/repository/github/kiwix/libkiwix/badge)](https://www.codefactor.io/repository/github/kiwix/libkiwix)
-[![Codecov](https://codecov.io/gh/kiwix/libkiwix/branch/master/graph/badge.svg)](https://codecov.io/gh/kiwix/libkiwix)
+[![Download](https://api.bintray.com/packages/kiwix/kiwix/kiwixlib/images/download.svg)](https://bintray.com/kiwix/kiwix/kiwixlib/_latestVersion)
+[![AUR version](https://img.shields.io/aur/version/kiwix-lib)](https://aur.archlinux.org/packages/kiwix-lib/)
+[![Build Status](https://github.com/kiwix/kiwix-lib/workflows/CI/badge.svg?query=branch%3Amaster)](https://github.com/kiwix/kiwix-lib/actions?query=branch%3Amaster)
+[![CodeFactor](https://www.codefactor.io/repository/github/kiwix/kiwix-lib/badge)](https://www.codefactor.io/repository/github/kiwix/kiwix-lib)
+[![Codecov](https://codecov.io/gh/kiwix/kiwix-lib/branch/master/graph/badge.svg)](https://codecov.io/gh/kiwix/kiwix-lib)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)

 Disclaimer
@@ -16,35 +17,30 @@ Disclaimer

 This document assumes you have a little knowledge about software
 compilation. If you experience difficulties with the dependencies or
-with the Libkiwix compilation itself, we recommend to have a look to
-[kiwix-build](https://github.com/kiwix/kiwix-build).
+with the Kiwix libary compilation itself, we recommend to have a look
+to [kiwix-build](https://github.com/kiwix/kiwix-build).

 Preamble
 --------

-Although the Libkiwix can be (cross-)compiled on/for many sytems, the
-following documentation explains how to do it on POSIX ones. It is
-primarly thought for GNU/Linux systems and has been tested on recent
-releases of Ubuntu and Fedora.
+Although the Kiwix library can be (cross-)compiled on/for many
+sytems, the following documentation explains how to do it on POSIX
+ones. It is primarly thought for GNU/Linux systems and has been tested
+on recent releases of Ubuntu and Fedora.

 Dependencies
 ------------

-The Libkiwix relies on many third party software libraries. They are
-prerequisites to the Libkiwix compilation. Following libraries need to
-be available:
+The Kiwix library relies on many third parts software libraries. They
+are prerequisites to the Kiwix library compilation. Following
+libraries need to be available:
+
 * [ICU](https://site.icu-project.org/) (package `libicu-dev` on Ubuntu)
 * [ZIM](https://openzim.org/) (package `libzim-dev` on Ubuntu)
 * [Pugixml](https://pugixml.org/) (package `libpugixml-dev` on Ubuntu)
 * [Mustache](https://github.com/kainjow/Mustache) (Just copy the
 header `mustache.hpp` somewhere it can be found by the compiler and/or
-set CPPFLAGS with correct `-I` option). Use Mustache version 4.1 or above.
-* [Libcurl](https://curl.se/libcurl) (`libcurl4-gnutls-dev`, `libcurl4-nss-dev` or `libcurl4-openssl-dev` on Ubuntu)
-* [Microhttpd](https://www.gnu.org/software/libmicrohttpd) (package `libmicrohttpd-dev` on Ubuntu)
-* [Zlib](https://zlib.net/) (package `zlib1g-dev` on Ubuntu)
-
-To test the code:
-* [Google Test](https://github.com/google/googletest) (package `googletest` on Ubuntu)
+set CPPFLAGS with correct `-I` option). Use Mustache version 3 only.

 The following dependency needs to be available at runtime:
 * [Aria2](https://aria2.github.io/) (package `aria2` on Ubuntu)
@@ -56,12 +52,12 @@ In the worse case, you will have to download and compile bleeding edge
 version by hand.

 If you want to install these dependencies locally, then use the
-`libkiwix` directory as install prefix.
+`kiwix-lib` directory as install prefix.

 Environment
 -------------

-The Libkiwix builds using [Meson](https://mesonbuild.com/) version
+The Kiwix library builds using [Meson](https://mesonbuild.com/) version
 0.45 or higher. Meson relies itself on Ninja, pkg-config and few other
 compilation tools.

@@ -77,7 +73,7 @@ section.
 Compilation
 -----------

-Once all dependencies are installed, you can compile the Libkiwix
+Once all dependencies are installed, you can compile the Kiwix library
 with:
 ```bash
 meson . build
@@ -85,20 +81,12 @@ ninja -C build
 ```

 By default, it will compile dynamic linked libraries. All binary files
-will be created in the `build` directory created automatically by
+will be created in the "build" directory created automatically by
 Meson. If you want statically linked libraries, you can add
 `--default-library=static` option to the Meson command.

 Depending of you system, `ninja` may be called `ninja-build`.

-The android wrapper uses deprecated methods of libkiwix so it cannot be compiled
-with `werror=true` (the default). So you must pass `-Dwerror=false` to meson:
-
-```bash
-meson . build -Dwrapper=android -Dwerror=false
-ninja -C build
-```
-
 Testing
 -------

@@ -111,7 +99,7 @@ meson test
 Installation
 ------------

-If you want to install the Libkiwix and the headers you just have
+If you want to install the Kiwix library and the headers you just have
 compiled on your system, here we go:
 ```bash
 ninja -C build install
@@ -154,57 +142,6 @@ cp ninja ../bin
 cd ..
 ```

-Custom Index Page
-----------------
-
-to use custom welcome page mention `customIndexPage` argument in `kiwix::internalServer()` or use `kiwix::server->setCustomIndexTemplate()`.
-(note - while using custom html file please mention all external links as absolute path.)
-
-to create a HTML template with custom JS you need to have a look at various OPDS based endpoints as mentioned [here](https://wiki.kiwix.org/wiki/OPDS) to load books.
-
-To use JS provided by kiwix-serve you can use the following template to start with ->
-
-```
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width,initial-scale=1" />
-    <title><-- Custom Tittle --></title>
-    <script
-      type="text/javascript"
-      src="{{root}}/skin/jquery-ui/external/jquery/jquery.js"
-    ></script>
-    <script
-      type="text/javascript"
-      src="{{root}}/skin/jquery-ui/jquery-ui.min.js"
-    ></script>
-    <script src="{{root}}/skin/isotope.pkgd.min.js" defer></script>
-    <script src="{{root}}/skin/iso6391To3.js"></script>
-    <script type="text/javascript" src="{{root}}/skin/index.js" defer></script>
-  </head>
-  <body>
-  </body>
-</html>
-```
-
- To get books listed using `index.js` add - `<div class="book__list"></div>` under body tag.
- To get number of books listed add - `<h3 class="kiwixHomeBody__results"></h3>` under body tag.
- To add language select box add - `<select id="languageFilter"></select>` under body tag.
- To add language select box add - `<select id="categoryFilter"></select>` under body tag.
- To add search box for books use following form -
-    ```
-        <form id='kiwixSearchForm'>
-        <input type="text" name="q" placeholder="Search" id="searchFilter" class='kiwixSearch filter'>
-        <input type="submit" class="searchButton" value="Search"/>
-        </form>
-    ```
-
-
-If you compile manually Libmicrohttpd, you might need to compile it
-without GNU TLS, a bug here will empeach further compilation
-otherwise.
-
 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
--- a/android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
+++ b/android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
@@ -26,10 +26,10 @@ task writePom {
    project {
        groupId 'org.kiwix.kiwixlib'
        artifactId 'kiwixlib'
-        version '10.0.1' + (System.env.KIWIXLIB_BUILDVERSION == null ? '' : '-'+System.env.KIWIXLIB_BUILDVERSION)
+        version '9.3.1' + (System.env.KIWIXLIB_BUILDVERSION == null ? '' : '-'+System.env.KIWIXLIB_BUILDVERSION)
        packaging 'aar'
        name 'kiwixlib'
-        url 'https://github.com/kiwix/libkiwix'
+        url 'https://github.com/kiwix/kiwix-lib'
        licenses {
            license {
                name 'GPLv3'
@@ -44,9 +44,9 @@ task writePom {
          }
      }
      scm {
-          connection 'https://github.com/kiwix/libkiwix.git'
-          developerConnection 'https://github.com/kiwix/libkiwix.git'
-          url 'https://github.com/kiwix/libkiwix'
+          connection 'https://github.com/kiwix/kiwix-lib.git'
+          developerConnection 'https://github.com/kiwix/kiwix-lib.git'
+          url 'https://github.com/kiwix/kiwix-lib'
      }
    }
  }.withXml {
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: Kiwix team <kiwix@kiwix.org>
 Build-Depends: debhelper-compat (= 13),
 meson,
 pkg-config,
- libzim-dev (>= 7.2.0~),
+ libzim-dev (>= 6.1.8),
 libcurl4-gnutls-dev,
 libicu-dev,
 libgtest-dev,
@@ -15,19 +15,18 @@ Build-Depends: debhelper-compat (= 13),
 zlib1g-dev
 Standards-Version: 4.5.0
 Section: libs
-Homepage: https://github.com/kiwix/libkiwix
+Homepage: https://github.com/kiwix/kiwix-lib
 Rules-Requires-Root: no

 Package: libkiwix-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libkiwix10 (= ${binary:Version}), ${misc:Depends}, python3,
- libzim-dev (>= 7.2.0~),
+Depends: libkiwix9 (= ${binary:Version}), ${misc:Depends}, python3,
+ libzim-dev (>= 6.0.0),
 libicu-dev,
 libpugixml-dev,
- libcurl4-gnutls-dev,
- libmicrohttpd-dev
+ libcurl4-gnutls-dev
 Description: library of common code for Kiwix (development)
 Kiwix is an offline Wikipedia reader. libkiwix provides the
 software core for Kiwix, and contains the code shared by all
@@ -35,11 +34,11 @@ Description: library of common code for Kiwix (development)
 .
 This package contains development files.

-Package: libkiwix10
+Package: libkiwix9
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, aria2
-Conflicts: libkiwix0, libkiwix3, libkiwix9
+Conflicts: libkiwix0, libkiwix3
 Description: library of common code for Kiwix
 Kiwix is an offline Wikipedia reader. libkiwix provides the
 software core for Kiwix, and contains the code shared by all
--- a/debian/libkiwix-dev.manpages
+++ b/debian/libkiwix-dev.manpages
@@ -1 +1 @@
-usr/share/man/man1/kiwix-compile-resources.1*
+usr/share/man/man1/kiwix-compile-resources.1
--- a/debian/libkiwix10.install
+++ b/debian/libkiwix10.install
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,2 +0,0 @@
-api
-xml
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,72 +0,0 @@
-# Configuration file for the Sphinx documentation builder.
-#
-# This file only contains a selection of the most common options. For a full
-# list see the documentation:
-# https://www.sphinx-doc.org/en/master/usage/configuration.html
-
-# -- Path setup --------------------------------------------------------------
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#
-import os
-# import sys
-# sys.path.insert(0, os.path.abspath('.'))
-
-
-# -- Project information -----------------------------------------------------
-
-project = 'libkiwix'
-copyright = '2022, libkiwix-team'
-author = 'libzim-team'
-
-
-# -- General configuration ---------------------------------------------------
-
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = [
-    'breathe',
-    'exhale'
-]
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-# This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
-
-
-if not on_rtd:
-    html_theme = 'sphinx_rtd_theme'
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-breathe_projects = {
-    "libkiwix": "./xml"
-}
-breathe_default_project = 'libkiwix'
-
-exhale_args = {
-    "containmentFolder":   "./api",
-    "rootFileName":        "ref_api.rst",
-    "rootFileTitle":       "Reference API",
-    "doxygenStripFromPath":"..",
-    "treeViewIsBootstrap": True,
-    "createTreeView" : True,
-    "exhaleExecutesDoxygen": True,
-    "exhaleDoxygenStdin":    "INPUT = ../include"
-}
-
-primary_domain = 'cpp'
-
-highlight_language = 'cpp'
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,14 +0,0 @@
-.. libkiwix documentation master file, created by
-   sphinx-quickstart on Fri Jul 24 15:40:50 2020.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Welcome to libzim's documentation!
-==================================
-
-.. toctree::
-   :maxdepth: 2
-   :caption: Contents:
-
-   usage
-   api/ref_api
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1,7 +0,0 @@
-
-sphinx = find_program('sphinx-build', native:true)
-
-sphinx_target = run_target('doc',
-    command: [sphinx, '-bhtml',
-              meson.current_source_dir(),
-              meson.current_build_dir()])
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +0,0 @@
-breathe
-exhale
-sphinx<4
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -1,17 +0,0 @@
-Libkiwix programming
-====================
-
-Introduction
------------
-
-libkiwix is written in C++. To use the library, you need the include files of libkiwix have
-to link against libzim.
-
-Errors are handled with exceptions. When something goes wrong, libzim throws an error,
-which is always derived from std::exception.
-
-All classes are defined in the namespace kiwix.
-
-libkiwix is a set of tools to manage zim files and provide some common functionnality.
-While libkiwix has some wrappers around libzim classes, they are deprecated and will be removed
-in the future.
--- a/format_code.sh
+++ b/format_code.sh
@@ -7,7 +7,6 @@ files=(
 "include/common/otherTools.h"
 "include/common/regexTools.h"
 "include/common/networkTools.h"
-"include/common/archiveTools.h"
 "include/manager.h"
 "include/reader.h"
 "include/kiwix.h"
@@ -23,7 +22,6 @@ files=(
 "src/common/pathTools.cpp"
 "src/common/regexTools.cpp"
 "src/common/otherTools.cpp"
-"src/common/archiveTools.cpp"
 "src/common/networkTools.cpp"
 "src/common/stringTools.cpp"
 "src/xapianSearcher.cpp"
--- a/include/book.h
+++ b/include/book.h
@@ -21,19 +21,11 @@
 #define KIWIX_BOOK_H

 #include <string>
-#include <vector>
-#include <memory>
-#include <mutex>
-#include "common.h"

 namespace pugi {
 class xml_node;
 }

-namespace zim {
-class Archive;
-}
-
 namespace kiwix
 {

@@ -45,32 +37,12 @@ class Reader;
 */
 class Book
 {
- public: // types
-  class Illustration
-  {
-    friend class Book;
-   public:
-    uint16_t width = 48;
-    uint16_t height = 48;
-    std::string mimeType;
-    std::string url;
-
-    const std::string& getData() const;
-
-   private:
-    mutable std::string data;
-    mutable std::mutex mutex;
-  };
-
-  typedef std::vector<std::shared_ptr<const Illustration>> Illustrations;
-
- public: // functions
+ public:
  Book();
  ~Book();

  bool update(const Book& other);
-  DEPRECATED void update(const Reader& reader);
-  void update(const zim::Archive& archive);
+  void update(const Reader& reader);
  void updateFromXml(const pugi::xml_node& node, const std::string& baseDir);
  void updateFromOpds(const pugi::xml_node& node, const std::string& urlHost);
  std::string getHumanReadableIdFromPath() const;
@@ -87,7 +59,6 @@ class Book
  const std::string& getDate() const { return m_date; }
  const std::string& getUrl() const { return m_url; }
  const std::string& getName() const { return m_name; }
-  std::string getCategory() const;
  const std::string& getTags() const { return m_tags; }
  std::string getTagStr(const std::string& tagName) const;
  bool getTagBool(const std::string& tagName) const;
@@ -96,13 +67,9 @@ class Book
  const uint64_t& getArticleCount() const { return m_articleCount; }
  const uint64_t& getMediaCount() const { return m_mediaCount; }
  const uint64_t& getSize() const { return m_size; }
-  DEPRECATED const std::string& getFavicon() const;
-  DEPRECATED const std::string& getFaviconUrl() const;
-  DEPRECATED const std::string& getFaviconMimeType() const;
-
-  Illustrations getIllustrations() const;
-  std::shared_ptr<const Illustration> getIllustration(unsigned int size) const;
-
+  const std::string& getFavicon() const;
+  const std::string& getFaviconUrl() const { return m_faviconUrl; }
+  const std::string& getFaviconMimeType() const { return m_faviconMimeType; }
  const std::string& getDownloadId() const { return m_downloadId; }

  void setReadOnly(bool readOnly) { m_readOnly = readOnly; }
@@ -123,20 +90,17 @@ class Book
  void setArticleCount(uint64_t articleCount) { m_articleCount = articleCount; }
  void setMediaCount(uint64_t mediaCount) { m_mediaCount = mediaCount; }
  void setSize(uint64_t size) { m_size = size; }
+  void setFavicon(const std::string& favicon) { m_favicon = favicon; }
+  void setFaviconMimeType(const std::string& faviconMimeType) { m_faviconMimeType = faviconMimeType; }
  void setDownloadId(const std::string& downloadId) { m_downloadId = downloadId; }

- private: // functions
-  std::string getCategoryFromTags() const;
-  const Illustration& getDefaultIllustration() const;
-
- protected: // data
+ protected:
  std::string m_id;
  std::string m_downloadId;
  std::string m_path;
  bool m_pathValid = false;
  std::string m_title;
  std::string m_description;
-  std::string m_category;
  std::string m_language;
  std::string m_creator;
  std::string m_publisher;
@@ -150,11 +114,9 @@ class Book
  uint64_t m_mediaCount = 0;
  bool m_readOnly = false;
  uint64_t m_size = 0;
-  Illustrations m_illustrations;
-
-  // Used as the return value of getDefaultIllustration() when no default
-  // illustration is found in the book
-  static const Illustration missingDefaultIllustration;
+  mutable std::string m_favicon;
+  std::string m_faviconUrl;
+  std::string m_faviconMimeType;
 };

 }
--- a/include/downloader.h
+++ b/include/downloader.h
@@ -23,6 +23,7 @@
 #include <string>
 #include <vector>
 #include <map>
+#include <pthread.h>
 #include <memory>
 #include <stdexcept>

--- a/include/entry.h
+++ b/include/entry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2020 Matthieu Gautier <mgautier@kymeria.fr>
+ * Copyright 2018 Matthieu Gautier <mgautier@kymeria.fr>
 *
 * 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
@@ -21,8 +21,7 @@
 #define KIWIX_ENTRY_H

 #include <stdio.h>
-#include <zim/entry.h>
-#include <zim/item.h>
+#include <zim/article.h>
 #include <exception>
 #include <string>

@@ -42,12 +41,19 @@ class NoEntry : public std::exception {};
 class Entry
 {
  public:
+    /**
+     * Default constructor.
+     *
+     * Construct an invalid entry.
+     */
+    Entry() = default;
+
    /**
     * Construct an entry making reference to an zim article.
     *
     * @param article a zim::Article object
     */
-    DEPRECATED Entry(zim::Entry entry) : Entry(entry, true) {};
+    Entry(zim::Article article);
    virtual ~Entry() = default;

    /**
@@ -57,14 +63,14 @@ class Entry
     *
     * @return the path of the entry.
     */
-    std::string getPath() const { return entry.getPath(); }
+    std::string getPath() const;

    /**
     * Get the title of the entry.
     *
     * @return the title of the entry.
     */
-    std::string getTitle() const { return entry.getTitle(); }
+    std::string getTitle() const;

    /**
     * Get the content of the entry.
@@ -74,7 +80,7 @@ class Entry
     *
     * @return the content of the entry.
     */
-    std::string getContent() const { return entry.getItem().getData(); }
+    std::string getContent() const;

    /**
     * Get the blob of the entry.
@@ -84,7 +90,7 @@ class Entry
     * @param offset The starting offset of the blob.
     * @return the blob of the entry.
     */
-    zim::Blob   getBlob(offset_type offset = 0) const { return entry.getItem().getData(offset); }
+    zim::Blob   getBlob(offset_type offset = 0) const;

    /**
     * Get the blob of the entry.
@@ -95,7 +101,7 @@ class Entry
     * @param size The size of the blob.
     * @return the blob of the entry.
     */
-    zim::Blob   getBlob(offset_type offset, size_type size) const { return entry.getItem().getData(offset, size); }
+    zim::Blob   getBlob(offset_type offset, size_type size) const;

    /**
     * Get the info for direct access to the content of the entry.
@@ -103,7 +109,7 @@ class Entry
     * Some entry (ie binary ones) have their content plain stored
     * in the zim file. Knowing the offset where the content is stored
     * an user can directly read the content in the zim file bypassing the
-     * libkiwix/libzim.
+     * kiwix-lib/libzim.
     *
     * @return A pair specifying where to read the content.
     *         The string is the real file to read (may be different that .zim
@@ -111,7 +117,7 @@ class Entry
     *         The offset is the offset to read in the file.
     *         Return <"",0> if is not possible to read directly.
     */
-    zim::Item::DirectAccessInfo getDirectAccessInfo() const { return entry.getItem().getDirectAccessInformation(); }
+    std::pair<std::string, offset_type> getDirectAccessInfo() const;

    /**
     * Get the size of the entry.
@@ -168,24 +174,17 @@ class Entry
    Entry getFinalEntry() const;

    /**
-     * Get the zim entry wrapped by this (kiwix) entry
+     * Convert the entry to a boolean value.
     *
-     * @return the zim entry
+     * @return True if the entry is valid.
     */
-    const zim::Entry& getZimEntry() const { return entry; }
+    explicit operator bool() const { return good(); }

  private:
-    zim::Entry entry;
+    zim::Article article;
+    mutable zim::Article final_article;

-  private:
-    // Entry is deprecated, so we've marked the constructor as deprecated.
-    // But we still need to construct the entry (in our deprecated code)
-    // To avoid warning because we use deprecated function, we create a second
-    // constructor not deprecated. The `bool marker` is unused, it sole purpose
-    // is to change the signature to have two different constructor.
-    // This one is not deprecated and we must use it in our private code.
-    Entry(zim::Entry entry, bool marker);
-    friend class Reader;
+    bool good() const { return article.good(); }
 };

 }
--- a/include/kiwix.h
+++ b/include/kiwix.h
@@ -22,4 +22,4 @@

 #include "library.h"

-#endif
+#endif
--- a/include/library.h
+++ b/include/library.h
@@ -24,8 +24,6 @@
 #include <vector>
 #include <map>
 #include <memory>
-#include <mutex>
-#include <zim/archive.h>

 #include "book.h"
 #include "bookmark.h"
@@ -37,7 +35,6 @@ namespace kiwix
 {

 class OPDSDumper;
-class Library;

 enum supportedListSortBy { UNSORTED, TITLE, SIZE, DATE, CREATOR, PUBLISHER };
 enum supportedListMode {
@@ -51,23 +48,18 @@ enum supportedListMode {
 };

 class Filter {
-  public: // types
-    using Tags = std::vector<std::string>;
-
-  private: // data
+  private:
    uint64_t activeFilters;
-    Tags _acceptTags;
-    Tags _rejectTags;
-    std::string _category;
+    std::vector<std::string> _acceptTags;
+    std::vector<std::string> _rejectTags;
    std::string _lang;
    std::string _publisher;
    std::string _creator;
    size_t _maxSize;
    std::string _query;
-    bool _queryIsPartial;
    std::string _name;

-  public: // functions
+  public:
    Filter();
    ~Filter() = default;

@@ -101,105 +93,33 @@ class Filter {
    /**
     * Set the filter to only accept book with corresponding tag.
     */
-    Filter& acceptTags(const Tags& tags);
-    Filter& rejectTags(const Tags& tags);
+    Filter& acceptTags(std::vector<std::string> tags);
+    Filter& rejectTags(std::vector<std::string> tags);

-    Filter& category(std::string category);
    Filter& lang(std::string lang);
    Filter& publisher(std::string publisher);
    Filter& creator(std::string creator);
    Filter& maxSize(size_t size);
-    Filter& query(std::string query, bool partial=true);
+    Filter& query(std::string query);
    Filter& name(std::string name);

-    bool hasQuery() const;
-    const std::string& getQuery() const { return _query; }
-    bool queryIsPartial() const { return _queryIsPartial; }
-
-    bool hasName() const;
-    const std::string& getName() const { return _name; }
-
-    bool hasCategory() const;
-    const std::string& getCategory() const { return _category; }
-
-    bool hasLang() const;
-    const std::string& getLang() const { return _lang; }
-
-    bool hasPublisher() const;
-    const std::string& getPublisher() const { return _publisher; }
-
-    bool hasCreator() const;
-    const std::string& getCreator() const { return _creator; }
-
-    const Tags& getAcceptTags() const { return _acceptTags; }
-    const Tags& getRejectTags() const { return _rejectTags; }
-
-private: // functions
-    friend class Library;
-
    bool accept(const Book& book) const;
 };

-/**
- * This class is not part of the libkiwix API. Its only purpose is
- * to simplify the implementation of the Library's move operations
- * and avoid bugs should new data members be added to Library.
- */
-class LibraryBase
-{
-protected: // types
-  typedef uint64_t LibraryRevision;
-
-  struct Entry : Book
-  {
-    LibraryRevision lastUpdatedRevision = 0;
-
-    // May also keep the Archive and Reader pointers here and get
-    // rid of the m_readers and m_archives data members in Library
-  };
-
-protected: // data
-  LibraryRevision m_revision;
-  std::map<std::string, Entry> m_books;
-  std::map<std::string, std::shared_ptr<Reader>> m_readers;
-  std::map<std::string, std::shared_ptr<zim::Archive>> m_archives;
-  std::vector<kiwix::Bookmark> m_bookmarks;
-  class BookDB;
-  std::unique_ptr<BookDB> m_bookDB;
-
-protected: // functions
-  LibraryBase();
-  ~LibraryBase();
-
-  LibraryBase(LibraryBase&& );
-  LibraryBase& operator=(LibraryBase&& );
-};

 /**
 * A Library store several books.
 */
-class Library : private LibraryBase
+class Library
 {
-  // all data fields must be added in LibraryBase
-  mutable std::mutex m_mutex;
-
- public:
-  typedef LibraryRevision Revision;
-  typedef std::vector<std::string> BookIdCollection;
-  typedef std::map<std::string, int> AttributeCounts;
+  std::map<std::string, kiwix::Book> m_books;
+  std::map<std::string, std::shared_ptr<Reader>> m_readers;
+  std::vector<kiwix::Bookmark> m_bookmarks;

 public:
  Library();
  ~Library();

-  /**
-   * Library is not a copiable object. However it can be moved.
-   */
-  Library(const Library& ) = delete;
-  Library(Library&& );
-  void operator=(const Library& ) = delete;
-  Library& operator=(Library&& );
-
  /**
   * Add a book to the library.
   *
@@ -212,11 +132,6 @@ class Library : private LibraryBase
   */
  bool addBook(const Book& book);

-  /**
-   * A self-explanatory alias for addBook()
-   */
-  bool addOrUpdateBook(const Book& book) { return addBook(book); }
-
  /**
   * Add a bookmark to the library.
   *
@@ -233,15 +148,9 @@ class Library : private LibraryBase
   */
  bool removeBookmark(const std::string& zimId, const std::string& url);

-  // XXX: This is a non-thread-safe operation
-  const Book& getBookById(const std::string& id) const;
-  // XXX: This is a non-thread-safe operation
-  const Book& getBookByPath(const std::string& path) const;
-
-  Book getBookByIdThreadSafe(const std::string& id) const;
-
-  DEPRECATED std::shared_ptr<Reader> getReaderById(const std::string& id);
-  std::shared_ptr<zim::Archive> getArchiveById(const std::string& id);
+  Book& getBookById(const std::string& id);
+  Book& getBookByPath(const std::string& path);
+  std::shared_ptr<Reader> getReaderById(const std::string& id);

  /**
   * Remove a book from the library.
@@ -257,7 +166,7 @@ class Library : private LibraryBase
   * @param path the path of the file to write to.
   * @return True if the library has been correctly saved.
   */
-  bool writeToFile(const std::string& path) const;
+  bool writeToFile(const std::string& path);

  /**
   * Write the library bookmarks to a file.
@@ -265,7 +174,7 @@ class Library : private LibraryBase
   * @param path the path of the file to write to.
   * @return True if the library has been correctly saved.
   */
-  bool writeBookmarksToFile(const std::string& path) const;
+  bool writeBookmarksToFile(const std::string& path);

  /**
   * Get the number of book in the library.
@@ -274,56 +183,53 @@ class Library : private LibraryBase
   * @param remoteBooks If we must count remote books (books with an url)
   * @return The number of books.
   */
-  unsigned int getBookCount(const bool localBooks, const bool remoteBooks) const;
+  unsigned int getBookCount(const bool localBooks, const bool remoteBooks);

  /**
-   * Get all languagues of the books in the library.
+   * Get all langagues of the books in the library.
   *
   * @return A list of languages.
   */
-  std::vector<std::string> getBooksLanguages() const;
-
-  /**
-   * Get all languagues of the books in the library with counts.
-   *
-   * @return A list of languages with the count of books in each language.
-   */
-  AttributeCounts getBooksLanguagesWithCounts() const;
-
-  /**
-   * Get all categories of the books in the library.
-   *
-   * @return A list of categories.
-   */
-  std::vector<std::string> getBooksCategories() const;
+  std::vector<std::string> getBooksLanguages();

  /**
   * Get all book creators of the books in the library.
   *
   * @return A list of book creators.
   */
-  std::vector<std::string> getBooksCreators() const;
+  std::vector<std::string> getBooksCreators();

  /**
   * Get all book publishers of the books in the library.
   *
   * @return A list of book publishers.
   */
-  std::vector<std::string> getBooksPublishers() const;
+  std::vector<std::string> getBooksPublishers();

  /**
   * Get all bookmarks.
   *
   * @return A list of bookmarks
   */
-  const std::vector<kiwix::Bookmark> getBookmarks(bool onlyValidBookmarks = true) const;
+  const std::vector<kiwix::Bookmark> getBookmarks(bool onlyValidBookmarks = true);

  /**
   * Get all book ids of the books in the library.
   *
   * @return A list of book ids.
   */
-  BookIdCollection getBooksIds() const;
+  std::vector<std::string> getBooksIds();
+
+  /**
+   * Filter the library and generate a new one with the keep elements.
+   *
+   * This is equivalent to `listBookIds(ALL, UNSORTED, search)`.
+   *
+   * @param search List only books with search in the title or description.
+   * @return The list of bookIds corresponding to the query.
+   */
+  DEPRECATED std::vector<std::string> filter(const std::string& search);
+

  /**
   * Filter the library and return the id of the keep elements.
@@ -331,7 +237,7 @@ class Library : private LibraryBase
   * @param filter The filter to use.
   * @return The list of bookIds corresponding to the filter.
   */
-  BookIdCollection filter(const Filter& filter) const;
+  std::vector<std::string> filter(const Filter& filter);


  /**
@@ -341,40 +247,43 @@ class Library : private LibraryBase
   * @param comparator how to sort the books
   * @return The sorted list of books
   */
-  void sort(BookIdCollection& bookIds, supportedListSortBy sortBy, bool ascending) const;
+  void sort(std::vector<std::string>& bookIds, supportedListSortBy sortBy, bool ascending);

  /**
-   * Return the current revision of the library.
+   * List books in the library.
   *
-   * The revision of the library is updated (incremented by one) only by
-   * the addBook() operation.
-   *
-   * @return Current revision of the library.
+   * @param mode The mode of listing :
+   *             - LOCAL    : list only local books (with a path).
+   *             - REMOTE   : list only remote books (with an url).
+   *             - VALID    : list only valid books (without a path or with a
+   *                          path pointing to a valid zim file).
+   *             - NOLOCAL  : list only books without valid path.
+   *             - NOREMOTE : list only books without url.
+   *             - NOVALID  : list only books not valid.
+   *             - ALL : Do not do any filter (LOCAL or REMOTE)
+   *             - Flags can be combined.
+   * @param sortBy Attribute to sort by the book list.
+   * @param search List only books with search in the title, description.
+   * @param language List only books in this language.
+   * @param creator List only books of this creator.
+   * @param publisher List only books of this publisher.
+   * @param maxSize Do not list book bigger than maxSize.
+   *                Set to 0 to cancel this filter.
+   * @return The list of bookIds corresponding to the query.
   */
-  LibraryRevision getRevision() const;
-
-  /**
-   * Remove books that have not been updated since the specified revision.
-   *
-   * @param  rev the library revision to use
-   * @return Count of books that were removed by this operation.
-   */
-  uint32_t removeBooksNotUpdatedSince(LibraryRevision rev);
+  DEPRECATED std::vector<std::string> listBooksIds(
+    int supportedListMode = ALL,
+    supportedListSortBy sortBy = UNSORTED,
+    const std::string& search = "",
+    const std::string& language = "",
+    const std::string& creator = "",
+    const std::string& publisher = "",
+    const std::vector<std::string>& tags = {},
+    size_t maxSize = 0);

  friend class OPDSDumper;
  friend class libXMLDumper;
-
-private: // types
-  typedef const std::string& (Book::*BookStrPropMemFn)() const;
-
-private: // functions
-  AttributeCounts getBookAttributeCounts(BookStrPropMemFn p) const;
-  std::vector<std::string> getBookPropValueSet(BookStrPropMemFn p) const;
-  BookIdCollection filterViaBookDB(const Filter& filter) const;
-  void updateBookDB(const Book& book);
-  void dropReader(const std::string& bookId);
 };
-
 }

 #endif
--- a/include/libxml_dumper.h
+++ b/include/libxml_dumper.h
@@ -38,7 +38,7 @@ class LibXMLDumper
 {
 public:
  LibXMLDumper() = default;
-  LibXMLDumper(const Library* library);
+  LibXMLDumper(Library* library);
  ~LibXMLDumper();

  /**
@@ -69,10 +69,10 @@ class LibXMLDumper
   *
   * @param library The library to dump.
   */
-  void setLibrary(const Library* library) { this->library = library; }
+  void setLibrary(Library* library) { this->library = library; }

 protected:
-  const kiwix::Library* library;
+  kiwix::Library* library;
  std::string baseDir;
 private:
  void handleBook(Book book, pugi::xml_node root_node);
--- a/include/manager.h
+++ b/include/manager.h
@@ -26,7 +26,6 @@

 #include <string>
 #include <vector>
-#include <memory>

 namespace pugi {
 class xml_document;
@@ -35,25 +34,26 @@ class xml_document;
 namespace kiwix
 {

-class LibraryManipulator
-{
- public: // functions
-  explicit LibraryManipulator(Library* library);
-  virtual ~LibraryManipulator();
+class LibraryManipulator {
+ public:
+  virtual ~LibraryManipulator() {}
+  virtual bool addBookToLibrary(Book book) = 0;
+  virtual void addBookmarkToLibrary(Bookmark bookmark) = 0;
+};

-  Library& getLibrary() const { return library; }
-
-  bool addBookToLibrary(const Book& book);
-  void addBookmarkToLibrary(const Bookmark& bookmark);
-  uint32_t removeBooksNotUpdatedSince(Library::Revision rev);
-
- protected: // overrides
-  virtual void bookWasAddedToLibrary(const Book& book);
-  virtual void bookmarkWasAddedToLibrary(const Bookmark& bookmark);
-  virtual void booksWereRemovedFromLibrary();
-
- private: // data
-  kiwix::Library& library;
+class DefaultLibraryManipulator : public LibraryManipulator {
+ public:
+  DefaultLibraryManipulator(Library* library) :
+    library(library) {}
+  virtual ~DefaultLibraryManipulator() {}
+  bool addBookToLibrary(Book book) {
+    return library->addBook(book);
+  }
+  void addBookmarkToLibrary(Bookmark bookmark) {
+    library->addBookmark(bookmark);
+  }
+ private:
+   kiwix::Library* library;
 };

 /**
@@ -61,12 +61,10 @@ class LibraryManipulator
 */
 class Manager
 {
- public: // types
-  typedef std::vector<std::string> Paths;
-
- public: // functions
-  explicit Manager(LibraryManipulator* manipulator);
-  explicit Manager(Library* library);
+ public:
+  Manager(LibraryManipulator* manipulator);
+  Manager(Library* library);
+  ~Manager();

  /**
   * Read a `library.xml` and add book in the file to the library.
@@ -74,22 +72,10 @@ class Manager
   * @param path The (utf8) path to the `library.xml`.
   * @param readOnly Set if the libray path could be overwritten latter with
   *                 updated content.
-   * @param trustLibrary use book metadata coming from XML.
   * @return True if file has been properly parsed.
   */
  bool readFile(const std::string& path, bool readOnly = true, bool trustLibrary = true);

-  /**
-   * Sync the contents of the library with one or more `library.xml` files.
-   *
-   * The metadata of the library files is trusted unconditionally.
-   * Any books not present in the input library.xml files are removed
-   * from the library.
-   *
-   * @param paths The (utf8) paths to the `library.xml` files.
-   */
-  void reload(const Paths& paths);
-
  /**
   * Load a library content store in the string.
   *
@@ -164,7 +150,8 @@ class Manager
  uint64_t m_itemsPerPage = 0;

 protected:
-  std::shared_ptr<kiwix::LibraryManipulator> manipulator;
+  kiwix::LibraryManipulator* manipulator;
+  bool mustDeleteManipulator;

  bool readBookFromPath(const std::string& path, Book* book);
  bool parseXmlDom(const pugi::xml_document& doc,
--- a/include/meson.build
+++ b/include/meson.build
@@ -13,9 +13,19 @@ headers = [
  'search_renderer.h',
  'server.h',
  'kiwixserve.h',
-  'name_mapper.h',
-  'tools.h',
-  'version.h'
+  'name_mapper.h'
 ]

 install_headers(headers, subdir:'kiwix')
+
+install_headers(
+  'tools/base64.h',
+  'tools/networkTools.h',
+  'tools/otherTools.h',
+  'tools/pathTools.h',
+  'tools/regexTools.h',
+  'tools/stringTools.h',
+  'tools/lock.h',
+  subdir:'kiwix/tools'
+)
+
--- a/include/name_mapper.h
+++ b/include/name_mapper.h
@@ -22,8 +22,6 @@

 #include <string>
 #include <map>
-#include <memory>
-#include <mutex>

 namespace kiwix
 {
@@ -33,15 +31,15 @@ class Library;
 class NameMapper {
  public:
    virtual ~NameMapper() = default;
-    virtual std::string getNameForId(const std::string& id) const = 0;
-    virtual std::string getIdForName(const std::string& name) const = 0;
+    virtual std::string getNameForId(const std::string& id) = 0;
+    virtual std::string getIdForName(const std::string& name) = 0;
 };


 class IdNameMapper : public NameMapper {
  public:
-    virtual std::string getNameForId(const std::string& id) const { return id; };
-    virtual std::string getIdForName(const std::string& name) const { return name; };
+    virtual std::string getNameForId(const std::string& id) { return id; };
+    virtual std::string getIdForName(const std::string& name) { return name; };
 };

 class HumanReadableNameMapper : public NameMapper {
@@ -52,29 +50,11 @@ class HumanReadableNameMapper : public NameMapper {
  public:
    HumanReadableNameMapper(kiwix::Library& library, bool withAlias);
    virtual ~HumanReadableNameMapper() = default;
-    virtual std::string getNameForId(const std::string& id) const;
-    virtual std::string getIdForName(const std::string& name) const;
+    virtual std::string getNameForId(const std::string& id);
+    virtual std::string getIdForName(const std::string& name);
 };

-class UpdatableNameMapper : public NameMapper {
-    typedef std::shared_ptr<NameMapper> NameMapperHandle;
-  public:
-    UpdatableNameMapper(Library& library, bool withAlias);

-    virtual std::string getNameForId(const std::string& id) const;
-    virtual std::string getIdForName(const std::string& name) const;
-
-    void update();
-
-  private:
-    NameMapperHandle currentNameMapper() const;
-
-  private:
-    mutable std::mutex mutex;
-    Library& library;
-    NameMapperHandle nameMapper;
-    const bool withAlias;
-};

 }

--- a/include/opds_catalog.h
+++ b/include/opds_catalog.h
@@ -1,33 +0,0 @@
-/*
- * Copyright 2021 Veloman Yunkan <veloman.yunkan@gmail.com>
- *
- * 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.
- */
-
-#ifndef KIWIX_OPDS_CATALOG_H
-#define KIWIX_OPDS_CATALOG_H
-
-
-#include "library.h"
-
-namespace kiwix
-{
-
-std::string getSearchUrl(const Filter& f);
-
-} // namespace kiwix
-
-#endif // KIWIX_OPDS_CATALOG_H
--- a/include/opds_dumper.h
+++ b/include/opds_dumper.h
@@ -26,6 +26,9 @@

 #include <pugixml.hpp>

+#include "tools/base64.h"
+#include "tools/pathTools.h"
+#include "tools/regexTools.h"
 #include "library.h"
 #include "reader.h"

@@ -48,50 +51,24 @@ class OPDSDumper
  /**
   * Dump the OPDS feed.
   *
-   * @param bookIds the ids of the books to include in the feed
-   * @param query the query used to obtain the list of book ids
+   * @param id The id of the library.
   * @return The OPDS feed.
   */
-  std::string dumpOPDSFeed(const std::vector<std::string>& bookIds, const std::string& query) const;
+  std::string dumpOPDSFeed(const std::vector<std::string>& bookIds);

  /**
-   * Dump the OPDS feed.
-   *
-   * @param bookIds the ids of the books to include in the feed
-   * @param query the query used to obtain the list of book ids
-   * @param partial whether the feed should include partial or complete entries
-   * @return The OPDS feed.
-   */
-  std::string dumpOPDSFeedV2(const std::vector<std::string>& bookIds, const std::string& query, bool partial) const;
-
-  /**
-   * Dump the OPDS complete entry document.
-   *
-   * @param bookId the id of the book
-   * @return The OPDS complete entry document.
-   */
-  std::string dumpOPDSCompleteEntry(const std::string& bookId) const;
-
-  /**
-   * Dump the categories OPDS feed.
-   *
-   * @return The OPDS feed.
-   */
-  std::string categoriesOPDSFeed() const;
-
-  /**
-   * Dump the languages OPDS feed.
-   *
-   * @return The OPDS feed.
-   */
-  std::string languagesOPDSFeed() const;
-
-  /**
-   * Set the id of the library.
+   * Set the id of the opds stream.
   *
   * @param id the id to use.
   */
-  void setLibraryId(const std::string& id) { this->libraryId = id;}
+  void setId(const std::string& id) { this->id = id;}
+
+  /**
+   * Set the title oft the opds stream.
+   *
+   * @param title the title to use.
+   */
+  void setTitle(const std::string& title) { this->title = title; }

  /**
   * Set the root location used when generating url.
@@ -100,6 +77,13 @@ class OPDSDumper
   */
  void setRootLocation(const std::string& rootLocation) { this->rootLocation = rootLocation; }

+  /**
+   * Set the search url.
+   *
+   * @param searchUrl the search url to use.
+   */
+  void setSearchDescriptionUrl(const std::string& searchDescriptionUrl) { this->searchDescriptionUrl = searchDescriptionUrl; }
+
  /**
   * Set some informations about the search results.
   *
@@ -109,13 +93,27 @@ class OPDSDumper
   */
  void setOpenSearchInfo(int totalResult, int startIndex, int count);

+  /**
+   * Set the library to dump.
+   *
+   * @param library The library to dump.
+   */
+  void setLibrary(Library* library) { this->library = library; }
+
 protected:
  kiwix::Library* library;
-  std::string libraryId;
+  std::string id;
+  std::string title;
+  std::string date;
  std::string rootLocation;
+  std::string searchDescriptionUrl;
  int m_totalResults;
  int m_startIndex;
  int m_count;
+  bool m_isSearchResult = false;
+
+ private:
+  pugi::xml_node handleBook(Book book, pugi::xml_node root_node);
 };
 }

--- a/include/reader.h
+++ b/include/reader.h
@@ -21,60 +21,30 @@
 #define KIWIX_READER_H

 #include <stdio.h>
+#include <zim/article.h>
+#include <zim/file.h>
+#include <zim/fileiterator.h>
 #include <zim/zim.h>
-#include <zim/archive.h>
 #include <exception>
 #include <map>
 #include <sstream>
 #include <string>
 #include "common.h"
 #include "entry.h"
+#include "tools/pathTools.h"
+#include "tools/stringTools.h"

 using namespace std;

 namespace kiwix
 {

-/**
- * The SuggestionItem is a helper class that contains the info about a single
- * suggestion item.
- */
-class SuggestionItem
-{
-  // Functions
-  public:
-    // Create a sugggestion item.
-    explicit SuggestionItem(const std::string& title, const std::string& normalizedTitle,
-                            const std::string& path, const std::string& snippet = "") :
-      title(title),
-      normalizedTitle(normalizedTitle),
-      path(path),
-      snippet(snippet) {}
-
-  public:
-    const std::string& getTitle() const           { return title;}
-    const std::string& getNormalizedTitle() const { return normalizedTitle;}
-    const std::string& getPath() const            { return path;}
-    const std::string& getSnippet() const         { return snippet;}
-
-    bool hasSnippet() const                { return !snippet.empty();}
-
-  // Data
-  private:
-    std::string title;
-    std::string normalizedTitle;
-    std::string path;
-    std::string snippet;
-};
-
 /**
 * The Reader class is the class who allow to get an entry content from a zim
 * file.
- *
- * Reader is now deprecated. Directly use `zim::Archive`.
 */

-using SuggestionsList_t = std::vector<SuggestionItem>;
+using SuggestionsList_t = std::vector<std::vector<std::string>>;
 class Reader
 {
 public:
@@ -87,20 +57,8 @@ class Reader
   *                    unsplitted path as if the file were not splitted
   *                    (.zim extesion).
   */
-  explicit DEPRECATED Reader(const string zimFilePath);
-
-   /**
-   * Create a Reader to read a zim file given by the Archive.
-   *
-   * @param archive The shared pointer to the Archive object.
-   */
-  explicit DEPRECATED Reader(const std::shared_ptr<zim::Archive> archive)
-   : Reader(archive, true) {};
-#ifndef _WIN32
-  explicit DEPRECATED Reader(int fd);
-  DEPRECATED Reader(int fd, zim::offset_type offset, zim::size_type size);
-#endif
-  ~Reader() = default;
+  Reader(const string zimFilePath);
+  ~Reader();

  /**
   * Get the number of "displayable" entries in the zim file.
@@ -143,6 +101,17 @@ class Reader
   */
  string getId() const;

+  /**
+   * Get the url of a random page.
+   *
+   * Deprecated : Use `getRandomPage` instead.
+   *
+   * @return Url of a random page. The page is picked from all entries in
+   *         the 'A' namespace.
+   *         The main page is excluded from the potential results.
+   */
+  DEPRECATED string getRandomPageUrl() const;
+
  /**
   * Get a random page.
   *
@@ -152,6 +121,31 @@ class Reader
   */
  Entry getRandomPage() const;

+  /**
+   * Get the url of the first page.
+   *
+   * Deprecated : Use `getFirstPage` instead.
+   *
+   * @return Url of the first entry in the 'A' namespace.
+   */
+  DEPRECATED string getFirstPageUrl() const;
+
+  /**
+   * Get the entry of the first page.
+   *
+   * @return The first entry in the 'A' namespace.
+   */
+  Entry getFirstPage() const;
+
+  /**
+   * Get the url of the main page.
+   *
+   * Deprecated : Use `getMainPage` instead.
+   *
+   * @return Url of the main page as specified in the zim file.
+   */
+  DEPRECATED string getMainPageUrl() const;
+
  /**
   * Get the entry of the main page.
   *
@@ -292,6 +286,16 @@ class Reader
   */
  string getScraper() const;

+  /**
+   * Get the origId of the zim file.
+   *
+   * The origId is only used in the case of patch zim file and is the Id
+   * of the original zim file.
+   *
+   * @return The origId of the zim file as specified in the zim metadata.
+   */
+  string getOrigId() const;
+
  /**
   * Get the favicon of the zim file.
   *
@@ -330,6 +334,88 @@ class Reader
   */
  Entry getEntryFromTitle(const std::string& title) const;

+  /**
+   * Get the url of a page specified by a title.
+   *
+   * @param[in] title the title of the page.
+   * @param[out] url the url of the page.
+   * @return True if the page can be found.
+   */
+  DEPRECATED bool getPageUrlFromTitle(const string& title, string& url) const;
+
+  /**
+   * Get the mimetype of a entry specified by a url.
+   *
+   * @param[in] url the url of the entry.
+   * @param[out] mimeType the mimeType of the entry.
+   * @return True if the mimeType has been found.
+   */
+  DEPRECATED bool getMimeTypeByUrl(const string& url, string& mimeType) const;
+
+  /**
+   * Get the content of an entry specifed by a url.
+   *
+   * Alias to `getContentByEncodedUrl`
+   */
+  DEPRECATED bool getContentByUrl(const string& url,
+                       string& content,
+                       string& title,
+                       unsigned int& contentLength,
+                       string& contentType) const;
+
+  /**
+   * Get the content of an entry specified by a url encoded url.
+   *
+   * Equivalent to getContentByDecodedUrl(urlDecode(url), ...).
+   */
+  DEPRECATED bool getContentByEncodedUrl(const string& url,
+                              string& content,
+                              string& title,
+                              unsigned int& contentLength,
+                              string& contentType,
+                              string& baseUrl) const;
+
+  /**
+   * Get the content of an entry specified by an url encoded url.
+   *
+   * Equivalent to getContentByEncodedUrl but without baseUrl.
+   */
+  DEPRECATED bool getContentByEncodedUrl(const string& url,
+                              string& content,
+                              string& title,
+                              unsigned int& contentLength,
+                              string& contentType) const;
+
+  /**
+   * Get the content of an entry specified by a url.
+   *
+   * @param[in] url The url of the entry.
+   * @param[out] content The content of the entry.
+   * @param[out] title the title of the entry.
+   * @param[out] contentLength The size of the entry (size of content).
+   * @param[out] contentType The mimeType of the entry.
+   * @param[out] baseUrl Return the true url of the entry.
+   *                     If the specified entry is a redirection, contains
+   *                     the url of the targeted entry.
+   * @return True if the entry has been found.
+   */
+  DEPRECATED bool getContentByDecodedUrl(const string& url,
+                              string& content,
+                              string& title,
+                              unsigned int& contentLength,
+                              string& contentType,
+                              string& baseUrl) const;
+  /**
+   * Get the content of an entry specified by a url.
+   *
+   * Equivalent to getContentByDecodedUrl but withou the baseUrl.
+   */
+  DEPRECATED bool getContentByDecodedUrl(const string& url,
+                              string& content,
+                              string& title,
+                              unsigned int& contentLength,
+                              string& contentType) const;
+
  /**
   * Search for entries with title starting with prefix (case sensitive).
   *
@@ -411,6 +497,16 @@ class Reader
                              SuggestionsList_t& results);


+  /**
+   * Check if the url exists in the zim file.
+   *
+   * Deprecated : Use `pathExists` instead.
+   *
+   * @param url the url to check.
+   * @return True if the url exits in the zim file.
+   */
+  DEPRECATED bool urlExists(const string& url) const;
+
  /**
   * Check if the path exists in the zim file.
   *
@@ -466,6 +562,16 @@ class Reader
   */
  bool isCorrupted() const;

+  /**
+   * Parse a full url into a namespace and url.
+   *
+   * @param[in] url The full url ("/N/url").
+   * @param[out] ns The namespace (N).
+   * @param[out] title The url (url).
+   * @return True
+   */
+  DEPRECATED bool parseUrl(const string& url, char* ns, string& title) const;
+
  /**
   * Return the total size of the zim file.
   *
@@ -480,10 +586,24 @@ class Reader
   *
   * @return The libzim file handler.
   */
-  zim::Archive* getZimArchive() const;
+  zim::File* getZimFileHandler() const;
+
+  /**
+   * Get the zim article object associated to a url.
+   *
+   * @param[in] url The url of the article.
+   * @param[out] article The libzim article object.
+   * @return True if the url is good (article.good()).
+   */
+  DEPRECATED bool getArticleObjectByDecodedUrl(const string& url,
+                                    zim::Article& article) const;

 protected:
-  std::shared_ptr<zim::Archive> zimArchive;
+  zim::File* zimFileHandler;
+  zim::size_type firstArticleOffset;
+  zim::size_type lastArticleOffset;
+  zim::size_type nsACount;
+  zim::size_type nsICount;
  std::string zimFilePath;

  SuggestionsList_t suggestions;
@@ -491,15 +611,6 @@ class Reader

 private:
  std::map<const std::string, unsigned int> parseCounterMetadata() const;
-
-  // Reader is deprecated, so we've marked the constructor as deprecated.
-  // But we still need to construct the reader (in our deprecated code)
-  // To avoid warning because we use deprecated function, we create a
-  // constructor not deprecated. The `bool marker` is unused, it sole purpose
-  // is to change the signature to have a different constructor.
-  // This one is not deprecated and we must use it in our private code.
-  Reader(const std::shared_ptr<zim::Archive> archive, bool marker);
-  friend class Library;
 };
 }

--- a/include/search_renderer.h
+++ b/include/search_renderer.h
@@ -21,7 +21,6 @@
 #define KIWIX_SEARCH_RENDERER_H

 #include <string>
-#include <zim/search.h>

 namespace kiwix
 {
@@ -35,26 +34,12 @@ class SearchRenderer
 {
 public:
  /**
-   * Construct a SearchRenderer from a Searcher.
+   * The default constructor.
   *
-   * This method is now deprecated. Construct the renderer from a
-   * `zim::SearchResultSet`
-   *
-   * @param searcher The `Searcher` to render.
-   * @param mapper The `NameMapper` to use to do the rendering.
+   * @param humanReadableName The global zim's humanReadableName.
+   *                          Used to generate pagination links.
   */
-  DEPRECATED SearchRenderer(Searcher* searcher, NameMapper* mapper);
-
-  /**
-   * Construct a SearchRenderer from a SearchResultSet.
-   *
-   * @param srs The `SearchResultSet` to render.
-   * @param mapper The `NameMapper` to use to do the rendering.
-   * @param start The start offset used for the srs.
-   * @param estimatedResultCount The estimatedResultCount of the whole search
-   */
-  SearchRenderer(zim::SearchResultSet srs, NameMapper* mapper,
-                 unsigned int start, unsigned int estimatedResultCount);
+  SearchRenderer(Searcher* searcher, NameMapper* mapper);

  ~SearchRenderer();

@@ -89,7 +74,7 @@ class SearchRenderer

 protected:
  std::string beautifyInteger(const unsigned int number);
-  zim::SearchResultSet m_srs;
+  Searcher* mp_searcher;
  NameMapper* mp_nameMapper;
  std::string searchContent;
  std::string searchPattern;
--- a/include/searcher.h
+++ b/include/searcher.h
@@ -27,10 +27,10 @@
 #include <cctype>
 #include <locale>
 #include <string>
-#include <memory>
 #include <vector>
-
-#include <zim/search.h>
+#include <vector>
+#include "tools/pathTools.h"
+#include "tools/stringTools.h"

 using namespace std;

@@ -48,16 +48,13 @@ class Result
  virtual std::string get_content() = 0;
  virtual int get_wordCount() = 0;
  virtual int get_size() = 0;
-  virtual std::string get_zimId() = 0;
+  virtual int get_readerIndex() = 0;
 };

 struct SearcherInternal;
-struct SuggestionInternal;
 /**
 * The Searcher class is reponsible to do different kind of search using the
 * fulltext index.
- *
- * The Searcher is now deprecated. Use libzim search feature.
 */
 class Searcher
 {
@@ -65,7 +62,7 @@ class Searcher
  /**
   * The default constructor.
   */
-  DEPRECATED Searcher();
+  Searcher();

  ~Searcher();

@@ -88,12 +85,12 @@ class Searcher
   *
   * @param search The search query.
   * @param resultStart the start offset of the search results (used for pagination).
-   * @param maxResultCount Maximum results to get from start (used for pagination).
+   * @param resultEnd the end offset of the search results (used for pagination).
   * @param verbose print some info on stdout if true.
   */
  void search(const std::string& search,
              unsigned int resultStart,
-              unsigned int maxResultCount,
+              unsigned int resultEnd,
              const bool verbose = false);

  /**
@@ -107,12 +104,12 @@ class Searcher
   * @param longitude The longitude of the center point.
   * @param distance The radius of the disc.
   * @param resultStart the start offset of the search results (used for pagination).
-   * @param maxResultCount Maximum number of results to get from start (used for pagination).
+   * @param resultEnd the end offset of the search results (used for pagination).
   * @param verbose print some info on stdout if true.
   */
  void geo_search(float latitude, float longitude, float distance,
                  unsigned int resultStart,
-                  unsigned int maxResultCount,
+                  unsigned int resultEnd,
                  const bool verbose = false);

  /**
@@ -145,29 +142,23 @@ class Searcher
   */
  unsigned int getEstimatedResultCount();

-  /**
-   * Get a SearchResultSet object for current search
-   */
-  zim::SearchResultSet getSearchResultSet();
-
  unsigned int getResultStart() { return resultStart; }
-  unsigned int getMaxResultCount() { return maxResultCount; }
+  unsigned int getResultEnd() { return resultEnd; }

 protected:
  std::string beautifyInteger(const unsigned int number);
  void closeIndex();
  void searchInIndex(string& search,
                     const unsigned int resultStart,
-                     const unsigned int maxResultCount,
+                     const unsigned int resultEnd,
                     const bool verbose = false);

  std::vector<Reader*> readers;
-  std::unique_ptr<SearcherInternal> internal;
-  std::unique_ptr<SuggestionInternal> suggestionInternal;
+  SearcherInternal* internal;
  std::string searchPattern;
  unsigned int estimatedResultCount;
  unsigned int resultStart;
-  unsigned int maxResultCount;
+  unsigned int resultEnd;

 private:
  void reset();
--- a/include/server.h
+++ b/include/server.h
@@ -55,20 +55,16 @@ namespace kiwix
       void setPort(int port) { m_port = port; }
       void setNbThreads(int threads) { m_nbThreads = threads; }
       void setVerbose(bool verbose) { m_verbose = verbose; }
-       void setIndexTemplateString(const std::string& indexTemplateString) { m_indexTemplateString = indexTemplateString; }
       void setTaskbar(bool withTaskbar, bool withLibraryButton)
        { m_withTaskbar = withTaskbar; m_withLibraryButton = withLibraryButton; }
       void setBlockExternalLinks(bool blockExternalLinks)
        { m_blockExternalLinks = blockExternalLinks; }
-       int getPort();
-       std::string getAddress();
-       
+
     protected:
       Library* mp_library;
       NameMapper* mp_nameMapper;
       std::string m_root = "";
       std::string m_addr = "";
-       std::string m_indexTemplateString = "";
       int m_port = 80;
       int m_nbThreads = 1;
       bool m_verbose = false;
--- a/include/tools.h
+++ b/include/tools.h
@@ -1,220 +0,0 @@
-/*
- * Copyright 2021 Matthieu Gautier <mgautier@kymeria.fr>
- *
- * 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.
- */
-
-#ifndef KIWIX_TOOLS_H
-#define KIWIX_TOOLS_H
-
-#include <string>
-#include <vector>
-#include <map>
-
-namespace kiwix {
-
-/**
- * Return the current directory.
- *
- * @return the current directory (utf8 encoded)
- */
-std::string getCurrentDirectory();
-
-/**
- * Return the data directory.
- *
- * The data directory is a directory where to put data (zim files, ...)
- * It depends of the platform and it may be changed by user using environment variable.
- *
- * The resolution order is :
- * - `KIWIX_DATA_DIR` env variable (if set).
- * - On Windows :
- *    . `$APPDATA/kiwix` if $APPDATA is set
- *    . `$USERPROFILE/kiwix` if $USERPROFILE is set
- * - Else :
- *    . `$XDG_DATA_HOME/kiwix`if $XDG_DATA_HOME is set
- *    . `$HOME/.local/share/kiwx` if $HOWE is set
- * - current directory
- *
- * @return the path of the data directory (utf8 encoded)
- */
-std::string getDataDirectory();
-
-/** Return the path of the executable
- *
- * Some application may be packaged in auto extractible archive (Appimage) and the
- * real executable is different of the path of the archive.
- * If `realPathOnly` is true, return the path of the real executable instead of the
- * archive launched by the user.
- *
- * @param realPathOnly If we must return the real path of the executable.
- * @return the path of the executable (utf8 encoded)
- */
-std::string getExecutablePath(bool realPathOnly = false);
-
-/** Tell if the path is a relative path.
- *
- * This function is provided as a small helper. It is probably better to use native tools
- * to manipulate paths.
- *
- * @param path A utf8 encoded path.
- * @return true if the path is relative.
- */
-bool isRelativePath(const std::string& path);
-
-/** Append a path to another one.
- *
- * This function is provided as a small helper. It is probably better to use native tools
- * to manipulate paths.
- *
- * @param basePath the base path.
- * @param relativePath a path to add to the base path, must be a relative path.
- * @return The concatenation of the paths, using the right separator.
- */
-std::string appendToDirectory(const std::string& basePath, const std::string& relativePath);
-
-/** Remove the last element of a path.
- *
- * This function is provided as a small helper. It is probably better to use native tools
- * to manipulate paths.
- *
- * @param path a path.
- * @return The parent directory (or empty string if none).
- */
-std::string removeLastPathElement(const std::string& path);
-
-/** Get the last element of a path.
- *
- * This function is provided as a small helper. It is probably better to use native tools
- * to manipulate paths.
- *
- * @param path a path.
- * @return The base name of the path or empty string if none (ending with a separator).
- */
-std::string getLastPathElement(const std::string& path);
-
-/** Compute the absolute path of a relative path based on another one
- *
- * Equivalent to appendToDirectory followed by a normalization of the path.
- *
- * This function is provided as a small helper. It is probably better to use native tools
- * to manipulate paths.
- *
- * @param path the base path (if empty, current directory is taken).
- * @param relativePath the relative path.
- * @return a absolute path.
- */
-std::string computeAbsolutePath(const std::string& path, const std::string& relativePath);
-
-/** Compute the relative path of a path relative to another one
- *
- * This function is provided as a small helper. It is probably better to use native tools
- * to manipulate paths.
- *
- * @param path the base path.
- * @param absolutePath the absolute path to find the relative path for.
- * @return a relative path (pointing to absolutePath, relative to path).
- */
-std::string computeRelativePath(const std::string& path, const std::string& absolutePath);
-
-/** Sleep the current thread.
- *
- * This function is provided as a small helper. It is probably better to use native tools.
- *
- * @param milliseconds The number of milliseconds to wait for.
- */
-void sleep(unsigned int milliseconds);
-
-/** Split a string
- *
- * This function is provided as a small helper. It is probably better to use native tools.
- *
- * Assuming text = "foo:;bar;baz,oups;"
- *
- * split(text, ":;", true, true) => ["foo", ":", ";", "bar", ";", "baz,oups", ";"]
- * split(text, ":;", true, false) => ["foo", "bar", "baz,oups"] (default)
- * split(text, ":;", false, true) => ["foo", ":", "", ";", "bar", ";", "baz,oups", ";", ""]
- * split(text, ":;", false, false) => ["foo", "", "bar", "baz,oups", ""]
- *
- * @param str The string to split.
- * @param delims A string of potential delimiters.
- *               Each charater in the string can be a individual delimiters.
- * @param dropEmpty true if empty part must be dropped from the result.
- * @param keepDelim true if delimiter must be included from the result.
- * @return a list of part (potentially containing delimiters)
- */
-std::vector<std::string> split(const std::string& str, const std::string& delims, bool dropEmpty=true, bool keepDelim = false);
-
-/** Convert language code from iso2 code to iso3
- *
- * This function is provided as a small helper. It is probably better to use native tools
- * to manipulate locales.
- *
- * @param a2code a iso2 code string.
- * @return the corresponding iso3 code.
- * @throw std::out_of_range if iso2 code is not known.
- */
-std::string converta2toa3(const std::string& a2code);
-
-/** Extracts content from given file.
- *
- * This function provides content of a file provided it's path.
- *
- * @param path The absolute path provided in string format.
- * @return Content of corresponding file in string format.
- */
-std::string getFileContent(const std::string& path);
-
-/** Checks if file exists.
- *
- * This function returns boolean stating if file exists.
- *
- * @param path The absolute path provided in string format.
- * @return Boolean representing if file exists or not.
- */
-bool fileExists(const std::string& path);
-
-/** Checks if file is readable.
- *
- * This function returns boolean stating if file is readable.
- *
- * @param path The absolute path provided in string format.
- * @return Boolean representing if file is readale or not.
- */
-bool fileReadable(const std::string& path);
-
-/** Provides mimetype from filename.
- *
- * This function provides mimetype from file-name.
- *
- * @param filename string containing filename.
- * @return mimetype from filename in string format.
- */
-std::string getMimeTypeForFile(const std::string& filename);
-
-/** Provides all available network interfaces
- *
- * This function provides the available IPv4 network interfaces
- */
-std::map<std::string, std::string> getNetworkInterfaces();
-
-/** Provides the best IP address
- * This function provides the best IP address from the list given by getNetworkInterfaces
- */
-std::string getBestPublicIp();
-
-}
-#endif // KIWIX_TOOLS_H
--- a/include/tools/base64.h
+++ b/include/tools/base64.h
--- a/include/tools/lock.h
+++ b/include/tools/lock.h
@@ -0,0 +1,46 @@
+
+
+#ifndef KIWIXLIB_TOOL_LOCK_H
+#define KIWIXLIB_TOOL_LOCK_H
+
+#include <pthread.h>
+
+namespace kiwix {
+
+class Lock
+{
+  public:
+    explicit Lock(pthread_mutex_t* mutex) :
+      mp_mutex(mutex)
+    {
+      pthread_mutex_lock(mp_mutex);
+    }
+    ~Lock() {
+      if (mp_mutex != nullptr) {
+        pthread_mutex_unlock(mp_mutex);
+      }
+    }
+    Lock(Lock && other) :
+      mp_mutex(other.mp_mutex)
+    {
+      other.mp_mutex = nullptr;
+    }
+    Lock & operator=(Lock && other)
+    {
+      mp_mutex = other.mp_mutex;
+      other.mp_mutex = nullptr;
+      return *this;
+    }
+
+
+  private:
+    pthread_mutex_t* mp_mutex;
+
+    Lock(Lock const &) = delete;
+    Lock & operator=(Lock const &) = delete;
+};
+
+
+}
+
+#endif //KIWIXLIB_TOOL_LOCK_H
--- a/include/tools/networkTools.h
+++ b/include/tools/networkTools.h
--- a/include/tools/otherTools.h
+++ b/include/tools/otherTools.h
@@ -22,9 +22,6 @@

 #include <string>
 #include <vector>
-#include <map>
-#include <zim/zim.h>
-#include <mustache.hpp>

 namespace pugi {
  class xml_node;
@@ -32,7 +29,9 @@ namespace pugi {

 namespace kiwix
 {
+  void sleep(unsigned int milliseconds);
  std::string nodeToString(const pugi::xml_node& node);
+  std::string converta2toa3(const std::string& a2code);

  /*
   * Convert all format tag string to new format
@@ -42,13 +41,6 @@ namespace kiwix
                                     const std::string& tagName);
  bool convertStrToBool(const std::string& value);

-  using MimeCounterType = std::map<const std::string, zim::entry_index_type>;
-  MimeCounterType parseMimetypeCounter(const std::string& counterData);
-
-  std::string gen_date_str();
-  std::string gen_uuid(const std::string& s);
-
-  std::string render_template(const std::string& template_str, kainjow::mustache::data data);
 }

 #endif
--- a/include/tools/pathTools.h
+++ b/include/tools/pathTools.h
@@ -26,13 +26,23 @@
 std::string WideToUtf8(const std::wstring& wstr);
 std::wstring Utf8ToWide(const std::string& str);
 #endif
+bool isRelativePath(const std::string& path);
+std::string computeAbsolutePath(const std::string& path, const std::string& relativePath);
+std::string computeRelativePath(const std::string& path, const std::string& absolutePath);
+std::string removeLastPathElement(const std::string& path);
+std::string appendToDirectory(const std::string& directoryPath, const std::string& filename);

 unsigned int getFileSize(const std::string& path);
 std::string getFileSizeAsString(const std::string& path);
+std::string getFileContent(const std::string& path);
+bool fileExists(const std::string& path);
 bool makeDirectory(const std::string& path);
 std::string makeTmpDirectory();
 bool copyFile(const std::string& sourcePath, const std::string& destPath);
+std::string getLastPathElement(const std::string& path);
+std::string getExecutablePath(bool realPathOnly = false);
+std::string getCurrentDirectory();
+std::string getDataDirectory();
 bool writeTextFile(const std::string& path, const std::string& content);
-
+std::string getMimeTypeForFile(const std::string& filename);
 #endif
-
--- a/include/tools/regexTools.h
+++ b/include/tools/regexTools.h
@@ -29,8 +29,5 @@ std::string replaceRegex(const std::string& content,
 std::string appendToFirstOccurence(const std::string& content,
                                   const std::string& regex,
                                   const std::string& replacement);
-std::string prependToFirstOccurence(const std::string& content,
-                                    const std::string& regex,
-                                    const std::string& replacement);

 #endif
--- a/include/tools/stringTools.h
+++ b/include/tools/stringTools.h
@@ -43,6 +43,7 @@ void loadICUExternalTables();
 std::string urlEncode(const std::string& value, bool encodeReserved = false);
 std::string urlDecode(const std::string& value, bool component = false);

+std::vector<std::string> split(const std::string&, const std::string&, bool trimEmpty = true);
 std::string join(const std::vector<std::string>& list, const std::string& sep);

 std::string ucAll(const std::string& word);
@@ -69,7 +70,5 @@ T extractFromString(const std::string& str) {
 }

 bool startsWith(const std::string& base, const std::string& start);
-
-std::vector<std::string> getTitleVariants(const std::string& title);
 } //namespace kiwix
 #endif
--- a/include/version.h
+++ b/include/version.h
@@ -1,33 +0,0 @@
-/*
- * Copyright 2021 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.
- */
-
-#ifndef KIWIX_VERSION_H
-#define KIWIX_VERSION_H
-
-#include <string>
-#include <vector>
-
-namespace kiwix
-{
-  typedef std::vector<std::pair<std::string, std::string>> LibVersions;
-  LibVersions getVersions();
-  void printVersions(std::ostream& out = std::cout);
-}
-
-#endif // KIWIX_VERSION_H
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
-project('libkiwix', 'cpp',
-  version : '10.0.1', # Also change this in android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
+project('kiwix-lib', 'cpp',
+  version : '9.3.1', # Also change this in android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
  license : 'GPLv3+',
  default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])

@@ -18,23 +18,17 @@ if wrapper.contains('java')
  add_languages('java')
 endif

-# See https://github.com/kiwix/libkiwix/issues/371
+# See https://github.com/kiwix/kiwix-lib/issues/371
 if ['arm', 'mips', 'm68k', 'ppc', 'sh4'].contains(target_machine.cpu_family())
  extra_libs += '-latomic'
 endif

-if (compiler.get_id() == 'gcc' and build_machine.system() == 'linux') or target_machine.system() == 'freebsd'
-  # C++ std::thread is implemented using pthread on linux by gcc
-  thread_dep = dependency('threads')
-else
-  thread_dep = dependency('', required:false)
-endif
+thread_dep = dependency('threads')
 libicu_dep = dependency('icu-i18n', static:static_deps)
+libzim_dep = dependency('libzim', version : '>=6.1.8', static:static_deps)
 pugixml_dep = dependency('pugixml', static:static_deps)
 libcurl_dep = dependency('libcurl', static:static_deps)
 microhttpd_dep = dependency('libmicrohttpd', static:static_deps)
-zlib_dep = dependency('zlib', static:static_deps)
-xapian_dep = dependency('xapian-core', static:static_deps)

 if compiler.has_header('mustache.hpp')
  extra_include = []
@@ -44,28 +38,18 @@ else
  error('Cannot found header mustache.hpp')
 endif

-libzim_dep = dependency('libzim', version : '>=7.2.0', static:static_deps)
-if not compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN')
-  error('Libzim seems to be compiled without xapian. Xapian support is mandatory.')
-endif
-
-
 extra_cflags = ''
 if target_machine.system() == 'windows' and static_deps
  add_project_arguments('-DCURL_STATICLIB', language : 'cpp')
  extra_cflags += '-DCURL_STATICLIB'
 endif

-if target_machine.system() == 'windows'
-  add_project_arguments('-DNOMINMAX', language: 'cpp')
-endif
-
-all_deps = [thread_dep, libicu_dep, libzim_dep, pugixml_dep, libcurl_dep, microhttpd_dep, zlib_dep, xapian_dep]
+all_deps = [thread_dep, libicu_dep, libzim_dep, pugixml_dep, libcurl_dep, microhttpd_dep]

 inc = include_directories('include', extra_include)

 conf = configuration_data()
-conf.set('LIBKIWIX_VERSION', '"@0@"'.format(meson.project_version()))
+conf.set('VERSION', '"@0@"'.format(meson.project_version()))

 if build_machine.system() == 'windows'
     extra_link_args = ['-lshlwapi', '-lwinmm']
@@ -78,11 +62,8 @@ subdir('scripts')
 subdir('static')
 subdir('src')
 subdir('test')
-if get_option('doc')
-  subdir('docs')
-endif

-pkg_requires = ['libzim', 'icu-i18n', 'pugixml', 'libcurl', 'libmicrohttpd', 'xapian-core']
+pkg_requires = ['libzim', 'icu-i18n', 'pugixml', 'libcurl']

 pkg_conf = configuration_data()
 pkg_conf.set('prefix', get_option('prefix'))
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,2 @@
 option('wrapper', type:'array', choices:['java', 'android'], value:[],
  description: 'The wrapper to generate.')
-option('doc', type : 'boolean', value : false,
-  description : 'Build the documentations.')
--- a/src/aria2.cpp
+++ b/src/aria2.cpp
@@ -3,15 +3,13 @@
 #include "aria2.h"
 #include "xmlrpc.h"
 #include <iostream>
-#include <algorithm>
 #include <sstream>
 #include <thread>
 #include <chrono>
-#include "tools.h"
-#include "tools/pathTools.h"
-#include "tools/stringTools.h"
-#include "tools/otherTools.h"
-#include "downloader.h" // For AriaError
+#include <tools/otherTools.h>
+#include <tools/pathTools.h>
+#include <tools/stringTools.h>
+#include <downloader.h> // For AriaError

 #ifdef _WIN32
 # define ARIA2_CMD "aria2c.exe"
@@ -21,20 +19,15 @@
 #endif


-#define LOG_ARIA_ERROR() \
-  { \
-    std::cerr << "ERROR: aria2 RPC request failed. (" << res << ")." << std::endl; \
-    std::cerr << (m_curlErrorBuffer[0] ? m_curlErrorBuffer.get() : curl_easy_strerror(res)) << std::endl; \
-  }

 namespace kiwix {

 Aria2::Aria2():
  mp_aria(nullptr),
  m_port(42042),
-  m_secret(getNewRpcSecret()),
-  m_curlErrorBuffer(new char[CURL_ERROR_SIZE]),
-  mp_curl(nullptr)
+  m_secret("kiwixariarpc"),
+  mp_curl(nullptr),
+  m_lock(PTHREAD_MUTEX_INITIALIZER)
 {
  m_downloadDir = getDataDirectory();
  makeDirectory(m_downloadDir);
@@ -65,12 +58,11 @@ Aria2::Aria2():
    // Try to use a potential installed aria2c.
    callCmd.push_back(ARIA2_CMD);
  }
-  callCmd.push_back("--follow-metalink=mem");
  callCmd.push_back("--enable-rpc");
  callCmd.push_back(rpc_secret.c_str());
  callCmd.push_back(rpc_port.c_str());
  callCmd.push_back(download_dir.c_str());
-  if (fileReadable(session_file)) {
+  if (fileExists(session_file)) {
    callCmd.push_back(inputFile.c_str());
  }
  callCmd.push_back(session.c_str());
@@ -92,21 +84,27 @@ Aria2::Aria2():
  }
  mp_aria = Subprocess::run(callCmd);
  mp_curl = curl_easy_init();
-
+  char errbuf[CURL_ERROR_SIZE];
  curl_easy_setopt(mp_curl, CURLOPT_URL, "http://localhost/rpc");
  curl_easy_setopt(mp_curl, CURLOPT_PORT, m_port);
  curl_easy_setopt(mp_curl, CURLOPT_POST, 1L);
-  curl_easy_setopt(mp_curl, CURLOPT_ERRORBUFFER, m_curlErrorBuffer.get());
+  curl_easy_setopt(mp_curl, CURLOPT_ERRORBUFFER, errbuf);

  int watchdog = 50;
  while(--watchdog) {
    sleep(10);
-    m_curlErrorBuffer[0] = 0;
+    errbuf[0] = 0;
    auto res = curl_easy_perform(mp_curl);
    if (res == CURLE_OK) {
      break;
    } else if (watchdog == 1) {
-      LOG_ARIA_ERROR();
+      std::cerr <<" curl_easy_perform() failed." << std::endl;
+      fprintf(stderr, "\nlibcurl: (%d) ", res);
+      if (errbuf[0] != 0) {
+        std::cerr << errbuf << std::endl;
+      } else {
+        std::cerr << curl_easy_strerror(res) << std::endl;
+      }
    }
  }
  if (!watchdog) {
@@ -117,7 +115,6 @@ Aria2::Aria2():

 Aria2::~Aria2()
 {
-  std::unique_lock<std::mutex> lock(m_lock);
  curl_easy_cleanup(mp_curl);
 }

@@ -129,44 +126,38 @@ void Aria2::close()

 size_t write_callback_to_iss(char* ptr, size_t size, size_t nmemb, void* userdata)
 {
-  auto outStream = static_cast<std::stringstream*>(userdata);
-  outStream->write(ptr, nmemb);
+  auto str = static_cast<std::stringstream*>(userdata);
+  str->write(ptr, nmemb);
  return nmemb;
 }

 std::string Aria2::doRequest(const MethodCall& methodCall)
 {
+  pthread_mutex_lock(&m_lock);
  auto requestContent = methodCall.toString();
-  std::stringstream outStream;
+  std::stringstream stringstream;
  CURLcode res;
-  long response_code;
-  {
-    std::unique_lock<std::mutex> lock(m_lock);
-    curl_easy_setopt(mp_curl, CURLOPT_POSTFIELDSIZE, requestContent.size());
-    curl_easy_setopt(mp_curl, CURLOPT_POSTFIELDS, requestContent.c_str());
-    curl_easy_setopt(mp_curl, CURLOPT_WRITEFUNCTION, &write_callback_to_iss);
-    curl_easy_setopt(mp_curl, CURLOPT_WRITEDATA, &outStream);
-    m_curlErrorBuffer[0] = 0;
-    res = curl_easy_perform(mp_curl);
-    if (res != CURLE_OK) {
-      LOG_ARIA_ERROR();
-      throw std::runtime_error("Cannot perform request");
-    }
+  curl_easy_setopt(mp_curl, CURLOPT_POSTFIELDSIZE, requestContent.size());
+  curl_easy_setopt(mp_curl, CURLOPT_POSTFIELDS, requestContent.c_str());
+  curl_easy_setopt(mp_curl, CURLOPT_WRITEFUNCTION, &write_callback_to_iss);
+  curl_easy_setopt(mp_curl, CURLOPT_WRITEDATA, &stringstream);
+  res = curl_easy_perform(mp_curl);
+  if (res == CURLE_OK) {
+    long response_code;
    curl_easy_getinfo(mp_curl, CURLINFO_RESPONSE_CODE, &response_code);
+    pthread_mutex_unlock(&m_lock);
+    if (response_code != 200) {
+      throw std::runtime_error("Invalid return code from aria");
+    }
+    auto responseContent = stringstream.str();
+    MethodResponse response(responseContent);
+    if (response.isFault()) {
+      throw AriaError(response.getFault().getFaultString());
+    }
+    return responseContent;
  }
-
-  auto responseContent = outStream.str();
-  if (response_code != 200) {
-    std::cerr << "ERROR: Invalid return code (" << response_code << ") from aria :" << std::endl;
-    std::cerr << responseContent << std::endl;
-    throw std::runtime_error("Invalid return code from aria");
-  }
-
-  MethodResponse response(responseContent);
-  if (response.isFault()) {
-    throw AriaError(response.getFault().getFaultString());
-  }
-  return responseContent;
+  pthread_mutex_unlock(&m_lock);
+  throw std::runtime_error("Cannot perform request");
 }

 std::string Aria2::addUri(const std::vector<std::string>& uris, const std::vector<std::pair<std::string, std::string>>& options)
@@ -197,13 +188,6 @@ std::string Aria2::tellStatus(const std::string& gid, const std::vector<std::str
  return doRequest(methodCall);
 }

-std::string Aria2::getNewRpcSecret()
-{
-  std::string uuid = gen_uuid("");
-  uuid.erase(std::remove(uuid.begin(), uuid.end(), '-'));
-  return uuid.substr(0, 9);
-}
-
 std::vector<std::string> Aria2::tellActive()
 {
  MethodCall methodCall("aria2.tellActive", m_secret);
--- a/src/aria2.h
+++ b/src/aria2.h
@@ -12,8 +12,8 @@
 #include "xmlrpc.h"

 #include <memory>
-#include <mutex>
 #include <curl/curl.h>
+#include <pthread.h>

 namespace kiwix {

@@ -24,9 +24,8 @@ class Aria2
    int m_port;
    std::string m_secret;
    std::string m_downloadDir;
-    std::unique_ptr<char[]> m_curlErrorBuffer;
    CURL* mp_curl;
-    std::mutex m_lock;
+    pthread_mutex_t m_lock;

    std::string doRequest(const MethodCall& methodCall);

@@ -37,7 +36,6 @@ class Aria2

    std::string addUri(const std::vector<std::string>& uri, const std::vector<std::pair<std::string, std::string>>& options = {});
    std::string tellStatus(const std::string& gid, const std::vector<std::string>& statusKey);
-    static std::string getNewRpcSecret();
    std::vector<std::string> tellActive();
    std::vector<std::string> tellWaiting();
    void saveSession();
--- a/src/book.cpp
+++ b/src/book.cpp
@@ -20,16 +20,10 @@
 #include "book.h"
 #include "reader.h"

-#include "tools.h"
 #include "tools/base64.h"
 #include "tools/regexTools.h"
 #include "tools/networkTools.h"
 #include "tools/otherTools.h"
-#include "tools/stringTools.h"
-#include "tools/pathTools.h"
-#include "tools/archiveTools.h"
-
-#include <zim/archive.h>

 #include <pugixml.hpp>

@@ -41,17 +35,11 @@ Book::Book() :
  m_readOnly(false)
 {
 }
-
 /* Destructor */
 Book::~Book()
 {
 }

-Book::Illustrations Book::getIllustrations() const
-{
-  return m_illustrations;
-}
-
 bool Book::update(const kiwix::Book& other)
 {
  if (m_readOnly)
@@ -60,43 +48,53 @@ bool Book::update(const kiwix::Book& other)
  if (m_id != other.m_id)
    return false;

-  *this = other;
+  m_readOnly = other.m_readOnly;
+  m_path = other.m_path;
+  m_pathValid = other.m_pathValid;
+  m_title = other.m_title;
+  m_description = other.m_description;
+  m_language = other.m_language;
+  m_creator = other.m_creator;
+  m_publisher = other.m_publisher;
+  m_date = other.m_date;
+  m_url = other.m_url;
+  m_name = other.m_name;
+  m_flavour = other.m_flavour;
+  m_tags = other.m_tags;
+  m_origId = other.m_origId;
+  m_articleCount = other.m_articleCount;
+  m_mediaCount = other.m_mediaCount;
+  m_size = other.m_size;
+  m_favicon = other.m_favicon;
+  m_faviconMimeType = other.m_faviconMimeType;
+  m_faviconUrl = other.m_faviconUrl;
+
+  m_downloadId = other.m_downloadId;
+
  return true;
 }

 void Book::update(const kiwix::Reader& reader)
 {
-  update(*reader.getZimArchive());
-}
-
-void Book::update(const zim::Archive& archive) {
-  m_path = archive.getFilename();
+  m_path = reader.getZimFilePath();
+  m_pathValid = true;
+  m_id = reader.getId();
+  m_title = reader.getTitle();
+  m_description = reader.getDescription();
+  m_language = reader.getLanguage();
+  m_creator = reader.getCreator();
+  m_publisher = reader.getPublisher();
+  m_date = reader.getDate();
+  m_name = reader.getName();
+  m_flavour = reader.getFlavour();
+  m_tags = reader.getTags();
+  m_origId = reader.getOrigId();
+  m_articleCount = reader.getArticleCount();
+  m_mediaCount = reader.getMediaCount();
+  m_size = static_cast<uint64_t>(reader.getFileSize()) << 10;
  m_pathValid = true;
-  m_id = getArchiveId(archive);
-  m_title = getArchiveTitle(archive);
-  m_description = getMetaDescription(archive);
-  m_language = getMetaLanguage(archive);
-  m_creator = getMetaCreator(archive);
-  m_publisher = getMetaPublisher(archive);
-  m_date = getMetaDate(archive);
-  m_name = getMetaName(archive);
-  m_flavour = getMetaFlavour(archive);
-  m_tags = getMetaTags(archive);
-  m_category = getCategoryFromTags();
-  m_articleCount = archive.getArticleCount();
-  m_mediaCount = getArchiveMediaCount(archive);
-  m_size = static_cast<uint64_t>(getArchiveFileSize(archive)) << 10;

-  m_illustrations.clear();
-  for ( const auto illustrationSize : archive.getIllustrationSizes() ) {
-    const auto illustration = std::make_shared<Illustration>();
-    const zim::Item illustrationItem = archive.getIllustrationItem(illustrationSize);
-    illustration->width = illustration->height = illustrationSize;
-    illustration->mimeType = illustrationItem.getMimetype();
-    illustration->data = illustrationItem.getData();
-    // NOTE: illustration->url is left uninitialized
-    m_illustrations.push_back(illustration);
-  }
+  reader.getFavicon(m_favicon, m_faviconMimeType);
 }

 #define ATTR(name) node.attribute(name).value()
@@ -108,7 +106,7 @@ void Book::updateFromXml(const pugi::xml_node& node, const std::string& baseDir)
    path = computeAbsolutePath(baseDir, path);
  }
  m_path = path;
-  m_pathValid = fileReadable(path);
+  m_pathValid = fileExists(path);
  m_title = ATTR("title");
  m_description = ATTR("description");
  m_language = ATTR("language");
@@ -123,19 +121,12 @@ void Book::updateFromXml(const pugi::xml_node& node, const std::string& baseDir)
  m_articleCount = strtoull(ATTR("articleCount"), 0, 0);
  m_mediaCount = strtoull(ATTR("mediaCount"), 0, 0);
  m_size = strtoull(ATTR("size"), 0, 0) << 10;
-  std::string favicon_mimetype = ATTR("faviconMimeType");
-  if (! favicon_mimetype.empty()) {
-    const auto favicon = std::make_shared<Illustration>();
-    favicon->data = base64_decode(ATTR("favicon"));
-    favicon->mimeType = favicon_mimetype;
-    favicon->url = ATTR("faviconUrl");
-    m_illustrations.assign(1, favicon);
-  }
+  m_favicon = base64_decode(ATTR("favicon"));
+  m_faviconMimeType = ATTR("faviconMimeType");
+  m_faviconUrl = ATTR("faviconUrl");
  try {
    m_downloadId = ATTR("downloadId");
  } catch(...) {}
-  const auto catattr = node.attribute("category");
-  m_category = catattr.empty() ? getCategoryFromTags() : catattr.value();
 }
 #undef ATTR

@@ -165,8 +156,6 @@ void Book::updateFromOpds(const pugi::xml_node& node, const std::string& urlHost
  m_name = VALUE("name");
  m_flavour = VALUE("flavour");
  m_tags = VALUE("tags");
-  const auto catnode = node.child("category");
-  m_category = catnode.empty() ? getCategoryFromTags() : catnode.child_value();
  m_articleCount = strtoull(VALUE("articleCount"), 0, 0);
  m_mediaCount = strtoull(VALUE("mediaCount"), 0, 0);
  for(auto linkNode = node.child("link"); linkNode;
@@ -178,11 +167,8 @@ void Book::updateFromOpds(const pugi::xml_node& node, const std::string& urlHost
      m_size = strtoull(linkNode.attribute("length").value(), 0, 0);
    }
    if (rel == "http://opds-spec.org/image/thumbnail") {
-      const auto favicon = std::make_shared<Illustration>();
-      favicon->data.clear();
-      favicon->url = urlHost + linkNode.attribute("href").value();
-      favicon->mimeType = linkNode.attribute("type").value();
-      m_illustrations.assign(1, favicon);
+      m_faviconUrl = urlHost + linkNode.attribute("href").value();
+      m_faviconMimeType = linkNode.attribute("type").value();
    }
 }

@@ -193,7 +179,7 @@ std::string Book::getHumanReadableIdFromPath() const
 {
  std::string id = m_path;
  if (!id.empty()) {
-    id = kiwix::removeAccents(id);
+    kiwix::removeAccents(id);

 #ifdef _WIN32
    id = replaceRegex(id, "", "^.*\\\\");
@@ -215,54 +201,15 @@ void Book::setPath(const std::string& path)
   : path;
 }

-const Book::Illustration Book::missingDefaultIllustration;
-
-std::shared_ptr<const Book::Illustration> Book::getIllustration(unsigned int size) const
-{
-  for ( const auto& ilPtr : m_illustrations ) {
-    if (ilPtr->width == size && ilPtr->height == size) {
-      return ilPtr;
-    }
-  }
-  throw std::runtime_error("Cannot find illustration");
-}
-
-const Book::Illustration& Book::getDefaultIllustration() const
-{
-  try {
-    return *getIllustration(48);
-  } catch (...) {
-    return missingDefaultIllustration;
-  }
-}
-
-const std::string& Book::Illustration::getData() const
-{
-  if (data.empty() && !url.empty()) {
-    const std::lock_guard<std::mutex> l(mutex);
-    if ( data.empty() ) {
-      try {
-        data = download(url);
-      } catch(...) {
-        std::cerr << "Cannot download favicon from " << url;
-      }
-    }
-  }
-  return data;
-}
-
 const std::string& Book::getFavicon() const {
-  return getDefaultIllustration().getData();
-}
-
-const std::string& Book::getFaviconUrl() const
-{
-  return getDefaultIllustration().url;
-}
-
-const std::string& Book::getFaviconMimeType() const
-{
-  return getDefaultIllustration().mimeType;
+  if (m_favicon.empty() && !m_faviconUrl.empty()) {
+    try {
+      m_favicon = download(m_faviconUrl);
+    } catch(...) {
+      std::cerr << "Cannot download favicon from " << m_faviconUrl;
+    }
+  }
+  return m_favicon;
 }

 std::string Book::getTagStr(const std::string& tagName) const {
@@ -273,21 +220,4 @@ bool Book::getTagBool(const std::string& tagName) const {
  return convertStrToBool(getTagStr(tagName));
 }

-std::string Book::getCategory() const
-{
-  return m_category;
-}
-
-std::string Book::getCategoryFromTags() const
-{
-  try
-  {
-    return getTagStr("category");
-  }
-  catch ( const std::out_of_range& )
-  {
-    return "";
-  }
-}
-
 }
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -1,3 +1,3 @@

-#mesondefine LIBKIWIX_VERSION
+#mesondefine VERSION

--- a/src/downloader.cpp
+++ b/src/downloader.cpp
@@ -133,7 +133,7 @@ Downloader::Downloader() :
      m_knownDownloads[gid]->updateStatus();
    }
  } catch (std::exception& e) {
-    std::cerr << "aria2 tellActive failed : " << e.what() << std::endl;
+    std::cerr << "aria2 tellActive failed : " << e.what();
  }
  try {
    for (auto gid : mp_aria->tellWaiting()) {
@@ -141,7 +141,7 @@ Downloader::Downloader() :
      m_knownDownloads[gid]->updateStatus();
    }
  } catch (std::exception& e) {
-    std::cerr << "aria2 tellWaiting failed : " << e.what() << std::endl;
+    std::cerr << "aria2 tellWaiting failed : " << e.what();
  }
 }

--- a/src/entry.cpp
+++ b/src/entry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2020 Matthieu Gautier <mgautier@kymeria.fr>
+ * Copyright 2011 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
@@ -20,54 +20,121 @@
 #include "reader.h"
 #include <time.h>

+#include <zim/search.h>
+
 namespace kiwix
 {

-Entry::Entry(zim::Entry entry, bool _marker)
-  : entry(entry)
+Entry::Entry(zim::Article article)
+  : article(article)
 {
 }

+#define RETURN_IF_INVALID(WHAT) if(!good()) { return (WHAT); }
+
+std::string Entry::getPath() const
+{
+  RETURN_IF_INVALID("");
+  return article.getLongUrl();
+}
+
+std::string Entry::getTitle() const
+{
+  RETURN_IF_INVALID("");
+  return article.getTitle();
+}
+
+std::string Entry::getContent() const
+{
+  RETURN_IF_INVALID("");
+  return article.getData();
+}
+
+zim::Blob Entry::getBlob(offset_type offset) const
+{
+  RETURN_IF_INVALID(zim::Blob());
+  return article.getData(offset);
+}
+
+zim::Blob Entry::getBlob(offset_type offset, size_type size) const
+{
+  RETURN_IF_INVALID(zim::Blob());
+  return article.getData(offset, size);
+}
+
+std::pair<std::string, offset_type> Entry::getDirectAccessInfo() const
+{
+  RETURN_IF_INVALID(std::make_pair("", 0));
+  return article.getDirectAccessInformation();
+}
+
 size_type Entry::getSize() const
 {
-  if (entry.isRedirect()) {
-    return 0;
-  } else {
-    return entry.getItem().getSize();
-  }
+  RETURN_IF_INVALID(0);
+  return article.getArticleSize();
 }

 std::string Entry::getMimetype() const
 {
-  return entry.getItem(true).getMimetype();
+  RETURN_IF_INVALID("");
+  try {
+    return article.getMimeType();
+  } catch (exception& e) {
+    return "application/octet-stream";
+  }
 }

 bool Entry::isRedirect() const
 {
-  return entry.isRedirect();
+  RETURN_IF_INVALID(false);
+  return article.isRedirect();
+}
+
+bool Entry::isLinkTarget() const
+{
+  RETURN_IF_INVALID(false);
+  return article.isLinktarget();
+}
+
+bool Entry::isDeleted() const
+{
+  RETURN_IF_INVALID(false);
+  return article.isDeleted();
 }

 Entry Entry::getRedirectEntry() const
 {
-  if ( !entry.isRedirect() ) {
+  RETURN_IF_INVALID(Entry());
+  if ( !article.isRedirect() ) {
    throw NoEntry();
  }

-  return Entry(entry.getRedirectEntry(), true);
+  auto targeted_article = article.getRedirectArticle();
+  if ( !targeted_article.good()) {
+    throw NoEntry();
+  }
+  return targeted_article;
 }

 Entry Entry::getFinalEntry() const
 {
+  RETURN_IF_INVALID(Entry());
+  if (final_article.good()) {
+    return final_article;
+  }
  int loopCounter = 42;
-  auto final_entry = entry;
-  while (final_entry.isRedirect() && loopCounter--) {
-    final_entry = final_entry.getRedirectEntry();
+  final_article = article;
+  while (final_article.isRedirect() && loopCounter--) {
+    final_article = final_article.getRedirectArticle();
+    if ( !final_article.good()) {
+      throw NoEntry();
+    }
  }
  // Prevent infinite loops.
-  if (final_entry.isRedirect()) {
+  if (final_article.isRedirect()) {
    throw NoEntry();
  }
-  return Entry(final_entry, true);
+  return final_article;
 }

 }
--- a/src/kiwixserve.cpp
+++ b/src/kiwixserve.cpp
@@ -9,7 +9,6 @@
    # include <unistd.h>
 #endif

-#include "tools.h"
 #include "tools/pathTools.h"
 #include "tools/stringTools.h"

--- a/src/library.cpp
+++ b/src/library.cpp
@@ -22,7 +22,6 @@
 #include "reader.h"
 #include "libxml_dumper.h"

-#include "tools.h"
 #include "tools/base64.h"
 #include "tools/regexTools.h"
 #include "tools/pathTools.h"
@@ -31,67 +30,14 @@
 #include <pugixml.hpp>
 #include <algorithm>
 #include <set>
-#include <unicode/locid.h>
-#include <xapian.h>

 namespace kiwix
 {

-namespace
-{
-
-std::string iso639_3ToXapian(const std::string& lang) {
-  return icu::Locale(lang.c_str()).getLanguage();
-};
-
-std::string normalizeText(const std::string& text)
-{
-  return removeAccents(text);
-}
-
-bool booksReferToTheSameArchive(const Book& book1, const Book& book2)
-{
-  return book1.isPathValid()
-      && book2.isPathValid()
-      && book1.getPath() == book2.getPath();
-}
-
-} // unnamed namespace
-
-class LibraryBase::BookDB : public Xapian::WritableDatabase
-{
-public:
-  BookDB() : Xapian::WritableDatabase("", Xapian::DB_BACKEND_INMEMORY) {}
-};
-
-LibraryBase::LibraryBase()
-  : m_bookDB(new BookDB)
-{
-}
-
-LibraryBase::~LibraryBase()
-{
-}
-
-LibraryBase::LibraryBase(LibraryBase&& ) = default;
-LibraryBase& LibraryBase::operator=(LibraryBase&& ) = default;
-
 /* Constructor */
 Library::Library()
 {
 }
-
-Library::Library(Library&& other)
-  : LibraryBase(std::move(other))
-{
-}
-
-Library& Library::operator=(Library&& other)
-{
-  LibraryBase::operator=(std::move(other));
-  return *this;
-}
-
 /* Destructor */
 Library::~Library()
 {
@@ -100,37 +46,24 @@ Library::~Library()

 bool Library::addBook(const Book& book)
 {
-  std::lock_guard<std::mutex> lock(m_mutex);
-  ++m_revision;
  /* Try to find it */
-  updateBookDB(book);
  try {
    auto& oldbook = m_books.at(book.getId());
-    if ( ! booksReferToTheSameArchive(oldbook, book) ) {
-      dropReader(book.getId());
-    }
-    oldbook.update(book); // XXX: This may have no effect if oldbook is readonly
-                          // XXX: Then m_bookDB will become out-of-sync with
-                          // XXX: the real contents of the library.
-    oldbook.lastUpdatedRevision = m_revision;
+    oldbook.update(book);
    return false;
  } catch (std::out_of_range&) {
-    Entry& newEntry = m_books[book.getId()];
-    static_cast<Book&>(newEntry) = book;
-    newEntry.lastUpdatedRevision = m_revision;
+    m_books[book.getId()] = book;
    return true;
  }
 }

 void Library::addBookmark(const Bookmark& bookmark)
 {
-  std::lock_guard<std::mutex> lock(m_mutex);
  m_bookmarks.push_back(bookmark);
 }

 bool Library::removeBookmark(const std::string& zimId, const std::string& url)
 {
-  std::lock_guard<std::mutex> lock(m_mutex);
  for(auto it=m_bookmarks.begin(); it!=m_bookmarks.end(); it++) {
    if (it->getBookId() == zimId && it->getUrl() == url) {
      m_bookmarks.erase(it);
@@ -141,63 +74,19 @@ bool Library::removeBookmark(const std::string& zimId, const std::string& url)
 }


-void Library::dropReader(const std::string& id)
-{
-  m_readers.erase(id);
-  m_archives.erase(id);
-}

 bool Library::removeBookById(const std::string& id)
 {
-  std::lock_guard<std::mutex> lock(m_mutex);
-  m_bookDB->delete_document("Q" + id);
-  dropReader(id);
  return m_books.erase(id) == 1;
 }

-Library::Revision Library::getRevision() const
+Book& Library::getBookById(const std::string& id)
 {
-  std::lock_guard<std::mutex> lock(m_mutex);
-  return m_revision;
-}
-
-uint32_t Library::removeBooksNotUpdatedSince(LibraryRevision libraryRevision)
-{
-  BookIdCollection booksToRemove;
-  {
-    std::lock_guard<std::mutex> lock(m_mutex);
-    for ( const auto& entry : m_books) {
-      if ( entry.second.lastUpdatedRevision <= libraryRevision ) {
-        booksToRemove.push_back(entry.first);
-      }
-    }
-  }
-
-  uint32_t countOfRemovedBooks = 0;
-  for ( const auto& id : booksToRemove ) {
-    if ( removeBookById(id) )
-      ++countOfRemovedBooks;
-  }
-  return countOfRemovedBooks;
-}
-
-const Book& Library::getBookById(const std::string& id) const
-{
-  // XXX: Doesn't make sense to lock this operation since it cannot
-  // XXX: guarantee thread-safety because of its return type
  return m_books.at(id);
 }

-Book Library::getBookByIdThreadSafe(const std::string& id) const
+Book& Library::getBookByPath(const std::string& path)
 {
-  std::lock_guard<std::mutex> lock(m_mutex);
-  return getBookById(id);
-}
-
-const Book& Library::getBookByPath(const std::string& path) const
-{
-  // XXX: Doesn't make sense to lock this operation since it cannot
-  // XXX: guarantee thread-safety because of its return type
  for(auto& it: m_books) {
    auto& book = it.second;
    if (book.getPath() == path)
@@ -211,40 +100,20 @@ const Book& Library::getBookByPath(const std::string& path) const
 std::shared_ptr<Reader> Library::getReaderById(const std::string& id)
 {
  try {
-    std::lock_guard<std::mutex> lock(m_mutex);
    return m_readers.at(id);
  } catch (std::out_of_range& e) {}

-  const auto archive = getArchiveById(id);
-  if ( !archive )
-    return nullptr;
-
-  const shared_ptr<Reader> reader(new Reader(archive, true));
-  std::lock_guard<std::mutex> lock(m_mutex);
-  m_readers[id] = reader;
-  return reader;
-}
-
-std::shared_ptr<zim::Archive> Library::getArchiveById(const std::string& id)
-{
-  std::lock_guard<std::mutex> lock(m_mutex);
-  try {
-    return m_archives.at(id);
-  } catch (std::out_of_range& e) {}
-
  auto book = getBookById(id);
  if (!book.isPathValid())
    return nullptr;
-
-  auto sptr = make_shared<zim::Archive>(book.getPath());
-  m_archives[id] = sptr;
+  auto sptr = make_shared<Reader>(book.getPath());
+  m_readers[id] = sptr;
  return sptr;
 }

 unsigned int Library::getBookCount(const bool localBooks,
-                                   const bool remoteBooks) const
+                                   const bool remoteBooks)
 {
-  std::lock_guard<std::mutex> lock(m_mutex);
  unsigned int result = 0;
  for (auto& pair: m_books) {
    auto& book = pair.second;
@@ -256,96 +125,84 @@ unsigned int Library::getBookCount(const bool localBooks,
  return result;
 }

-bool Library::writeToFile(const std::string& path) const
+bool Library::writeToFile(const std::string& path)
 {
-  const auto allBookIds = getBooksIds();
-
  auto baseDir = removeLastPathElement(path);
  LibXMLDumper dumper(this);
  dumper.setBaseDir(baseDir);
-  std::string xml;
-  {
-    std::lock_guard<std::mutex> lock(m_mutex);
-    xml = dumper.dumpLibXMLContent(allBookIds);
-  };
-  return writeTextFile(path, xml);
+  return writeTextFile(path, dumper.dumpLibXMLContent(getBooksIds()));
 }

-bool Library::writeBookmarksToFile(const std::string& path) const
+bool Library::writeBookmarksToFile(const std::string& path)
 {
  LibXMLDumper dumper(this);
-  // NOTE: LibXMLDumper::dumpLibXMLBookmark uses Library in a thread-safe way
-  const std::string xml = dumper.dumpLibXMLBookmark();
-  return writeTextFile(path, xml);
+  return writeTextFile(path, dumper.dumpLibXMLBookmark());
 }

-Library::AttributeCounts Library::getBookAttributeCounts(BookStrPropMemFn p) const
+std::vector<std::string> Library::getBooksLanguages()
 {
-  std::lock_guard<std::mutex> lock(m_mutex);
-  AttributeCounts propValueCounts;
+  std::vector<std::string> booksLanguages;
+  std::map<std::string, bool> booksLanguagesMap;

-  for (const auto& pair: m_books) {
-    const auto& book = pair.second;
-    if (book.getOrigId().empty()) {
-      propValueCounts[(book.*p)()] += 1;
-    }
-  }
-  return propValueCounts;
-}
-
-std::vector<std::string> Library::getBookPropValueSet(BookStrPropMemFn p) const
-{
-  std::vector<std::string> result;
-  for ( const auto& kv : getBookAttributeCounts(p) ) {
-    result.push_back(kv.first);
-  }
-  return result;
-}
-
-std::vector<std::string> Library::getBooksLanguages() const
-{
-  return getBookPropValueSet(&Book::getLanguage);
-}
-
-Library::AttributeCounts Library::getBooksLanguagesWithCounts() const
-{
-  return getBookAttributeCounts(&Book::getLanguage);
-}
-
-std::vector<std::string> Library::getBooksCategories() const
-{
-  std::lock_guard<std::mutex> lock(m_mutex);
-  std::set<std::string> categories;
-
-  for (const auto& pair: m_books) {
-    const auto& book = pair.second;
-    const auto& c = book.getCategory();
-    if ( !c.empty() ) {
-      categories.insert(c);
+  for (auto& pair: m_books) {
+    auto& book = pair.second;
+    auto& language = book.getLanguage();
+    if (booksLanguagesMap.find(language) == booksLanguagesMap.end()) {
+      if (book.getOrigId().empty()) {
+        booksLanguagesMap[language] = true;
+        booksLanguages.push_back(language);
+      }
    }
  }

-  return std::vector<std::string>(categories.begin(), categories.end());
+  return booksLanguages;
 }

-std::vector<std::string> Library::getBooksCreators() const
+std::vector<std::string> Library::getBooksCreators()
 {
-  return getBookPropValueSet(&Book::getCreator);
+  std::vector<std::string> booksCreators;
+  std::map<std::string, bool> booksCreatorsMap;
+
+  for (auto& pair: m_books) {
+    auto& book = pair.second;
+    auto& creator = book.getCreator();
+    if (booksCreatorsMap.find(creator) == booksCreatorsMap.end()) {
+      if (book.getOrigId().empty()) {
+        booksCreatorsMap[creator] = true;
+        booksCreators.push_back(creator);
+      }
+    }
+  }
+
+  return booksCreators;
 }

-std::vector<std::string> Library::getBooksPublishers() const
+std::vector<std::string> Library::getBooksPublishers()
 {
-  return getBookPropValueSet(&Book::getPublisher);
+  std::vector<std::string> booksPublishers;
+  std::map<std::string, bool> booksPublishersMap;
+
+  for (auto& pair:m_books) {
+    auto& book = pair.second;
+    auto& publisher = book.getPublisher();
+    if (booksPublishersMap.find(publisher) == booksPublishersMap.end()) {
+      if (book.getOrigId().empty()) {
+        booksPublishersMap[publisher] = true;
+        booksPublishers.push_back(publisher);
+      }
+    }
+  }
+
+  return booksPublishers;
 }

-const std::vector<kiwix::Bookmark> Library::getBookmarks(bool onlyValidBookmarks) const
+const std::vector<kiwix::Bookmark> Library::getBookmarks(bool onlyValidBookmarks)
 {
  if (!onlyValidBookmarks) {
    return m_bookmarks;
  }
  std::vector<kiwix::Bookmark> validBookmarks;
  auto booksId = getBooksIds();
-  std::lock_guard<std::mutex> lock(m_mutex);
  for(auto& bookmark:m_bookmarks) {
    if (std::find(booksId.begin(), booksId.end(), bookmark.getBookId()) != booksId.end()) {
      validBookmarks.push_back(bookmark);
@@ -354,10 +211,9 @@ const std::vector<kiwix::Bookmark> Library::getBookmarks(bool onlyValidBookmarks
  return validBookmarks;
 }

-Library::BookIdCollection Library::getBooksIds() const
+std::vector<std::string> Library::getBooksIds()
 {
-  std::lock_guard<std::mutex> lock(m_mutex);
-  BookIdCollection bookIds;
+  std::vector<std::string> bookIds;

  for (auto& pair: m_books) {
    bookIds.push_back(pair.first);
@@ -366,199 +222,26 @@ Library::BookIdCollection Library::getBooksIds() const
  return bookIds;
 }

-
-void Library::updateBookDB(const Book& book)
+std::vector<std::string> Library::filter(const std::string& search)
 {
-  Xapian::Stem stemmer;
-  Xapian::TermGenerator indexer;
-  const std::string lang = book.getLanguage();
-  try {
-    stemmer = Xapian::Stem(iso639_3ToXapian(lang));
-    indexer.set_stemmer(stemmer);
-    indexer.set_stemming_strategy(Xapian::TermGenerator::STEM_SOME);
-  } catch (...) {}
-  Xapian::Document doc;
-  indexer.set_document(doc);
-
-  const std::string title = normalizeText(book.getTitle());
-  const std::string desc = normalizeText(book.getDescription());
-
-  // Index title and description without prefixes for general search
-  indexer.index_text(title);
-  indexer.increase_termpos();
-  indexer.index_text(desc);
-
-  // Index all fields for field-based search
-  indexer.index_text(title, 1, "S");
-  indexer.index_text(desc,  1, "XD");
-  indexer.index_text(lang,  1, "L");
-  indexer.index_text(normalizeText(book.getCreator()),   1, "A");
-  indexer.index_text(normalizeText(book.getPublisher()), 1, "XP");
-  indexer.index_text(normalizeText(book.getName()),      1, "XN");
-  indexer.index_text(normalizeText(book.getCategory()),  1, "XC");
-
-  for ( const auto& tag : split(normalizeText(book.getTags()), ";") )
-    doc.add_boolean_term("XT" + tag);
-
-  const std::string idterm = "Q" + book.getId();
-  doc.add_boolean_term(idterm);
-
-  doc.set_data(book.getId());
-
-  m_bookDB->replace_document(idterm, doc);
-}
-
-namespace
-{
-
-bool willSelectEverything(const Xapian::Query& query)
-{
-  return query.get_type() == Xapian::Query::LEAF_MATCH_ALL;
-}
-
-
-Xapian::Query buildXapianQueryFromFilterQuery(const Filter& filter)
-{
-  if ( !filter.hasQuery() || filter.getQuery().empty() ) {
-    // This is a thread-safe way to construct an equivalent of
-    // a Xapian::Query::MatchAll query
-    return Xapian::Query(std::string());
-  }
-
-  Xapian::QueryParser queryParser;
-  queryParser.set_default_op(Xapian::Query::OP_AND);
-  queryParser.add_prefix("title", "S");
-  queryParser.add_prefix("description", "XD");
-  queryParser.add_prefix("name", "XN");
-  queryParser.add_prefix("category", "XC");
-  queryParser.add_prefix("lang", "L");
-  queryParser.add_prefix("publisher", "XP");
-  queryParser.add_prefix("creator", "A");
-  queryParser.add_prefix("tag", "XT");
-  const auto partialQueryFlag = filter.queryIsPartial()
-                              ? Xapian::QueryParser::FLAG_PARTIAL
-                              : 0;
-  // Language assumed for the query is not known for sure so stemming
-  // is not applied
-  //queryParser.set_stemmer(Xapian::Stem(iso639_3ToXapian(???)));
-  //queryParser.set_stemming_strategy(Xapian::QueryParser::STEM_SOME);
-  const auto flags = Xapian::QueryParser::FLAG_PHRASE
-                   | Xapian::QueryParser::FLAG_BOOLEAN
-                   | Xapian::QueryParser::FLAG_BOOLEAN_ANY_CASE
-                   | Xapian::QueryParser::FLAG_LOVEHATE
-                   | Xapian::QueryParser::FLAG_WILDCARD
-                   | partialQueryFlag;
-  return queryParser.parse_query(normalizeText(filter.getQuery()), flags);
-}
-
-Xapian::Query nameQuery(const std::string& name)
-{
-  return Xapian::Query("XN" + normalizeText(name));
-}
-
-Xapian::Query categoryQuery(const std::string& category)
-{
-  return Xapian::Query("XC" + normalizeText(category));
-}
-
-Xapian::Query langQuery(const std::string& lang)
-{
-  return Xapian::Query("L" + normalizeText(lang));
-}
-
-Xapian::Query publisherQuery(const std::string& publisher)
-{
-  Xapian::QueryParser queryParser;
-  queryParser.set_default_op(Xapian::Query::OP_OR);
-  queryParser.set_stemming_strategy(Xapian::QueryParser::STEM_NONE);
-  const auto flags = 0;
-  const auto q = queryParser.parse_query(normalizeText(publisher), flags, "XP");
-  return Xapian::Query(Xapian::Query::OP_PHRASE, q.get_terms_begin(), q.get_terms_end(), q.get_length());
-}
-
-Xapian::Query creatorQuery(const std::string& creator)
-{
-  Xapian::QueryParser queryParser;
-  queryParser.set_default_op(Xapian::Query::OP_OR);
-  queryParser.set_stemming_strategy(Xapian::QueryParser::STEM_NONE);
-  const auto flags = 0;
-  const auto q = queryParser.parse_query(normalizeText(creator), flags, "A");
-  return Xapian::Query(Xapian::Query::OP_PHRASE, q.get_terms_begin(), q.get_terms_end(), q.get_length());
-}
-
-Xapian::Query tagsQuery(const Filter::Tags& acceptTags, const Filter::Tags& rejectTags)
-{
-  Xapian::Query q = Xapian::Query(std::string());
-  if (!acceptTags.empty()) {
-    for ( const auto& tag : acceptTags )
-      q &= Xapian::Query("XT" + normalizeText(tag));
-  }
-
-  if (!rejectTags.empty()) {
-    for ( const auto& tag : rejectTags )
-      q = Xapian::Query(Xapian::Query::OP_AND_NOT, q, "XT" + normalizeText(tag));
-  }
-  return q;
-}
-
-Xapian::Query buildXapianQuery(const Filter& filter)
-{
-  auto q = buildXapianQueryFromFilterQuery(filter);
-  if ( filter.hasName() ) {
-    q = Xapian::Query(Xapian::Query::OP_AND, q, nameQuery(filter.getName()));
-  }
-  if ( filter.hasCategory() ) {
-    q = Xapian::Query(Xapian::Query::OP_AND, q, categoryQuery(filter.getCategory()));
-  }
-  if ( filter.hasLang() ) {
-    q = Xapian::Query(Xapian::Query::OP_AND, q, langQuery(filter.getLang()));
-  }
-  if ( filter.hasPublisher() ) {
-    q = Xapian::Query(Xapian::Query::OP_AND, q, publisherQuery(filter.getPublisher()));
-  }
-  if ( filter.hasCreator() ) {
-    q = Xapian::Query(Xapian::Query::OP_AND, q, creatorQuery(filter.getCreator()));
-  }
-  if ( !filter.getAcceptTags().empty() || !filter.getRejectTags().empty() ) {
-    const auto tq = tagsQuery(filter.getAcceptTags(), filter.getRejectTags());
-    q = Xapian::Query(Xapian::Query::OP_AND, q, tq);;
-  }
-  return q;
-}
-
-} // unnamed namespace
-
-Library::BookIdCollection Library::filterViaBookDB(const Filter& filter) const
-{
-  const auto query = buildXapianQuery(filter);
-
-  if ( willSelectEverything(query) )
+  if (search.empty()) {
    return getBooksIds();
-
-  BookIdCollection bookIds;
-
-  std::lock_guard<std::mutex> lock(m_mutex);
-  Xapian::Enquire enquire(*m_bookDB);
-  enquire.set_query(query);
-  const auto results = enquire.get_mset(0, m_books.size());
-  for ( auto it = results.begin(); it != results.end(); ++it  ) {
-    bookIds.push_back(it.get_document().get_data());
  }

-  return bookIds;
+  return filter(Filter().query(search));
 }

-Library::BookIdCollection Library::filter(const Filter& filter) const
+
+std::vector<std::string> Library::filter(const Filter& filter)
 {
-  BookIdCollection result;
-  const auto preliminaryResult = filterViaBookDB(filter);
-  std::lock_guard<std::mutex> lock(m_mutex);
-  for(auto id : preliminaryResult) {
-    if(filter.accept(m_books.at(id))) {
-      result.push_back(id);
+  std::vector<std::string> bookIds;
+  for(auto& pair:m_books) {
+    auto book = pair.second;
+    if(filter.accept(book)) {
+      bookIds.push_back(pair.first);
    }
  }
-  return result;
+  return bookIds;
 }

 template<supportedListSortBy SORT>
@@ -574,13 +257,13 @@ struct KEY_TYPE<SIZE> {
 template<supportedListSortBy sort>
 class Comparator {
  private:
-    const Library* const lib;
-    const bool     ascending;
+    Library* lib;
+    bool     ascending;

    inline typename KEY_TYPE<sort>::TYPE get_key(const std::string& id);

  public:
-    Comparator(const Library* lib, bool ascending) : lib(lib), ascending(ascending) {}
+    Comparator(Library* lib, bool ascending) : lib(lib), ascending(ascending) {}
    inline bool operator() (const std::string& id1, const std::string& id2) {
      if (ascending) {
        return get_key(id1) < get_key(id2);
@@ -620,13 +303,8 @@ std::string Comparator<PUBLISHER>::get_key(const std::string& id)
  return lib->getBookById(id).getPublisher();
 }

-void Library::sort(BookIdCollection& bookIds, supportedListSortBy sort, bool ascending) const
+void Library::sort(std::vector<std::string>& bookIds, supportedListSortBy sort, bool ascending)
 {
-  // NOTE: Can reimplement this method in a way that doesn't require locking
-  // NOTE: for the entire duration of the sort. Will need to obtain (under a
-  // NOTE: lock) the required atributes from the books once, and then the
-  // NOTE: sorting will run on a copy of data without locking.
-  std::lock_guard<std::mutex> lock(m_mutex);
  switch(sort) {
    case TITLE:
      std::sort(bookIds.begin(), bookIds.end(), Comparator<TITLE>(this, ascending));
@@ -649,6 +327,48 @@ void Library::sort(BookIdCollection& bookIds, supportedListSortBy sort, bool asc
 }


+std::vector<std::string> Library::listBooksIds(
+    int mode,
+    supportedListSortBy sortBy,
+    const std::string& search,
+    const std::string& language,
+    const std::string& creator,
+    const std::string& publisher,
+    const std::vector<std::string>& tags,
+    size_t maxSize) {
+
+  Filter _filter;
+  if (mode & LOCAL)
+    _filter.local(true);
+  if (mode & NOLOCAL)
+    _filter.local(false);
+  if (mode & VALID)
+    _filter.valid(true);
+  if (mode & NOVALID)
+    _filter.valid(false);
+  if (mode & REMOTE)
+    _filter.remote(true);
+  if (mode & NOREMOTE)
+    _filter.remote(false);
+  if (!tags.empty())
+    _filter.acceptTags(tags);
+  if (maxSize != 0)
+    _filter.maxSize(maxSize);
+  if (!language.empty())
+    _filter.lang(language);
+  if (!publisher.empty())
+    _filter.publisher(publisher);
+  if (!creator.empty())
+    _filter.creator(creator);
+  if (!search.empty())
+    _filter.query(search);
+
+  auto bookIds = filter(_filter);
+
+  sort(bookIds, sortBy, true);
+  return bookIds;
+}
+
 Filter::Filter()
  : activeFilters(0),
    _maxSize(0)
@@ -671,7 +391,6 @@ enum filterTypes {
  MAXSIZE = FLAG(11),
  QUERY = FLAG(12),
  NAME = FLAG(13),
-  CATEGORY = FLAG(14),
 };

 Filter& Filter::local(bool accept)
@@ -710,27 +429,20 @@ Filter& Filter::valid(bool accept)
  return *this;
 }

-Filter& Filter::acceptTags(const Tags& tags)
+Filter& Filter::acceptTags(std::vector<std::string> tags)
 {
  _acceptTags = tags;
  activeFilters |= ACCEPTTAGS;
  return *this;
 }

-Filter& Filter::rejectTags(const Tags& tags)
+Filter& Filter::rejectTags(std::vector<std::string> tags)
 {
  _rejectTags = tags;
  activeFilters |= REJECTTAGS;
  return *this;
 }

-Filter& Filter::category(std::string category)
-{
-  _category = category;
-  activeFilters |= CATEGORY;
-  return *this;
-}
-
 Filter& Filter::lang(std::string lang)
 {
  _lang = lang;
@@ -759,10 +471,9 @@ Filter& Filter::maxSize(size_t maxSize)
  return *this;
 }

-Filter& Filter::query(std::string query, bool partial)
+Filter& Filter::query(std::string query)
 {
  _query = query;
-  _queryIsPartial = partial;
  activeFilters |= QUERY;
  return *this;
 }
@@ -776,36 +487,6 @@ Filter& Filter::name(std::string name)

 #define ACTIVE(X) (activeFilters & (X))
 #define FILTER(TAG, TEST) if (ACTIVE(TAG) && !(TEST)) { return false; }
-bool Filter::hasQuery() const
-{
-  return ACTIVE(QUERY);
-}
-
-bool Filter::hasName() const
-{
-  return ACTIVE(NAME);
-}
-
-bool Filter::hasCategory() const
-{
-  return ACTIVE(CATEGORY);
-}
-
-bool Filter::hasLang() const
-{
-  return ACTIVE(LANG);
-}
-
-bool Filter::hasPublisher() const
-{
-  return ACTIVE(_PUBLISHER);
-}
-
-bool Filter::hasCreator() const
-{
-  return ACTIVE(_CREATOR);
-}
-
 bool Filter::accept(const Book& book) const
 {
  auto local = !book.getPath().empty();
@@ -821,8 +502,40 @@ bool Filter::accept(const Book& book) const
  FILTER(_NOREMOTE, !remote)

  FILTER(MAXSIZE, book.getSize() <= _maxSize)
+  FILTER(LANG, book.getLanguage() == _lang)
+  FILTER(_PUBLISHER, book.getPublisher() == _publisher)
+  FILTER(_CREATOR, book.getCreator() == _creator)
+  FILTER(NAME, book.getName() == _name)
+
+  if (ACTIVE(ACCEPTTAGS)) {
+    if (!_acceptTags.empty()) {
+      auto vBookTags = split(book.getTags(), ";");
+      std::set<std::string> sBookTags(vBookTags.begin(), vBookTags.end());
+      for (auto& t: _acceptTags) {
+        if (sBookTags.find(t) == sBookTags.end()) {
+          return false;
+        }
+      }
+    }
+  }
+  if (ACTIVE(REJECTTAGS)) {
+    if (!_rejectTags.empty()) {
+      auto vBookTags = split(book.getTags(), ";");
+      std::set<std::string> sBookTags(vBookTags.begin(), vBookTags.end());
+      for (auto& t: _rejectTags) {
+        if (sBookTags.find(t) != sBookTags.end()) {
+          return false;
+        }
+      }
+    }
+  }
+  if ( ACTIVE(QUERY)
+    && !(matchRegex(book.getTitle(), "\\Q" + _query + "\\E")
+        || matchRegex(book.getDescription(), "\\Q" + _query + "\\E")))
+    return false;

  return true;
+
 }

 }
--- a/src/libxml_dumper.cpp
+++ b/src/libxml_dumper.cpp
@@ -20,15 +20,15 @@
 #include "libxml_dumper.h"
 #include "book.h"

-#include "tools.h"
 #include "tools/base64.h"
 #include "tools/stringTools.h"
 #include "tools/otherTools.h"
+#include "tools/pathTools.h"

 namespace kiwix
 {
 /* Constructor */
-LibXMLDumper::LibXMLDumper(const Library* library)
+LibXMLDumper::LibXMLDumper(Library* library)
  : library(library)
 {
 }
@@ -60,13 +60,10 @@ void LibXMLDumper::handleBook(Book book, pugi::xml_node root_node) {
    ADD_ATTR_NOT_EMPTY(entry_node, "name", book.getName());
    ADD_ATTR_NOT_EMPTY(entry_node, "flavour", book.getFlavour());
    ADD_ATTR_NOT_EMPTY(entry_node, "tags", book.getTags());
-    try {
-      auto defaultIllustration = book.getIllustration(48);
-      ADD_ATTR_NOT_EMPTY(entry_node, "faviconMimeType", defaultIllustration->mimeType);
-      ADD_ATTR_NOT_EMPTY(entry_node, "faviconUrl", defaultIllustration->url);
-      if (!defaultIllustration->getData().empty())
-        ADD_ATTRIBUTE(entry_node, "favicon", base64_encode(defaultIllustration->getData()));
-    } catch(...) {}
+    ADD_ATTR_NOT_EMPTY(entry_node, "faviconMimeType", book.getFaviconMimeType());
+    ADD_ATTR_NOT_EMPTY(entry_node, "faviconUrl", book.getFaviconUrl());
+    if (!book.getFavicon().empty())
+      ADD_ATTRIBUTE(entry_node, "favicon", base64_encode(book.getFavicon()));
  } else {
    ADD_ATTRIBUTE(entry_node, "origId", book.getOrigId());
  }
@@ -94,7 +91,7 @@ void LibXMLDumper::handleBookmark(Bookmark bookmark, pugi::xml_node root_node) {
  auto book_node = entry_node.append_child("book");

  try {
-    auto book = library->getBookByIdThreadSafe(bookmark.getBookId());
+    auto book = library->getBookById(bookmark.getBookId());
    ADD_TEXT_ENTRY(book_node, "id", book.getId());
    ADD_TEXT_ENTRY(book_node, "title", book.getTitle());
    ADD_TEXT_ENTRY(book_node, "language", book.getLanguage());
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -19,88 +19,34 @@

 #include "manager.h"

-#include "tools.h"
 #include "tools/pathTools.h"

 #include <pugixml.hpp>

 namespace kiwix
 {
-
-namespace
-{
-
-struct NoDelete
-{
-  template<class T> void operator()(T*) {}
-};
-
-} // unnamed namespace
-
-////////////////////////////////////////////////////////////////////////////////
-// LibraryManipulator
-////////////////////////////////////////////////////////////////////////////////
-
-LibraryManipulator::LibraryManipulator(Library* library)
-  : library(*library)
-{}
-
-LibraryManipulator::~LibraryManipulator()
-{}
-
-bool LibraryManipulator::addBookToLibrary(const Book& book)
-{
-  const auto ret = library.addBook(book);
-  if ( ret ) {
-    bookWasAddedToLibrary(book);
-  }
-  return ret;
-}
-
-void LibraryManipulator::addBookmarkToLibrary(const Bookmark& bookmark)
-{
-  library.addBookmark(bookmark);
-  bookmarkWasAddedToLibrary(bookmark);
-}
-
-uint32_t LibraryManipulator::removeBooksNotUpdatedSince(Library::Revision rev)
-{
-  const auto n = library.removeBooksNotUpdatedSince(rev);
-  if ( n != 0 ) {
-    booksWereRemovedFromLibrary();
-  }
-  return n;
-}
-
-void LibraryManipulator::bookWasAddedToLibrary(const Book& book)
-{
-}
-
-void LibraryManipulator::bookmarkWasAddedToLibrary(const Bookmark& bookmark)
-{
-}
-
-void LibraryManipulator::booksWereRemovedFromLibrary()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Manager
-////////////////////////////////////////////////////////////////////////////////
-
 /* Constructor */
 Manager::Manager(LibraryManipulator* manipulator):
  writableLibraryPath(""),
-  manipulator(manipulator, NoDelete())
+  manipulator(manipulator),
+  mustDeleteManipulator(false)
 {
 }

 Manager::Manager(Library* library) :
  writableLibraryPath(""),
-  manipulator(new LibraryManipulator(library))
+  manipulator(new DefaultLibraryManipulator(library)),
+  mustDeleteManipulator(true)
 {
 }

+/* Destructor */
+Manager::~Manager()
+{
+  if (mustDeleteManipulator) {
+    delete manipulator;
+  }
+}
 bool Manager::parseXmlDom(const pugi::xml_document& doc,
                          bool readOnly,
                          const std::string& libraryPath,
@@ -134,7 +80,7 @@ bool Manager::readXml(const std::string& xml,
 {
  pugi::xml_document doc;
  pugi::xml_parse_result result
-      = doc.load_buffer((void*)xml.data(), xml.size());
+      = doc.load_buffer_inplace((void*)xml.data(), xml.size());

  if (result) {
    this->parseXmlDom(doc, readOnly, libraryPath, trustLibrary);
@@ -178,7 +124,7 @@ bool Manager::readOpds(const std::string& content, const std::string& urlHost)
 {
  pugi::xml_document doc;
  pugi::xml_parse_result result
-      = doc.load_buffer((void*)content.data(), content.size());
+      = doc.load_buffer_inplace((void*)content.data(), content.size());

  if (result) {
    this->parseOpdsDom(doc, urlHost);
@@ -268,8 +214,8 @@ bool Manager::readBookFromPath(const std::string& path, kiwix::Book* book)
    tmp_path = computeAbsolutePath(getCurrentDirectory(), path);
  }
  try {
-    zim::Archive archive(tmp_path);
-    book->update(archive);
+    kiwix::Reader reader(tmp_path);
+    book->update(reader);
    book->setPathValid(true);
  } catch (const std::exception& e) {
    book->setPathValid(false);
@@ -302,21 +248,4 @@ bool Manager::readBookmarkFile(const std::string& path)
  return true;
 }

-void Manager::reload(const Paths& paths)
-{
-  const auto libRevision = manipulator->getLibrary().getRevision();
-  for (std::string path : paths) {
-    if (!path.empty()) {
-      if ( kiwix::isRelativePath(path) )
-        path = kiwix::computeAbsolutePath(kiwix::getCurrentDirectory(), path);
-
-      if (!readFile(path, false, true)) {
-        throw std::runtime_error("Failed to load the XML library file '" + path + "'.");
-      }
-    }
-  }
-
-  manipulator->removeBooksNotUpdatedSince(libRevision);
-}
-
 }
--- a/src/meson.build
+++ b/src/meson.build
@@ -19,17 +19,12 @@ kiwix_sources = [
  'tools/stringTools.cpp',
  'tools/networkTools.cpp',
  'tools/otherTools.cpp',
-  'tools/archiveTools.cpp',
  'kiwixserve.cpp',
  'name_mapper.cpp',
  'server/byte_range.cpp',
  'server/etag.cpp',
  'server/request_context.cpp',
-  'server/response.cpp',
-  'server/internalServer.cpp',
-  'server/internalServer_catalog_v2.cpp',
-  'opds_catalog.cpp',
-  'version.cpp'
+  'server/response.cpp'
 ]
 kiwix_sources += lib_resources

--- a/src/name_mapper.cpp
+++ b/src/name_mapper.cpp
@@ -51,54 +51,12 @@ HumanReadableNameMapper::HumanReadableNameMapper(kiwix::Library& library, bool w
  }
 }

-std::string HumanReadableNameMapper::getNameForId(const std::string& id) const {
+std::string HumanReadableNameMapper::getNameForId(const std::string& id) {
  return m_idToName.at(id);
 }

-std::string HumanReadableNameMapper::getIdForName(const std::string& name) const {
+std::string HumanReadableNameMapper::getIdForName(const std::string& name) {
  return m_nameToId.at(name);
 }

-////////////////////////////////////////////////////////////////////////////////
-// UpdatableNameMapper
-////////////////////////////////////////////////////////////////////////////////
-
-UpdatableNameMapper::UpdatableNameMapper(Library& lib, bool withAlias)
-  : library(lib)
-  , withAlias(withAlias)
-{
-  update();
-}
-
-void UpdatableNameMapper::update()
-{
-  const auto newNameMapper = new HumanReadableNameMapper(library, withAlias);
-  std::lock_guard<std::mutex> lock(mutex);
-  nameMapper.reset(newNameMapper);
-}
-
-UpdatableNameMapper::NameMapperHandle
-UpdatableNameMapper::currentNameMapper() const
-{
-  // Return a copy of the handle to the current NameMapper object. It will
-  // ensure that the object survives any call to UpdatableNameMapper::update()
-  // made before the completion of any pending operation on that object.
-  std::lock_guard<std::mutex> lock(mutex);
-  return nameMapper;
-}
-
-std::string UpdatableNameMapper::getNameForId(const std::string& id) const
-{
-  // Ensure that the current nameMapper object survives a concurrent call
-  // to UpdatableNameMapper::update()
-  return currentNameMapper()->getNameForId(id);
-}
-
-std::string UpdatableNameMapper::getIdForName(const std::string& name) const
-{
-  // Ensure that the current nameMapper object survives a concurrent call
-  // to UpdatableNameMapper::update()
-  return currentNameMapper()->getIdForName(name);
-}
-
 }
--- a/src/opds_catalog.cpp
+++ b/src/opds_catalog.cpp
@@ -1,74 +0,0 @@
-/*
- * Copyright 2021 Veloman Yunkan <veloman.yunkan@gmail.com>
- *
- * 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 "opds_catalog.h"
-#include "tools/stringTools.h"
-
-#include <sstream>
-
-namespace kiwix
-{
-
-namespace
-{
-const char opdsSearchEndpoint[] = "/catalog/v2/entries";
-
-enum Separator { AMP };
-
-std::ostringstream& operator<<(std::ostringstream& oss, Separator sep)
-{
-  if ( oss.tellp() > 0 )
-    oss << "&";
-  return oss;
-}
-
-std::string buildSearchString(const Filter& f)
-{
-  std::ostringstream oss;
-  if ( f.hasQuery() )
-    oss << AMP << "q=" << urlEncode(f.getQuery());
-
-  if ( f.hasCategory() )
-    oss << AMP << "category=" << urlEncode(f.getCategory());
-
-  if ( f.hasLang() )
-    oss << AMP << "lang=" << urlEncode(f.getLang());
-
-  if ( f.hasName() )
-    oss << AMP << "name=" << urlEncode(f.getName());
-
-  if ( !f.getAcceptTags().empty() )
-    oss << AMP << "tag=" << urlEncode(join(f.getAcceptTags(), ";"));
-
-  return oss.str();
-}
-
-} // unnamed namespace
-
-std::string getSearchUrl(const Filter& f)
-{
-  const std::string searchString = buildSearchString(f);
-
-  if ( searchString.empty() )
-    return opdsSearchEndpoint;
-  else
-    return opdsSearchEndpoint + ("?" + searchString);
-}
-
-} // namespace kiwix
--- a/src/opds_dumper.cpp
+++ b/src/opds_dumper.cpp
@@ -20,16 +20,11 @@
 #include "opds_dumper.h"
 #include "book.h"

-#include "kiwixlib-resources.h"
-#include <mustache.hpp>
-#include <unicode/locid.h>
-
-#include "tools/stringTools.h"
 #include "tools/otherTools.h"
+#include <iomanip>

 namespace kiwix
 {
-
 /* Constructor */
 OPDSDumper::OPDSDumper(Library* library)
  : library(library)
@@ -40,196 +35,120 @@ OPDSDumper::~OPDSDumper()
 {
 }

+std::string gen_date_str()
+{
+  auto now = time(0);
+  auto tm = localtime(&now);
+
+  std::stringstream is;
+  is << std::setw(2) << std::setfill('0')
+     << 1900+tm->tm_year << "-"
+     << std::setw(2) << std::setfill('0') << tm->tm_mon << "-"
+     << std::setw(2) << std::setfill('0') << tm->tm_mday << "T"
+     << std::setw(2) << std::setfill('0') << tm->tm_hour << ":"
+     << std::setw(2) << std::setfill('0') << tm->tm_min << ":"
+     << std::setw(2) << std::setfill('0') << tm->tm_sec << "Z";
+  return is.str();
+}
+
+static std::string gen_date_from_yyyy_mm_dd(const std::string& date)
+{
+  std::stringstream is;
+  is << date << "T00:00::00:Z";
+  return is.str();
+}
+
 void OPDSDumper::setOpenSearchInfo(int totalResults, int startIndex, int count)
 {
  m_totalResults = totalResults;
  m_startIndex = startIndex,
  m_count = count;
+  m_isSearchResult = true;
 }

-namespace
-{
+#define ADD_TEXT_ENTRY(node, child, value) (node).append_child((child)).append_child(pugi::node_pcdata).set_value((value).c_str())

-typedef kainjow::mustache::data MustacheData;
-typedef kainjow::mustache::list BooksData;
-typedef kainjow::mustache::list IllustrationInfo;
+pugi::xml_node OPDSDumper::handleBook(Book book, pugi::xml_node root_node) {
+  auto entry_node = root_node.append_child("entry");
+  ADD_TEXT_ENTRY(entry_node, "id", "urn:uuid:"+book.getId());
+  ADD_TEXT_ENTRY(entry_node, "title", book.getTitle());
+  ADD_TEXT_ENTRY(entry_node, "summary", book.getDescription());
+  ADD_TEXT_ENTRY(entry_node, "language", book.getLanguage());
+  ADD_TEXT_ENTRY(entry_node, "updated", gen_date_from_yyyy_mm_dd(book.getDate()));
+  ADD_TEXT_ENTRY(entry_node, "name", book.getName());
+  ADD_TEXT_ENTRY(entry_node, "flavour", book.getFlavour());
+  ADD_TEXT_ENTRY(entry_node, "tags", book.getTags());
+  ADD_TEXT_ENTRY(entry_node, "articleCount", to_string(book.getArticleCount()));
+  ADD_TEXT_ENTRY(entry_node, "mediaCount", to_string(book.getMediaCount()));
+  ADD_TEXT_ENTRY(entry_node, "icon", rootLocation + "/meta?name=favicon&content=" + book.getHumanReadableIdFromPath());

-IllustrationInfo getBookIllustrationInfo(const Book& book)
-{
-    kainjow::mustache::list illustrations;
-    if ( book.isPathValid() ) {
-      for ( const auto& illustration : book.getIllustrations() ) {
-        // For now, we are handling only sizexsize@1 illustration.
-        // So we can simply pass one size to mustache.
-        illustrations.push_back(kainjow::mustache::object{
-          {"icon_size", to_string(illustration->width)},
-          {"icon_mimetype", illustration->mimeType}
-        });
-      }
-    }
-    return illustrations;
+  auto content_node = entry_node.append_child("link");
+  content_node.append_attribute("type") = "text/html";
+  content_node.append_attribute("href") = (rootLocation + "/" + book.getHumanReadableIdFromPath()).c_str();
+
+  auto author_node = entry_node.append_child("author");
+  ADD_TEXT_ENTRY(author_node, "name", book.getCreator());
+
+  auto publisher_node = entry_node.append_child("publisher");
+  ADD_TEXT_ENTRY(publisher_node, "name", book.getPublisher());
+
+  if (! book.getUrl().empty()) {
+    auto acquisition_link = entry_node.append_child("link");
+    acquisition_link.append_attribute("rel") = "http://opds-spec.org/acquisition/open-access";
+    acquisition_link.append_attribute("type") = "application/x-zim";
+    acquisition_link.append_attribute("href") = book.getUrl().c_str();
+    acquisition_link.append_attribute("length") = to_string(book.getSize()).c_str();
+  }
+
+  if (! book.getFaviconMimeType().empty() ) {
+    auto image_link = entry_node.append_child("link");
+    image_link.append_attribute("rel") = "http://opds-spec.org/image/thumbnail";
+    image_link.append_attribute("type") = book.getFaviconMimeType().c_str();
+    image_link.append_attribute("href") = (rootLocation + "/meta?name=favicon&content=" + book.getHumanReadableIdFromPath()).c_str();
+  }
+  return entry_node;
 }

-kainjow::mustache::object getSingleBookData(const Book& book)
+string OPDSDumper::dumpOPDSFeed(const std::vector<std::string>& bookIds)
 {
-    const MustacheData bookUrl = book.getUrl().empty()
-                               ? MustacheData(false)
-                               : MustacheData(book.getUrl());
-    return kainjow::mustache::object{
-      {"id", book.getId()},
-      {"name", book.getName()},
-      {"title", book.getTitle()},
-      {"description", book.getDescription()},
-      {"language", book.getLanguage()},
-      {"content_id",  urlEncode(book.getHumanReadableIdFromPath(), true)},
-      {"updated", book.getDate() + "T00:00:00Z"},
-      {"category", book.getCategory()},
-      {"flavour", book.getFlavour()},
-      {"tags", book.getTags()},
-      {"article_count", to_string(book.getArticleCount())},
-      {"media_count", to_string(book.getMediaCount())},
-      {"author_name", book.getCreator()},
-      {"publisher_name", book.getPublisher()},
-      {"url", bookUrl},
-      {"size", to_string(book.getSize())},
-      {"icons", getBookIllustrationInfo(book)},
-    };
-}
+  date = gen_date_str();
+  pugi::xml_document doc;

-std::string getSingleBookEntryXML(const Book& book, bool withXMLHeader, const std::string& rootLocation, const std::string& endpointRoot, bool partial)
-{
-  auto data = getSingleBookData(book);
-  data["with_xml_header"] = MustacheData(withXMLHeader);
-  data["dump_partial_entries"] = MustacheData(partial);
-  data["endpoint_root"] = endpointRoot;
-  data["root"] = rootLocation;
-  return render_template(RESOURCE::templates::catalog_v2_entry_xml, data);
-}
+  auto root_node = doc.append_child("feed");
+  root_node.append_attribute("xmlns") = "http://www.w3.org/2005/Atom";
+  root_node.append_attribute("xmlns:opds") = "http://opds-spec.org/2010/catalog";

-BooksData getBooksData(const Library* library, const std::vector<std::string>& bookIds, const std::string& rootLocation, const std::string& endpointRoot, bool partial)
-{
-  BooksData booksData;
-  for ( const auto& bookId : bookIds ) {
-    try {
-      const Book book = library->getBookByIdThreadSafe(bookId);
-      booksData.push_back(kainjow::mustache::object{
-          {"entry", getSingleBookEntryXML(book, false, rootLocation, endpointRoot, partial)}
-      });
-    } catch ( const std::out_of_range& ) {
-      // the book was removed from the library since its id was obtained
-      // ignore it
+  ADD_TEXT_ENTRY(root_node, "id", id);
+
+  ADD_TEXT_ENTRY(root_node, "title", title);
+  ADD_TEXT_ENTRY(root_node, "updated", date);
+
+  if (m_isSearchResult) {
+    ADD_TEXT_ENTRY(root_node, "totalResults", to_string(m_totalResults));
+    ADD_TEXT_ENTRY(root_node, "startIndex", to_string(m_startIndex));
+    ADD_TEXT_ENTRY(root_node, "itemsPerPage", to_string(m_count));
+  }
+
+  auto self_link_node = root_node.append_child("link");
+  self_link_node.append_attribute("rel") = "self";
+  self_link_node.append_attribute("href") = "";
+  self_link_node.append_attribute("type") = "application/atom+xml";
+
+
+  if (!searchDescriptionUrl.empty() ) {
+    auto search_link = root_node.append_child("link");
+    search_link.append_attribute("rel") = "search";
+    search_link.append_attribute("type") = "application/opensearchdescription+xml";
+    search_link.append_attribute("href") = searchDescriptionUrl.c_str();
+  }
+
+  if (library) {
+    for (auto& bookId: bookIds) {
+      handleBook(library->getBookById(bookId), root_node);
    }
  }

-  return booksData;
-}
-
-std::string getLanguageSelfName(const std::string& lang) {
-  const icu::Locale locale(lang.c_str());
-  icu::UnicodeString ustring;
-  locale.getDisplayLanguage(locale, ustring);
-  std::string result;
-  ustring.toUTF8String(result);
-  return result;
-};
-
-} // unnamed namespace
-
-string OPDSDumper::dumpOPDSFeed(const std::vector<std::string>& bookIds, const std::string& query) const
-{
-  const auto booksData = getBooksData(library, bookIds, rootLocation, "", false);
-  const kainjow::mustache::object template_data{
-     {"date", gen_date_str()},
-     {"root", rootLocation},
-     {"feed_id", gen_uuid(libraryId + "/catalog/search?"+query)},
-     {"filter", query.empty() ? MustacheData(false) : MustacheData(query)},
-     {"totalResults", to_string(m_totalResults)},
-     {"startIndex", to_string(m_startIndex)},
-     {"itemsPerPage", to_string(m_count)},
-     {"books", booksData }
-  };
-
-  return render_template(RESOURCE::templates::catalog_entries_xml, template_data);
-}
-
-string OPDSDumper::dumpOPDSFeedV2(const std::vector<std::string>& bookIds, const std::string& query, bool partial) const
-{
-  const auto endpointRoot = rootLocation + "/catalog/v2";
-  const auto booksData = getBooksData(library, bookIds, rootLocation, endpointRoot, partial);
-
-  const char* const endpoint = partial ? "/partial_entries" : "/entries";
-  const kainjow::mustache::object template_data{
-     {"date", gen_date_str()},
-     {"endpoint_root", endpointRoot},
-     {"feed_id", gen_uuid(libraryId + endpoint + "?" + query)},
-     {"filter", query.empty() ? MustacheData(false) : MustacheData(query)},
-     {"query", query.empty() ? "" : "?" + urlEncode(query)},
-     {"totalResults", to_string(m_totalResults)},
-     {"startIndex", to_string(m_startIndex)},
-     {"itemsPerPage", to_string(m_count)},
-     {"books", booksData },
-     {"dump_partial_entries", MustacheData(partial)}
-  };
-
-  return render_template(RESOURCE::templates::catalog_v2_entries_xml, template_data);
-}
-
-std::string OPDSDumper::dumpOPDSCompleteEntry(const std::string& bookId) const
-{
-  return getSingleBookEntryXML(library->getBookById(bookId), true, rootLocation, "", false);
-}
-
-std::string OPDSDumper::categoriesOPDSFeed() const
-{
-  const auto now = gen_date_str();
-  kainjow::mustache::list categoryData;
-  for ( const auto& category : library->getBooksCategories() ) {
-    const auto urlencodedCategoryName = urlEncode(category);
-    categoryData.push_back(kainjow::mustache::object{
-      {"name", category},
-      {"urlencoded_name",  urlencodedCategoryName},
-      {"updated", now},
-      {"id", gen_uuid(libraryId + "/categories/" + urlencodedCategoryName)}
-    });
-  }
-
-  return render_template(
-             RESOURCE::templates::catalog_v2_categories_xml,
-             kainjow::mustache::object{
-               {"date", now},
-               {"endpoint_root", rootLocation + "/catalog/v2"},
-               {"feed_id", gen_uuid(libraryId + "/categories")},
-               {"categories", categoryData }
-             }
-  );
-}
-
-std::string OPDSDumper::languagesOPDSFeed() const
-{
-  const auto now = gen_date_str();
-  kainjow::mustache::list languageData;
-  for ( const auto& langAndBookCount : library->getBooksLanguagesWithCounts() ) {
-    const std::string languageCode = langAndBookCount.first;
-    const int bookCount = langAndBookCount.second;
-    const auto languageSelfName = getLanguageSelfName(languageCode);
-    languageData.push_back(kainjow::mustache::object{
-      {"lang_code",  languageCode},
-      {"lang_self_name", languageSelfName},
-      {"book_count", to_string(bookCount)},
-      {"updated", now},
-      {"id", gen_uuid(libraryId + "/languages/" + languageCode)}
-    });
-  }
-
-  return render_template(
-             RESOURCE::templates::catalog_v2_languages_xml,
-             kainjow::mustache::object{
-               {"date", now},
-               {"endpoint_root", rootLocation + "/catalog/v2"},
-               {"feed_id", gen_uuid(libraryId + "/languages")},
-               {"languages", languageData }
-             }
-  );
+  return nodeToString(root_node);
 }

 }
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -21,21 +21,51 @@
 #include <time.h>

 #include <zim/search.h>
-#include <zim/suggestion.h>
-#include <zim/item.h>
-#include <zim/error.h>

-#include "tools.h"
-#include "tools/stringTools.h"
 #include "tools/otherTools.h"
-#include "tools/archiveTools.h"
+
+inline char hi(char v)
+{
+  char hex[] = "0123456789abcdef";
+  return hex[(v >> 4) & 0xf];
+}
+
+inline char lo(char v)
+{
+  char hex[] = "0123456789abcdef";
+  return hex[v & 0xf];
+}
+
+std::string hexUUID(std::string in)
+{
+  std::ostringstream out;
+  for (unsigned n = 0; n < 4; ++n) {
+    out << hi(in[n]) << lo(in[n]);
+  }
+  out << '-';
+  for (unsigned n = 4; n < 6; ++n) {
+    out << hi(in[n]) << lo(in[n]);
+  }
+  out << '-';
+  for (unsigned n = 6; n < 8; ++n) {
+    out << hi(in[n]) << lo(in[n]);
+  }
+  out << '-';
+  for (unsigned n = 8; n < 10; ++n) {
+    out << hi(in[n]) << lo(in[n]);
+  }
+  out << '-';
+  for (unsigned n = 10; n < 16; ++n) {
+    out << hi(in[n]) << lo(in[n]);
+  }
+  std::string op = out.str();
+  return op;
+}

 namespace kiwix
 {
 /* Constructor */
-Reader::Reader(const string zimFilePath)
-  :  zimArchive(nullptr),
-     zimFilePath(zimFilePath)
+Reader::Reader(const string zimFilePath) : zimFileHandler(NULL)
 {
  string tmpZimFilePath = zimFilePath;

@@ -46,43 +76,56 @@ Reader::Reader(const string zimFilePath)
    tmpZimFilePath.resize(tmpZimFilePath.size() - 2);
  }

-  zimArchive.reset(new zim::Archive(tmpZimFilePath));
+  this->zimFileHandler = new zim::File(tmpZimFilePath);
+
+  if (this->zimFileHandler != NULL) {
+    this->firstArticleOffset
+        = this->zimFileHandler->getNamespaceBeginOffset('A');
+    this->lastArticleOffset = this->zimFileHandler->getNamespaceEndOffset('A');
+    this->nsACount = this->zimFileHandler->getNamespaceCount('A');
+    this->nsICount = this->zimFileHandler->getNamespaceCount('I');
+    this->zimFilePath = zimFilePath;
+  }

  /* initialize random seed: */
-  srand(time(nullptr));
+  srand(time(NULL));
 }

-Reader::Reader(const std::shared_ptr<zim::Archive> archive, bool _marker)
-  : zimArchive(archive),
-    zimFilePath(archive->getFilename())
-  {}
-
-#ifndef _WIN32
-Reader::Reader(int fd)
-  :  zimArchive(new zim::Archive(fd)),
-     zimFilePath("")
+/* Destructor */
+Reader::~Reader()
 {
-  /* initialize random seed: */
-  srand(time(nullptr));
+  if (this->zimFileHandler != NULL) {
+    delete this->zimFileHandler;
+  }
 }

-Reader::Reader(int fd, zim::offset_type offset, zim::size_type size)
-  :  zimArchive(new zim::Archive(fd, offset, size)),
-     zimFilePath("")
+zim::File* Reader::getZimFileHandler() const
 {
-  /* initialize random seed: */
-  srand(time(nullptr));
+  return this->zimFileHandler;
 }
-#endif // #ifndef _WIN32
-
-zim::Archive* Reader::getZimArchive() const
+std::map<const std::string, unsigned int> Reader::parseCounterMetadata() const
 {
-  return zimArchive.get();
-}
+  std::map<const std::string, unsigned int> counters;
+  string mimeType, item, counterString;
+  unsigned int counter;

-MimeCounterType Reader::parseCounterMetadata() const
-{
-  return kiwix::parseArchiveCounter(*zimArchive);
+  zim::Article article = this->zimFileHandler->getArticle('M', "Counter");
+
+  if (article.good()) {
+    stringstream ssContent(article.getData());
+
+    while (getline(ssContent, item, ';')) {
+      stringstream ssItem(item);
+      getline(ssItem, mimeType, '=');
+      getline(ssItem, counterString, '=');
+      if (!counterString.empty() && !mimeType.empty()) {
+        sscanf(counterString.c_str(), "%u", &counter);
+        counters.insert(pair<string, int>(mimeType, counter));
+      }
+    }
+  }
+
+  return counters;
 }

 /* Get the count of articles which can be indexed/displayed */
@@ -92,9 +135,13 @@ unsigned int Reader::getArticleCount() const
      = this->parseCounterMetadata();
  unsigned int counter = 0;

-  for(auto &pair:counterMap) {
-    if (startsWith(pair.first, "text/html")) {
-      counter += pair.second;
+  if (counterMap.empty()) {
+    counter = this->nsACount;
+  } else {
+    for(auto &pair:counterMap) {
+      if (startsWith(pair.first, "text/html")) {
+        counter += pair.second;
+      }
    }
  }

@@ -104,51 +151,143 @@ unsigned int Reader::getArticleCount() const
 /* Get the count of medias content in the ZIM file */
 unsigned int Reader::getMediaCount() const
 {
-  return kiwix::getArchiveMediaCount(*zimArchive);
+  std::map<const std::string, unsigned int> counterMap
+      = this->parseCounterMetadata();
+  unsigned int counter = 0;
+
+  if (counterMap.empty()) {
+    counter = this->nsICount;
+  } else {
+    auto it = counterMap.find("image/jpeg");
+    if (it != counterMap.end()) {
+      counter += it->second;
+    }
+
+    it = counterMap.find("image/gif");
+    if (it != counterMap.end()) {
+      counter += it->second;
+    }
+
+    it = counterMap.find("image/png");
+    if (it != counterMap.end()) {
+      counter += it->second;
+    }
+  }
+  return counter;
 }

 /* Get the total of all items of a ZIM file, redirects included */
 unsigned int Reader::getGlobalCount() const
 {
-  return zimArchive->getEntryCount();
+  return this->zimFileHandler->getCountArticles();
 }

 /* Return the UID of the ZIM file */
 string Reader::getId() const
 {
-  return kiwix::getArchiveId(*zimArchive);
+  std::ostringstream s;
+  s << this->zimFileHandler->getFileheader().getUuid();
+  return s.str();
+}
+
+/* Return a page url from a title */
+bool Reader::getPageUrlFromTitle(const string& title, string& url) const
+{
+  try {
+    auto entry = getEntryFromTitle(title);
+    entry = entry.getFinalEntry();
+    url = entry.getPath();
+    return true;
+  } catch (NoEntry& e) {
+    return false;
+  }
+}
+
+/* Return an URL from a title */
+string Reader::getRandomPageUrl() const
+{
+  return getRandomPage().getPath();
 }

 Entry Reader::getRandomPage() const
 {
-  try {
-    return Entry(zimArchive->getRandomEntry(), true);
-  } catch(...) {
+  if (!this->zimFileHandler) {
    throw NoEntry();
  }
+
+  zim::Article article;
+  std::string mainPagePath = this->getMainPage().getPath();
+  int watchdog = 42;
+
+  do {
+    auto idx = this->firstArticleOffset
+          + (zim::size_type)((double)rand() / ((double)RAND_MAX + 1)
+                             * this->nsACount);
+    article = zimFileHandler->getArticle(idx);
+    if (!watchdog--) {
+      throw NoEntry();
+    }
+  } while (!article.good() && article.getLongUrl() == mainPagePath);
+
+  return article;
+}
+
+/* Return the welcome page URL */
+string Reader::getMainPageUrl() const
+{
+  return getMainPage().getPath();
 }

 Entry Reader::getMainPage() const
 {
-  return Entry(zimArchive->getMainEntry(), true);
+  if (!this->zimFileHandler) {
+    throw NoEntry();
+  }
+
+  zim::Article article;
+  if (this->zimFileHandler->getFileheader().hasMainPage())
+  {
+    article = zimFileHandler->getArticle(
+        this->zimFileHandler->getFileheader().getMainPage());
+  }
+
+  if (!article.good())
+  {
+    return getFirstPage();
+  }
+
+  return article;
 }

 bool Reader::getFavicon(string& content, string& mimeType) const
 {
-  return kiwix::getArchiveFavicon(*zimArchive, 48, content, mimeType);
+  static const char* const paths[] = {"-/favicon", "-/favicon.png", "I/favicon.png", "I/favicon"};
+
+  for (auto &path: paths) {
+    try {
+      auto entry = getEntryFromPath(path);
+      entry = entry.getFinalEntry();
+      content = entry.getContent();
+      mimeType = entry.getMimetype();
+      return true;
+    } catch(NoEntry& e) {};
+  }
+
+  return false;
 }

 string Reader::getZimFilePath() const
 {
-  return zimFilePath;
+  return this->zimFilePath;
 }
 /* Return a metatag value */
 bool Reader::getMetadata(const string& name, string& value) const
 {
  try {
-    value = zimArchive->getMetadata(name);
+    auto entry = getEntryFromPath("M/"+name);
+    value = entry.getContent();
    return true;
-  } catch(zim::EntryNotFound& e) {
+  } catch(NoEntry& e) {
    return false;
  }
 }
@@ -157,32 +296,48 @@ bool Reader::getMetadata(const string& name, string& value) const

 string Reader::getName() const
 {
-  return kiwix::getMetaName(*zimArchive);
+  METADATA("Name")
 }

 string Reader::getTitle() const
 {
-  return kiwix::getArchiveTitle(*zimArchive);
+  string value;
+  this->getMetadata("Title", value);
+  if (value.empty()) {
+    value = getLastPathElement(zimFileHandler->getFilename());
+    std::replace(value.begin(), value.end(), '_', ' ');
+    size_t pos = value.find(".zim");
+    value = value.substr(0, pos);
+  }
+  return value;
 }

 string Reader::getCreator() const
 {
-  return kiwix::getMetaCreator(*zimArchive);
+  METADATA("Creator")
 }

 string Reader::getPublisher() const
 {
-  return kiwix::getMetaPublisher(*zimArchive);
+  METADATA("Publisher")
 }

 string Reader::getDate() const
 {
-  return kiwix::getMetaDate(*zimArchive);
+  METADATA("Date")
 }

 string Reader::getDescription() const
 {
-  return kiwix::getMetaDescription(*zimArchive);
+  string value;
+  this->getMetadata("Description", value);
+
+  /* Mediawiki Collection tends to use the "Subtitle" name */
+  if (value.empty()) {
+    this->getMetadata("Subtitle", value);
+  }
+
+  return value;
 }

 string Reader::getLongDescription() const
@@ -192,7 +347,7 @@ string Reader::getLongDescription() const

 string Reader::getLanguage() const
 {
-  return kiwix::getMetaLanguage(*zimArchive);
+  METADATA("Language")
 }

 string Reader::getLicense() const
@@ -202,7 +357,13 @@ string Reader::getLicense() const

 string Reader::getTags(bool original) const
 {
-  return kiwix::getMetaTags(*zimArchive, original);
+  string tags_str;
+  getMetadata("Tags", tags_str);
+  if (original) {
+    return tags_str;
+  }
+  auto tags = convertTags(tags_str);
+  return join(tags, ";");
 }


@@ -225,7 +386,7 @@ string Reader::getRelation() const

 string Reader::getFlavour() const
 {
-  return kiwix::getMetaFlavour(*zimArchive);
+  METADATA("Flavour")
 }

 string Reader::getSource() const
@@ -239,13 +400,108 @@ string Reader::getScraper() const
 }
 #undef METADATA

-Entry Reader::getEntryFromPath(const std::string& path) const
+string Reader::getOrigId() const
 {
-  try {
-    return Entry(kiwix::getEntryFromPath(*zimArchive, path), true);
-  } catch (zim::EntryNotFound& e) {
+  string value;
+  this->getMetadata("startfileuid", value);
+  if (value.empty()) {
+    return "";
+  }
+  std::string id = value;
+  std::string origID;
+  std::string temp = "";
+  unsigned int k = 0;
+  char tempArray[16] = "";
+  for (unsigned int i = 0; i < id.size(); i++) {
+    if (id[i] == '\n') {
+      tempArray[k] = atoi(temp.c_str());
+      temp = "";
+      k++;
+    } else {
+      temp += id[i];
+    }
+  }
+  origID = hexUUID(tempArray);
+  return origID;
+}
+
+/* Return the first page URL */
+string Reader::getFirstPageUrl() const
+{
+  return getFirstPage().getPath();
+}
+
+Entry Reader::getFirstPage() const
+{
+  if (!this->zimFileHandler) {
    throw NoEntry();
  }
+
+  auto firstPageOffset = zimFileHandler->getNamespaceBeginOffset('A');
+  auto article = zimFileHandler->getArticle(firstPageOffset);
+
+  if (! article.good()) {
+    throw NoEntry();
+  }
+
+  return article;
+}
+
+bool _parseUrl(const string& url, char* ns, string& title)
+{
+  /* Offset to visit the url */
+  unsigned int urlLength = url.size();
+  unsigned int offset = 0;
+
+  /* Ignore the first '/' */
+  if (url[offset] == '/')
+    offset++;
+
+  if (url[offset] == '/' || offset >= urlLength)
+    return false;
+
+  /* Get namespace */
+  *ns = url[offset++];
+
+  if (url[offset] != '/' || offset >= urlLength)
+    return false;
+
+  offset++;
+
+  if ( offset >= urlLength)
+    return false;
+
+  /* Get content title */
+  title = url.substr(offset, urlLength - offset);
+
+  return true;
+}
+
+bool Reader::parseUrl(const string& url, char* ns, string& title) const
+{
+  return _parseUrl(url, ns, title);
+}
+
+Entry Reader::getEntryFromPath(const std::string& path) const
+{
+  char ns = 0;
+  std::string short_url;
+
+  if (!this->zimFileHandler) {
+    throw NoEntry();
+  }
+  _parseUrl(path, &ns, short_url);
+
+  if (short_url.empty() && ns == 0) {
+    return getMainPage();
+  }
+
+  auto article = zimFileHandler->getArticle(ns, short_url);
+  if (!article.good()) {
+    throw NoEntry();
+  }
+
+  return article;
 }

 Entry Reader::getEntryFromEncodedPath(const std::string& path) const
@@ -255,22 +511,202 @@ Entry Reader::getEntryFromEncodedPath(const std::string& path) const

 Entry Reader::getEntryFromTitle(const std::string& title) const
 {
-  try {
-    return Entry(zimArchive->getEntryByTitle(title), true);
-  } catch(zim::EntryNotFound& e) {
+  if (!this->zimFileHandler) {
    throw NoEntry();
  }
+
+  auto article = this->zimFileHandler->getArticleByTitle('A', title);
+  if (!article.good()) {
+    throw NoEntry();
+  }
+
+  return article;
+}
+
+/* Return article by url */
+bool Reader::getArticleObjectByDecodedUrl(const string& url,
+                                          zim::Article& article) const
+{
+  if (this->zimFileHandler == NULL) {
+    return false;
+  }
+
+  /* Parse the url */
+  char ns = 0;
+  string urlStr;
+  _parseUrl(url, &ns, urlStr);
+
+  /* Main page */
+  if (urlStr.empty() && ns == 0) {
+    _parseUrl(this->getMainPage().getPath(), &ns, urlStr);
+  }
+
+  /* Extract the content from the zim file */
+  article = zimFileHandler->getArticle(ns, urlStr);
+  return article.good();
+}
+
+/* Return the mimeType without the content */
+bool Reader::getMimeTypeByUrl(const string& url, string& mimeType) const
+{
+  try {
+    auto entry = getEntryFromPath(url);
+    mimeType = entry.getMimetype();
+    return true;
+  } catch (NoEntry& e) {
+    mimeType = "";
+    return false;
+  }
+}
+
+bool get_content_by_decoded_url(const Reader& reader,
+                                const string& url,
+                                string& content,
+                                string& title,
+                                unsigned int& contentLength,
+                                string& contentType,
+                                string& baseUrl)
+{
+  content = "";
+  contentType = "";
+  contentLength = 0;
+
+  try {
+    auto entry = reader.getEntryFromPath(url);
+    entry = entry.getFinalEntry();
+    baseUrl = entry.getPath();
+    contentType = entry.getMimetype();
+    content = entry.getContent();
+    contentLength = entry.getSize();
+    title = entry.getTitle();
+
+    /* Try to set a stub HTML header/footer if necesssary */
+    if (contentType.find("text/html") != string::npos
+      && content.find("<body") == std::string::npos
+      && content.find("<BODY") == std::string::npos) {
+      content = "<html><head><title>" + title +
+              "</title><meta http-equiv=\"Content-Type\" content=\"text/html; "
+              "charset=utf-8\" /></head><body>" +
+              content + "</body></html>";
+    }
+    return true;
+  } catch (NoEntry& e) {
+    return false;
+  }
+}
+
+
+/* Get a content from a zim file */
+bool Reader::getContentByUrl(const string& url,
+                             string& content,
+                             string& title,
+                             unsigned int& contentLength,
+                             string& contentType) const
+{
+  std::string stubRedirectUrl;
+  return get_content_by_decoded_url(*this,
+                                kiwix::urlDecode(url),
+                                content,
+                                title,
+                                contentLength,
+                                contentType,
+                                stubRedirectUrl);
+}
+
+bool Reader::getContentByEncodedUrl(const string& url,
+                                    string& content,
+                                    string& title,
+                                    unsigned int& contentLength,
+                                    string& contentType,
+                                    string& baseUrl) const
+{
+  return get_content_by_decoded_url(*this,
+                                kiwix::urlDecode(url),
+                                content,
+                                title,
+                                contentLength,
+                                contentType,
+                                baseUrl);
+}
+
+bool Reader::getContentByEncodedUrl(const string& url,
+                                    string& content,
+                                    string& title,
+                                    unsigned int& contentLength,
+                                    string& contentType) const
+{
+  std::string stubRedirectUrl;
+  return get_content_by_decoded_url(*this,
+                                kiwix::urlDecode(url),
+                                content,
+                                title,
+                                contentLength,
+                                contentType,
+                                stubRedirectUrl);
+}
+
+bool Reader::getContentByDecodedUrl(const string& url,
+                                    string& content,
+                                    string& title,
+                                    unsigned int& contentLength,
+                                    string& contentType) const
+{
+  std::string stubRedirectUrl;
+  return get_content_by_decoded_url(*this,
+                                url,
+                                content,
+                                title,
+                                contentLength,
+                                contentType,
+                                stubRedirectUrl);
+}
+
+bool Reader::getContentByDecodedUrl(const string& url,
+                                    string& content,
+                                    string& title,
+                                    unsigned int& contentLength,
+                                    string& contentType,
+                                    string& baseUrl) const
+{
+  return get_content_by_decoded_url(*this,
+                                url,
+                                content,
+                                title,
+                                contentLength,
+                                contentType,
+                                baseUrl);
+}
+
+/* Check if an article exists */
+bool Reader::urlExists(const string& url) const
+{
+  return pathExists(url);
 }

 bool Reader::pathExists(const string& path) const
 {
-  return zimArchive->hasEntryByPath(path);
+  if (!zimFileHandler)
+  {
+    return false;
+  }
+
+  char ns = 0;
+  string titleStr;
+  _parseUrl(path, &ns, titleStr);
+  zim::File::const_iterator findItr = zimFileHandler->find(ns, titleStr);
+  return findItr != zimFileHandler->end() && findItr->getUrl() == titleStr;
 }

 /* Does the ZIM file has a fulltext index */
 bool Reader::hasFulltextIndex() const
 {
-  return zimArchive->hasFulltextIndex();
+  if (!zimFileHandler || zimFileHandler->is_multiPart() )
+  {
+    return false;
+  }
+
+  return ( pathExists("Z//fulltextIndex/xapian")
+        || pathExists("X/fulltext/xapian"));
 }

 /* Search titles by prefix */
@@ -310,28 +746,34 @@ bool Reader::searchSuggestions(const string& prefix,
    return false;
  }

-  for (auto& entry: zimArchive->findByTitle(prefix)) {
-    if (results.size() >= suggestionsCount) {
-      break;
-    }
+  for (auto articleItr = zimFileHandler->findByTitle('A', prefix);
+       articleItr != zimFileHandler->end()
+       && articleItr->getTitle().compare(0, prefix.size(), prefix) == 0
+       && results.size() < suggestionsCount;
+       ++articleItr) {
    /* Extract the interesting part of article title & url */
    std::string normalizedArticleTitle
-        = kiwix::normalize(entry.getTitle());
-
-    // Get the final path.
-    auto item = entry.getItem(true);
-    std::string articleFinalUrl = item.getPath();
+        = kiwix::normalize(articleItr->getTitle());
+    std::string articleFinalUrl = "/A/" + articleItr->getUrl();
+    if (articleItr->isRedirect()) {
+      zim::Article article = *articleItr;
+      unsigned int loopCounter = 0;
+      while (article.isRedirect() && loopCounter++ < 42) {
+        article = article.getRedirectArticle();
+      }
+      articleFinalUrl = "/A/" + article.getUrl();
+    }

    /* Go through all already found suggestions and skip if this
       article is already in the suggestions list (with an other
       title) */
    bool insert = true;
-    std::vector<SuggestionItem>::iterator suggestionItr;
+    std::vector<std::vector<std::string>>::iterator suggestionItr;
    for (suggestionItr = results.begin();
         suggestionItr != results.end();
         suggestionItr++) {
-      int result = normalizedArticleTitle.compare((*suggestionItr).getNormalizedTitle());
-      if (result == 0 && articleFinalUrl.compare((*suggestionItr).getPath()) == 0) {
+      int result = normalizedArticleTitle.compare((*suggestionItr)[2]);
+      if (result == 0 && articleFinalUrl.compare((*suggestionItr)[1]) == 0) {
        insert = false;
        break;
      } else if (result < 0) {
@@ -341,7 +783,10 @@ bool Reader::searchSuggestions(const string& prefix,

    /* Insert if possible */
    if (insert) {
-      SuggestionItem suggestion(entry.getTitle(), normalizedArticleTitle, articleFinalUrl);
+      std::vector<std::string> suggestion;
+      suggestion.push_back(articleItr->getTitle());
+      suggestion.push_back(articleFinalUrl);
+      suggestion.push_back(normalizedArticleTitle);
      results.insert(suggestionItr, suggestion);
    }

@@ -355,7 +800,12 @@ bool Reader::searchSuggestions(const string& prefix,
 std::vector<std::string> Reader::getTitleVariants(
    const std::string& title) const
 {
-  return kiwix::getTitleVariants(title);
+  std::vector<std::string> variants;
+  variants.push_back(title);
+  variants.push_back(kiwix::ucFirst(title));
+  variants.push_back(kiwix::lcFirst(title));
+  variants.push_back(kiwix::toTitle(title));
+  return variants;
 }


@@ -378,36 +828,36 @@ bool Reader::searchSuggestionsSmart(const string& prefix,
                                    SuggestionsList_t& results)
 {
  std::vector<std::string> variants = this->getTitleVariants(prefix);
+  bool retVal = false;

-  auto suggestionSearcher = zim::SuggestionSearcher(*zimArchive);
+  /* Try to search in the title using fulltext search database */
+  const auto suggestionSearch
+      = this->getZimFileHandler()->suggestions(prefix, 0, suggestionsCount);

-  if (zimArchive->hasTitleIndex()) {
-    auto suggestionSearch = suggestionSearcher.suggest(prefix);
-    const auto suggestions = suggestionSearch.getResults(0, suggestionsCount);
-    for (auto current : suggestions) {
-      SuggestionItem suggestion(current.getTitle(), kiwix::normalize(current.getTitle()),
-                                current.getPath(), current.getSnippet());
+  if (suggestionSearch->get_matches_estimated()) {
+    for (auto current = suggestionSearch->begin();
+         current != suggestionSearch->end();
+         current++) {
+      if (!current->good()) {
+          continue;
+      }
+      std::vector<std::string> suggestion;
+      suggestion.push_back(current->getTitle());
+      suggestion.push_back("/A/" + current->getUrl());
+      suggestion.push_back(kiwix::normalize(current->getTitle()));
      results.push_back(suggestion);
    }
+    retVal = true;
  } else {
-    // Check some of the variants of the prefix
    for (std::vector<std::string>::iterator variantsItr = variants.begin();
         variantsItr != variants.end();
         variantsItr++) {
-      auto suggestionSearch = suggestionSearcher.suggest(*variantsItr);
-      for (auto current : suggestionSearch.getResults(0, suggestionsCount)) {
-        if (results.size() >= suggestionsCount) {
-          break;
-        }
-
-        SuggestionItem suggestion(current.getTitle(), kiwix::normalize(current.getTitle()),
-                                current.getPath(), current.getSnippet());
-        results.push_back(suggestion);
-      }
+      retVal = this->searchSuggestions(*variantsItr, suggestionsCount, results)
+               || retVal;
    }
  }

-  return results.size() > 0;
+  return retVal;
 }

 /* Get next suggestion */
@@ -415,7 +865,7 @@ bool Reader::getNextSuggestion(string& title)
 {
  if (this->suggestionsOffset != this->suggestions.end()) {
    /* title */
-    title = (*(this->suggestionsOffset)).getTitle();
+    title = (*(this->suggestionsOffset))[0];

    /* increment the cursor for the next call */
    this->suggestionsOffset++;
@@ -430,8 +880,8 @@ bool Reader::getNextSuggestion(string& title, string& url)
 {
  if (this->suggestionsOffset != this->suggestions.end()) {
    /* title */
-    title = (*(this->suggestionsOffset)).getTitle();
-    url = (*(this->suggestionsOffset)).getPath();
+    title = (*(this->suggestionsOffset))[0];
+    url = (*(this->suggestionsOffset))[1];

    /* increment the cursor for the next call */
    this->suggestionsOffset++;
@@ -445,14 +895,14 @@ bool Reader::getNextSuggestion(string& title, string& url)
 /* Check if the file has as checksum */
 bool Reader::canCheckIntegrity() const
 {
-  return zimArchive->hasChecksum();
+  return this->zimFileHandler->getChecksum() != "";
 }

 /* Return true if corrupted, false otherwise */
 bool Reader::isCorrupted() const
 {
  try {
-    if (zimArchive->check() == true) {
+    if (this->zimFileHandler->verify() == true) {
      return false;
    }
  } catch (exception& e) {
@@ -466,7 +916,13 @@ bool Reader::isCorrupted() const
 /* Return the file size, works also for splitted files */
 unsigned int Reader::getFileSize() const
 {
-  return kiwix::getArchiveFileSize(*zimArchive);
-}
+  zim::File* file = this->getZimFileHandler();
+  zim::size_type size = 0;

+  if (file != NULL) {
+    size = file->getFilesize();
+  }
+
+  return (size / 1024);
+}
 }
--- a/src/search_renderer.cpp
+++ b/src/search_renderer.cpp
@@ -30,29 +30,17 @@

 #include <mustache.hpp>
 #include "kiwixlib-resources.h"
-#include "tools/stringTools.h"
+

 namespace kiwix
 {

 /* Constructor */
 SearchRenderer::SearchRenderer(Searcher* searcher, NameMapper* mapper)
-    : m_srs(searcher->getSearchResultSet()),
+    : mp_searcher(searcher),
      mp_nameMapper(mapper),
      protocolPrefix("zim://"),
-      searchProtocolPrefix("search://?"),
-      estimatedResultCount(searcher->getEstimatedResultCount()),
-      resultStart(searcher->getResultStart())
-{}
-
-SearchRenderer::SearchRenderer(zim::SearchResultSet srs, NameMapper* mapper,
-                      unsigned int start, unsigned int estimatedResultCount)
-    : m_srs(srs),
-      mp_nameMapper(mapper),
-      protocolPrefix("zim://"),
-      searchProtocolPrefix("search://?"),
-      estimatedResultCount(estimatedResultCount),
-      resultStart(start)
+      searchProtocolPrefix("search://?")
 {}

 /* Destructor */
@@ -82,26 +70,31 @@ std::string SearchRenderer::getHtml()
 {
  kainjow::mustache::data results{kainjow::mustache::data::type::list};

-  for (auto it = m_srs.begin(); it != m_srs.end(); it++) {
+  mp_searcher->restart_search();
+  Result* p_result = NULL;
+  while ((p_result = mp_searcher->getNextResult())) {
    kainjow::mustache::data result;
-    result.set("title", it.getTitle());
-    result.set("url", it.getPath());
-    result.set("snippet", it.getSnippet());
-    std::ostringstream s;
-    s << it.getZimId();
-    result.set("resultContentId", mp_nameMapper->getNameForId(s.str()));
+    result.set("title", p_result->get_title());
+    result.set("url", p_result->get_url());
+    result.set("snippet", p_result->get_snippet());
+    auto readerIndex = p_result->get_readerIndex();
+    auto reader = mp_searcher->get_reader(readerIndex);
+    result.set("resultContentId", mp_nameMapper->getNameForId(reader->getId()));

-    if (it.getWordCount() >= 0) {
-      result.set("wordCount", kiwix::beautifyInteger(it.getWordCount()));
+    if (p_result->get_wordCount() >= 0) {
+      result.set("wordCount", kiwix::beautifyInteger(p_result->get_wordCount()));
    }

    results.push_back(result);
+    delete p_result;
  }

  // pages
  kainjow::mustache::data pages{kainjow::mustache::data::type::list};

+  auto resultStart = mp_searcher->getResultStart();
  auto resultEnd = 0U;
+  auto estimatedResultCount = mp_searcher->getEstimatedResultCount();
  auto currentPage = 0U;
  auto pageStart = 0U;
  auto pageEnd = 0U;
@@ -155,4 +148,4 @@ std::string SearchRenderer::getHtml()
  return ss.str();
 }

-}
+}
--- a/src/searcher.cpp
+++ b/src/searcher.cpp
@@ -18,16 +18,14 @@
 */


+#include <cmath>

 #include "searcher.h"
 #include "reader.h"

 #include <zim/search.h>
-#include <zim/suggestion.h>

 #include <mustache.hpp>
-#include <cmath>
-#include "tools/stringTools.h"
 #include "kiwixlib-resources.h"

 #define MAX_SEARCH_LEN 140
@@ -37,8 +35,7 @@ namespace kiwix
 class _Result : public Result
 {
 public:
-  _Result(zim::SearchResultSet::iterator iterator);
-  _Result(SuggestionItem suggestionItem);
+  _Result(zim::Search::iterator& iterator);
  virtual ~_Result(){};

  virtual std::string get_url();
@@ -48,38 +45,32 @@ class _Result : public Result
  virtual std::string get_content();
  virtual int get_wordCount();
  virtual int get_size();
-  virtual std::string get_zimId();
+  virtual int get_readerIndex();

 private:
-  zim::SearchResultSet::iterator iterator;
-  SuggestionItem suggestionItem;
-  bool isSuggestion;
+  zim::Search::iterator iterator;
 };

-struct SearcherInternal : zim::SearchResultSet {
-  explicit SearcherInternal(const zim::SearchResultSet& srs)
-    : zim::SearchResultSet(srs)
-    , current_iterator(srs.begin())
+struct SearcherInternal {
+  const zim::Search* _search;
+  zim::Search::iterator current_iterator;
+
+  SearcherInternal() : _search(NULL) {}
+  ~SearcherInternal()
  {
+    if (_search != NULL) {
+      delete _search;
+    }
  }
-
-  zim::SearchResultSet::iterator current_iterator;
-};
-
-struct SuggestionInternal : zim::SuggestionResultSet {
-  explicit SuggestionInternal(const zim::SuggestionResultSet& srs)
-    : zim::SuggestionResultSet(srs),
-      currentIterator(srs.begin()) {}
-
-  zim::SuggestionResultSet::iterator currentIterator;
 };

 /* Constructor */
 Searcher::Searcher()
-    : searchPattern(""),
+    : internal(new SearcherInternal()),
+      searchPattern(""),
      estimatedResultCount(0),
      resultStart(0),
-      maxResultCount(0)
+      resultEnd(0)
 {
  loadICUExternalTables();
 }
@@ -87,6 +78,7 @@ Searcher::Searcher()
 /* Destructor */
 Searcher::~Searcher()
 {
+  delete internal;
 }

 bool Searcher::add_reader(Reader* reader)
@@ -94,12 +86,6 @@ bool Searcher::add_reader(Reader* reader)
  if (!reader->hasFulltextIndex()) {
      return false;
  }
-
-  for ( const Reader* const existing_reader : readers ) {
-    if ( existing_reader->getZimArchive()->getUuid() == reader->getZimArchive()->getUuid() )
-      return false;
-  }
-
  this->readers.push_back(reader);
  return true;
 }
@@ -113,7 +99,7 @@ Reader* Searcher::get_reader(int readerIndex)
 /* Search strings in the database */
 void Searcher::search(const std::string& search,
                      unsigned int resultStart,
-                      unsigned int maxResultCount,
+                      unsigned int resultEnd,
                      const bool verbose)
 {
  this->reset();
@@ -124,25 +110,25 @@ void Searcher::search(const std::string& search,

  this->searchPattern = search;
  this->resultStart = resultStart;
-  this->maxResultCount = maxResultCount;
+  this->resultEnd = resultEnd;
  /* Try to find results */
-  if (maxResultCount != 0) {
+  if (resultStart != resultEnd) {
    /* Perform the search */
    string unaccentedSearch = removeAccents(search);
-    std::vector<zim::Archive> archives;
+    std::vector<const zim::File*> zims;
    for (auto current = this->readers.begin(); current != this->readers.end();
         current++) {
      if ( (*current)->hasFulltextIndex() ) {
-          archives.push_back(*(*current)->getZimArchive());
+          zims.push_back((*current)->getZimFileHandler());
      }
    }
-    zim::Searcher searcher(archives);
-    searcher.setVerbose(verbose);
-    zim::Query query;
-    query.setQuery(unaccentedSearch);
-    zim::Search search = searcher.search(query);
-    internal.reset(new SearcherInternal(search.getResults(resultStart, maxResultCount)));
-    this->estimatedResultCount = search.getEstimatedMatches();
+    zim::Search* search = new zim::Search(zims);
+    search->set_verbose(verbose);
+    search->set_query(unaccentedSearch);
+    search->set_range(resultStart, resultEnd);
+    internal->_search = search;
+    internal->current_iterator = internal->_search->begin();
+    this->estimatedResultCount = internal->_search->get_matches_estimated();
  }

  return;
@@ -151,7 +137,7 @@ void Searcher::search(const std::string& search,

 void Searcher::geo_search(float latitude, float longitude, float distance,
                          unsigned int resultStart,
-                          unsigned int maxResultCount,
+                          unsigned int resultEnd,
                          const bool verbose)
 {
  this->reset();
@@ -165,53 +151,43 @@ void Searcher::geo_search(float latitude, float longitude, float distance,
  oss << "Articles located less than " << distance << " meters of " << latitude << ";" << longitude;
  this->searchPattern = oss.str();
  this->resultStart = resultStart;
-  this->maxResultCount = maxResultCount;
+  this->resultEnd = resultEnd;

  /* Try to find results */
-  if (maxResultCount == 0) {
+  if (resultStart == resultEnd) {
    return;
  }

-  std::vector<zim::Archive> archives;
+  std::vector<const zim::File*> zims;
  for (auto current = this->readers.begin(); current != this->readers.end();
       current++) {
-    archives.push_back(*(*current)->getZimArchive());
+    zims.push_back((*current)->getZimFileHandler());
  }
-  zim::Searcher searcher(archives);
-  searcher.setVerbose(verbose);
-  zim::Query query;
-  query.setQuery("");
-  query.setGeorange(latitude, longitude, distance);
-  zim::Search search = searcher.search(query);
-  internal.reset(new SearcherInternal(search.getResults(resultStart, maxResultCount)));
-  this->estimatedResultCount = search.getEstimatedMatches();
+  zim::Search* search = new zim::Search(zims);
+  search->set_verbose(verbose);
+  search->set_query("");
+  search->set_georange(latitude, longitude, distance);
+  search->set_range(resultStart, resultEnd);
+  internal->_search = search;
+  internal->current_iterator = internal->_search->begin();
+  this->estimatedResultCount = internal->_search->get_matches_estimated();
 }


 void Searcher::restart_search()
 {
-  if (internal.get()) {
-    internal->current_iterator = internal->begin();
+  if (internal->_search) {
+    internal->current_iterator = internal->_search->begin();
  }
 }

 Result* Searcher::getNextResult()
 {
-  if (internal.get() && internal->current_iterator != internal->end()) {
+  if (internal->_search &&
+             internal->current_iterator != internal->_search->end()) {
    Result* result = new _Result(internal->current_iterator);
    internal->current_iterator++;
    return result;
-  } else if (suggestionInternal.get() &&
-             suggestionInternal->currentIterator != suggestionInternal->end()) {
-    SuggestionItem item(
-                        suggestionInternal->currentIterator->getTitle(),
-                        normalize(suggestionInternal->currentIterator->getTitle()),
-                        suggestionInternal->currentIterator->getPath(),
-                        suggestionInternal->currentIterator->getSnippet()
-                      );
-    Result* result = new _Result(item);
-    suggestionInternal->currentIterator++;
-    return result;
  }
  return NULL;
 }
@@ -234,16 +210,22 @@ void Searcher::suggestions(std::string& searchPattern, const bool verbose)

  this->searchPattern = searchPattern;
  this->resultStart = 0;
-  this->maxResultCount = 10;
+  this->resultEnd = 10;
  string unaccentedSearch = removeAccents(searchPattern);

-  // Multizim suggestion is not supported as of now! taking only one archive
-  zim::Archive archive = *(*this->readers.begin())->getZimArchive();
-  zim::SuggestionSearcher searcher(archive);
-  searcher.setVerbose(verbose);
-  zim::SuggestionSearch search = searcher.suggest(searchPattern);
-  suggestionInternal.reset(new SuggestionInternal(search.getResults(resultStart, maxResultCount)));
-  this->estimatedResultCount = search.getEstimatedMatches();
+  std::vector<const zim::File*> zims;
+  for (auto current = this->readers.begin(); current != this->readers.end();
+       current++) {
+    zims.push_back((*current)->getZimFileHandler());
+  }
+  zim::Search* search = new zim::Search(zims);
+  search->set_verbose(verbose);
+  search->set_query(unaccentedSearch);
+  search->set_range(resultStart, resultEnd);
+  search->set_suggestion_mode(true);
+  internal->_search = search;
+  internal->current_iterator = internal->_search->begin();
+  this->estimatedResultCount = internal->_search->get_matches_estimated();
 }

 /* Return the result count estimation */
@@ -252,78 +234,45 @@ unsigned int Searcher::getEstimatedResultCount()
  return this->estimatedResultCount;
 }

-zim::SearchResultSet Searcher::getSearchResultSet()
+_Result::_Result(zim::Search::iterator& iterator)
+    : iterator(iterator)
 {
-  return *(this->internal);
 }

-_Result::_Result(zim::SearchResultSet::iterator iterator)
-    : iterator(iterator),
-      suggestionItem("", "", ""),
-      isSuggestion(false)
-{}
-
-_Result::_Result(SuggestionItem item)
-    : iterator(),
-      suggestionItem(item.getTitle(), item.getNormalizedTitle(), item.getPath(), item.getSnippet()),
-      isSuggestion(true)
-{}
-
 std::string _Result::get_url()
 {
-  if (isSuggestion) {
-    return suggestionItem.getPath();
-  }
-  return iterator.getPath();
+  return iterator.get_url();
 }
 std::string _Result::get_title()
 {
-  if (isSuggestion) {
-    return suggestionItem.getTitle();
-  }
-  return iterator.getTitle();
+  return iterator.get_title();
 }
 int _Result::get_score()
 {
-  if (isSuggestion) {
-    return 0;
-  }
-  return iterator.getScore();
+  return iterator.get_score();
 }
 std::string _Result::get_snippet()
 {
-  if (isSuggestion) {
-    return suggestionItem.getSnippet();
-  }
-  return iterator.getSnippet();
+  return iterator.get_snippet();
 }
 std::string _Result::get_content()
 {
-  if (isSuggestion) return "";
-  return iterator->getItem(true).getData();
+  if (iterator->good()) {
+    return iterator->getData();
+  }
+  return "";
 }
 int _Result::get_size()
 {
-  if (isSuggestion) {
-    return 0;
-  }
-  return iterator.getSize();
+  return iterator.get_size();
 }
 int _Result::get_wordCount()
 {
-  if (isSuggestion) {
-    return 0;
-  }
-  return iterator.getWordCount();
+  return iterator.get_wordCount();
 }
-std::string _Result::get_zimId()
+int _Result::get_readerIndex()
 {
-  if (isSuggestion) {
-    return "";
-  }
-  std::ostringstream s;
-  s << iterator.getZimId();
-  return s.str();
+  return iterator.get_fileIndex();
 }


--- a/src/server.cpp
+++ b/src/server.cpp
@@ -19,15 +19,140 @@

 #include "server.h"

+#ifdef _WIN32
+# if !defined(__MINGW32__) && (_MSC_VER < 1600)
+#   include "stdint4win.h"
+# endif
+# include <winsock2.h>
+# include <ws2tcpip.h>
+# ifdef __GNUC__
+  // inet_pton is not declared in mingw, even if the function exists.
+  extern "C" {
+    WINSOCK_API_LINKAGE  INT WSAAPI inet_pton( INT Family, PCSTR pszAddrString, PVOID pAddrBuf);
+  }
+# endif
+  typedef UINT64 uint64_t;
+  typedef UINT16 uint16_t;
+#endif
+
+extern "C" {
+#include "microhttpd_wrapper.h"
+}
+
+#include "tools/otherTools.h"
+#include "tools/pathTools.h"
+#include "tools/regexTools.h"
+#include "tools/stringTools.h"
 #include "library.h"
 #include "name_mapper.h"
+#include "entry.h"
+#include "searcher.h"
+#include "search_renderer.h"
+#include "opds_dumper.h"

+#include <zim/uuid.h>
+
+#include <mustache.hpp>
+
+#include <pthread.h>
+#include <atomic>
 #include <string>
+#include <vector>
+#include <chrono>
+#include "kiwixlib-resources.h"

-#include "server/internalServer.h"
+#ifndef _WIN32
+# include <arpa/inet.h>
+#endif
+
+#include "server/request_context.h"
+#include "server/response.h"
+
+#define MAX_SEARCH_LEN 140
+#define KIWIX_MIN_CONTENT_SIZE_TO_DEFLATE 100

 namespace kiwix {

+static IdNameMapper defaultNameMapper;
+
+typedef kainjow::mustache::data MustacheData;
+
+static MHD_Result staticHandlerCallback(void* cls,
+                                        struct MHD_Connection* connection,
+                                        const char* url,
+                                        const char* method,
+                                        const char* version,
+                                        const char* upload_data,
+                                        size_t* upload_data_size,
+                                        void** cont_cls);
+
+
+class InternalServer {
+  public:
+    InternalServer(Library* library,
+                   NameMapper* nameMapper,
+                   std::string addr,
+                   int port,
+                   std::string root,
+                   int nbThreads,
+                   bool verbose,
+                   bool withTaskbar,
+                   bool withLibraryButton,
+                   bool blockExternalLinks);
+    virtual ~InternalServer() = default;
+
+    MHD_Result handlerCallback(struct MHD_Connection* connection,
+                               const char* url,
+                               const char* method,
+                               const char* version,
+                               const char* upload_data,
+                               size_t* upload_data_size,
+                               void** cont_cls);
+    bool start();
+    void stop();
+
+  private: // functions
+    Response handle_request(const RequestContext& request);
+    Response build_500(const std::string& msg);
+    Response build_404(const RequestContext& request, const std::string& zimName);
+    Response build_304(const RequestContext& request, const ETag& etag) const;
+    Response build_redirect(const std::string& bookName, const kiwix::Entry& entry) const;
+    Response build_homepage(const RequestContext& request);
+    Response handle_skin(const RequestContext& request);
+    Response handle_catalog(const RequestContext& request);
+    Response handle_meta(const RequestContext& request);
+    Response handle_search(const RequestContext& request);
+    Response handle_suggest(const RequestContext& request);
+    Response handle_random(const RequestContext& request);
+    Response handle_captured_external(const RequestContext& request);
+    Response handle_content(const RequestContext& request);
+
+    MustacheData get_default_data() const;
+    MustacheData homepage_data() const;
+    Response get_default_response() const;
+
+    std::shared_ptr<Reader> get_reader(const std::string& bookName) const;
+    bool etag_not_needed(const RequestContext& r) const;
+    ETag get_matching_if_none_match_etag(const RequestContext& request) const;
+
+  private: // data
+    std::string m_addr;
+    int m_port;
+    std::string m_root;
+    int m_nbThreads;
+    std::atomic_bool m_verbose;
+    bool m_withTaskbar;
+    bool m_withLibraryButton;
+    bool m_blockExternalLinks;
+    struct MHD_Daemon* mp_daemon;
+
+    Library* mp_library;
+    NameMapper* mp_nameMapper;
+
+    std::string m_server_id;
+};
+
+
 Server::Server(Library* library, NameMapper* nameMapper) :
  mp_library(library),
  mp_nameMapper(nameMapper),
@@ -48,16 +173,13 @@ bool Server::start() {
    m_verbose,
    m_withTaskbar,
    m_withLibraryButton,
-    m_blockExternalLinks,
-    m_indexTemplateString));
+    m_blockExternalLinks));
  return mp_server->start();
 }

 void Server::stop() {
-  if (mp_server) {
-    mp_server->stop();
-    mp_server.reset(nullptr);
-  }
+  mp_server->stop();
+  mp_server.reset(nullptr);
 }

 void Server::setRoot(const std::string& root)
@@ -71,14 +193,780 @@ void Server::setRoot(const std::string& root)
  }
 }

-int Server::getPort()
-{
-  return mp_server->getPort();
+
+InternalServer::InternalServer(Library* library,
+                               NameMapper* nameMapper,
+                               std::string addr,
+                               int port,
+                               std::string root,
+                               int nbThreads,
+                               bool verbose,
+                               bool withTaskbar,
+                               bool withLibraryButton,
+                               bool blockExternalLinks) :
+  m_addr(addr),
+  m_port(port),
+  m_root(root),
+  m_nbThreads(nbThreads),
+  m_verbose(verbose),
+  m_withTaskbar(withTaskbar),
+  m_withLibraryButton(withLibraryButton),
+  m_blockExternalLinks(blockExternalLinks),
+  mp_daemon(nullptr),
+  mp_library(library),
+  mp_nameMapper(nameMapper ? nameMapper : &defaultNameMapper)
+{}
+
+bool InternalServer::start() {
+#ifdef _WIN32
+  int flags = MHD_USE_SELECT_INTERNALLY;
+#else
+  int flags = MHD_USE_POLL_INTERNALLY;
+#endif
+  if (m_verbose.load())
+    flags |= MHD_USE_DEBUG;
+
+
+  struct sockaddr_in sockAddr;
+  memset(&sockAddr, 0, sizeof(sockAddr));
+  sockAddr.sin_family = AF_INET;
+  sockAddr.sin_port = htons(m_port);
+  if (m_addr.empty()) {
+    if (0 != INADDR_ANY)
+      sockAddr.sin_addr.s_addr = htonl(INADDR_ANY);
+  } else {
+    if (inet_pton(AF_INET, m_addr.c_str(), &(sockAddr.sin_addr.s_addr)) == 0) {
+      std::cerr << "Ip address " << m_addr << "  is not a valid ip address" << std::endl;
+      return false;
+    }
+  }
+
+  mp_daemon = MHD_start_daemon(flags,
+                            m_port,
+                            NULL,
+                            NULL,
+                            &staticHandlerCallback,
+                            this,
+                            MHD_OPTION_SOCK_ADDR, &sockAddr,
+                            MHD_OPTION_THREAD_POOL_SIZE, m_nbThreads,
+                            MHD_OPTION_END);
+  if (mp_daemon == nullptr) {
+    std::cerr << "Unable to instantiate the HTTP daemon. The port " << m_port
+              << " is maybe already occupied or need more permissions to be open. "
+                 "Please try as root or with a port number higher or equal to 1024."
+              << std::endl;
+    return false;
+  }
+  auto server_start_time = std::chrono::system_clock::now().time_since_epoch();
+  m_server_id = kiwix::to_string(server_start_time.count());
+  return true;
 }

-std::string Server::getAddress()
+void InternalServer::stop()
 {
-  return mp_server->getAddress();
+  MHD_stop_daemon(mp_daemon);
+}
+
+static MHD_Result staticHandlerCallback(void* cls,
+                                        struct MHD_Connection* connection,
+                                        const char* url,
+                                        const char* method,
+                                        const char* version,
+                                        const char* upload_data,
+                                        size_t* upload_data_size,
+                                        void** cont_cls)
+{
+  InternalServer* _this = static_cast<InternalServer*>(cls);
+
+  return _this->handlerCallback(connection,
+                                url,
+                                method,
+                                version,
+                                upload_data,
+                                upload_data_size,
+                                cont_cls);
+}
+
+MHD_Result InternalServer::handlerCallback(struct MHD_Connection* connection,
+                                           const char* url,
+                                           const char* method,
+                                           const char* version,
+                                           const char* upload_data,
+                                           size_t* upload_data_size,
+                                           void** cont_cls)
+{
+  auto start_time = std::chrono::steady_clock::now();
+  if (m_verbose.load() ) {
+    printf("======================\n");
+    printf("Requesting : \n");
+    printf("full_url  : %s\n", url);
+  }
+  RequestContext request(connection, m_root, url, method, version);
+
+  if (m_verbose.load() ) {
+    request.print_debug_info();
+  }
+  /* Unexpected method */
+  if (request.get_method() != RequestMethod::GET
+   && request.get_method() != RequestMethod::POST
+   && request.get_method() != RequestMethod::HEAD) {
+    printf("Reject request because of unhandled request method.\n");
+    printf("----------------------\n");
+    return MHD_NO;
+  }
+
+  auto response = handle_request(request);
+
+  if (response.getReturnCode() == MHD_HTTP_INTERNAL_SERVER_ERROR) {
+    printf("========== INTERNAL ERROR !! ============\n");
+    if (!m_verbose.load()) {
+      printf("Requesting : \n");
+      printf("full_url : %s\n", url);
+      request.print_debug_info();
+    }
+  }
+
+  if (response.getReturnCode() == MHD_HTTP_OK && !etag_not_needed(request))
+    response.set_server_id(m_server_id);
+
+  auto ret = response.send(request, connection);
+  auto end_time = std::chrono::steady_clock::now();
+  auto time_span = std::chrono::duration_cast<std::chrono::duration<double>>(end_time - start_time);
+  if (m_verbose.load()) {
+    printf("Request time : %fs\n", time_span.count());
+    printf("----------------------\n");
+  }
+  return ret;
+}
+
+Response InternalServer::build_304(const RequestContext& request, const ETag& etag) const
+{
+  auto response = get_default_response();
+  response.set_code(MHD_HTTP_NOT_MODIFIED);
+  response.set_etag(etag);
+  response.set_content("");
+  return response;
+}
+
+Response InternalServer::handle_request(const RequestContext& request)
+{
+  try {
+    if (! request.is_valid_url())
+      return build_404(request, "");
+
+    const ETag etag = get_matching_if_none_match_etag(request);
+    if ( etag )
+      return build_304(request, etag);
+
+    if (kiwix::startsWith(request.get_url(), "/skin/"))
+      return handle_skin(request);
+
+    if (startsWith(request.get_url(), "/catalog"))
+      return handle_catalog(request);
+
+    if (request.get_url() == "/meta")
+      return handle_meta(request);
+
+    if (request.get_url() == "/search")
+      return handle_search(request);
+
+    if (request.get_url() == "/suggest")
+     return handle_suggest(request);
+
+    if (request.get_url() == "/random")
+      return handle_random(request);
+
+    if (request.get_url() == "/catch/external")
+      return handle_captured_external(request);
+
+    return handle_content(request);
+  } catch (std::exception& e) {
+    fprintf(stderr, "===== Unhandled error : %s\n", e.what());
+    return build_500(e.what());
+  } catch (...) {
+    fprintf(stderr, "===== Unhandled unknown error\n");
+    return build_500("Unknown error");
+  }
+}
+
+MustacheData InternalServer::get_default_data() const
+{
+  MustacheData data;
+  data.set("root", m_root);
+  return data;
+}
+
+Response InternalServer::get_default_response() const
+{
+  return Response(m_root, m_verbose.load(), m_withTaskbar, m_withLibraryButton, m_blockExternalLinks);
+}
+
+
+Response InternalServer::build_404(const RequestContext& request,
+                                   const std::string& bookName)
+{
+  MustacheData results;
+  results.set("url", request.get_full_url());
+
+  auto response = get_default_response();
+  response.set_template(RESOURCE::templates::_404_html, results);
+  response.set_mimeType("text/html");
+  response.set_code(MHD_HTTP_NOT_FOUND);
+  response.set_compress(true);
+  response.set_taskbar(bookName, "");
+
+  return response;
+}
+
+Response InternalServer::build_500(const std::string& msg)
+{
+  MustacheData data;
+  data.set("error", msg);
+  Response response(m_root, true, false, false, false);
+  response.set_template(RESOURCE::templates::_500_html, data);
+  response.set_mimeType("text/html");
+  response.set_code(MHD_HTTP_INTERNAL_SERVER_ERROR);
+  return response;
+}
+
+MustacheData InternalServer::homepage_data() const
+{
+  auto data = get_default_data();
+
+  MustacheData books{MustacheData::type::list};
+  for (auto& bookId: mp_library->filter(kiwix::Filter().local(true).valid(true))) {
+    auto& currentBook = mp_library->getBookById(bookId);
+
+    MustacheData book;
+    book.set("name", mp_nameMapper->getNameForId(bookId));
+    book.set("title", currentBook.getTitle());
+    book.set("description", currentBook.getDescription());
+    book.set("articleCount", beautifyInteger(currentBook.getArticleCount()));
+    book.set("mediaCount", beautifyInteger(currentBook.getMediaCount()));
+    books.push_back(book);
+  }
+
+  data.set("books", books);
+  return data;
+}
+
+bool InternalServer::etag_not_needed(const RequestContext& request) const
+{
+  const std::string url = request.get_url();
+  return kiwix::startsWith(url, "/catalog")
+      || url == "/search"
+      || url == "/suggest"
+      || url == "/random"
+      || url == "/catch/external";
+}
+
+ETag
+InternalServer::get_matching_if_none_match_etag(const RequestContext& r) const
+{
+  try {
+    const std::string etag_list = r.get_header(MHD_HTTP_HEADER_IF_NONE_MATCH);
+    return ETag::match(etag_list, m_server_id);
+  } catch (const std::out_of_range&) {
+    return ETag();
+  }
+}
+
+Response InternalServer::build_homepage(const RequestContext& request)
+{
+  auto response = get_default_response();
+  response.set_template(RESOURCE::templates::index_html, homepage_data());
+  response.set_mimeType("text/html; charset=utf-8");
+  response.set_compress(true);
+  return response;
+}
+
+Response InternalServer::handle_meta(const RequestContext& request)
+{
+  std::string bookName;
+  std::string bookId;
+  std::string meta_name;
+  std::shared_ptr<Reader> reader;
+  try {
+    bookName = request.get_argument("content");
+    bookId = mp_nameMapper->getIdForName(bookName);
+    meta_name = request.get_argument("name");
+    reader = mp_library->getReaderById(bookId);
+  } catch (const std::out_of_range& e) {
+    return build_404(request, bookName);
+  }
+
+  if (reader == nullptr) {
+    return build_404(request, bookName);
+  }
+
+  std::string content;
+  std::string mimeType = "text";
+
+  if (meta_name == "title") {
+    content = reader->getTitle();
+  } else if (meta_name == "description") {
+    content = reader->getDescription();
+  } else if (meta_name == "language") {
+    content = reader->getLanguage();
+  } else if (meta_name == "name") {
+    content = reader->getName();
+  } else if (meta_name == "tags") {
+    content = reader->getTags();
+  } else if (meta_name == "date") {
+    content = reader->getDate();
+  } else if (meta_name == "creator") {
+    content = reader->getCreator();
+  } else if (meta_name == "publisher") {
+    content = reader->getPublisher();
+  } else if (meta_name == "favicon") {
+    reader->getFavicon(content, mimeType);
+  } else {
+    return build_404(request, bookName);
+  }
+
+  auto response = get_default_response();
+  response.set_content(content);
+  response.set_mimeType(mimeType);
+  response.set_compress(false);
+  response.set_cacheable();
+  return response;
+}
+
+Response InternalServer::handle_suggest(const RequestContext& request)
+{
+  if (m_verbose.load()) {
+    printf("** running handle_suggest\n");
+  }
+
+  std::string content;
+  std::string mimeType;
+  unsigned int maxSuggestionCount = 10;
+  unsigned int suggestionCount = 0;
+
+  std::string bookName;
+  std::string bookId;
+  std::string term;
+  std::shared_ptr<Reader> reader;
+  try {
+    bookName = request.get_argument("content");
+    bookId = mp_nameMapper->getIdForName(bookName);
+    term = request.get_argument("term");
+    reader = mp_library->getReaderById(bookId);
+  } catch (const std::out_of_range&) {
+    return build_404(request, bookName);
+  }
+
+  if (m_verbose.load()) {
+    printf("Searching suggestions for: \"%s\"\n", term.c_str());
+  }
+
+  MustacheData results{MustacheData::type::list};
+
+  bool first = true;
+  if (reader != nullptr) {
+    /* Get the suggestions */
+    SuggestionsList_t suggestions;
+    reader->searchSuggestionsSmart(term, maxSuggestionCount, suggestions);
+    for(auto& suggestion:suggestions) {
+      MustacheData result;
+      result.set("label", suggestion[0]);
+      result.set("value", suggestion[0]);
+      result.set("first", first);
+      first = false;
+      results.push_back(result);
+      suggestionCount++;
+    }
+  }
+
+  /* Propose the fulltext search if possible */
+  if (reader->hasFulltextIndex()) {
+    MustacheData result;
+    result.set("label", "containing '" + term + "'...");
+    result.set("value", term + " ");
+    result.set("first", first);
+    results.push_back(result);
+  }
+
+  auto data = get_default_data();
+  data.set("suggestions", results);
+
+  auto response = get_default_response();
+  response.set_template(RESOURCE::templates::suggestion_json, data);
+  response.set_mimeType("application/json; charset=utf-8");
+  response.set_compress(true);
+  return response;
+}
+
+Response InternalServer::handle_skin(const RequestContext& request)
+{
+  if (m_verbose.load()) {
+    printf("** running handle_skin\n");
+  }
+
+  auto response = get_default_response();
+  auto resourceName = request.get_url().substr(1);
+  try {
+    response.set_content(getResource(resourceName));
+  } catch (const ResourceNotFound& e) {
+    return build_404(request, "");
+  }
+  response.set_mimeType(getMimeTypeForFile(resourceName));
+  response.set_compress(true);
+  response.set_cacheable();
+  return response;
+}
+
+Response InternalServer::handle_search(const RequestContext& request)
+{
+  if (m_verbose.load()) {
+    printf("** running handle_search\n");
+  }
+
+  std::string bookName;
+  std::string bookId;
+  try {
+    bookName = request.get_argument("content");
+    bookId = mp_nameMapper->getIdForName(bookName);
+  } catch (const std::out_of_range&) {}
+
+  std::string patternString;
+  try {
+    patternString = request.get_argument("pattern");
+  } catch (const std::out_of_range&) {}
+
+  /* Retrive geo search */
+  bool has_geo_query = false;
+  float latitude = 0;
+  float longitude = 0;
+  float distance = 0;
+  try {
+    latitude = request.get_argument<float>("latitude");
+    longitude = request.get_argument<float>("longitude");
+    distance = request.get_argument<float>("distance");
+    has_geo_query = true;
+  } catch(const std::out_of_range&) {}
+    catch(const std::invalid_argument&) {}
+
+  std::shared_ptr<Reader> reader(nullptr);
+  try {
+    reader = mp_library->getReaderById(bookId);
+  } catch (const std::out_of_range&) {}
+
+  /* Try first to load directly the article */
+  if (reader != nullptr && !patternString.empty()) {
+    std::string patternCorrespondingUrl;
+    auto variants = reader->getTitleVariants(patternString);
+    auto variantsItr = variants.begin();
+
+    while (patternCorrespondingUrl.empty() && variantsItr != variants.end()) {
+      try {
+        auto entry = reader->getEntryFromTitle(*variantsItr);
+        entry = entry.getFinalEntry();
+        patternCorrespondingUrl = entry.getPath();
+        break;
+      } catch(kiwix::NoEntry& e) {
+        variantsItr++;
+      }
+    }
+
+    /* If article found then redirect directly to it */
+    if (!patternCorrespondingUrl.empty()) {
+      auto response = get_default_response();
+      response.set_redirection(m_root + "/" + bookName + "/" + patternCorrespondingUrl);
+      return response;
+    }
+  }
+
+  /* Make the search */
+  auto response = get_default_response();
+  response.set_mimeType("text/html; charset=utf-8");
+  response.set_taskbar(bookName, reader ? reader->getTitle() : "");
+  response.set_compress(true);
+
+  if ( (!reader && !bookName.empty())
+    || (patternString.empty() && ! has_geo_query) ) {
+    auto data = get_default_data();
+    data.set("pattern", encodeDiples(patternString));
+    response.set_template(RESOURCE::templates::no_search_result_html, data);
+    response.set_code(MHD_HTTP_NOT_FOUND);
+    return response;
+  }
+
+  Searcher searcher;
+  if (reader) {
+    searcher.add_reader(reader.get());
+  } else {
+    for (auto& bookId: mp_library->filter(kiwix::Filter().local(true).valid(true))) {
+      auto currentReader = mp_library->getReaderById(bookId);
+      if (currentReader) {
+        searcher.add_reader(currentReader.get());
+      }
+    }
+  }
+
+  auto start = 0;
+  try {
+    start = request.get_argument<unsigned int>("start");
+  } catch (const std::exception&) {}
+  auto pageLength=25;
+  try{
+    pageLength=request.get_argument<unsigned int>("pageLength");
+  }catch(const std::exception&){}
+  if (pageLength > MAX_SEARCH_LEN) {
+    pageLength = MAX_SEARCH_LEN;
+  }
+
+  if(pageLength==0)
+  {
+    pageLength=25;
+  }
+
+  auto end=start+pageLength;
+
+  /* Get the results */
+  try {
+    if (patternString.empty()) {
+      searcher.geo_search(latitude, longitude, distance,
+                           start, end , m_verbose.load());
+    } else {
+      searcher.search(patternString,
+                       start, end , m_verbose.load());
+    }
+    SearchRenderer renderer(&searcher, mp_nameMapper);
+    renderer.setSearchPattern(patternString);
+    renderer.setSearchContent(bookName);
+    renderer.setProtocolPrefix(m_root + "/");
+    renderer.setSearchProtocolPrefix(m_root + "/search?");
+    renderer.setPageLength(pageLength);
+    response.set_content(renderer.getHtml());
+  } catch (const std::exception& e) {
+    std::cerr << e.what() << std::endl;
+  }
+
+  //changing status code if no result obtained
+  if(searcher.getEstimatedResultCount() == 0)
+  {
+    response.set_code(MHD_HTTP_NO_CONTENT);
+  }
+
+  return response;
+}
+
+Response InternalServer::handle_random(const RequestContext& request)
+{
+  if (m_verbose.load()) {
+    printf("** running handle_random\n");
+  }
+
+  std::string bookName;
+  std::string bookId;
+  std::shared_ptr<Reader> reader;
+  try {
+    bookName = request.get_argument("content");
+    bookId = mp_nameMapper->getIdForName(bookName);
+    reader = mp_library->getReaderById(bookId);
+  } catch (const std::out_of_range&) {
+    return build_404(request, bookName);
+  }
+
+  if (reader == nullptr) {
+    return build_404(request, bookName);
+  }
+
+  try {
+    auto entry = reader->getRandomPage();
+    return build_redirect(bookName, entry.getFinalEntry());
+  } catch(kiwix::NoEntry& e) {
+    return build_404(request, bookName);
+  }
+}
+
+Response InternalServer::handle_captured_external(const RequestContext& request)
+{
+  std::string source = "";
+  try {
+    source = kiwix::urlDecode(request.get_argument("source"));
+  } catch (const std::out_of_range& e) {}
+
+  if (source.empty())
+    return build_404(request, "");
+
+  auto data = get_default_data();
+  data.set("source", source);
+  auto response = get_default_response();
+  response.set_template(RESOURCE::templates::captured_external_html, data);
+  response.set_mimeType("text/html; charset=utf-8");
+  response.set_compress(true);
+  return response;
+}
+
+Response InternalServer::handle_catalog(const RequestContext& request)
+{
+  if (m_verbose.load()) {
+    printf("** running handle_catalog");
+  }
+
+  std::string host;
+  std::string url;
+  try {
+    host = request.get_header("Host");
+    url  = request.get_url_part(1);
+  } catch (const std::out_of_range&) {
+    return build_404(request, "");
+  }
+
+  if (url != "searchdescription.xml" && url != "root.xml" && url != "search") {
+    return build_404(request, "");
+  }
+
+  auto response = get_default_response();
+  response.set_compress(true);
+  if (url == "searchdescription.xml") {
+    response.set_template(RESOURCE::opensearchdescription_xml, get_default_data());
+    response.set_mimeType("application/opensearchdescription+xml");
+    return response;
+  }
+
+  zim::Uuid uuid;
+  kiwix::OPDSDumper opdsDumper;
+  opdsDumper.setRootLocation(m_root);
+  opdsDumper.setSearchDescriptionUrl("catalog/searchdescription.xml");
+  opdsDumper.setLibrary(mp_library);
+  response.set_mimeType("application/atom+xml; profile=opds-catalog; kind=acquisition; charset=utf-8");
+  std::vector<std::string> bookIdsToDump;
+  if (url == "root.xml") {
+    opdsDumper.setTitle("All zims");
+    uuid = zim::Uuid::generate(host);
+    bookIdsToDump = mp_library->filter(kiwix::Filter().valid(true).local(true).remote(true));
+  } else if (url == "search") {
+    auto filter = kiwix::Filter().valid(true).local(true).remote(true);
+    string query("<Empty query>");
+    size_t count(10);
+    size_t startIndex(0);
+    try {
+      query = request.get_argument("q");
+      filter.query(query);
+    } catch (const std::out_of_range&) {}
+    try {
+      filter.maxSize(extractFromString<unsigned long>(request.get_argument("maxsize")));
+    } catch (...) {}
+    try {
+      filter.name(request.get_argument("name"));
+    } catch (const std::out_of_range&) {}
+    try {
+      filter.lang(request.get_argument("lang"));
+    } catch (const std::out_of_range&) {}
+    try {
+      count = extractFromString<unsigned long>(request.get_argument("count"));
+    } catch (...) {}
+    try {
+      startIndex = extractFromString<unsigned long>(request.get_argument("start"));
+    } catch (...) {}
+    try {
+      filter.acceptTags(kiwix::split(request.get_argument("tag"), ";"));
+    } catch (...) {}
+    try {
+      filter.rejectTags(kiwix::split(request.get_argument("notag"), ";"));
+    } catch (...) {}
+    opdsDumper.setTitle("Search result for " + query);
+    uuid = zim::Uuid::generate();
+    bookIdsToDump = mp_library->filter(filter);
+    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());
+  }
+
+  opdsDumper.setId(kiwix::to_string(uuid));
+  response.set_content(opdsDumper.dumpOPDSFeed(bookIdsToDump));
+  return response;
+}
+
+namespace
+{
+
+std::string get_book_name(const RequestContext& request)
+{
+  try {
+    return request.get_url_part(0);
+  } catch (const std::out_of_range& e) {
+    return std::string();
+  }
+}
+
+} // unnamed namespace
+
+std::shared_ptr<Reader>
+InternalServer::get_reader(const std::string& bookName) const
+{
+  std::shared_ptr<Reader> reader;
+  try {
+    const std::string bookId = mp_nameMapper->getIdForName(bookName);
+    reader = mp_library->getReaderById(bookId);
+  } catch (const std::out_of_range& e) {
+  }
+  return reader;
+}
+
+Response
+InternalServer::build_redirect(const std::string& bookName, const kiwix::Entry& entry) const
+{
+  auto response = get_default_response();
+  response.set_redirection(m_root + "/" + bookName + "/" +
+                           kiwix::urlEncode(entry.getPath()));
+  return response;
+}
+
+Response InternalServer::handle_content(const RequestContext& request)
+{
+  if (m_verbose.load()) {
+    printf("** running handle_content\n");
+  }
+
+  const std::string bookName = get_book_name(request);
+  if (bookName.empty())
+    return build_homepage(request);
+
+  const std::shared_ptr<Reader> reader = get_reader(bookName);
+  if (reader == nullptr) {
+    return build_404(request, bookName);
+  }
+
+  auto urlStr = request.get_url().substr(bookName.size()+1);
+  if (urlStr[0] == '/') {
+    urlStr = urlStr.substr(1);
+  }
+
+  kiwix::Entry entry;
+
+  try {
+    entry = reader->getEntryFromPath(urlStr);
+    if (entry.isRedirect() || urlStr.empty()) {
+      // If urlStr is empty, we want to mainPage.
+      // We must do a redirection to the real page.
+      return build_redirect(bookName, entry.getFinalEntry());
+    }
+  } catch(kiwix::NoEntry& e) {
+    if (m_verbose.load())
+      printf("Failed to find %s\n", urlStr.c_str());
+
+    return build_404(request, bookName);
+  }
+
+  auto response = get_default_response();
+
+  response.set_entry(entry, request);
+  response.set_taskbar(bookName, reader->getTitle());
+
+  if (m_verbose.load()) {
+    printf("Found %s\n", entry.getPath().c_str());
+    printf("mimeType: %s\n", response.get_mimeType().c_str());
+  }
+
+
+  return response;
 }

 }
--- a/src/server/internalServer.cpp
+++ b/src/server/internalServer.cpp
@@ -1,876 +0,0 @@
-/*
- * Copyright 2019 Matthieu Gautier <mgautier@kymeria.fr>
- *
- * 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 "internalServer.h"
-
-#ifdef __FreeBSD__
-#include <netinet/in.h>
-#endif
-
-#ifdef _WIN32
-# if !defined(__MINGW32__) && (_MSC_VER < 1600)
-#   include "stdint4win.h"
-# endif
-# include <winsock2.h>
-# include <ws2tcpip.h>
-# ifdef __GNUC__
-  // inet_pton is not declared in mingw, even if the function exists.
-  extern "C" {
-    WINSOCK_API_LINKAGE  INT WSAAPI inet_pton( INT Family, PCSTR pszAddrString, PVOID pAddrBuf);
-  }
-# endif
-  typedef UINT64 uint64_t;
-  typedef UINT16 uint16_t;
-#endif
-
-extern "C" {
-#include "microhttpd_wrapper.h"
-}
-
-#include "tools.h"
-#include "tools/pathTools.h"
-#include "tools/regexTools.h"
-#include "tools/stringTools.h"
-#include "tools/archiveTools.h"
-#include "tools/networkTools.h"
-#include "library.h"
-#include "name_mapper.h"
-#include "entry.h"
-#include "searcher.h"
-#include "search_renderer.h"
-#include "opds_dumper.h"
-
-#include <zim/uuid.h>
-#include <zim/error.h>
-#include <zim/search.h>
-#include <zim/suggestion.h>
-#include <zim/entry.h>
-#include <zim/item.h>
-
-#include <mustache.hpp>
-
-#include <atomic>
-#include <string>
-#include <vector>
-#include <chrono>
-#include "kiwixlib-resources.h"
-
-#ifndef _WIN32
-# include <arpa/inet.h>
-#endif
-
-#include "request_context.h"
-#include "response.h"
-
-#define MAX_SEARCH_LEN 140
-#define KIWIX_MIN_CONTENT_SIZE_TO_DEFLATE 100
-
-namespace kiwix {
-
-namespace
-{
-
-inline std::string normalizeRootUrl(std::string rootUrl)
-{
-  while ( !rootUrl.empty() && rootUrl.back() == '/' )
-    rootUrl.pop_back();
-
-  while ( !rootUrl.empty() && rootUrl.front() == '/' )
-    rootUrl = rootUrl.substr(1);
-  return rootUrl.empty() ? rootUrl : "/" + rootUrl;
-}
-
-} // unnamed namespace
-
-static IdNameMapper defaultNameMapper;
-
-static MHD_Result staticHandlerCallback(void* cls,
-                                        struct MHD_Connection* connection,
-                                        const char* url,
-                                        const char* method,
-                                        const char* version,
-                                        const char* upload_data,
-                                        size_t* upload_data_size,
-                                        void** cont_cls);
-
-
-InternalServer::InternalServer(Library* library,
-                               NameMapper* nameMapper,
-                               std::string addr,
-                               int port,
-                               std::string root,
-                               int nbThreads,
-                               bool verbose,
-                               bool withTaskbar,
-                               bool withLibraryButton,
-                               bool blockExternalLinks,
-                               std::string indexTemplateString) :
-  m_addr(addr),
-  m_port(port),
-  m_root(normalizeRootUrl(root)),
-  m_nbThreads(nbThreads),
-  m_verbose(verbose),
-  m_withTaskbar(withTaskbar),
-  m_withLibraryButton(withLibraryButton),
-  m_blockExternalLinks(blockExternalLinks),
-  m_indexTemplateString(indexTemplateString.empty() ? RESOURCE::templates::index_html : indexTemplateString),
-  mp_daemon(nullptr),
-  mp_library(library),
-  mp_nameMapper(nameMapper ? nameMapper : &defaultNameMapper)
-{}
-
-bool InternalServer::start() {
-#ifdef _WIN32
-  int flags = MHD_USE_SELECT_INTERNALLY;
-#else
-  int flags = MHD_USE_POLL_INTERNALLY;
-#endif
-  if (m_verbose.load())
-    flags |= MHD_USE_DEBUG;
-
-
-  struct sockaddr_in sockAddr;
-  memset(&sockAddr, 0, sizeof(sockAddr));
-  sockAddr.sin_family = AF_INET;
-  sockAddr.sin_port = htons(m_port);
-  if (m_addr.empty()) {
-    if (0 != INADDR_ANY) {
-      sockAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-    }
-    m_addr = kiwix::getBestPublicIp();
-  } else {
-    if (inet_pton(AF_INET, m_addr.c_str(), &(sockAddr.sin_addr.s_addr)) == 0) {
-      std::cerr << "Ip address " << m_addr << "  is not a valid ip address" << std::endl;
-      return false;
-    }
-  }
-  mp_daemon = MHD_start_daemon(flags,
-                            m_port,
-                            NULL,
-                            NULL,
-                            &staticHandlerCallback,
-                            this,
-                            MHD_OPTION_SOCK_ADDR, &sockAddr,
-                            MHD_OPTION_THREAD_POOL_SIZE, m_nbThreads,
-                            MHD_OPTION_END);
-  if (mp_daemon == nullptr) {
-    std::cerr << "Unable to instantiate the HTTP daemon. The port " << m_port
-              << " is maybe already occupied or need more permissions to be open. "
-                 "Please try as root or with a port number higher or equal to 1024."
-              << std::endl;
-    return false;
-  }
-  auto server_start_time = std::chrono::system_clock::now().time_since_epoch();
-  m_server_id = kiwix::to_string(server_start_time.count());
-  m_library_id = m_server_id;
-  return true;
-}
-
-void InternalServer::stop()
-{
-  MHD_stop_daemon(mp_daemon);
-}
-
-static MHD_Result staticHandlerCallback(void* cls,
-                                        struct MHD_Connection* connection,
-                                        const char* url,
-                                        const char* method,
-                                        const char* version,
-                                        const char* upload_data,
-                                        size_t* upload_data_size,
-                                        void** cont_cls)
-{
-  InternalServer* _this = static_cast<InternalServer*>(cls);
-
-  return _this->handlerCallback(connection,
-                                url,
-                                method,
-                                version,
-                                upload_data,
-                                upload_data_size,
-                                cont_cls);
-}
-
-MHD_Result InternalServer::handlerCallback(struct MHD_Connection* connection,
-                                           const char* url,
-                                           const char* method,
-                                           const char* version,
-                                           const char* upload_data,
-                                           size_t* upload_data_size,
-                                           void** cont_cls)
-{
-  auto start_time = std::chrono::steady_clock::now();
-  if (m_verbose.load() ) {
-    printf("======================\n");
-    printf("Requesting : \n");
-    printf("full_url  : %s\n", url);
-  }
-  RequestContext request(connection, m_root, url, method, version);
-
-  if (m_verbose.load() ) {
-    request.print_debug_info();
-  }
-  /* Unexpected method */
-  if (request.get_method() != RequestMethod::GET
-   && request.get_method() != RequestMethod::POST
-   && request.get_method() != RequestMethod::HEAD) {
-    printf("Reject request because of unhandled request method.\n");
-    printf("----------------------\n");
-    return MHD_NO;
-  }
-
-  auto response = handle_request(request);
-
-  if (response->getReturnCode() == MHD_HTTP_INTERNAL_SERVER_ERROR) {
-    printf("========== INTERNAL ERROR !! ============\n");
-    if (!m_verbose.load()) {
-      printf("Requesting : \n");
-      printf("full_url : %s\n", url);
-      request.print_debug_info();
-    }
-  }
-
-  if (response->getReturnCode() == MHD_HTTP_OK && !etag_not_needed(request))
-    response->set_server_id(m_server_id);
-
-  auto ret = response->send(request, connection);
-  auto end_time = std::chrono::steady_clock::now();
-  auto time_span = std::chrono::duration_cast<std::chrono::duration<double>>(end_time - start_time);
-  if (m_verbose.load()) {
-    printf("Request time : %fs\n", time_span.count());
-    printf("----------------------\n");
-  }
-  return ret;
-}
-
-std::unique_ptr<Response> InternalServer::handle_request(const RequestContext& request)
-{
-  try {
-    if (! request.is_valid_url())
-      return Response::build_404(*this, request.get_full_url(), "", "");
-
-    const ETag etag = get_matching_if_none_match_etag(request);
-    if ( etag )
-      return Response::build_304(*this, etag);
-
-    if (startsWith(request.get_url(), "/skin/"))
-      return handle_skin(request);
-
-    if (startsWith(request.get_url(), "/catalog/"))
-      return handle_catalog(request);
-
-    if (startsWith(request.get_url(), "/raw/"))
-      return handle_raw(request);
-
-    if (request.get_url() == "/search")
-      return handle_search(request);
-
-    if (request.get_url() == "/suggest")
-     return handle_suggest(request);
-
-    if (request.get_url() == "/random")
-      return handle_random(request);
-
-    if (request.get_url() == "/catch/external")
-      return handle_captured_external(request);
-
-    return handle_content(request);
-  } catch (std::exception& e) {
-    fprintf(stderr, "===== Unhandled error : %s\n", e.what());
-    return Response::build_500(*this, e.what());
-  } catch (...) {
-    fprintf(stderr, "===== Unhandled unknown error\n");
-    return Response::build_500(*this, "Unknown error");
-  }
-}
-
-MustacheData InternalServer::get_default_data() const
-{
-  MustacheData data;
-  data.set("root", m_root);
-  return data;
-}
-
-bool InternalServer::etag_not_needed(const RequestContext& request) const
-{
-  const std::string url = request.get_url();
-  return kiwix::startsWith(url, "/catalog")
-      || url == "/search"
-      || url == "/suggest"
-      || url == "/random"
-      || url == "/catch/external";
-}
-
-ETag
-InternalServer::get_matching_if_none_match_etag(const RequestContext& r) const
-{
-  try {
-    const std::string etag_list = r.get_header(MHD_HTTP_HEADER_IF_NONE_MATCH);
-    return ETag::match(etag_list, m_server_id);
-  } catch (const std::out_of_range&) {
-    return ETag();
-  }
-}
-
-std::unique_ptr<Response> InternalServer::build_homepage(const RequestContext& request)
-{
-  return ContentResponse::build(*this, m_indexTemplateString, get_default_data(), "text/html; charset=utf-8", true);
-}
-
-/**
- * Archive and Zim handlers begin
- **/
-
-// TODO: retrieve searcher from caching mechanism
-SuggestionsList_t getSuggestions(const zim::Archive* const archive,
-                  const std::string& queryString, int start, int suggestionCount)
-{
-  SuggestionsList_t suggestions;
-  auto searcher = zim::SuggestionSearcher(*archive);
-  if (archive->hasTitleIndex()) {
-    auto search = searcher.suggest(queryString);
-    auto srs = search.getResults(start, suggestionCount);
-
-    for (auto it : srs) {
-      SuggestionItem suggestion(it.getTitle(), kiwix::normalize(it.getTitle()),
-                                it.getPath(), it.getSnippet());
-      suggestions.push_back(suggestion);
-    }
-  } else {
-    // TODO: This case should be handled by libzim
-    std::vector<std::string> variants = getTitleVariants(queryString);
-    int currCount = 0;
-    for (auto it = variants.begin(); it != variants.end() && currCount < suggestionCount; it++) {
-      auto search = searcher.suggest(queryString);
-      auto srs = search.getResults(0, suggestionCount);
-      for (auto it : srs) {
-        SuggestionItem suggestion(it.getTitle(), kiwix::normalize(it.getTitle()),
-                                  it.getPath());
-        suggestions.push_back(suggestion);
-        currCount++;
-      }
-    }
-  }
-  return suggestions;
-}
-
-
-std::unique_ptr<Response> InternalServer::handle_suggest(const RequestContext& request)
-{
-  if (m_verbose.load()) {
-    printf("** running handle_suggest\n");
-  }
-
-  std::string bookName;
-  std::shared_ptr<zim::Archive> archive;
-  try {
-    bookName = request.get_argument("content");
-    const std::string bookId = mp_nameMapper->getIdForName(bookName);
-    archive = mp_library->getArchiveById(bookId);
-  } catch (const std::out_of_range&) {
-    // error handled by the archive == nullptr check below
-  }
-
-  if (archive == nullptr) {
-    const std::string error_details = "No such book: " + bookName;
-    return Response::build_404(*this, "", bookName, "", error_details);
-  }
-
-  const auto queryString = request.get_optional_param("term", std::string());
-  const auto start = request.get_optional_param<unsigned int>("start", 0);
-  unsigned int count = request.get_optional_param<unsigned int>("count", 10);
-  if (count == 0) {
-    count = 10;
-  }
-
-  if (m_verbose.load()) {
-    printf("Searching suggestions for: \"%s\"\n", queryString.c_str());
-  }
-
-  MustacheData results{MustacheData::type::list};
-
-  bool first = true;
-
-  /* Get the suggestions */
-  SuggestionsList_t suggestions = getSuggestions(archive.get(), queryString, start, count);
-  for(auto& suggestion:suggestions) {
-    MustacheData result;
-    result.set("label", suggestion.getTitle());
-
-    if (suggestion.hasSnippet()) {
-      result.set("label", suggestion.getSnippet());
-    }
-
-    result.set("value", suggestion.getTitle());
-    result.set("kind", "path");
-    result.set("path", suggestion.getPath());
-    result.set("first", first);
-    first = false;
-    results.push_back(result);
-  }
-
-
-  /* Propose the fulltext search if possible */
-  if (archive->hasFulltextIndex()) {
-    MustacheData result;
-    result.set("label", "containing '" + queryString + "'...");
-    result.set("value", queryString + " ");
-    result.set("kind", "pattern");
-    result.set("first", first);
-    results.push_back(result);
-  }
-
-  auto data = get_default_data();
-  data.set("suggestions", results);
-
-  auto response = ContentResponse::build(*this, RESOURCE::templates::suggestion_json, data, "application/json; charset=utf-8");
-  return std::move(response);
-}
-
-std::unique_ptr<Response> InternalServer::handle_skin(const RequestContext& request)
-{
-  if (m_verbose.load()) {
-    printf("** running handle_skin\n");
-  }
-
-  auto resourceName = request.get_url().substr(1);
-  try {
-    auto response = ContentResponse::build(
-        *this,
-        getResource(resourceName),
-        getMimeTypeForFile(resourceName));
-    response->set_cacheable();
-    return std::move(response);
-  } catch (const ResourceNotFound& e) {
-    return Response::build_404(*this, request.get_full_url(), "", "");
-  }
-}
-
-std::unique_ptr<Response> InternalServer::handle_search(const RequestContext& request)
-{
-  if (m_verbose.load()) {
-    printf("** running handle_search\n");
-  }
-
-  std::string patternString;
-  try {
-    patternString = request.get_argument("pattern");
-  } catch (const std::out_of_range&) {}
-
-  /* Retrive geo search */
-  bool has_geo_query = false;
-  float latitude = 0;
-  float longitude = 0;
-  float distance = 0;
-  try {
-    latitude = request.get_argument<float>("latitude");
-    longitude = request.get_argument<float>("longitude");
-    distance = request.get_argument<float>("distance");
-    has_geo_query = true;
-  } catch(const std::out_of_range&) {}
-    catch(const std::invalid_argument&) {}
-
-  std::string bookName;
-  std::shared_ptr<zim::Archive> archive;
-  try {
-    bookName = request.get_argument("content");
-    const std::string bookId = mp_nameMapper->getIdForName(bookName);
-    archive = mp_library->getArchiveById(bookId);
-  } catch (const std::out_of_range&) {}
-
-  /* Make the search */
-  if ( (!archive && !bookName.empty())
-    || (patternString.empty() && ! has_geo_query) ) {
-    auto data = get_default_data();
-    data.set("pattern", encodeDiples(patternString));
-    auto response = ContentResponse::build(*this, RESOURCE::templates::no_search_result_html, data, "text/html; charset=utf-8");
-    response->set_taskbar(bookName, archive ? getArchiveTitle(*archive) : "");
-    response->set_code(MHD_HTTP_NOT_FOUND);
-    return std::move(response);
-  }
-
-  std::shared_ptr<zim::Searcher> searcher;
-  if (archive) {
-    searcher = std::make_shared<zim::Searcher>(*archive);
-  } else {
-    for (auto& bookId: mp_library->filter(kiwix::Filter().local(true).valid(true))) {
-      auto currentArchive = mp_library->getArchiveById(bookId);
-      if (currentArchive) {
-        if (! searcher) {
-          searcher = std::make_shared<zim::Searcher>(*currentArchive);
-        } else {
-          searcher->addArchive(*currentArchive);
-        }
-      }
-    }
-  }
-
-  auto start = 0;
-  try {
-    start = request.get_argument<unsigned int>("start");
-  } catch (const std::exception&) {}
-
-  auto pageLength = 25;
-  try {
-    pageLength = request.get_argument<unsigned int>("pageLength");
-  } catch (const std::exception&) {}
-  if (pageLength > MAX_SEARCH_LEN) {
-    pageLength = MAX_SEARCH_LEN;
-  }
-  if (pageLength == 0) {
-    pageLength = 25;
-  }
-
-  /* Get the results */
-  try {
-    zim::Query query;
-    if (patternString.empty()) {
-      // Execute geo-search
-      if (m_verbose.load()) {
-        cout << "Performing geo query `" << distance << "&(" << latitude << ";" << longitude << ")'" << endl;
-      }
-
-      query.setQuery("");
-      query.setGeorange(latitude, longitude, distance);
-    } else {
-      // Execute Ft search
-      if (m_verbose.load()) {
-          cout << "Performing query `" << patternString << "'" << endl;
-      }
-
-      std::string queryString = removeAccents(patternString);
-      query.setQuery(queryString);
-    }
-
-    zim::Search search = searcher->search(query);
-    SearchRenderer renderer(search.getResults(start, pageLength), mp_nameMapper, start,
-                            search.getEstimatedMatches());
-    renderer.setSearchPattern(patternString);
-    renderer.setSearchContent(bookName);
-    renderer.setProtocolPrefix(m_root + "/");
-    renderer.setSearchProtocolPrefix(m_root + "/search?");
-    renderer.setPageLength(pageLength);
-    auto response = ContentResponse::build(*this, renderer.getHtml(), "text/html; charset=utf-8");
-    response->set_taskbar(bookName, archive ? getArchiveTitle(*archive) : "");
-
-    return std::move(response);
-  } catch (const std::exception& e) {
-    std::cerr << e.what() << std::endl;
-    return Response::build_500(*this, e.what());
-  }
-}
-
-std::unique_ptr<Response> InternalServer::handle_random(const RequestContext& request)
-{
-  if (m_verbose.load()) {
-    printf("** running handle_random\n");
-  }
-
-  std::string bookName;
-  std::shared_ptr<zim::Archive> archive;
-  try {
-    bookName = request.get_argument("content");
-    const std::string bookId = mp_nameMapper->getIdForName(bookName);
-    archive = mp_library->getArchiveById(bookId);
-  } catch (const std::out_of_range&) {
-    // error handled by the archive == nullptr check below
-  }
-
-  if (archive == nullptr) {
-    const std::string error_details = "No such book: " + bookName;
-    return Response::build_404(*this, "", bookName, "", error_details);
-  }
-
-  try {
-    auto entry = archive->getRandomEntry();
-    return build_redirect(bookName, getFinalItem(*archive, entry));
-  } catch(zim::EntryNotFound& e) {
-    const std::string error_details = "Oops! Failed to pick a random article :(";
-    return Response::build_404(*this, "", bookName, getArchiveTitle(*archive), error_details);
-  }
-}
-
-std::unique_ptr<Response> InternalServer::handle_captured_external(const RequestContext& request)
-{
-  std::string source = "";
-  try {
-    source = kiwix::urlDecode(request.get_argument("source"));
-  } catch (const std::out_of_range& e) {}
-
-  if (source.empty())
-    return Response::build_404(*this, request.get_full_url(), "", "");
-
-  auto data = get_default_data();
-  data.set("source", source);
-  return ContentResponse::build(*this, RESOURCE::templates::captured_external_html, data, "text/html; charset=utf-8");
-}
-
-std::unique_ptr<Response> InternalServer::handle_catalog(const RequestContext& request)
-{
-  if (m_verbose.load()) {
-    printf("** running handle_catalog");
-  }
-
-  std::string host;
-  std::string url;
-  try {
-    host = request.get_header("Host");
-    url  = request.get_url_part(1);
-  } catch (const std::out_of_range&) {
-    return Response::build_404(*this, request.get_full_url(), "", "");
-  }
-
-  if (url == "v2") {
-    return handle_catalog_v2(request);
-  }
-
-  if (url != "searchdescription.xml" && url != "root.xml" && url != "search") {
-    return Response::build_404(*this, request.get_full_url(), "", "");
-  }
-
-  if (url == "searchdescription.xml") {
-    auto response = ContentResponse::build(*this, RESOURCE::opensearchdescription_xml, get_default_data(), "application/opensearchdescription+xml");
-    return std::move(response);
-  }
-
-  zim::Uuid uuid;
-  kiwix::OPDSDumper opdsDumper(mp_library);
-  opdsDumper.setRootLocation(m_root);
-  opdsDumper.setLibraryId(m_library_id);
-  std::vector<std::string> bookIdsToDump;
-  if (url == "root.xml") {
-    uuid = zim::Uuid::generate(host);
-    bookIdsToDump = mp_library->filter(kiwix::Filter().valid(true).local(true).remote(true));
-  } else if (url == "search") {
-    bookIdsToDump = search_catalog(request, opdsDumper);
-    uuid = zim::Uuid::generate();
-  }
-
-  auto response = ContentResponse::build(
-      *this,
-      opdsDumper.dumpOPDSFeed(bookIdsToDump, request.get_query()),
-      "application/atom+xml; profile=opds-catalog; kind=acquisition; charset=utf-8");
-  return std::move(response);
-}
-
-namespace
-{
-
-Filter get_search_filter(const RequestContext& request)
-{
-    auto filter = kiwix::Filter().valid(true).local(true);
-    try {
-      filter.query(request.get_argument("q"));
-    } catch (const std::out_of_range&) {}
-    try {
-      filter.maxSize(request.get_argument<unsigned long>("maxsize"));
-    } catch (...) {}
-    try {
-      filter.name(request.get_argument("name"));
-    } catch (const std::out_of_range&) {}
-    try {
-      filter.category(request.get_argument("category"));
-    } catch (const std::out_of_range&) {}
-    try {
-      filter.lang(request.get_argument("lang"));
-    } catch (const std::out_of_range&) {}
-    try {
-      filter.acceptTags(kiwix::split(request.get_argument("tag"), ";"));
-    } catch (...) {}
-    try {
-      filter.rejectTags(kiwix::split(request.get_argument("notag"), ";"));
-    } catch (...) {}
-    return filter;
-}
-
-template<class T>
-std::vector<T> subrange(const std::vector<T>& v, size_t s, size_t n)
-{
-  const size_t e = std::min(v.size(), s+n);
-  return std::vector<T>(v.begin()+std::min(v.size(), s), v.begin()+e);
-}
-
-} // unnamed namespace
-
-std::vector<std::string>
-InternalServer::search_catalog(const RequestContext& request,
-                               kiwix::OPDSDumper& opdsDumper)
-{
-    const auto filter = get_search_filter(request);
-    const std::string q = filter.hasQuery()
-                        ? filter.getQuery()
-                        : "<Empty query>";
-    std::vector<std::string> bookIdsToDump = mp_library->filter(filter);
-    const auto totalResults = bookIdsToDump.size();
-    const size_t count = request.get_optional_param("count", 10UL);
-    const size_t startIndex = request.get_optional_param("start", 0UL);
-    const size_t intendedCount = count > 0 ? count : bookIdsToDump.size();
-    bookIdsToDump = subrange(bookIdsToDump, startIndex, intendedCount);
-    opdsDumper.setOpenSearchInfo(totalResults, startIndex, bookIdsToDump.size());
-    return bookIdsToDump;
-}
-
-namespace
-{
-
-std::string get_book_name(const RequestContext& request)
-{
-  try {
-    return request.get_url_part(0);
-  } catch (const std::out_of_range& e) {
-    return std::string();
-  }
-}
-
-std::string searchSuggestionHTML(const std::string& searchURL, const std::string& pattern)
-{
-  kainjow::mustache::mustache tmpl("Make a full text search for <a href=\"{{{searchURL}}}\">{{pattern}}</a>");
-  MustacheData data;
-  data.set("pattern", pattern);
-  data.set("searchURL", searchURL);
-  return (tmpl.render(data));
-}
-
-} // unnamed namespace
-
-std::unique_ptr<Response>
-InternalServer::build_redirect(const std::string& bookName, const zim::Item& item) const
-{
-  auto redirectUrl = m_root + "/" + bookName + "/" + kiwix::urlEncode(item.getPath());
-  return Response::build_redirect(*this, redirectUrl);
-}
-
-std::unique_ptr<Response> InternalServer::handle_content(const RequestContext& request)
-{
-  const std::string url = request.get_url();
-  const std::string pattern = url.substr((url.find_last_of('/'))+1);
-  if (m_verbose.load()) {
-    printf("** running handle_content\n");
-  }
-
-  const std::string bookName = get_book_name(request);
-  if (bookName.empty())
-    return build_homepage(request);
-
-  std::shared_ptr<zim::Archive> archive;
-  try {
-    const std::string bookId = mp_nameMapper->getIdForName(bookName);
-    archive = mp_library->getArchiveById(bookId);
-  } catch (const std::out_of_range& e) {}
-
-  if (archive == nullptr) {
-    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.get_full_url(), bookName, "", details);
-  }
-
-  auto urlStr = request.get_url().substr(bookName.size()+1);
-  if (urlStr[0] == '/') {
-    urlStr = urlStr.substr(1);
-  }
-
-  try {
-    auto entry = getEntryFromPath(*archive, urlStr);
-    if (entry.isRedirect() || urlStr.empty()) {
-      // If urlStr is empty, we want to mainPage.
-      // We must do a redirection to the real page.
-      return build_redirect(bookName, getFinalItem(*archive, entry));
-    }
-    auto response = ItemResponse::build(*this, request, entry.getItem());
-    try {
-      dynamic_cast<ContentResponse&>(*response).set_taskbar(bookName, getArchiveTitle(*archive));
-    } catch (std::bad_cast& e) {}
-
-    if (m_verbose.load()) {
-      printf("Found %s\n", entry.getPath().c_str());
-      printf("mimeType: %s\n", entry.getItem(true).getMimetype().c_str());
-    }
-
-    return response;
-  } catch(zim::EntryNotFound& e) {
-    if (m_verbose.load())
-      printf("Failed to find %s\n", urlStr.c_str());
-
-    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.get_full_url(), bookName, getArchiveTitle(*archive), details);
-  }
-}
-
-
-std::unique_ptr<Response> InternalServer::handle_raw(const RequestContext& request)
-{
-  if (m_verbose.load()) {
-    printf("** running handle_raw\n");
-  }
-
-  std::string bookName;
-  std::string kind;
-  try {
-     bookName = request.get_url_part(1);
-     kind = request.get_url_part(2);
-  } catch (const std::out_of_range& e) {
-     return Response::build_404(*this, request.get_full_url(), bookName, "", "");
-  }
-
-  if (kind != "meta" && kind!= "content") {
-    const std::string error_details = kind + " is not a valid request for raw content.";
-    return Response::build_404(*this, request.get_full_url(), bookName, "", error_details);
-  }
-
-  std::shared_ptr<zim::Archive> archive;
-  try {
-    const std::string bookId = mp_nameMapper->getIdForName(bookName);
-    archive = mp_library->getArchiveById(bookId);
-  } catch (const std::out_of_range& e) {}
-
-  if (archive == nullptr) {
-    const std::string error_details = "No such book: " + bookName;
-    return Response::build_404(*this, request.get_full_url(), bookName, "", error_details);
-  }
-
-  // Remove the beggining of the path:
-  // /raw/<bookName>/<kind>/foo
-  // ^^^^^          ^      ^
-  //   5      +     1  +   1   = 7
-  auto itemPath = request.get_url().substr(bookName.size()+kind.size()+7);
-
-  try {
-    if (kind == "meta") {
-      auto item = archive->getMetadataItem(itemPath);
-      return ItemResponse::build(*this, request, item, /*raw=*/true);
-    } else {
-      auto entry = archive->getEntryByPath(itemPath);
-      if (entry.isRedirect()) {
-        return build_redirect(bookName, entry.getItem(true));
-      }
-      return ItemResponse::build(*this, request, entry.getItem(), /*raw=*/true);
-    }
-  } catch (zim::EntryNotFound& e ) {
-    if (m_verbose.load()) {
-      printf("Failed to find %s\n", itemPath.c_str());
-    }
-    const std::string error_details = "Cannot find " + kind + " entry " + itemPath;
-    return Response::build_404(*this, request.get_full_url(), bookName, getArchiveTitle(*archive), error_details);
-  }
-}
-
-}
--- a/src/server/internalServer.h
+++ b/src/server/internalServer.h
@@ -1,128 +0,0 @@
-/*
- * Copyright 2019 Matthieu Gautier <mgautier@kymeria.fr>
- *
- * 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.
- */
-
-#ifndef KIWIXLIB_SERVER_INTERNALSERVER_H
-#define KIWIXLIB_SERVER_INTERNALSERVER_H
-
-
-extern "C" {
-#include "microhttpd_wrapper.h"
-}
-
-#include "library.h"
-#include "name_mapper.h"
-
-#include <mustache.hpp>
-
-#include <atomic>
-#include <string>
-
-#include "server/request_context.h"
-#include "server/response.h"
-
-namespace kiwix {
-
-typedef kainjow::mustache::data MustacheData;
-
-class Entry;
-class OPDSDumper;
-
-class InternalServer {
-  public:
-    InternalServer(Library* library,
-                   NameMapper* nameMapper,
-                   std::string addr,
-                   int port,
-                   std::string root,
-                   int nbThreads,
-                   bool verbose,
-                   bool withTaskbar,
-                   bool withLibraryButton,
-                   bool blockExternalLinks,
-                   std::string indexTemplateString);
-    virtual ~InternalServer() = default;
-
-    MHD_Result handlerCallback(struct MHD_Connection* connection,
-                               const char* url,
-                               const char* method,
-                               const char* version,
-                               const char* upload_data,
-                               size_t* upload_data_size,
-                               void** cont_cls);
-    bool start();
-    void stop();
-    std::string getAddress() { return m_addr; }
-    int getPort() { return m_port; } 
-
-  private: // functions
-    std::unique_ptr<Response> handle_request(const RequestContext& request);
-    std::unique_ptr<Response> build_redirect(const std::string& bookName, const zim::Item& item) const;
-    std::unique_ptr<Response> build_homepage(const RequestContext& request);
-    std::unique_ptr<Response> handle_skin(const RequestContext& request);
-    std::unique_ptr<Response> handle_catalog(const RequestContext& request);
-    std::unique_ptr<Response> handle_catalog_v2(const RequestContext& request);
-    std::unique_ptr<Response> handle_catalog_v2_root(const RequestContext& request);
-    std::unique_ptr<Response> handle_catalog_v2_entries(const RequestContext& request, bool partial);
-    std::unique_ptr<Response> handle_catalog_v2_complete_entry(const RequestContext& request, const std::string& entryId);
-    std::unique_ptr<Response> handle_catalog_v2_categories(const RequestContext& request);
-    std::unique_ptr<Response> handle_catalog_v2_languages(const RequestContext& request);
-    std::unique_ptr<Response> handle_catalog_v2_illustration(const RequestContext& request);
-    std::unique_ptr<Response> handle_search(const RequestContext& request);
-    std::unique_ptr<Response> handle_suggest(const RequestContext& request);
-    std::unique_ptr<Response> handle_random(const RequestContext& request);
-    std::unique_ptr<Response> handle_captured_external(const RequestContext& request);
-    std::unique_ptr<Response> handle_content(const RequestContext& request);
-    std::unique_ptr<Response> handle_raw(const RequestContext& request);
-
-    std::vector<std::string> search_catalog(const RequestContext& request,
-                                            kiwix::OPDSDumper& opdsDumper);
-
-    MustacheData get_default_data() const;
-
-    bool etag_not_needed(const RequestContext& r) const;
-    ETag get_matching_if_none_match_etag(const RequestContext& request) const;
-
-  private: // data
-    std::string m_addr;
-    int m_port;
-    std::string m_root;
-    int m_nbThreads;
-    std::atomic_bool m_verbose;
-    bool m_withTaskbar;
-    bool m_withLibraryButton;
-    bool m_blockExternalLinks;
-    std::string m_indexTemplateString;
-    struct MHD_Daemon* mp_daemon;
-
-    Library* mp_library;
-    NameMapper* mp_nameMapper;
-
-    std::string m_server_id;
-    std::string m_library_id;
-
-    friend std::unique_ptr<Response> Response::build(const InternalServer& server);
-    friend std::unique_ptr<ContentResponse> ContentResponse::build(const InternalServer& server, const std::string& content, const std::string& mimetype, bool isHomePage, bool raw);
-    friend std::unique_ptr<Response> ItemResponse::build(const InternalServer& server, const RequestContext& request, const zim::Item& item, bool raw);
-    friend std::unique_ptr<Response> Response::build_500(const InternalServer& server, const std::string& msg);
-
-};
-
-}
-
-#endif //KIWIXLIB_SERVER_INTERNALSERVER_H
--- a/src/server/internalServer_catalog_v2.cpp
+++ b/src/server/internalServer_catalog_v2.cpp
@@ -1,165 +0,0 @@
-/*
- * Copyright 2021 Veloman Yunkan <veloman.yunkan@gmail.com>
- *
- * 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 "internalServer.h"
-
-#include "library.h"
-#include "opds_dumper.h"
-#include "request_context.h"
-#include "response.h"
-#include "tools/otherTools.h"
-#include "kiwixlib-resources.h"
-
-#include <mustache.hpp>
-
-#include <string>
-#include <vector>
-
-namespace kiwix {
-
-std::unique_ptr<Response> InternalServer::handle_catalog_v2(const RequestContext& request)
-{
-  if (m_verbose.load()) {
-    printf("** running handle_catalog_v2");
-  }
-
-  std::string url;
-  try {
-    url  = request.get_url_part(2);
-  } catch (const std::out_of_range&) {
-    return Response::build_404(*this, request.get_full_url(), "", "");
-  }
-
-  if (url == "root.xml") {
-    return handle_catalog_v2_root(request);
-  } else if (url == "searchdescription.xml") {
-    const std::string endpoint_root = m_root + "/catalog/v2";
-    return ContentResponse::build(*this,
-        RESOURCE::catalog_v2_searchdescription_xml,
-        kainjow::mustache::object({{"endpoint_root", endpoint_root}}),
-        "application/opensearchdescription+xml"
-    );
-  } else if (url == "entry") {
-    const std::string entryId  = request.get_url_part(3);
-    return handle_catalog_v2_complete_entry(request, entryId);
-  } else if (url == "entries") {
-    return handle_catalog_v2_entries(request, /*partial=*/false);
-  } else if (url == "partial_entries") {
-    return handle_catalog_v2_entries(request, /*partial=*/true);
-  } else if (url == "categories") {
-    return handle_catalog_v2_categories(request);
-  } else if (url == "languages") {
-    return handle_catalog_v2_languages(request);
-  } else if (url == "illustration") {
-    return handle_catalog_v2_illustration(request);
-  } else {
-    return Response::build_404(*this, request.get_full_url(), "", "");
-  }
-}
-
-std::unique_ptr<Response> InternalServer::handle_catalog_v2_root(const RequestContext& request)
-{
-  return ContentResponse::build(
-             *this,
-             RESOURCE::templates::catalog_v2_root_xml,
-             kainjow::mustache::object{
-               {"date", gen_date_str()},
-               {"endpoint_root", m_root + "/catalog/v2"},
-               {"feed_id", gen_uuid(m_library_id)},
-               {"all_entries_feed_id", gen_uuid(m_library_id + "/entries")},
-               {"partial_entries_feed_id", gen_uuid(m_library_id + "/partial_entries")},
-               {"category_list_feed_id", gen_uuid(m_library_id + "/categories")},
-               {"language_list_feed_id", gen_uuid(m_library_id + "/languages")}
-             },
-             "application/atom+xml;profile=opds-catalog;kind=navigation"
-  );
-}
-
-std::unique_ptr<Response> InternalServer::handle_catalog_v2_entries(const RequestContext& request, bool partial)
-{
-  OPDSDumper opdsDumper(mp_library);
-  opdsDumper.setRootLocation(m_root);
-  opdsDumper.setLibraryId(m_library_id);
-  const auto bookIds = search_catalog(request, opdsDumper);
-  const auto opdsFeed = opdsDumper.dumpOPDSFeedV2(bookIds, request.get_query(), partial);
-  return ContentResponse::build(
-             *this,
-             opdsFeed,
-             "application/atom+xml;profile=opds-catalog;kind=acquisition"
-  );
-}
-
-std::unique_ptr<Response> InternalServer::handle_catalog_v2_complete_entry(const RequestContext& request, const std::string& entryId)
-{
-  try {
-    mp_library->getBookById(entryId);
-  } catch (const std::out_of_range&) {
-    return Response::build_404(*this, request.get_full_url(), "", "");
-  }
-
-  OPDSDumper opdsDumper(mp_library);
-  opdsDumper.setRootLocation(m_root);
-  opdsDumper.setLibraryId(m_library_id);
-  const auto opdsFeed = opdsDumper.dumpOPDSCompleteEntry(entryId);
-  return ContentResponse::build(
-             *this,
-             opdsFeed,
-             "application/atom+xml;type=entry;profile=opds-catalog"
-  );
-}
-
-std::unique_ptr<Response> InternalServer::handle_catalog_v2_categories(const RequestContext& request)
-{
-  OPDSDumper opdsDumper(mp_library);
-  opdsDumper.setRootLocation(m_root);
-  opdsDumper.setLibraryId(m_library_id);
-  return ContentResponse::build(
-             *this,
-             opdsDumper.categoriesOPDSFeed(),
-             "application/atom+xml;profile=opds-catalog;kind=navigation"
-  );
-}
-
-std::unique_ptr<Response> InternalServer::handle_catalog_v2_languages(const RequestContext& request)
-{
-  OPDSDumper opdsDumper(mp_library);
-  opdsDumper.setRootLocation(m_root);
-  opdsDumper.setLibraryId(m_library_id);
-  return ContentResponse::build(
-             *this,
-             opdsDumper.languagesOPDSFeed(),
-             "application/atom+xml;profile=opds-catalog;kind=navigation"
-  );
-}
-
-std::unique_ptr<Response> InternalServer::handle_catalog_v2_illustration(const RequestContext& request)
-{
-  try {
-    const auto bookName  = request.get_url_part(3);
-    const auto bookId = mp_nameMapper->getIdForName(bookName);
-    auto book = mp_library->getBookByIdThreadSafe(bookId);
-    auto size = request.get_argument<unsigned int>("size");
-    auto illustration = book.getIllustration(size);
-    return ContentResponse::build(*this, illustration->getData(), illustration->mimeType);
-  } catch(...) {
-    return Response::build_404(*this, request.get_full_url(), "", "");
-  }
-}
-
-} // namespace kiwix
--- a/src/server/request_context.cpp
+++ b/src/server/request_context.cpp
@@ -183,14 +183,4 @@ std::string RequestContext::get_header(const std::string& name) const {
  return headers.at(lcAll(name));
 }

-std::string RequestContext::get_query() const {
-  std::string q;
-  const char* sep = "";
-  for ( const auto& a : arguments ) {
-    q += sep + a.first + '=' + a.second;
-    sep = "&";
-  }
-  return q;
-}
-
 }
--- a/src/server/request_context.h
+++ b/src/server/request_context.h
@@ -74,21 +74,11 @@ class RequestContext {
        return v;
    }

-    template<class T>
-    T get_optional_param(const std::string& name, T default_value) const
-    {
-      try {
-        return get_argument<T>(name);
-      } catch (...) {}
-      return default_value;
-    }
-

    RequestMethod get_method() const;
    std::string get_url() const;
    std::string get_url_part(int part) const;
    std::string get_full_url() const;
-    std::string get_query() const;

    ByteRange get_range() const;

--- a/src/server/response.cpp
+++ b/src/server/response.cpp
@@ -1,30 +1,12 @@
-/*
- * Copyright 2019 Matthieu Gautier <mgautier@kymeria.fr>
- *
- * 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 "response.h"
 #include "request_context.h"
-#include "internalServer.h"
 #include "kiwixlib-resources.h"

 #include "tools/regexTools.h"
 #include "tools/stringTools.h"
-#include "tools/otherTools.h"

 #include "string.h"
 #include <mustache.hpp>
@@ -39,10 +21,10 @@ namespace
 {
 // some utilities

-std::string get_mime_type(const zim::Item& item)
+std::string get_mime_type(const kiwix::Entry& entry)
 {
  try {
-    return item.getMimetype();
+    return entry.getMimetype();
  } catch (exception& e) {
    return "application/octet-stream";
  }
@@ -60,85 +42,20 @@ bool is_compressible_mime_type(const std::string& mimeType)

 } // unnamed namespace

-Response::Response(bool verbose)
+Response::Response(const std::string& root, bool verbose, bool withTaskbar, bool withLibraryButton, bool blockExternalLinks)
  : m_verbose(verbose),
-    m_returnCode(MHD_HTTP_OK)
+    m_root(root),
+    m_content(""),
+    m_mimeType(""),
+    m_returnCode(MHD_HTTP_OK),
+    m_withTaskbar(withTaskbar),
+    m_withLibraryButton(withLibraryButton),
+    m_blockExternalLinks(blockExternalLinks),
+    m_bookName(""),
+    m_bookTitle("")
 {
-  add_header(MHD_HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN, "*");
 }

-std::unique_ptr<Response> Response::build(const InternalServer& server)
-{
-  return std::unique_ptr<Response>(new Response(server.m_verbose.load()));
-}
-
-std::unique_ptr<Response> Response::build_304(const InternalServer& server, const ETag& etag)
-{
-  auto response = Response::build(server);
-  response->set_code(MHD_HTTP_NOT_MODIFIED);
-  response->m_etag = etag;
-  if ( etag.get_option(ETag::COMPRESSED_CONTENT) ) {
-    response->add_header(MHD_HTTP_HEADER_VARY, "Accept-Encoding");
-  }
-  return response;
-}
-
-std::unique_ptr<Response> Response::build_404(const InternalServer& server, const std::string& url, const std::string& bookName, const std::string& bookTitle, const std::string& details)
-{
-  MustacheData results;
-  if ( !url.empty() ) {
-    results.set("url", url);
-  }
-  results.set("details", details);
-
-  auto response = ContentResponse::build(server, RESOURCE::templates::_404_html, results, "text/html");
-  response->set_code(MHD_HTTP_NOT_FOUND);
-  response->set_taskbar(bookName, bookTitle);
-
-  return std::move(response);
-}
-
-std::unique_ptr<Response> Response::build_416(const InternalServer& server, size_t resourceLength)
-{
-  auto response = Response::build(server);
-// [FIXME] (compile with recent enough version of libmicrohttpd)
-//  response->set_code(MHD_HTTP_RANGE_NOT_SATISFIABLE);
-  response->set_code(416);
-  std::ostringstream oss;
-  oss << "bytes */" << resourceLength;
-  response->add_header(MHD_HTTP_HEADER_CONTENT_RANGE, oss.str());
-
-  return response;
-}
-
-std::unique_ptr<Response> Response::build_500(const InternalServer& server, const std::string& msg)
-{
-  MustacheData data;
-  data.set("error", msg);
-  auto content = render_template(RESOURCE::templates::_500_html, data);
-  std::unique_ptr<Response> response (
-      new ContentResponse(
-        server.m_root, //root
-        true, //verbose
-        true, //raw
-        false, //withTaskbar
-        false, //withLibraryButton
-        false, //blockExternalLinks
-        content, //content
-        "text/html" //mimetype
-  ));
-  response->set_code(MHD_HTTP_INTERNAL_SERVER_ERROR);
-  return response;
-}
-
-
-std::unique_ptr<Response> Response::build_redirect(const InternalServer& server, const std::string& redirectUrl)
-{
-  auto response = Response::build(server);
-  response->m_returnCode = MHD_HTTP_FOUND;
-  response->add_header(MHD_HTTP_HEADER_LOCATION, redirectUrl);
-  return response;
-}

 static MHD_Result print_key_value (void *cls, enum MHD_ValueKind kind,
                                   const char *key, const char *value)
@@ -149,17 +66,17 @@ static MHD_Result print_key_value (void *cls, enum MHD_ValueKind kind,


 struct RunningResponse {
-   zim::Item item;
+   kiwix::Entry entry;
   int range_start;

-   RunningResponse(zim::Item item,
+   RunningResponse(kiwix::Entry entry,
                   int range_start) :
-     item(item),
+     entry(entry),
     range_start(range_start)
   {}
 };

-static ssize_t callback_reader_from_item(void* cls,
+static ssize_t callback_reader_from_entry(void* cls,
                                  uint64_t pos,
                                  char* buf,
                                  size_t max)
@@ -168,13 +85,13 @@ static ssize_t callback_reader_from_item(void* cls,

  size_t max_size_to_set = min<size_t>(
    max,
-    response->item.getSize() - pos - response->range_start);
+    response->entry.getSize() - pos - response->range_start);

  if (max_size_to_set <= 0) {
    return MHD_CONTENT_READER_END_WITH_ERROR;
  }

-  zim::Blob blob = response->item.getData(response->range_start+pos, max_size_to_set);
+  zim::Blob blob = response->entry.getBlob(response->range_start+pos, max_size_to_set);
  memcpy(buf, blob.data(), max_size_to_set);
  return max_size_to_set;
 }
@@ -196,18 +113,30 @@ void print_response_info(int retCode, MHD_Response* response)
 }


-void ContentResponse::introduce_taskbar()
+std::string render_template(const std::string& template_str, kainjow::mustache::data data)
+{
+  kainjow::mustache::mustache tmpl(template_str);
+  kainjow::mustache::data urlencode{kainjow::mustache::lambda2{
+                               [](const std::string& str,const kainjow::mustache::renderer& r) { return urlEncode(r(str), true); }}};
+  data.set("urlencoded", urlencode);
+  std::stringstream ss;
+  tmpl.render(data, [&ss](const std::string& str) { ss << str; });
+  return ss.str();
+}
+
+
+void Response::introduce_taskbar()
 {
  kainjow::mustache::data data;
  data.set("root", m_root);
  data.set("content", m_bookName);
-  data.set("hascontent", (!m_bookName.empty() && !m_bookTitle.empty()));
+  data.set("hascontent", !m_bookName.empty());
  data.set("title", m_bookTitle);
  data.set("withlibrarybutton", m_withLibraryButton);
-  auto head_content = render_template(RESOURCE::templates::head_taskbar_html, data);
-  m_content = prependToFirstOccurence(
+  auto head_content = render_template(RESOURCE::templates::head_part_html, data);
+  m_content = appendToFirstOccurence(
    m_content,
-    "</head[ \\t]*>",
+    "<head>",
    head_content);

  auto taskbar_part = render_template(RESOURCE::templates::taskbar_part_html, data);
@@ -218,26 +147,19 @@ void ContentResponse::introduce_taskbar()
 }


-void ContentResponse::inject_externallinks_blocker()
+void Response::inject_externallinks_blocker()
 {
  kainjow::mustache::data data;
  data.set("root", m_root);
  auto script_tag = render_template(RESOURCE::templates::external_blocker_part_html, data);
-  m_content = prependToFirstOccurence(
+  m_content = appendToFirstOccurence(
    m_content,
-    "</head[ \\t]*>",
+    "<head>",
    script_tag);
 }

-void ContentResponse::inject_root_link(){
-  m_content = prependToFirstOccurence(
-    m_content,
-    "</head[ \\t]*>",
-    "<link type=\"root\" href=\"" + m_root + "\">");
-}
-
 bool
-ContentResponse::can_compress(const RequestContext& request) const
+Response::can_compress(const RequestContext& request) const
 {
  return request.can_compress()
      && is_compressible_mime_type(m_mimeType)
@@ -245,28 +167,30 @@ ContentResponse::can_compress(const RequestContext& request) const
 }

 bool
-ContentResponse::contentDecorationAllowed() const
+Response::contentDecorationAllowed() const
 {
-  if (m_raw) {
-    return false;
-  }
-  return (startsWith(m_mimeType, "text/html")
-    && m_mimeType.find(";raw=true") == std::string::npos);
+    return (startsWith(m_mimeType, "text/html")
+         && m_mimeType.find(";raw=true") == std::string::npos);
 }

 MHD_Response*
-Response::create_mhd_response(const RequestContext& request)
+Response::create_error_response(const RequestContext& request) const
 {
-  MHD_Response* response = MHD_create_response_from_buffer(0, nullptr, MHD_RESPMEM_PERSISTENT);
+  MHD_Response* response = MHD_create_response_from_buffer(0, NULL, MHD_RESPMEM_PERSISTENT);
+  if ( m_returnCode == 416 ) {
+    std::ostringstream oss;
+    oss << "bytes */" << m_byteRange.length();
+
+    MHD_add_response_header(response,
+      MHD_HTTP_HEADER_CONTENT_RANGE, oss.str().c_str());
+  }
  return response;
 }

 MHD_Response*
-ContentResponse::create_mhd_response(const RequestContext& request)
+Response::create_raw_content_mhd_response(const RequestContext& request)
 {
  if (contentDecorationAllowed()) {
-    inject_root_link();
-
    if (m_withTaskbar) {
      introduce_taskbar();
    }
@@ -275,7 +199,7 @@ ContentResponse::create_mhd_response(const RequestContext& request)
    }
  }

-  bool shouldCompress = can_compress(request);
+  bool shouldCompress = m_compress && can_compress(request);
  if (shouldCompress) {
    std::vector<Bytef> compr_buffer(compressBound(m_content.size()));
    uLongf comprLen = compr_buffer.capacity();
@@ -299,26 +223,88 @@ ContentResponse::create_mhd_response(const RequestContext& request)
  MHD_Response* response = MHD_create_response_from_buffer(
    m_content.size(), const_cast<char*>(m_content.data()), MHD_RESPMEM_MUST_COPY);

-  if (shouldCompress) {
+  // At shis point m_etag.get_option(ETag::COMPRESSED_CONTENT) and
+  // shouldCompress can have different values. This can happen for a 304 (Not
+  // Modified) response generated while handling a conditional If-None-Match
+  // request. In that case the m_etag (together with its COMPRESSED_CONTENT
+  // option) is obtained from the ETag list of the If-None-Match header and the
+  // response has no body (which shouldn't be compressed).
+  if ( m_etag.get_option(ETag::COMPRESSED_CONTENT) ) {
    MHD_add_response_header(
        response, MHD_HTTP_HEADER_VARY, "Accept-Encoding");
+  }
+  if (shouldCompress) {
    MHD_add_response_header(
        response, MHD_HTTP_HEADER_CONTENT_ENCODING, "deflate");
  }
+  MHD_add_response_header(response, MHD_HTTP_HEADER_CONTENT_TYPE, m_mimeType.c_str());
  return response;
 }

+MHD_Response*
+Response::create_redirection_mhd_response() const
+{
+  MHD_Response* response = MHD_create_response_from_buffer(0, nullptr, MHD_RESPMEM_MUST_COPY);
+  MHD_add_response_header(response, MHD_HTTP_HEADER_LOCATION, m_content.c_str());
+  return response;
+}
+
+MHD_Response*
+Response::create_entry_mhd_response() const
+{
+  const auto content_length = m_byteRange.length();
+  MHD_Response* response = MHD_create_response_from_callback(content_length,
+                                               16384,
+                                               callback_reader_from_entry,
+                                               new RunningResponse(m_entry, m_byteRange.first()),
+                                               callback_free_response);
+  MHD_add_response_header(response,
+    MHD_HTTP_HEADER_CONTENT_TYPE, m_mimeType.c_str());
+  MHD_add_response_header(response, MHD_HTTP_HEADER_ACCEPT_RANGES, "bytes");
+  if ( m_byteRange.kind() == ByteRange::RESOLVED_PARTIAL_CONTENT ) {
+    std::ostringstream oss;
+    oss << "bytes " << m_byteRange.first() << "-" << m_byteRange.last()
+        << "/" << m_entry.getSize();
+
+    MHD_add_response_header(response,
+      MHD_HTTP_HEADER_CONTENT_RANGE, oss.str().c_str());
+  }
+
+  MHD_add_response_header(response,
+    MHD_HTTP_HEADER_CONTENT_LENGTH, kiwix::to_string(content_length).c_str());
+  return response;
+}
+
+MHD_Response*
+Response::create_mhd_response(const RequestContext& request)
+{
+  switch (m_mode) {
+    case ResponseMode::ERROR_RESPONSE:
+      return create_error_response(request);
+
+    case ResponseMode::RAW_CONTENT :
+      return create_raw_content_mhd_response(request);
+
+    case ResponseMode::REDIRECTION :
+      return create_redirection_mhd_response();
+
+    case ResponseMode::ENTRY :
+      return create_entry_mhd_response();
+  }
+  return nullptr;
+}
+
 MHD_Result Response::send(const RequestContext& request, MHD_Connection* connection)
 {
  MHD_Response* response = create_mhd_response(request);

-  MHD_add_response_header(response, MHD_HTTP_HEADER_CACHE_CONTROL,
-    m_etag.get_option(ETag::CACHEABLE_ENTITY) ? "max-age=2723040, public" : "no-cache, no-store, must-revalidate");
-  const std::string etag = m_etag.get_etag();
-  if ( ! etag.empty() )
-    MHD_add_response_header(response, MHD_HTTP_HEADER_ETAG, etag.c_str());
-  for(auto& p: m_customHeaders) {
-    MHD_add_response_header(response, p.first.c_str(), p.second.c_str());
+  if ( m_mode != ResponseMode::ERROR_RESPONSE ) {
+    MHD_add_response_header(response, "Access-Control-Allow-Origin", "*");
+    MHD_add_response_header(response, MHD_HTTP_HEADER_CACHE_CONTROL,
+      m_etag.get_option(ETag::CACHEABLE_ENTITY) ? "max-age=2723040, public" : "no-cache, no-store, must-revalidate");
+    const std::string etag = m_etag.get_etag();
+    if ( ! etag.empty() )
+        MHD_add_response_header(response, MHD_HTTP_HEADER_ETAG, etag.c_str());
  }

  if (m_returnCode == MHD_HTTP_OK && m_byteRange.kind() == ByteRange::RESOLVED_PARTIAL_CONTENT)
@@ -332,116 +318,49 @@ MHD_Result Response::send(const RequestContext& request, MHD_Connection* connect
  return ret;
 }

-void ContentResponse::set_taskbar(const std::string& bookName, const std::string& bookTitle)
+void Response::set_template(const std::string& template_str, kainjow::mustache::data data) {
+  set_content(render_template(template_str, data));
+}
+
+void Response::set_content(const std::string& content) {
+  m_content = content;
+  m_mode = ResponseMode::RAW_CONTENT;
+}
+
+void Response::set_redirection(const std::string& url) {
+  m_content = url;
+  m_mode = ResponseMode::REDIRECTION;
+  m_returnCode = MHD_HTTP_FOUND;
+}
+
+void Response::set_entry(const Entry& entry, const RequestContext& request) {
+  m_entry = entry;
+  m_mode = ResponseMode::ENTRY;
+
+  const std::string mimeType = get_mime_type(entry);
+  set_mimeType(mimeType);
+  set_cacheable();
+
+  m_byteRange = request.get_range().resolve(entry.getSize());
+  const bool noRange = m_byteRange.kind() == ByteRange::RESOLVED_FULL_CONTENT;
+  if ( noRange && is_compressible_mime_type(mimeType) ) {
+    zim::Blob raw_content = entry.getBlob();
+    const std::string content = string(raw_content.data(), raw_content.size());
+
+    set_content(content);
+    set_compress(true);
+  } else if ( m_byteRange.kind() == ByteRange::RESOLVED_UNSATISFIABLE ) {
+    set_code(416);
+    set_content("");
+    m_mode = ResponseMode::ERROR_RESPONSE;
+  }
+}
+
+void Response::set_taskbar(const std::string& bookName, const std::string& bookTitle)
 {
  m_bookName = bookName;
  m_bookTitle = bookTitle;
 }


-ContentResponse::ContentResponse(const std::string& root, bool verbose, bool raw, bool withTaskbar, bool withLibraryButton, bool blockExternalLinks, const std::string& content, const std::string& mimetype) :
-  Response(verbose),
-  m_root(root),
-  m_content(content),
-  m_mimeType(mimetype),
-  m_raw(raw),
-  m_withTaskbar(withTaskbar),
-  m_withLibraryButton(withLibraryButton),
-  m_blockExternalLinks(blockExternalLinks),
-  m_bookName(""),
-  m_bookTitle("")
-{
-  add_header(MHD_HTTP_HEADER_CONTENT_TYPE, m_mimeType);
-}
-
-std::unique_ptr<ContentResponse> ContentResponse::build(
-  const InternalServer& server,
-  const std::string& content,
-  const std::string& mimetype,
-  bool isHomePage,
-  bool raw)
-{
-   return std::unique_ptr<ContentResponse>(new ContentResponse(
-        server.m_root,
-        server.m_verbose.load(),
-        raw,
-        server.m_withTaskbar && !isHomePage,
-        server.m_withLibraryButton,
-        server.m_blockExternalLinks,
-        content,
-        mimetype));
-}
-
-std::unique_ptr<ContentResponse> ContentResponse::build(
-  const InternalServer& server,
-  const std::string& template_str,
-  kainjow::mustache::data data,
-  const std::string& mimetype,
-  bool isHomePage)
-{
-  auto content = render_template(template_str, data);
-  return ContentResponse::build(server, content, mimetype, isHomePage);
-}
-
-ItemResponse::ItemResponse(bool verbose, const zim::Item& item, const std::string& mimetype, const ByteRange& byterange) :
-  Response(verbose),
-  m_item(item),
-  m_mimeType(mimetype)
-{
-  m_byteRange = byterange;
-  set_cacheable();
-  add_header(MHD_HTTP_HEADER_CONTENT_TYPE, m_mimeType);
-}
-
-std::unique_ptr<Response> ItemResponse::build(const InternalServer& server, const RequestContext& request, const zim::Item& item, bool raw)
-{
-  const std::string mimetype = get_mime_type(item);
-  auto byteRange = request.get_range().resolve(item.getSize());
-  const bool noRange = byteRange.kind() == ByteRange::RESOLVED_FULL_CONTENT;
-  if (noRange && is_compressible_mime_type(mimetype)) {
-    // Return a contentResponse
-    auto response = ContentResponse::build(server, item.getData(), mimetype, /*isHomePage=*/false, raw);
-    response->set_cacheable();
-    response->m_byteRange = byteRange;
-    return std::move(response);
-  }
-
-  if (byteRange.kind() == ByteRange::RESOLVED_UNSATISFIABLE) {
-    auto response = Response::build_416(server, item.getSize());
-    response->set_cacheable();
-    return response;
-  }
-
-  return std::unique_ptr<Response>(new ItemResponse(
-        server.m_verbose.load(),
-        item,
-        mimetype,
-        byteRange));
-}
-
-MHD_Response*
-ItemResponse::create_mhd_response(const RequestContext& request)
-{
-  const auto content_length = m_byteRange.length();
-  MHD_Response* response = MHD_create_response_from_callback(content_length,
-                                               16384,
-                                               callback_reader_from_item,
-                                               new RunningResponse(m_item, m_byteRange.first()),
-                                               callback_free_response);
-  MHD_add_response_header(response, MHD_HTTP_HEADER_ACCEPT_RANGES, "bytes");
-  if ( m_byteRange.kind() == ByteRange::RESOLVED_PARTIAL_CONTENT ) {
-    std::ostringstream oss;
-    oss << "bytes " << m_byteRange.first() << "-" << m_byteRange.last()
-        << "/" << m_item.getSize();
-
-    MHD_add_response_header(response,
-      MHD_HTTP_HEADER_CONTENT_RANGE, oss.str().c_str());
-  }
-
-  MHD_add_response_header(response,
-    MHD_HTTP_HEADER_CONTENT_LENGTH, kiwix::to_string(content_length).c_str());
-  return response;
-}
-
-
 }
--- a/src/server/response.h
+++ b/src/server/response.h
@@ -22,7 +22,6 @@
 #define KIWIXLIB_SERVER_RESPONSE_H

 #include <string>
-#include <map>

 #include <mustache.hpp>
 #include "byte_range.h"
@@ -35,105 +34,68 @@ extern "C" {

 namespace kiwix {

-class InternalServer;
-class RequestContext;
+enum class ResponseMode {
+  ERROR_RESPONSE,
+  RAW_CONTENT,
+  REDIRECTION,
+  ENTRY
+};

-class EntryResponse;
+class RequestContext;

 class Response {
  public:
-    Response(bool verbose);
-    virtual ~Response() = default;
-
-    static std::unique_ptr<Response> build(const InternalServer& server);
-    static std::unique_ptr<Response> build_304(const InternalServer& server, const ETag& etag);
-    static std::unique_ptr<Response> build_404(const InternalServer& server, const std::string& url, const std::string& bookName, const std::string& bookTitle, const std::string& details="");
-    static std::unique_ptr<Response> build_416(const InternalServer& server, size_t resourceLength);
-    static std::unique_ptr<Response> build_500(const InternalServer& server, const std::string& msg);
-    static std::unique_ptr<Response> build_redirect(const InternalServer& server, const std::string& redirectUrl);
+    Response(const std::string& root, bool verbose, bool withTaskbar, bool withLibraryButton, bool blockExternalLinks);
+    ~Response() = default;

    MHD_Result send(const RequestContext& request, MHD_Connection* connection);

+    void set_template(const std::string& template_str, kainjow::mustache::data data);
+    void set_content(const std::string& content);
+    void set_redirection(const std::string& url);
+    void set_entry(const Entry& entry, const RequestContext& request);
+
+
+    void set_mimeType(const std::string& mimeType) { m_mimeType = mimeType; }
    void set_code(int code) { m_returnCode = code; }
    void set_cacheable() { m_etag.set_option(ETag::CACHEABLE_ENTITY); }
    void set_server_id(const std::string& id) { m_etag.set_server_id(id); }
-    void add_header(const std::string& name, const std::string& value) { m_customHeaders[name] = value; }
-
-    int getReturnCode() const { return m_returnCode; }
-
-  private: // functions
-    virtual MHD_Response* create_mhd_response(const RequestContext& request);
-    MHD_Response* create_error_response(const RequestContext& request) const;
-
-  protected: // data
-    bool m_verbose;
-    int m_returnCode;
-    ByteRange m_byteRange;
-    ETag m_etag;
-    std::map<std::string, std::string> m_customHeaders;
-
-    friend class ItemResponse;
-};
-
-
-class ContentResponse : public Response {
-  public:
-    ContentResponse(
-      const std::string& root,
-      bool verbose,
-      bool raw,
-      bool withTaskbar,
-      bool withLibraryButton,
-      bool blockExternalLinks,
-      const std::string& content,
-      const std::string& mimetype);
-    static std::unique_ptr<ContentResponse> build(
-      const InternalServer& server,
-      const std::string& content,
-      const std::string& mimetype,
-      bool isHomePage = false,
-      bool raw = false);
-    static std::unique_ptr<ContentResponse> build(
-      const InternalServer& server,
-      const std::string& template_str,
-      kainjow::mustache::data data,
-      const std::string& mimetype,
-      bool isHomePage = false);
-
+    void set_etag(const ETag& etag) { m_etag = etag; }
+    void set_compress(bool compress) { m_compress = compress; }
    void set_taskbar(const std::string& bookName, const std::string& bookTitle);

-  private:
-    MHD_Response* create_mhd_response(const RequestContext& request);
+    int getReturnCode() const { return m_returnCode; }
+    std::string get_mimeType() const { return m_mimeType; }

    void introduce_taskbar();
    void inject_externallinks_blocker();
-    void inject_root_link();
+
    bool can_compress(const RequestContext& request) const;
    bool contentDecorationAllowed() const;

+  private: // functions
+    MHD_Response* create_mhd_response(const RequestContext& request);
+    MHD_Response* create_error_response(const RequestContext& request) const;
+    MHD_Response* create_raw_content_mhd_response(const RequestContext& request);
+    MHD_Response* create_redirection_mhd_response() const;
+    MHD_Response* create_entry_mhd_response() const;

-  private:
+  private: // data
+    bool m_verbose;
+    ResponseMode m_mode;
    std::string m_root;
    std::string m_content;
+    Entry m_entry;
    std::string m_mimeType;
-    bool m_raw;
+    int m_returnCode;
    bool m_withTaskbar;
    bool m_withLibraryButton;
    bool m_blockExternalLinks;
+    bool m_compress;
    std::string m_bookName;
    std::string m_bookTitle;
- };
-
-class ItemResponse : public Response {
-  public:
-    ItemResponse(bool verbose, const zim::Item& item, const std::string& mimetype, const ByteRange& byterange);
-    static std::unique_ptr<Response> build(const InternalServer& server, const RequestContext& request, const zim::Item& item, bool raw = false);
-
-  private:
-    MHD_Response* create_mhd_response(const RequestContext& request);
-
-    zim::Item m_item;
-    std::string m_mimeType;
+    ByteRange m_byteRange;
+    ETag m_etag;
 };

 }
--- a/src/subprocess_unix.cpp
+++ b/src/subprocess_unix.cpp
@@ -12,31 +12,45 @@
 UnixImpl::UnixImpl():
  m_pid(0),
  m_running(false),
-  m_shouldQuit(false)
+  m_mutex(PTHREAD_MUTEX_INITIALIZER),
+  m_waitingThread()
 {
 }

 UnixImpl::~UnixImpl()
 {
  kill();
-  m_shouldQuit = true;
-  m_waitingThread.join();
+// Android has no pthread_cancel :(
+#ifdef __ANDROID__
+  pthread_kill(m_waitingThread, SIGUSR1);
+#else
+  pthread_cancel(m_waitingThread);
+#endif
 }

+#ifdef __ANDROID__
+void thread_exit_handler(int sig) {
+  pthread_exit(0);
+}
+#endif
+
 void* UnixImpl::waitForPID(void* _self)
 {
-  UnixImpl* self = static_cast<UnixImpl*>(_self);
-  while (true) {
-    if (!waitpid(self->m_pid, NULL, WNOHANG)) {
-      break;
-    }
-    if (self->m_shouldQuit) {
-      return nullptr;
-    }
-    std::this_thread::sleep_for(std::chrono::milliseconds(100));
-  }
+#ifdef __ANDROID__
+  struct sigaction actions;
+  memset(&actions, 0, sizeof(actions));
+  sigemptyset(&actions.sa_mask);
+  actions.sa_flags = 0;
+  actions.sa_handler = thread_exit_handler;
+  sigaction(SIGUSR1, &actions, NULL);
+#endif

+  UnixImpl* self = static_cast<UnixImpl*>(_self);
+  waitpid(self->m_pid, NULL, 0);
+
+  pthread_mutex_lock(&self->m_mutex);
  self->m_running = false;
+  pthread_mutex_unlock(&self->m_mutex);

  return self;
 }
@@ -60,7 +74,7 @@ void UnixImpl::run(commandLine_t& commandLine)
    default:
      m_pid = pid;
      m_running = true;
-      m_waitingThread = std::thread(waitForPID, this);
+      pthread_create(&m_waitingThread, NULL, waitForPID, this);
      break;
  }
 }
@@ -72,5 +86,8 @@ bool UnixImpl::kill()

 bool UnixImpl::isRunning()
 {
-  return m_running;
+  pthread_mutex_lock(&m_mutex);
+  bool ret = m_running;
+  pthread_mutex_unlock(&m_mutex);
+  return ret;
 }
--- a/src/subprocess_unix.h
+++ b/src/subprocess_unix.h
@@ -3,16 +3,16 @@

 #include "subprocess.h"

-#include <atomic>
-#include <thread>
+#include <pthread.h>
+

 class UnixImpl : public SubprocessImpl
 {
  private:
    int m_pid;
-    std::atomic<bool> m_running;
-    std::atomic<bool> m_shouldQuit;
-    std::thread m_waitingThread;
+    bool m_running;
+    pthread_mutex_t m_mutex;
+    pthread_t m_waitingThread;

  public:
    UnixImpl();
--- a/src/subprocess_windows.cpp
+++ b/src/subprocess_windows.cpp
@@ -11,8 +11,7 @@
 WinImpl::WinImpl():
  m_pid(0),
  m_running(false),
-  m_subprocessHandle(INVALID_HANDLE_VALUE),
-  m_waitingThreadHandle(INVALID_HANDLE_VALUE)
+  m_handle(INVALID_HANDLE_VALUE)
 {
  InitializeCriticalSection(&m_criticalSection);
 }
@@ -20,15 +19,14 @@ WinImpl::WinImpl():
 WinImpl::~WinImpl()
 {
  kill();
-  WaitForSingleObject(m_waitingThreadHandle, INFINITE);
-  CloseHandle(m_subprocessHandle);
+  CloseHandle(m_handle);
  DeleteCriticalSection(&m_criticalSection);
 }

 DWORD WINAPI WinImpl::waitForPID(void* _self)
 {
  WinImpl* self = static_cast<WinImpl*>(_self);
-  WaitForSingleObject(self->m_subprocessHandle, INFINITE);
+  WaitForSingleObject(self->m_handle, INFINITE);

  EnterCriticalSection(&self->m_criticalSection);
  self->m_running = false;
@@ -81,16 +79,16 @@ void WinImpl::run(commandLine_t& commandLine)
    &procInfo))
  {
    m_pid = procInfo.dwProcessId;
-    m_subprocessHandle = procInfo.hProcess;
+    m_handle = procInfo.hProcess;
    CloseHandle(procInfo.hThread);
    m_running = true;
-    m_waitingThreadHandle = CreateThread(NULL, 0, &waitForPID, this, 0, NULL);
+    CreateThread(NULL, 0, &waitForPID, this, 0, NULL	);
  }
 }

 bool WinImpl::kill()
 {
-  return TerminateProcess(m_subprocessHandle, 0);
+  return TerminateProcess(m_handle, 0);
 }

 bool WinImpl::isRunning()
--- a/src/subprocess_windows.h
+++ b/src/subprocess_windows.h
@@ -11,8 +11,7 @@ class WinImpl : public SubprocessImpl
  private:
    int m_pid;
    bool m_running;
-    HANDLE m_subprocessHandle;
-    HANDLE  m_waitingThreadHandle;
+    HANDLE m_handle;
    CRITICAL_SECTION m_criticalSection;

  public:
--- a/src/tools/archiveTools.cpp
+++ b/src/tools/archiveTools.cpp
@@ -1,158 +0,0 @@
-/*
- * Copyright 2021 Maneesh P M <manu.pm55@gmail.com>
- *
- * 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 "archiveTools.h"
-
-#include "tools.h"
-#include "pathTools.h"
-#include "otherTools.h"
-#include "stringTools.h"
-
-#include <zim/error.h>
-#include <zim/item.h>
-
-namespace kiwix
-{
-std::string getMetadata(const zim::Archive& archive, const std::string& name) {
-    try {
-        return archive.getMetadata(name);
-    } catch (zim::EntryNotFound& e) {
-        return "";
-    }
-}
-
-std::string getArchiveTitle(const zim::Archive& archive) {
-  std::string value = getMetadata(archive, "Title");
-  if (value.empty()) {
-    value = getLastPathElement(archive.getFilename());
-    std::replace(value.begin(), value.end(), '_', ' ');
-    size_t pos = value.find(".zim");
-    value = value.substr(0, pos);
-  }
-  return value;
-}
-
-std::string getMetaDescription(const zim::Archive& archive) {
-  std::string value;
-  value = getMetadata(archive, "Description");
-
-  /* Mediawiki Collection tends to use the "Subtitle" name */
-  if (value.empty()) {
-    value = getMetadata(archive, "Subtitle");
-  }
-
-  return value;
-}
-
-std::string getMetaTags(const zim::Archive& archive, bool original) {
-  std::string tags_str = getMetadata(archive, "Tags");
-  if (original) {
-    return tags_str;
-  }
-  auto tags = convertTags(tags_str);
-  return join(tags, ";");
-}
-
-std::string getMetaLanguage(const zim::Archive& archive) {
-  return getMetadata(archive, "Language");
-}
-
-std::string getMetaName(const zim::Archive& archive) {
-  return getMetadata(archive, "Name");
-}
-
-std::string getMetaDate(const zim::Archive& archive) {
-  return getMetadata(archive, "Date");
-}
-
-std::string getMetaCreator(const zim::Archive& archive) {
-  return getMetadata(archive, "Creator");
-}
-
-std::string getMetaPublisher(const zim::Archive& archive) {
-  return getMetadata(archive, "Publisher");
-}
-
-std::string getMetaFlavour(const zim::Archive& archive) {
-  return getMetadata(archive, "Flavour");
-}
-
-std::string getArchiveId(const zim::Archive& archive) {
-  return (std::string) archive.getUuid();
-}
-
-bool getArchiveFavicon(const zim::Archive& archive, unsigned size,
-                           std::string& content, std::string& mimeType){
-  try {
-    auto item = archive.getIllustrationItem(size);
-    content = item.getData();
-    mimeType = item.getMimetype();
-    return true;
-  } catch(zim::EntryNotFound& e) {};
-
-  return false;
-}
-
-// should this be in libzim
-unsigned int getArchiveMediaCount(const zim::Archive& archive) {
-  std::map<const std::string, unsigned int> counterMap = parseArchiveCounter(archive);
-  unsigned int counter = 0;
-
-  for (auto &pair:counterMap) {
-    if (startsWith(pair.first, "image/") ||
-        startsWith(pair.first, "video/") ||
-        startsWith(pair.first, "audio/")) {
-      counter += pair.second;
-    }
-  }
-
-  return counter;
-}
-
-unsigned int getArchiveFileSize(const zim::Archive& archive) {
-  return archive.getFilesize() / 1024;
-}
-
-zim::Item getFinalItem(const zim::Archive& archive, const zim::Entry& entry)
-{
-  return entry.getItem(true);
-}
-
-zim::Entry getEntryFromPath(const zim::Archive& archive, const std::string& path)
-{
-  try {
-    return archive.getEntryByPath(path);
-  } catch (zim::EntryNotFound& e) {
-    if (path.empty() || path == "/") {
-      return archive.getMainEntry();
-    }
-  }
-  throw zim::EntryNotFound("Cannot find entry for non empty path");
-}
-
-MimeCounterType parseArchiveCounter(const zim::Archive& archive) {
-  try {
-    auto counterContent = archive.getMetadata("Counter");
-    return parseMimetypeCounter(counterContent);
-  } catch (zim::EntryNotFound& e) {
-    return {};
-  }
-}
-
-} // kiwix
--- a/src/tools/archiveTools.h
+++ b/src/tools/archiveTools.h
@@ -1,59 +0,0 @@
-/*
- * Copyright 2021 Maneesh P M <manu.pm55@gmail.com>
- *
- * 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.
- */
-
-#ifndef KIWIX_ARCHIVETOOLS_H
-#define KIWIX_ARCHIVETOOLS_H
-
-#include <zim/archive.h>
-#include <tools/otherTools.h>
-
-/**
- * This file contains all the functions that would make handling data related to
- * an archive easier.
- **/
-
-namespace kiwix
-{
-    std::string getMetadata(const zim::Archive& archive, const std::string& name);
-    std::string getArchiveTitle(const zim::Archive& archive);
-    std::string getMetaDescription(const zim::Archive& archive);
-    std::string getMetaTags(const zim::Archive& archive, bool original = false);
-    std::string getMetaLanguage(const zim::Archive& archive);
-    std::string getMetaName(const zim::Archive& archive);
-    std::string getMetaDate(const zim::Archive& archive);
-    std::string getMetaCreator(const zim::Archive& archive);
-    std::string getMetaPublisher(const zim::Archive& archive);
-    std::string getMetaFlavour(const zim::Archive& archive);
-    std::string getArchiveId(const zim::Archive& archive);
-
-    bool getArchiveFavicon(const zim::Archive& archive, unsigned size,
-                           std::string& content, std::string& mimeType);
-
-    unsigned int getArchiveMediaCount(const zim::Archive& archive);
-    unsigned int getArchiveFileSize(const zim::Archive& archive);
-
-    zim::Item getFinalItem(const zim::Archive& archive, const zim::Entry& entry);
-
-    zim::Entry getEntryFromPath(const zim::Archive& archive, const std::string& path);
-
-    MimeCounterType parseArchiveCounter(const zim::Archive& archive);
-
-}
-
-#endif
--- a/src/tools/networkTools.cpp
+++ b/src/tools/networkTools.cpp
@@ -1,6 +1,5 @@
 /*
 * Copyright 2012 Emmanuel Engelhart <kelson@kiwix.org>
- * Copyright 2021 Nikhil Tanwar <2002nikhiltanwar@gmail.com>
 *
 * 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
@@ -18,7 +17,6 @@
 * MA 02110-1301, USA.
 */

-#include "tools.h"
 #include <tools/networkTools.h>

 #include <stdio.h>
@@ -31,17 +29,6 @@
 #include <iostream>
 #include <stdexcept>

-#ifdef _WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <iostream>
-#else
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netdb.h>
-#endif

 size_t write_callback_to_iss(char* ptr, size_t size, size_t nmemb, void* userdata)
 {
@@ -70,104 +57,3 @@ std::string kiwix::download(const std::string& url) {
  }
  return ss.str();
 }
-
-std::map<std::string, std::string> kiwix::getNetworkInterfaces() {
-  std::map<std::string, std::string> interfaces;
-
-#ifdef _WIN32
-  SOCKET sd = WSASocket(AF_INET, SOCK_DGRAM, 0, 0, 0, 0);
-  if (sd == INVALID_SOCKET) {
-    std::cerr << "Failed to get a socket. Error " << WSAGetLastError() << std::endl;
-    return interfaces;
-  }
-
-  INTERFACE_INFO InterfaceList[20];
-  unsigned long nBytesReturned;
-  if (WSAIoctl(sd, SIO_GET_INTERFACE_LIST, 0, 0, &InterfaceList,
-      sizeof(InterfaceList), &nBytesReturned, 0, 0) == SOCKET_ERROR) {
-    std::cerr << "Failed calling WSAIoctl: error " << WSAGetLastError() << std::endl;
-    return interfaces;
-  }
-
-  int nNumInterfaces = nBytesReturned / sizeof(INTERFACE_INFO);
-  for (int i = 0; i < nNumInterfaces; ++i) {
-    sockaddr_in *pAddress;
-    pAddress = (sockaddr_in *) & (InterfaceList[i].iiAddress.AddressIn);
-    if(pAddress->sin_family == AF_INET) {
-    /* Add to the map */
-    std::string interfaceName = std::string(inet_ntoa(pAddress->sin_addr));
-    interfaces[interfaceName] = interfaceName;
-    }
-  }
-#else
-  /* Get Network interfaces information */
-  char buf[16384];
-  struct ifconf ifconf;
-  int fd = socket(PF_INET, SOCK_DGRAM, 0); /* Only IPV4 */
-  ifconf.ifc_len = sizeof(buf);
-  ifconf.ifc_buf=buf;
-  if(ioctl(fd, SIOCGIFCONF, &ifconf)!=0) {
-    perror("ioctl(SIOCGIFCONF)");
-  }
-
-  /* Go through each interface */
-  struct ifreq *ifreq;
-  ifreq = ifconf.ifc_req;
-  for (int i = 0; i < ifconf.ifc_len; ) {
-    if (ifreq->ifr_addr.sa_family == AF_INET) {
-      /* Get the network interface ip */
-      char host[128] = { 0 };
-      const int error = getnameinfo(&(ifreq->ifr_addr), sizeof(ifreq->ifr_addr),
-                                    host, sizeof(host),
-                                    0, 0, NI_NUMERICHOST);
-      if (!error) {
-        std::string interfaceName = std::string(ifreq->ifr_name);
-        std::string interfaceIp = std::string(host);
-        /* Add to the map */
-        interfaces[interfaceName] = interfaceIp;
-      } else {
-        perror("getnameinfo()");
-      }
-    }
-
-    /* some systems have ifr_addr.sa_len and adjust the length that
-     * way, but not mine. weird */
-    size_t len;
-#ifndef __linux__
-    len = IFNAMSIZ + ifreq->ifr_addr.sa_len;
-#else
-    len = sizeof(*ifreq);
-#endif
-    ifreq = (struct ifreq*)((char*)ifreq+len);
-    i += len;
-  }
-#endif
-  return interfaces;
-}
-
-std::string kiwix::getBestPublicIp() {
-  auto interfaces = getNetworkInterfaces();
-
-#ifndef _WIN32
-  const char* const prioritizedNames[] =
-      { "eth0", "eth1", "wlan0", "wlan1", "en0", "en1" };
-  for(auto name: prioritizedNames) {
-    auto it = interfaces.find(name);
-    if(it != interfaces.end()) {
-      return it->second;
-    }
-  }
-#endif
-
-  const char* const prefixes[] = { "192.168", "172.16.", "10.0" };
-  for(auto prefix : prefixes){
-    for(auto& itr : interfaces) {
-      auto interfaceIp = itr.second;
-      if (interfaceIp.find(prefix) == 0) {
-        return interfaceIp;
-      }
-    }
-  }
-
-  return "127.0.0.1";
-}
--- a/src/tools/otherTools.cpp
+++ b/src/tools/otherTools.cpp
@@ -17,14 +17,8 @@
 * MA 02110-1301, USA.
 */

-// Implement function declared in tools.h and tools/otherTools.h
-#include "tools.h"
 #include "tools/otherTools.h"

-
-#include <algorithm>
-#include <iomanip>
-
 #ifdef _WIN32
 #include <windows.h>
 #else
@@ -37,8 +31,6 @@
 #include <sstream>
 #include <pugixml.hpp>

-#include <zim/uuid.h>
-

 static std::map<std::string, std::string> codeisomapping {
 { "aa", "aar" },
@@ -288,95 +280,3 @@ bool kiwix::convertStrToBool(const std::string& value)
  throw std::domain_error(ss.str());
 }

-namespace
-{
-// The counter metadata format is a list of item separated by a `;` :
-// item0;item1;item2
-// Each item is a "tuple" mimetype=number.
-// However, the mimetype may contains parameters:
-// text/html;raw=true;foo=bar
-// So the final format may be complex to parse:
-// key0=value0;key1;foo=bar=value1;key2=value2
-
-typedef kiwix::MimeCounterType::value_type MimetypeAndCounter;
-
-std::string readFullMimetypeAndCounterString(std::istream& in)
-{
-  std::string mtcStr, params;
-  getline(in, mtcStr, ';');
-  if ( mtcStr.find('=') == std::string::npos )
-  {
-    do
-    {
-      if ( !getline(in, params, ';' ) )
-        return std::string();
-      mtcStr += ";" + params;
-    }
-    while ( std::count(params.begin(), params.end(), '=') != 2 );
-  }
-  return mtcStr;
-}
-
-MimetypeAndCounter parseASingleMimetypeCounter(const std::string& s)
-{
-  const std::string::size_type k = s.find_last_of("=");
-  if ( k != std::string::npos )
-  {
-    const std::string mimeType = s.substr(0, k);
-    std::istringstream counterSS(s.substr(k+1));
-    unsigned int counter;
-    if (counterSS >> counter && counterSS.eof())
-      return MimetypeAndCounter{mimeType, counter};
-  }
-  return MimetypeAndCounter{"", 0};
-}
-
-} // unnamed namespace
-
-kiwix::MimeCounterType kiwix::parseMimetypeCounter(const std::string& counterData)
-{
-  kiwix::MimeCounterType counters;
-  std::istringstream ss(counterData);
-
-  while (ss)
-  {
-    const std::string mtcStr = readFullMimetypeAndCounterString(ss);
-    const MimetypeAndCounter mtc = parseASingleMimetypeCounter(mtcStr);
-    if ( !mtc.first.empty() )
-      counters.insert(mtc);
-  }
-
-  return counters;
-}
-
-std::string kiwix::gen_date_str()
-{
-  auto now = std::time(0);
-  auto tm = std::localtime(&now);
-
-  std::stringstream is;
-  is << std::setw(2) << std::setfill('0')
-     << 1900+tm->tm_year << "-"
-     << std::setw(2) << std::setfill('0') << tm->tm_mon+1 << "-"
-     << std::setw(2) << std::setfill('0') << tm->tm_mday << "T"
-     << std::setw(2) << std::setfill('0') << tm->tm_hour << ":"
-     << std::setw(2) << std::setfill('0') << tm->tm_min << ":"
-     << std::setw(2) << std::setfill('0') << tm->tm_sec << "Z";
-  return is.str();
-}
-
-std::string kiwix::gen_uuid(const std::string& s)
-{
-  return kiwix::to_string(zim::Uuid::generate(s));
-}
-
-std::string kiwix::render_template(const std::string& template_str, kainjow::mustache::data data)
-{
-  kainjow::mustache::mustache tmpl(template_str);
-  kainjow::mustache::data urlencode{kainjow::mustache::lambda2{
-                               [](const std::string& str,const kainjow::mustache::renderer& r) { return urlEncode(r(str), true); }}};
-  data.set("urlencoded", urlencode);
-  std::stringstream ss;
-  tmpl.render(data, [&ss](const std::string& str) { ss << str; });
-  return ss.str();
-}
--- a/src/tools/pathTools.cpp
+++ b/src/tools/pathTools.cpp
@@ -17,10 +17,7 @@
 * MA 02110-1301, USA.
 */

-// Implement method defined in <kiwix/tools.h> and "tools/pathTools.h"
-#include "tools.h"
 #include "tools/pathTools.h"
-
 #include <stdexcept>

 #ifdef __APPLE__
@@ -62,6 +59,7 @@
 #define PATH_MAX 1024
 #endif

+
 #ifdef _WIN32
 std::string WideToUtf8(const std::wstring& wstr)
 {
@@ -80,7 +78,7 @@ std::wstring Utf8ToWide(const std::string& str)
 }
 #endif

-bool kiwix::isRelativePath(const std::string& path)
+bool isRelativePath(const std::string& path)
 {
 #ifdef _WIN32
  if (path.size() < 3 ) {
@@ -175,7 +173,7 @@ std::vector<std::string> normalizeParts(std::vector<std::string>& parts, bool ab
  return ret;
 }

-std::string kiwix::computeRelativePath(const std::string& path, const std::string& absolutePath)
+std::string computeRelativePath(const std::string& path, const std::string& absolutePath)
 {
  auto parts = kiwix::split(path, SEPARATOR, false);
  auto pathParts = normalizeParts(parts, false);
@@ -200,11 +198,11 @@ std::string kiwix::computeRelativePath(const std::string& path, const std::strin
  return ret;
 }

-std::string kiwix::computeAbsolutePath(const std::string& path, const std::string& relativePath)
+std::string computeAbsolutePath(const std::string& path, const std::string& relativePath)
 {
  std::string absolutePath = path;
  if (path.empty()) {
-    absolutePath = kiwix::getCurrentDirectory();
+    absolutePath = getCurrentDirectory();
  }

  auto parts = kiwix::split(absolutePath, SEPARATOR, false);
@@ -217,7 +215,7 @@ std::string kiwix::computeAbsolutePath(const std::string& path, const std::strin
  return ret;
 }

-std::string kiwix::removeLastPathElement(const std::string& path)
+std::string removeLastPathElement(const std::string& path)
 {
  auto parts_ = kiwix::split(path, SEPARATOR, false);
  auto parts = normalizeParts(parts_, false);
@@ -228,7 +226,7 @@ std::string kiwix::removeLastPathElement(const std::string& path)
  return ret;
 }

-std::string kiwix::appendToDirectory(const std::string& directoryPath, const std::string& filename)
+std::string appendToDirectory(const std::string& directoryPath, const std::string& filename)
 {
  std::string newPath = directoryPath;
  if (!directoryPath.empty() && directoryPath.back() != SEPARATOR[0]) {
@@ -238,7 +236,7 @@ std::string kiwix::appendToDirectory(const std::string& directoryPath, const std
  return newPath;
 }

-std::string kiwix::getLastPathElement(const std::string& path)
+std::string getLastPathElement(const std::string& path)
 {
  auto parts_ = kiwix::split(path, SEPARATOR);
  auto parts = normalizeParts(parts_, false);
@@ -269,7 +267,7 @@ std::string getFileSizeAsString(const std::string& path)
  return convert.str();
 }

-std::string kiwix::getFileContent(const std::string& path)
+std::string getFileContent(const std::string& path)
 {
 #ifdef _WIN32
  auto wpath = Utf8ToWide(path);
@@ -302,21 +300,19 @@ std::string kiwix::getFileContent(const std::string& path)
  return content;
 }

-bool kiwix::fileExists(const std::string& path)
+bool fileExists(const std::string& path)
 {
 #ifdef _WIN32
-  return (_waccess_s(Utf8ToWide(path).c_str(), 0) == 0);
+  return PathFileExistsW(Utf8ToWide(path).c_str());
 #else
-  return (access(path.c_str(), F_OK) == 0);
-#endif
-}
-
-bool kiwix::fileReadable(const std::string& path)
-{
-#ifdef _WIN32
-  return (_waccess_s(Utf8ToWide(path).c_str(), 4) == 0);
-#else
-  return (access(path.c_str(), R_OK) == 0);
+  bool flag = false;
+  std::fstream fin;
+  fin.open(path.c_str(), std::ios::in);
+  if (fin.is_open()) {
+    flag = true;
+  }
+  fin.close();
+  return flag;
 #endif
 }

@@ -343,7 +339,7 @@ std::string makeTmpDirectory()
  _wmkdir(ctmp);
  return WideToUtf8(ctmp);
 #else
-  char _template_array[] = {"/tmp/libkiwix_XXXXXX"};
+  char _template_array[] = {"/tmp/kiwix-lib_XXXXXX"};
  std::string dir = mkdtemp(_template_array);
  return dir;
 #endif
@@ -370,7 +366,7 @@ bool copyFile(const std::string& sourcePath, const std::string& destPath)
 #endif
 }

-std::string kiwix::getExecutablePath(bool realPathOnly)
+std::string getExecutablePath(bool realPathOnly)
 {
  if (!realPathOnly) {
    char* cAppImage = ::getenv("APPIMAGE");
@@ -424,7 +420,7 @@ bool writeTextFile(const std::string& path, const std::string& content)
  return true;
 }

-std::string kiwix::getCurrentDirectory()
+std::string getCurrentDirectory()
 {
 #ifdef _WIN32
  wchar_t* a_cwd = _wgetcwd(NULL, 0);
@@ -438,7 +434,7 @@ std::string kiwix::getCurrentDirectory()
  return ret;
 }

-std::string kiwix::getDataDirectory()
+std::string getDataDirectory()
 {
 // Try to get the dataDir from the `KIWIX_DATA_DIR` env var
 #ifdef _WIN32
@@ -507,7 +503,7 @@ static std::map<std::string, std::string> extMimeTypes = {
 };

 /* Try to get the mimeType from the file extension */
-std::string kiwix::getMimeTypeForFile(const std::string& filename)
+std::string getMimeTypeForFile(const std::string& filename)
 {
  std::string mimeType = "text/plain";
  auto pos = filename.find_last_of(".");
@@ -528,3 +524,4 @@ std::string kiwix::getMimeTypeForFile(const std::string& filename)

  return mimeType;
 }
+
--- a/src/tools/regexTools.cpp
+++ b/src/tools/regexTools.cpp
@@ -18,6 +18,7 @@
 */

 #include <tools/regexTools.h>
+#include <tools/lock.h>

 #include <unicode/regex.h>
 #include <unicode/ucnv.h>
@@ -25,10 +26,10 @@
 #include <memory>
 #include <map>
 #include <stdexcept>
-#include <mutex>
+#include <pthread.h>

 std::map<std::string, std::shared_ptr<icu::RegexPattern>> regexCache;
-static std::mutex regexLock;
+static pthread_mutex_t regexLock = PTHREAD_MUTEX_INITIALIZER;

 std::unique_ptr<icu::RegexMatcher> buildMatcher(const std::string& regex, icu::UnicodeString& content)
 {
@@ -38,7 +39,7 @@ std::unique_ptr<icu::RegexMatcher> buildMatcher(const std::string& regex, icu::U
    pattern = regexCache.at(regex);
  } catch (std::out_of_range&) {
    // Redo the search with a lock to avoid race condition.
-    std::lock_guard<std::mutex> l(regexLock);
+    kiwix::Lock l(&regexLock);
    try {
      pattern = regexCache.at(regex);
    } catch (std::out_of_range&) {
@@ -94,22 +95,3 @@ std::string appendToFirstOccurence(const std::string& content,

  return content;
 }
-
-std::string prependToFirstOccurence(const std::string& content,
-                                   const std::string& regex,
-                                   const std::string& replacement)
-{
-  ucnv_setDefaultName("UTF-8");
-  icu::UnicodeString ucontent(content.c_str());
-  icu::UnicodeString ureplacement(replacement.c_str());
-  auto matcher = buildMatcher(regex, ucontent);
-  if (matcher->find()) {
-    UErrorCode status = U_ZERO_ERROR;
-    ucontent.insert(matcher->start(status), ureplacement);
-    std::string tmp;
-    ucontent.toUTF8String(tmp);
-    return tmp;
-  }
-
-  return content;
-}
--- a/src/tools/stringTools.cpp
+++ b/src/tools/stringTools.cpp
@@ -17,11 +17,9 @@
 * MA 02110-1301, USA.
 */

-// Implement function declared in tools.h and tools/stringTools.h
-#include "tools.h"
-#include "tools/stringTools.h"
+#include <tools/stringTools.h>

-#include "tools/pathTools.h"
+#include <tools/pathTools.h>
 #include <unicode/normlzr.h>
 #include <unicode/rep.h>
 #include <unicode/translit.h>
@@ -270,8 +268,7 @@ std::string kiwix::urlDecode(const std::string& value, bool component)
 /* Split string in a token array */
 std::vector<std::string> kiwix::split(const std::string& str,
                                      const std::string& delims,
-                                      bool dropEmpty,
-                                      bool keepDelim)
+                                      bool trimEmpty)
 {
  std::string::size_type lastPos = 0;
  std::string::size_type pos = 0;
@@ -279,17 +276,14 @@ std::vector<std::string> kiwix::split(const std::string& str,
  while( (pos = str.find_first_of(delims, lastPos)) < str.length() )
  {
    auto token = str.substr(lastPos, pos - lastPos);
-    if (!dropEmpty || !token.empty()) {
+    if (!trimEmpty || !token.empty()) {
      tokens.push_back(token);
    }
-    if (keepDelim) {
-      tokens.push_back(str.substr(pos, 1));
-    }
    lastPos = pos + 1;
  }

  auto token = str.substr(lastPos);
-  if (!dropEmpty || !token.empty()) {
+  if (!trimEmpty || !token.empty()) {
    tokens.push_back(token);
  }
  return tokens;
@@ -397,11 +391,3 @@ bool kiwix::startsWith(const std::string& base, const std::string& start)
        && std::equal(start.begin(), start.end(), base.begin());
 }

-std::vector<std::string> kiwix::getTitleVariants(const std::string& title) {
-  std::vector<std::string> variants;
-  variants.push_back(title);
-  variants.push_back(kiwix::ucFirst(title));
-  variants.push_back(kiwix::lcFirst(title));
-  variants.push_back(kiwix::toTitle(title));
-  return variants;
-}
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -1,77 +0,0 @@
-/*
- * Copyright 2021 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 <iostream>
-#include <sstream>
-
-#include <version.h>
-#include <zim/zim.h>
-#include <kiwix_config.h>
-#include <unicode/uversion.h>
-#include <pugixml.hpp>
-#include <curl/curl.h>
-#include <microhttpd.h>
-#include <xapian.h>
-#include <mustache.hpp>
-#include <zlib.h>
-
-namespace kiwix
-{
-  LibVersions getVersions() {
-    LibVersions versions = {
-      { "libkiwix",      LIBKIWIX_VERSION    },
-      { "libzim",        LIBZIM_VERSION      },
-      { "libxapian",     XAPIAN_VERSION      },
-      { "libcurl",       LIBCURL_VERSION     },
-      { "libmicrohttpd", MHD_get_version()   },
-      { "libz",          ZLIB_VERSION        }
-    };
-
-    // U_ICU_VERSION does not include the patch level if 0
-    std::ostringstream libicu_version;
-    libicu_version << U_ICU_VERSION_MAJOR_NUM << "." << U_ICU_VERSION_MINOR_NUM << "." << U_ICU_VERSION_PATCHLEVEL_NUM;
-    versions.push_back({ "libicu", libicu_version.str() });
-
-    // No human readable version string for pugixml
-    const unsigned pugixml_major = (PUGIXML_VERSION - PUGIXML_VERSION % 1000) / 1000;
-    const unsigned pugixml_minor = (PUGIXML_VERSION - pugixml_major * 1000 - PUGIXML_VERSION % 10) / 10;
-    const unsigned pugixml_patch = PUGIXML_VERSION - pugixml_major * 1000 - pugixml_minor * 10;
-    std::ostringstream libpugixml_version;
-    libpugixml_version << pugixml_major << "." << pugixml_minor << "." << pugixml_patch;
-    versions.push_back({ "libpugixml", libpugixml_version.str() });
-
-    // Needs version 5.0 of Mustache
-#if defined(KAINJOW_MUSTACHE_VERSION_MAJOR)
-    std::ostringstream libmustache_version;
-    libmustache_version << KAINJOW_MUSTACHE_VERSION_MAJOR << "." <<
-      KAINJOW_MUSTACHE_VERSION_MINOR << "." << KAINJOW_MUSTACHE_VERSION_PATCH;
-    versions.push_back({ "libmustache", libmustache_version.str() });
-#endif
-
-    return versions;
-  }
-
-  void printVersions(std::ostream& out) {
-    LibVersions versions = getVersions();
-    for (const auto& iter : versions) {
-      out << (iter != versions.front() ? "+ " : "")
-                << iter.first << " " << iter.second << std::endl;
-    }
-  }
-} //namespace kiwix
--- a/src/wrapper/java/book.cpp
+++ b/src/wrapper/java/book.cpp
@@ -69,7 +69,6 @@ GETTER(jstring, getDate)
 GETTER(jstring, getUrl)
 GETTER(jstring, getName)
 GETTER(jstring, getFlavour)
-GETTER(jstring, getCategory)
 GETTER(jstring, getTags)
 GETTER(jlong, getArticleCount)
 GETTER(jlong, getMediaCount)
--- a/src/wrapper/java/kiwixicu.cpp
+++ b/src/wrapper/java/kiwixicu.cpp
@@ -28,7 +28,11 @@

 #include "utils.h"

-std::mutex globalLock;
+#if __ANDROID__
+pthread_mutex_t globalLock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
+#else
+pthread_mutex_t globalLock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+#endif

 JNIEXPORT void JNICALL Java_org_kiwix_kiwixlib_JNIICU_setDataDirectory(
    JNIEnv* env, jclass kclass, jstring dirStr)
--- a/src/wrapper/java/kiwixreader.cpp
+++ b/src/wrapper/java/kiwixreader.cpp
@@ -20,6 +20,7 @@


 #include <jni.h>
+#include <zim/file.h>
 #include <exception>
 #include "org_kiwix_kiwixlib_JNIKiwixReader.h"

@@ -45,72 +46,6 @@ JNIEXPORT jlong JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getNativeReader(
  }
 }

-namespace
-{
-
-int jni2fd(const jobject& fdObj, JNIEnv* env)
-{
-  jclass class_fdesc = env->FindClass("java/io/FileDescriptor");
-  jfieldID field_fd = env->GetFieldID(class_fdesc, "fd", "I");
-  if ( field_fd == NULL )
-  {
-    env->ExceptionClear();
-    // Under Android the (private) 'fd' field of java.io.FileDescriptor has been
-    // renamed to 'descriptor'. See, for example,
-    // https://android.googlesource.com/platform/libcore/+/refs/tags/android-8.1.0_r1/ojluni/src/main/java/java/io/FileDescriptor.java#55
-    field_fd = env->GetFieldID(class_fdesc, "descriptor", "I");
-  }
-  return env->GetIntField(fdObj, field_fd);
-}
-
-} // unnamed namespace
-
-JNIEXPORT jlong JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getNativeReaderByFD(
-    JNIEnv* env, jobject obj, jobject fdObj)
-{
-#ifndef _WIN32
-  int fd = jni2fd(fdObj, env);
-
-  LOG("Attempting to create reader with fd: %d", fd);
-  Lock l;
-  try {
-    kiwix::Reader* reader = new kiwix::Reader(fd);
-    return reinterpret_cast<jlong>(new Handle<kiwix::Reader>(reader));
-  } catch (std::exception& e) {
-    LOG("Error opening ZIM file");
-    LOG(e.what());
-    return 0;
-  }
-#else
-  jclass exception = env->FindClass("java/lang/UnsupportedOperationException");
-  env->ThrowNew(exception, "org.kiwix.kiwixlib.JNIKiwixReader.getNativeReaderByFD() is not supported under Windows");
-  return 0;
-#endif
-}
-
-JNIEXPORT jlong JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getNativeReaderEmbedded(
-    JNIEnv* env, jobject obj, jobject fdObj, jlong offset, jlong size)
-{
-#ifndef _WIN32
-  int fd = jni2fd(fdObj, env);
-
-  LOG("Attempting to create reader with fd: %d", fd);
-  Lock l;
-  try {
-    kiwix::Reader* reader = new kiwix::Reader(fd, offset, size);
-    return reinterpret_cast<jlong>(new Handle<kiwix::Reader>(reader));
-  } catch (std::exception& e) {
-    LOG("Error opening ZIM file");
-    LOG(e.what());
-    return 0;
-  }
-#else
-  jclass exception = env->FindClass("java/lang/UnsupportedOperationException");
-  env->ThrowNew(exception, "org.kiwix.kiwixlib.JNIKiwixReader.getNativeReaderEmbedded() is not supported under Windows");
-  return 0;
-#endif
-}
-
 JNIEXPORT void JNICALL
 Java_org_kiwix_kiwixlib_JNIKiwixReader_dispose(JNIEnv* env, jobject obj)
 {
@@ -391,22 +326,22 @@ JNIEXPORT jobject JNICALL
 Java_org_kiwix_kiwixlib_JNIKiwixReader_getDirectAccessInformation(
    JNIEnv* env, jobject obj, jstring url)
 {
-   jclass daiClass = env->FindClass("org/kiwix/kiwixlib/DirectAccessInfo");
-   jmethodID daiInitMethod = env->GetMethodID(daiClass, "<init>", "()V");
-   jobject dai = env->NewObject(daiClass, daiInitMethod);
-   setDaiObjValue("", 0, dai, env);
+   jclass classPair = env->FindClass("org/kiwix/kiwixlib/Pair");
+   jmethodID midPairinit = env->GetMethodID(classPair, "<init>", "()V");
+   jobject pair = env->NewObject(classPair, midPairinit);
+   setPairObjValue("", 0, pair, env);

   std::string cUrl = jni2c(url, env);
   try {
    auto entry = READER->getEntryFromEncodedPath(cUrl);
    entry = entry.getFinalEntry();
    auto part_info = entry.getDirectAccessInfo();
-    setDaiObjValue(part_info.first, part_info.second, dai, env);
+    setPairObjValue(part_info.first, part_info.second, pair, env);
  } catch (std::exception& e) {
    LOG("Unable to get direct access info for url: %s", cUrl.c_str());
    LOG(e.what());
  }
-  return dai;
+  return pair;
 }

 JNIEXPORT jboolean JNICALL
--- a/src/wrapper/java/kiwixsearcher.cpp
+++ b/src/wrapper/java/kiwixsearcher.cpp
@@ -19,6 +19,7 @@
 */


+#include <zim/file.h>
 #include "org_kiwix_kiwixlib_JNIKiwixSearcher.h"
 #include "org_kiwix_kiwixlib_JNIKiwixSearcher_Result.h"

--- a/src/wrapper/java/kiwixserver.cpp
+++ b/src/wrapper/java/kiwixserver.cpp
@@ -20,6 +20,7 @@


 #include <jni.h>
+#include <zim/file.h>
 #include "org_kiwix_kiwixlib_JNIKiwixServer.h"

 #include "tools/base64.h"
--- a/src/wrapper/java/manager.cpp
+++ b/src/wrapper/java/manager.cpp
@@ -19,6 +19,7 @@


 #include <jni.h>
+#include <zim/file.h>
 #include "org_kiwix_kiwixlib_Manager.h"

 #include "manager.h"
--- a/src/wrapper/java/meson.build
+++ b/src/wrapper/java/meson.build
@@ -12,7 +12,7 @@ java_sources = files([
  'org/kiwix/kiwixlib/JNIKiwixString.java',
  'org/kiwix/kiwixlib/JNIKiwixBool.java',
  'org/kiwix/kiwixlib/JNIKiwixException.java',
-  'org/kiwix/kiwixlib/DirectAccessInfo.java'
+  'org/kiwix/kiwixlib/Pair.java'
 ])

 kiwix_jni = custom_target('jni',
--- a/src/wrapper/java/org/kiwix/kiwixlib/Book.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/Book.java
@@ -24,7 +24,6 @@ public class Book
  public native String getUrl();
  public native String getName();
  public native String getFlavour();
-  public native String getCategory();
  public native String getTags();
  /**
   * Return the value associated to the tag tagName
--- a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixReader.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixReader.java
@@ -24,8 +24,7 @@ import org.kiwix.kiwixlib.JNIKiwixException;
 import org.kiwix.kiwixlib.JNIKiwixString;
 import org.kiwix.kiwixlib.JNIKiwixInt;
 import org.kiwix.kiwixlib.JNIKiwixSearcher;
-import org.kiwix.kiwixlib.DirectAccessInfo;
-import java.io.FileDescriptor;
+import org.kiwix.kiwixlib.Pair;

 public class JNIKiwixReader
 {
@@ -103,13 +102,13 @@ public class JNIKiwixReader
   * the zim file (or zim part) and directly read the content from it (and so
   * bypassing the libzim).
   *
-   * Return a `DirectAccessInfo` (filename, offset) where the content is located.
+   * Return a `Pair` (filename, offset) where the content is located.
   *
   * If the content cannot be directly accessed (content is compressed or zim
   * file is cut in the middle of the content), the filename is an empty string
   * and offset is zero.
   */
-  public native DirectAccessInfo getDirectAccessInformation(String url);
+  public native Pair getDirectAccessInformation(String url);

  public native boolean searchSuggestions(String prefix, int count);

@@ -152,31 +151,11 @@ public class JNIKiwixReader
        throw new JNIKiwixException("Cannot open zimfile "+filename);
    }
  }
-
-  public JNIKiwixReader(FileDescriptor fd) throws JNIKiwixException
-  {
-    nativeHandle = getNativeReaderByFD(fd);
-    if (nativeHandle == 0) {
-        throw new JNIKiwixException("Cannot open zimfile by fd "+fd.toString());
-    }
-  }
-
-  public JNIKiwixReader(FileDescriptor fd, long offset, long size)
-      throws JNIKiwixException
-  {
-    nativeHandle = getNativeReaderEmbedded(fd, offset, size);
-    if (nativeHandle == 0) {
-        throw new JNIKiwixException(String.format("Cannot open embedded zimfile (fd=%s, offset=%d, size=%d)", fd, offset, size));
-    }
-  }
-
  public JNIKiwixReader() {

  }
  public native void dispose();

  private native long getNativeReader(String filename);
-  private native long getNativeReaderByFD(FileDescriptor fd);
-  private native long getNativeReaderEmbedded(FileDescriptor fd, long offset, long size);
  private long nativeHandle;
 }
--- a/src/wrapper/java/org/kiwix/kiwixlib/DirectAccessInfo.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/DirectAccessInfo.java
@@ -19,7 +19,7 @@

 package org.kiwix.kiwixlib;

-public class DirectAccessInfo
+public class Pair
 {
  public String filename;
  public long offset;
--- a/src/wrapper/java/org/kiwix/testing/catalog.xml
+++ b/src/wrapper/java/org/kiwix/testing/catalog.xml
@@ -1,19 +0,0 @@
-<feed xmlns="http://www.w3.org/2005/Atom" xmlns:opds="http://opds-spec.org/2010/catalog">
-  <id>00000000-0000-0000-0000-000000000000</id>
-  <entry>
-    <title>Test ZIM file</title>
-    <id>urn:uuid:86c91e51-55bf-8882-464e-072aca37a3e8</id>
-    <icon>/meta?name=favicon&amp;content=small</icon>
-    <updated>2020-11-27:00::00:Z</updated>
-    <language>en</language>
-    <summary>This is a ZIM file used in libzim unit-tests</summary>
-    <tags>unit;test</tags>
-    <link type="text/html" href="/small" />
-    <author>
-      <name>Kiwix</name>
-    </author>
-    <link rel="http://opds-spec.org/acquisition/open-access" type="application/x-zim" href="http://localhost/small.zim" length="78982" />
-    <link rel="http://opds-spec.org/image/thumbnail" type="image/png" href="/meta?name=favicon&amp;content=small" />
-  </entry>
-</feed>
-
--- a/src/wrapper/java/org/kiwix/testing/compile_and_run_test.sh
+++ b/src/wrapper/java/org/kiwix/testing/compile_and_run_test.sh
@@ -1,37 +0,0 @@
-#!/usr/bin/bash
-
-# This script compiles and runs the unit test to test the java wrapper.
-# This is not integrated in meson because ... this is not so easy.
-
-die()
-{
-  echo >&2 "!!! ERROR: $*"
-  exit 1
-}
-
-
-KIWIX_LIB_JAR=$1
-if [ -z $KIWIX_LIB_JAR ]
-then
-  die "You must give the path to the kiwixlib.jar as first argument"
-fi
-
-KIWIX_LIB_DIR=$2
-if [ -z $KIWIX_LIB_DIR ]
-then
-  die "You must give the path to directory containing libkiwix.so as second argument"
-fi
-
-KIWIX_LIB_JAR=$(readlink -f "$KIWIX_LIB_JAR")
-KIWIX_LIB_DIR=$(readlink -f "$KIWIX_LIB_DIR")
-TEST_SOURCE_DIR=$(dirname "$(readlink -f $0)")
-
-cd "$TEST_SOURCE_DIR"
-
-javac -g -d . -s . -cp "junit-4.13.jar:$KIWIX_LIB_JAR" test.java \
-  || die "Compilation failed"
-
-java -Djava.library.path="$KIWIX_LIB_DIR" \
-     -cp "junit-4.13.jar:hamcrest-core-1.3.jar:$KIWIX_LIB_JAR:." \
-     org.junit.runner.JUnitCore test \
-  || die "Unit test failed"
--- a/src/wrapper/java/org/kiwix/testing/compile_test.sh
+++ b/src/wrapper/java/org/kiwix/testing/compile_test.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/bash
+
+# This script compile the unit test to test the java wrapper.
+# This is not integrated in meson because ... this is not so easy.
+
+
+KIWIX_LIB_JAR=$1
+if [ -z $KIWIX_LIB_JAR ]
+then
+  echo "You must give the path to the kiwixlib.jar as first argument"
+  exit 1
+fi
+
+KIWIX_LIB_DIR=$2
+if [ -z $KIWIX_LIB_DIR ]
+then
+  echo "You must give the path to directory containing libkiwix.so as second argument"
+  exit 1
+fi
+TEST_SOURCE_DIR=$(dirname $(readlink -f $0))
+
+
+javac -g -d . -s . -cp $TEST_SOURCE_DIR/junit-4.13.jar:$KIWIX_LIB_JAR $TEST_SOURCE_DIR/test.java
+
+java -Djava.library.path=$KIWIX_LIB_DIR -cp $TEST_SOURCE_DIR/junit-4.13.jar:$TEST_SOURCE_DIR/hamcrest-core-1.3.jar:$KIWIX_LIB_JAR:. org.junit.runner.JUnitCore test
+
--- a/src/wrapper/java/org/kiwix/testing/create_test_zimfiles
+++ b/src/wrapper/java/org/kiwix/testing/create_test_zimfiles
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-die()
-{
-  echo >&2 "!!! ERROR: $*"
-  exit 1
-}
-
-cd "$(dirname "$0")"
-rm -f small.zim
-zimwriterfs --withoutFTIndex \
-            -w main.html \
-            -f favicon.png \
-            -l en \
-            -t "Test ZIM file" \
-            -d "N/A" \
-            -c "N/A" \
-            -p "N/A" \
-            small_zimfile_data \
-            small.zim \
-&& echo 'small.zim was successfully created' \
-|| die 'Failed to create small.zim'
-
-printf "BEGINZIM" > small.zim.embedded \
-&& cat small.zim >> small.zim.embedded \
-&& printf "ENDZIM" >> small.zim.embedded \
-&& echo 'small.zim.embedded was successfully created' \
-|| die 'Failed to create small.zim.embedded'
--- a/src/wrapper/java/org/kiwix/testing/small.zim
+++ b/src/wrapper/java/org/kiwix/testing/small.zim
--- a/src/wrapper/java/org/kiwix/testing/small.zim.embedded
+++ b/src/wrapper/java/org/kiwix/testing/small.zim.embedded
--- a/src/wrapper/java/org/kiwix/testing/small_zimfile_data/favicon.png
+++ b/src/wrapper/java/org/kiwix/testing/small_zimfile_data/favicon.png
--- a/src/wrapper/java/org/kiwix/testing/small_zimfile_data/main.html
+++ b/src/wrapper/java/org/kiwix/testing/small_zimfile_data/main.html
@@ -1,11 +0,0 @@
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <title>Test ZIM file</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  </head>
-
-  <body>
-    Test ZIM file
-  </body>
-</html>
--- a/src/wrapper/java/org/kiwix/testing/test.java
+++ b/src/wrapper/java/org/kiwix/testing/test.java
@@ -10,143 +10,36 @@ static {
  System.loadLibrary("kiwix");
 }

-private static byte[] getFileContent(String path)
+private static String getCatalogContent()
 throws IOException
 {
-  File file = new File(path);
-  DataInputStream in = new DataInputStream(
-                         new BufferedInputStream(
-                           new FileInputStream(file)));
-  byte[] data = new byte[(int)file.length()];
-  in.read(data);
-  return data;
-}
-
-private static byte[] getFileContentPartial(String path, int offset, int size)
-throws IOException
-{
-  File file = new File(path);
-  DataInputStream in = new DataInputStream(
-                         new BufferedInputStream(
-                           new FileInputStream(file)));
-  byte[] data = new byte[size];
-  in.skipBytes(offset);
-  in.read(data, 0, size);
-  return data;
-}
-
-private static String getTextFileContent(String path)
-throws IOException
-{
-  return new String(getFileContent(path));
+  BufferedReader reader = new BufferedReader(new FileReader("catalog.xml"));
+  String line;
+  StringBuilder sb = new StringBuilder();
+  while ((line = reader.readLine()) != null)
+  {
+    sb.append(line + "\n");
+  }
+  reader.close();
+  return sb.toString();
 }

@Test
-public void testReader()
-throws JNIKiwixException, IOException
-{
-  JNIKiwixReader reader = new JNIKiwixReader("small.zim");
-  assertEquals("Test ZIM file", reader.getTitle());
-  assertEquals(45, reader.getFileSize()); // The file size is in KiB
-  assertEquals("A/main.html", reader.getMainPage());
-  String s = getTextFileContent("small_zimfile_data/main.html");
-  byte[] c = reader.getContent(new JNIKiwixString("A/main.html"),
-                                new JNIKiwixString(),
-                                new JNIKiwixString(),
-                                new JNIKiwixInt());
-  assertEquals(s, new String(c));
-
-  byte[] faviconData = getFileContent("small_zimfile_data/favicon.png");
-  assertEquals(faviconData.length, reader.getArticleSize("I/favicon.png"));
-  c = reader.getContent(new JNIKiwixString("I/favicon.png"),
-                                new JNIKiwixString(),
-                                new JNIKiwixString(),
-                                new JNIKiwixInt());
-  assertTrue(Arrays.equals(faviconData, c));
-
-  DirectAccessInfo dai = reader.getDirectAccessInformation("I/favicon.png");
-  assertNotEquals("", dai.filename);
-  c = getFileContentPartial(dai.filename, (int)dai.offset, faviconData.length);
-  assertTrue(Arrays.equals(faviconData, c));
-}
-
-@Test
-public void testReaderByFd()
-throws JNIKiwixException, IOException
-{
-  FileInputStream fis = new FileInputStream("small.zim");
-  JNIKiwixReader reader = new JNIKiwixReader(fis.getFD());
-  assertEquals("Test ZIM file", reader.getTitle());
-  assertEquals(45, reader.getFileSize()); // The file size is in KiB
-  assertEquals("A/main.html", reader.getMainPage());
-  String s = getTextFileContent("small_zimfile_data/main.html");
-  byte[] c = reader.getContent(new JNIKiwixString("A/main.html"),
-                                new JNIKiwixString(),
-                                new JNIKiwixString(),
-                                new JNIKiwixInt());
-  assertEquals(s, new String(c));
-
-  byte[] faviconData = getFileContent("small_zimfile_data/favicon.png");
-  assertEquals(faviconData.length, reader.getArticleSize("I/favicon.png"));
-  c = reader.getContent(new JNIKiwixString("I/favicon.png"),
-                                new JNIKiwixString(),
-                                new JNIKiwixString(),
-                                new JNIKiwixInt());
-  assertTrue(Arrays.equals(faviconData, c));
-
-  DirectAccessInfo dai = reader.getDirectAccessInformation("I/favicon.png");
-  assertNotEquals("", dai.filename);
-  c = getFileContentPartial(dai.filename, (int)dai.offset, faviconData.length);
-  assertTrue(Arrays.equals(faviconData, c));
-}
-
-@Test
-public void testReaderWithAnEmbeddedArchive()
-throws JNIKiwixException, IOException
-{
-  File plainArchive = new File("small.zim");
-  FileInputStream fis = new FileInputStream("small.zim.embedded");
-  JNIKiwixReader reader = new JNIKiwixReader(fis.getFD(), 8, plainArchive.length());
-  assertEquals("Test ZIM file", reader.getTitle());
-  assertEquals(45, reader.getFileSize()); // The file size is in KiB
-  assertEquals("A/main.html", reader.getMainPage());
-  String s = getTextFileContent("small_zimfile_data/main.html");
-  byte[] c = reader.getContent(new JNIKiwixString("A/main.html"),
-                                new JNIKiwixString(),
-                                new JNIKiwixString(),
-                                new JNIKiwixInt());
-  assertEquals(s, new String(c));
-
-  byte[] faviconData = getFileContent("small_zimfile_data/favicon.png");
-  assertEquals(faviconData.length, reader.getArticleSize("I/favicon.png"));
-  c = reader.getContent(new JNIKiwixString("I/favicon.png"),
-                                new JNIKiwixString(),
-                                new JNIKiwixString(),
-                                new JNIKiwixInt());
-  assertTrue(Arrays.equals(faviconData, c));
-
-  DirectAccessInfo dai = reader.getDirectAccessInformation("I/favicon.png");
-  assertNotEquals("", dai.filename);
-  c = getFileContentPartial(dai.filename, (int)dai.offset, faviconData.length);
-  assertTrue(Arrays.equals(faviconData, c));
-}
-
-@Test
-public void testLibrary()
+public void testSome()
 throws IOException
 {
  Library lib = new Library();
  Manager manager = new Manager(lib);
-  String content = getTextFileContent("catalog.xml");
-  manager.readOpds(content, "http://localhost");
-  assertEquals(lib.getBookCount(true, true), 1);
+  String content = getCatalogContent();
+  manager.readOpds(content, "https://library.kiwix.org");
+  assertEquals(lib.getBookCount(true, true), 10);
  String[] bookIds = lib.getBooksIds();
-  assertEquals(bookIds.length, 1);
+  assertEquals(bookIds.length, 10);
  Book book = lib.getBookById(bookIds[0]);
-  assertEquals(book.getTitle(), "Test ZIM file");
-  assertEquals(book.getTags(), "unit;test");
-  assertEquals(book.getFaviconUrl(), "http://localhost/meta?name=favicon&content=small");
-  assertEquals(book.getUrl(), "http://localhost/small.zim");
+  assertEquals(book.getTitle(), "Wikisource");
+  assertEquals(book.getTags(), "wikisource;_category:wikisource;_pictures:no;_videos:no;_details:yes;_ftindex:yes");
+  assertEquals(book.getFaviconUrl(), "https://library.kiwix.org/meta?name=favicon&content=wikisource_fr_all_nopic_2020-01");
+  assertEquals(book.getUrl(), "http://download.kiwix.org/zim/wikisource/wikisource_fr_all_nopic_2020-01.zim.meta4");
 }

 static
--- a/src/wrapper/java/utils.h
+++ b/src/wrapper/java/utils.h
@@ -24,7 +24,7 @@

 #include <jni.h>

-#include <mutex>
+#include <pthread.h>
 #include <string>
 #include <vector>
 #include <iostream>
@@ -36,7 +36,7 @@
 #define LOG(...)
 #endif

-extern std::mutex globalLock;
+extern pthread_mutex_t globalLock;

 template<typename T>
 void setPtr(JNIEnv* env, jobject thisObj, T* ptr)
@@ -88,10 +88,22 @@ inline jobjectArray createArray(JNIEnv* env, size_t length, const std::string& t
  return env->NewObjectArray(length, c, NULL);
 }

-class Lock : public std::unique_lock<std::mutex>
+class Lock
 {
+ protected:
+  pthread_mutex_t* lock;
+
 public:
-  Lock() : std::unique_lock<std::mutex>(globalLock) { }
+  Lock() : lock(&globalLock) { pthread_mutex_lock(lock); }
+  Lock(const Lock&) = delete;
+  Lock& operator=(const Lock&) = delete;
+  Lock(Lock&& other) : lock(&globalLock) { other.lock = nullptr; }
+  virtual ~Lock()
+  {
+    if (lock) {
+      pthread_mutex_unlock(lock);
+    }
+  }
 };

 template <class T>
@@ -246,7 +258,7 @@ inline void setBoolObjValue(const bool value, const jobject obj, JNIEnv* env)
  env->SetIntField(obj, objFid, c2jni(value, env));
 }

-inline void setDaiObjValue(const std::string& filename, const long offset,
+inline void setPairObjValue(const std::string& filename, const long offset,
                            const jobject obj, JNIEnv* env)
 {
  jclass objClass = env->GetObjectClass(obj);
--- a/src/xmlrpc.h
+++ b/src/xmlrpc.h
@@ -3,7 +3,6 @@
 #ifndef KIWIX_XMLRPC_H_
 #define KIWIX_XMLRPC_H_

-#include <stdexcept>
 #include <tools/otherTools.h>
 #include <pugixml.hpp>

--- a/Show More
+++ b/Show More