added nofilter attribute and iframe conditions

2025-12-24 06:57:59 -05:00 · 2021-07-15 13:49:49 +05:30
241 changed files with 33540 additions and 15468 deletions
--- a/.github/move.yml
+++ b/.github/move.yml
@@ -0,0 +1,27 @@
+# Configuration for Move Issues - https://github.com/dessant/move-issues
+
+# Delete the command comment when it contains no other content
+deleteCommand: true
+
+# Close the source issue after moving
+closeSourceIssue: true
+
+# Lock the source issue after moving
+lockSourceIssue: false
+
+# Mention issue and comment authors
+mentionAuthors: true
+
+# Preserve mentions in the issue content
+keepContentMentions: true
+
+# Move labels that also exist on the target repository
+moveLabels: true
+
+# Set custom aliases for targets
+# aliases:
+#   r: repo
+#   or: owner/repo
+
+# Repository to extend settings from
+# _extends: repo
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,25 +1,21 @@
 name: CI

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

 jobs:
  Macos:
    runs-on: macos-latest
    steps:
      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Setup python 3.9
+        uses: actions/checkout@v1
+      - name: Setup python 3.5
        uses: actions/setup-python@v1
        with:
-          python-version: '3.9'
+          python-version: '3.5'
      - name: Install packages
        run: |
          brew update
-          brew install gcovr pkg-config ninja || brew link --overwrite python
+          brew install gcovr pkg-config ninja
      - name: Install python modules
        run: pip3 install meson==0.49.2 pytest
      - name: Install deps
@@ -41,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:
@@ -51,6 +56,7 @@ jobs:
        name:
          - native_static
          - native_dyn
+          - native_dyn_bionic
          - android_arm
          - android_arm64
          - win32_static
@@ -58,34 +64,42 @@ jobs:
        include:
          - name: native_static
            target: native_static
-            image_variant: bionic
+            image_variant: xenial
            lib_postfix: '/x86_64-linux-gnu'
          - name: native_dyn
+            target: native_dyn
+            image_variant: xenial
+            lib_postfix: '/x86_64-linux-gnu'
+          - name: native_dyn_bionic
            target: native_dyn
            image_variant: bionic
            lib_postfix: '/x86_64-linux-gnu'
          - name: android_arm
            target: android_arm
-            image_variant: bionic
-            lib_postfix: '/arm-linux-androideabi'
+            image_variant: xenial
+            lib_postfix: '/x86_64-linux-gnu'
          - name: android_arm64
            target: android_arm64
-            image_variant: bionic
-            lib_postfix: '/aarch64-linux-android'
+            image_variant: xenial
+            lib_postfix: '/x86_64-linux-gnu'
          - name: win32_static
            target: win32_static
-            image_variant: f35
+            image_variant: f31
            lib_postfix: '64'
          - name: win32_dyn
            target: win32_dyn
-            image_variant: f35
+            image_variant: f31
            lib_postfix: '64'
    env:
      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
+      run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+      id: extract_branch
    - name: Checkout code
      shell: python
      run: |
@@ -95,7 +109,7 @@ jobs:
          'git', 'clone',
          'https://github.com/${{github.repository}}',
          '--depth=1',
-          '--branch', '${{ github.head_ref || github.ref_name }}'
+          '--branch', '${{steps.extract_branch.outputs.branch}}'
        ]
        check_call(command, cwd=environ['HOME'])
    - name: Install deps
@@ -118,7 +132,7 @@ jobs:
          MESON_OPTION="$MESON_OPTION --cross-file $HOME/BUILD_${{matrix.target}}/meson_cross_file.txt"
        fi
        if [[ "${{matrix.target}}" =~ android_.* ]]; then
-          MESON_OPTION="$MESON_OPTION -Dstatic-linkage=true"
+          MESON_OPTION="$MESON_OPTION -Dandroid=true"
        fi
        cd $HOME/libkiwix
        meson . build ${MESON_OPTION}
@@ -144,6 +158,6 @@ jobs:
        curl https://codecov.io/bash -o codecov.sh
        bash codecov.sh -n "${OS_NAME}_${{matrix.target}}" -Z
        rm codecov.sh
-      if: startsWith(matrix.target, 'native_')
+      if: startsWith(matrix.target, 'native_') && matrix.image_variant == 'xenial'
      env:
        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -8,8 +8,9 @@ jobs:
      fail-fast: false
      matrix:
        distro:
-          - ubuntu-kinetic
-          - ubuntu-jammy
+          - ubuntu-impish
+          - ubuntu-hirsute
+          - ubuntu-groovy
          - ubuntu-focal
          - ubuntu-bionic
    steps:
@@ -34,18 +35,26 @@ jobs:
          email: release+launchpad@kiwix.org
          distro: ${{ matrix.distro }}

-      - uses: legoktm/gh-action-build-deb@ubuntu-kinetic
-        if: matrix.distro == 'ubuntu-kinetic'
-        name: Build package for ubuntu-kinetic
-        id: build-ubuntu-kinetic
+      - uses: legoktm/gh-action-build-deb@ubuntu-impish
+        if: matrix.distro == 'ubuntu-impish'
+        name: Build package for ubuntu-impish
+        id: build-ubuntu-impish
        with:
          args: --no-sign
          ppa: ${{ steps.ppa.outputs.ppa }}

-      - uses: legoktm/gh-action-build-deb@ubuntu-jammy
-        if: matrix.distro == 'ubuntu-jammy'
-        name: Build package for ubuntu-jammy
-        id: build-ubuntu-jammy
+      - uses: legoktm/gh-action-build-deb@ubuntu-hirsute
+        if: matrix.distro == 'ubuntu-hirsute'
+        name: Build package for ubuntu-hirsute
+        id: build-ubuntu-hirsute
+        with:
+          args: --no-sign
+          ppa: ${{ steps.ppa.outputs.ppa }}
+
+      - 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 }}
@@ -73,8 +82,8 @@ jobs:

      - uses: legoktm/gh-action-dput@master
        name: Upload dev package
-        # Only upload on pushes to git default branch
-        if: github.event_name == 'push' && github.event.ref == 'refs/heads/main' && startswith(matrix.distro, 'ubuntu-')
+        # Only upload on pushes to master
+        if: github.event_name == 'push' && github.event.ref == 'refs/heads/master' && startswith(matrix.distro, 'ubuntu-')
        with:
          gpg_key: ${{ secrets.LAUNCHPAD_GPG }}
          repository: ppa:kiwixteam/dev
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,3 @@ subprojects/googletest-release*
 build/
 .vscode/
 builddir/
-.cache/
-.clangd/
--- a/162
+++ b/162
@@ -1,167 +1,7 @@
-libkiwix 12.0.0
-===============
-
- * [API Break] Remove wrapper around libzim (@mgautierfr #789)
- * Allow kiwix-serve to use custom resource files (@veloman-yunkan #779)
- * Properly handle searchProtocolPrefix when rendering search result (@veloman-yunkan #823)
- * Prevent search on multi language content (@veloman-yunkan #838)
- * Use new `zim::Archive::getMediaCount` from libzim (@mgautierfr #836)
- * Catalog:
-  - Include tags in free text catalog search (@veloman-yunkan #802)
-  - Illustration's url is based on book's uuid (@veloman-yunkan #804)
-  - Cleanup of the opds-dumper (@veloman-yunkan #829)
-  - Allow filtering of catalog content using multiple languages (@veloman-yunkan #841)
-  - Make opds-dumper respect the namemapper (@mgautierfr #837)
- * Server:
-  - Correctly handle `\` in suggestion json generation (@veloman-yunkan #843)
-  - Better http caching (@veloman-yunkan #833)
-  - Make `/suggest` endpoint thread-safe (@veloman-yunkan #834)
-  - Better redirection of main page (@veloman-yunkan #827)
-  - Remove jquery (@mgautierfr @juuz0 #796)
-  - Better Viewer of zim content :
-    . Introduce `/content` endpoints (@veloman-yunkan #806)
-    . Switch to iframe based content viewer (@veloman-yunkan #716)
-  - Optimised design of the welcome page:
-    . Alignement (@juuz0 @kelson42 #786)
-    . Exit download modal on pressing escape key (@juzz0 #800)
-    . Add favicon for different devices (@juzz0 #805)
-    . Fix auto hidding of the toolbar (@veloman-yunkan #821)
-    . Allow user to filter books by tags in the front page (@juuz0 #711)
- * CI :
-   - Trigger CI on pull_request (@kelson42 #791)
-   - Drop Ubuntu Impish packaging (@legoktm #825)
-   - Add Ubuntu Kinetic packaging (@legoktm #801)
- * Testing:
-   - Test ICULanguageInfo (@veloman-yunkan #795)
-   - Introduce fake `test` language to test i18n (@veloman-yunkan #848)
- * Fix documentation (@kelson42 #816)
- * Udpate translation (#787 #839 #847)
-
-
-libkiwix 11.0.0
-===============
-
- * [server] Add support for internationalization (@veloman-yunkan #679)
- * [server] Use gzip compression instead of deflat (mgautierfr #757)
- * [server] Version the static resources. This allow better invalidating
-   browser cache when resources are changed (@veloman-yunkan #712)
- * [server|front] Use integer to query the host for page length (@juuz0 #772)
- * [server] Improve multizim search API:
-   - Improvement of the cache system
-   - Better API to select on which books to search in.
-   - SysAdmin is now able to limit the number of book we search in for a multizim search
- * [server] Introduce a opensearch API for multizim fulltext search
- * [wrapper] Remove java wrapper
- * Testing:
-   - Testing of search result pages content (@veloman-yunkan #765)
-   - Better testing structure of xml search result (@veloman-yunkan #780)
-
-libkiwix 10.1.1
-===============
-
- * Correctly detect the number of article for older zims (<=6) (@mgautier #743)
- * [server] Fix fulltext search (@mgautierfr #724)
- * [server][internal] New way to build Error message (@veloman-yunkan #732 #738 #744)
- * Fix CI (@mgautierfr #736)
-
-libkiwix 10.1.0
-===============
-
- This release is an important one as it fixes a Xss vulnerability introduced
- in libkiwix 10.0.0
-
- * [SECURITY] Fix a Xss attack vulnerability (introduced in 10.0.0) (@juuz0 #721)
- * [server] Add a option to set a limit on the number of connexion per IP (@kelson42 #700)
- * [server] Do not display a lang tag in the UI if the book has no language (@juuz0 #706)
- * [server] Add the book title associated to a search results (@thavelick #705, @mgautierfr #718)
- * Add `dc:issued` to opds output stream (@veloman-yunkan #715)
- * Add handling of several languages not provided by ICU (@juuz0 #701)
- * [server] Add a caching system for search and suggestion (@maneeshpm #620)
- * Fix cross-compilation (@kelson42 #703)
- * Add unit-testing of suggestions and error pages (@veloman-yunkan #709 #710 #727)
- * Better testing system of html response (@veloman-yunkan #725)
-
-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
 ===============
--- a/README.md
+++ b/README.md
@@ -5,12 +5,10 @@ The Libkiwix provides the [Kiwix](https://kiwix.org) software suite
 core. It contains the code shared by all Kiwix ports (Windows,
 GNU/Linux, macOS, Android, iOS, ...).

-[![Release](https://img.shields.io/github/v/tag/kiwix/libkiwix?label=release&sort=semver)](https://download.kiwix.org/release/libkiwix/)
 [![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%3Amain)](https://github.com/kiwix/libkiwix/actions?query=branch%3Amain)
-[![Doc](https://readthedocs.org/projects/libkiwix/badge/?style=flat)](https://libkiwix.readthedocs.org/en/latest/?badge=latest)
+[![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/main/graph/badge.svg)](https://codecov.io/gh/kiwix/libkiwix)
+[![Codecov](https://codecov.io/gh/kiwix/libkiwix/branch/master/graph/badge.svg)](https://codecov.io/gh/kiwix/libkiwix)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)

 Disclaimer
@@ -93,41 +91,6 @@ Meson. If you want statically linked libraries, you can add

 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
-```
-
-Static files compilation
------------------------
-
-Libkiwix has a few static files 'compiled' within the binary
-code. This is mostly Javascript/HTML/pictures necessary for the HTTP
-daemon.
-
-These static files are available in the `static` directory and are
-compiled by custom Python code available in this repository `scripts`
-directory. This happens automatically at compilation time without any
-additional command to run.
-
-To avoid HTTP caching issues, the URLs (to the static content) are
-appended with a `cacheid` parameter (this is called "cache
-busting"). This `cacheid` value derived from the
-[sha1sum](https://en.wikipedia.org/wiki/Sha1sum) of each targeted
-static file. As a consequence, each time you change a static file, the
-corresponding `cacheid` value will change.
-
-To properly test this feature, this `cacheid` needs to be added
-manually to the automated tests and has to be commited. After
-modifying the needed static file, [run the automated
-tests](#Testing). They will fail, but the inspection of the testing
-log will give you the new `cacheid` value(s). Finally update
-`test/server.cpp` with the appropriate `cacheid` value(s) which have
-changed.
-
 Testing
 -------

@@ -151,7 +114,7 @@ where you want to install the libraries. After the installation
 succeeded, you may need to run `ldconfig` (as `root`).

 Uninstallation
--------------
+------------

 If you want to uninstall the Kiwix library:
 ```bash
@@ -161,55 +124,6 @@ ninja -C build uninstall
 Like for the installation, you might need to run the command as `root`
 (or using `sudo`).

-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 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="kiwixButton" 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
-problematic upstream project or even directly from the source code
-repository.
-
 Troubleshooting
 ---------------

@@ -232,6 +146,16 @@ cp ninja ../bin
 cd ..
 ```

+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
+problematic upstream project or even directly from the source code
+repository.
+
 License
 -------

--- a/android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
+++ b/android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
@@ -26,7 +26,7 @@ task writePom {
    project {
        groupId 'org.kiwix.kiwixlib'
        artifactId 'kiwixlib'
-        version '10.1.1' + (System.env.KIWIXLIB_BUILDVERSION == null ? '' : '-'+System.env.KIWIXLIB_BUILDVERSION)
+        version '10.0.0' + (System.env.KIWIXLIB_BUILDVERSION == null ? '' : '-'+System.env.KIWIXLIB_BUILDVERSION)
        packaging 'aar'
        name 'kiwixlib'
        url 'https://github.com/kiwix/libkiwix'
--- 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,
@@ -23,7 +23,7 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libkiwix10 (= ${binary:Version}), ${misc:Depends}, python3,
- libzim-dev (>= 7.2.0~),
+ libzim-dev (>= 6.0.0),
 libicu-dev,
 libpugixml-dev,
 libcurl4-gnutls-dev,
--- a/debian/libkiwix-dev.manpages
+++ b/debian/libkiwix-dev.manpages
@@ -1,2 +1 @@
 usr/share/man/man1/kiwix-compile-resources.1*
-usr/share/man/man1/kiwix-compile-i18n.1*
--- 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 = 'libkiwix-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 libkiwix'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,2 +0,0 @@
-breathe
-exhale
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -1,15 +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, libkiwix 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.
--- a/format_code.sh
+++ b/format_code.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/bash
+
+files=(
+"include/library.h"
+"include/common/stringTools.h"
+"include/common/pathTools.h"
+"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"
+"include/xapianSearcher.h"
+"include/searcher.h"
+"src/library.cpp"
+"src/android/kiwix.cpp"
+"src/android/org/kiwix/kiwixlib/JNIKiwixBool.java"
+"src/android/org/kiwix/kiwixlib/JNIKiwix.java"
+"src/android/org/kiwix/kiwixlib/JNIKiwixString.java"
+"src/android/org/kiwix/kiwixlib/JNIKiwixInt.java"
+"src/searcher.cpp"
+"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"
+"src/manager.cpp"
+"src/reader.cpp"
+)
+
+for i in "${files[@]}"
+do
+  echo $i
+  clang-format -i -style=file $i
+done
--- a/include/book.h
+++ b/include/book.h
@@ -21,54 +21,28 @@
 #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
 {

 class OPDSDumper;
+class Reader;

 /**
 * A class to store information about a book (a zim file)
 */
 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);
-  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;
@@ -94,13 +68,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; }
@@ -121,13 +91,14 @@ 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
+ private:
  std::string getCategoryFromTags() const;
-  const Illustration& getDefaultIllustration() const;

- protected: // data
+ protected:
  std::string m_id;
  std::string m_downloadId;
  std::string m_path;
@@ -148,11 +119,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/entry.h
+++ b/include/entry.h
@@ -0,0 +1,183 @@
+/*
+ * Copyright 2018-2020 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_ENTRY_H
+#define KIWIX_ENTRY_H
+
+#include <stdio.h>
+#include <zim/entry.h>
+#include <zim/item.h>
+#include <exception>
+#include <string>
+
+#include "common.h"
+
+using namespace std;
+
+namespace kiwix
+{
+
+
+class NoEntry : public std::exception {};
+
+/**
+ * A entry represent an.. entry in a zim file.
+ */
+class Entry
+{
+  public:
+    /**
+     * Construct an entry making reference to an zim article.
+     *
+     * @param article a zim::Article object
+     */
+    Entry(zim::Entry entry);
+    virtual ~Entry() = default;
+
+    /**
+     * Get the path of the entry.
+     *
+     * The path is the "key" of an entry.
+     *
+     * @return the path of the entry.
+     */
+    std::string getPath() const { return entry.getPath(); }
+
+    /**
+     * Get the title of the entry.
+     *
+     * @return the title of the entry.
+     */
+    std::string getTitle() const { return entry.getTitle(); }
+
+    /**
+     * Get the content of the entry.
+     *
+     * The string is a copy of the content.
+     * If you don't want to do a copy, use get_blob.
+     *
+     * @return the content of the entry.
+     */
+    std::string getContent() const { return entry.getItem().getData(); }
+
+    /**
+     * Get the blob of the entry.
+     *
+     * A blob make reference to the content without copying it.
+     *
+     * @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); }
+
+    /**
+     * Get the blob of the entry.
+     *
+     * A blob make reference to the content without copying it.
+     *
+     * @param offset The starting offset of the blob.
+     * @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); }
+
+    /**
+     * Get the info for direct access to the content of the 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.
+     *
+     * @return A pair specifying where to read the content.
+     *         The string is the real file to read (may be different that .zim
+     *         file if zim is cut).
+     *         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(); }
+
+    /**
+     * Get the size of the entry.
+     *
+     * @return the size of the entry.
+     */
+    size_type   getSize() const;
+
+    /**
+     * Get the mime_type of the entry.
+     *
+     * @return the mime_type of the entry.
+     */
+    std::string getMimetype() const;
+
+
+    /**
+     * Get if the entry is a redirect entry.
+     *
+     * @return True if the entry is a redirect.
+     */
+    bool isRedirect() const;
+
+    /**
+     * Get if the entry is a link target entry.
+     *
+     * @return True if the entry is a link target.
+     */
+    bool isLinkTarget() const;
+
+    /**
+     * Get if the entry is a deleted entry.
+     *
+     * @return True if the entry is a deleted entry.
+     */
+    bool isDeleted() const;
+
+    /**
+     * Get the entry pointed by this entry.
+     *
+     * @return the entry pointed.
+     * @throw NoEntry if the entry is not a redirected entry.
+     */
+    Entry getRedirectEntry() const;
+
+    /**
+     * Get the final entry pointed by this entry.
+     *
+     * Follow the redirection until a "not redirecting" entry is found.
+     * If the entry is not a redirected entry, return the entry itself.
+     *
+     * @return the final entry.
+     */
+    Entry getFinalEntry() const;
+
+    /**
+     * Get the zim entry wrapped by this (kiwix) entry
+     *
+     * @return the zim entry
+     */
+    const zim::Entry& getZimEntry() const { return entry; }
+
+  private:
+    zim::Entry entry;
+};
+
+}
+
+#endif // KIWIX_ENTRY_H
--- 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,9 +24,7 @@
 #include <vector>
 #include <map>
 #include <memory>
-#include <mutex>
 #include <zim/archive.h>
-#include <zim/search.h>

 #include "book.h"
 #include "bookmark.h"
@@ -106,15 +104,7 @@ class Filter {
    Filter& rejectTags(const Tags& tags);

    Filter& category(std::string category);
-
-    /**
-     *  Set the filter to only accept books in the specified language.
-     *
-     *  Multiple languages can be specified as a comma-separated list (in
-     *  which case a book in any of those languages will match).
-     */
    Filter& lang(std::string lang);
-
    Filter& publisher(std::string publisher);
    Filter& creator(std::string creator);
    Filter& maxSize(size_t size);
@@ -150,34 +140,20 @@ private: // functions
 };


-class ZimSearcher : public zim::Searcher
-{
-  public:
-    explicit ZimSearcher(zim::Searcher&& searcher)
-      : zim::Searcher(searcher)
-    {}
-
-    std::unique_lock<std::mutex> getLock() {
-      return std::unique_lock<std::mutex>(m_mutex);
-    }
-    virtual ~ZimSearcher() = default;
-  private:
-    std::mutex m_mutex;
-};
-
 /**
 * A Library store several books.
 */
 class Library
 {
-  // all data fields must be added in LibraryBase
-  mutable std::mutex m_mutex;
+  std::map<std::string, kiwix::Book> 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;

 public:
-  typedef uint64_t Revision;
  typedef std::vector<std::string> BookIdCollection;
-  typedef std::map<std::string, int> AttributeCounts;
-  typedef std::set<std::string> BookIdSet;

 public:
  Library();
@@ -203,11 +179,6 @@ class Library
   */
  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.
   *
@@ -224,18 +195,12 @@ class Library
   */
  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
+  Book& getBookById(const std::string& id);
  const Book& getBookByPath(const std::string& path) const;
-
-  Book getBookByIdThreadSafe(const std::string& id) const;
-
+  Book& getBookByPath(const std::string& path);
+  std::shared_ptr<Reader> getReaderById(const std::string& id);
  std::shared_ptr<zim::Archive> getArchiveById(const std::string& id);
-  std::shared_ptr<ZimSearcher> getSearcherById(const std::string& id) {
-    return getSearcherByIds(BookIdSet{id});
-  }
-  std::shared_ptr<ZimSearcher> getSearcherByIds(const BookIdSet& ids);

  /**
   * Remove a book from the library.
@@ -277,13 +242,6 @@ class Library
   */
  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.
   *
@@ -319,6 +277,17 @@ class Library
   */
  BookIdCollection getBooksIds() const;

+  /**
+   * 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 BookIdCollection filter(const std::string& search) const;
+
+
  /**
   * Filter the library and return the id of the keep elements.
   *
@@ -338,39 +307,43 @@ class Library
  void sort(BookIdCollection& bookIds, supportedListSortBy sortBy, bool ascending) const;

  /**
-   * Return the current revision of the library.
+   * List books in the library.
   *
-   * The revision of the library is updated (incremented by one) by
-   * the addBook() and removeBookById() operations.
-   *
-   * @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.
   */
-  Revision 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(Revision rev);
+  DEPRECATED BookIdCollection 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) const;

  friend class OPDSDumper;
  friend class libXMLDumper;

-private: // types
-  typedef const std::string& (Book::*BookStrPropMemFn)() const;
-  struct Impl;
-
 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 dropCache(const std::string& bookId);
-
-private: //data
-  std::unique_ptr<Impl> mp_impl;
 };

 }
--- a/include/manager.h
+++ b/include/manager.h
@@ -22,10 +22,10 @@

 #include "book.h"
 #include "library.h"
+#include "reader.h"

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

 namespace pugi {
 class xml_document;
@@ -34,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;
 };

 /**
@@ -60,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.
@@ -73,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.
   *
@@ -163,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
@@ -7,12 +7,14 @@ headers = [
  'libxml_dumper.h',
  'opds_dumper.h',
  'downloader.h',
+  'reader.h',
+  'entry.h',
+  'searcher.h',
  'search_renderer.h',
  'server.h',
  'kiwixserve.h',
  'name_mapper.h',
-  'tools.h',
-  'version.h'
+  'tools.h'
 ]

 install_headers(headers, subdir:'kiwix')
--- 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_dumper.h
+++ b/include/opds_dumper.h
@@ -27,7 +27,7 @@
 #include <pugixml.hpp>

 #include "library.h"
-#include "name_mapper.h"
+#include "reader.h"

 using namespace std;

@@ -42,7 +42,7 @@ class OPDSDumper
 {
 public:
  OPDSDumper() = default;
-  OPDSDumper(Library* library, NameMapper* NameMapper);
+  OPDSDumper(Library* library);
  ~OPDSDumper();

  /**
@@ -59,32 +59,17 @@ class OPDSDumper
   *
   * @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;
+  std::string dumpOPDSFeedV2(const std::vector<std::string>& bookIds, const std::string& query) const;

  /**
   * Dump the categories OPDS feed.
   *
+   * @param categories list of category names
   * @return The OPDS feed.
   */
-  std::string categoriesOPDSFeed() const;
-
-  /**
-   * Dump the languages OPDS feed.
-   *
-   * @return The OPDS feed.
-   */
-  std::string languagesOPDSFeed() const;
+  std::string categoriesOPDSFeed(const std::vector<std::string>& categories) const;

  /**
   * Set the id of the library.
@@ -111,7 +96,6 @@ class OPDSDumper

 protected:
  kiwix::Library* library;
-  kiwix::NameMapper* nameMapper;
  std::string libraryId;
  std::string rootLocation;
  int m_totalResults;
--- a/include/reader.h
+++ b/include/reader.h
@@ -0,0 +1,507 @@
+/*
+ * 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
+ * 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_READER_H
+#define KIWIX_READER_H
+
+#include <stdio.h>
+#include <zim/zim.h>
+#include <zim/archive.h>
+#include <exception>
+#include <map>
+#include <sstream>
+#include <string>
+#include "common.h"
+#include "entry.h"
+
+using namespace std;
+
+namespace kiwix
+{
+
+/**
+ * The SuggestionItem is a helper class that contains the info about a single
+ * suggestion item.
+ */
+class SuggestionItem
+{
+  // Functions
+  // Temporarily making the constructor public until the code move is complete
+  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;
+
+  friend class Reader;
+};
+
+/**
+ * The Reader class is the class who allow to get an entry content from a zim
+ * file.
+ */
+
+using SuggestionsList_t = std::vector<SuggestionItem>;
+class Reader
+{
+ public:
+  /**
+   * Create a Reader to read a zim file specified by zimFilePath.
+   *
+   * @param zimFilePath The path to the zim file to read.
+   *                    The zim file can be splitted (.zimaa, .zimab, ...).
+   *                    In this case, the file path must still point to the
+   *                    unsplitted path as if the file were not splitted
+   *                    (.zim extesion).
+   */
+  explicit 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 Reader(const std::shared_ptr<zim::Archive> archive);
+#ifndef _WIN32
+  explicit Reader(int fd);
+  Reader(int fd, zim::offset_type offset, zim::size_type size);
+#endif
+  ~Reader() = default;
+
+  /**
+   * Get the number of "displayable" entries in the zim file.
+   *
+   * @return If the zim file has a /M/Counter metadata, return the number of
+   *         entries with the 'text/html' MIMEtype specified in the metadata.
+   *         Else return the number of entries in the 'A' namespace.
+   */
+  unsigned int getArticleCount() const;
+
+  /**
+   * Get the number of media in the zim file.
+   *
+   * @return If the zim file has a /M/Counter metadata, return the number of
+   *         entries with the 'image/jpeg', 'image/gif' and 'image/png' in
+   *         the metadata.
+   *         Else return the number of entries in the 'I' namespace.
+   */
+  unsigned int getMediaCount() const;
+
+  /**
+   * Get the number of all entries in the zim file.
+   *
+   * @return Return the number of all the entries, whatever their MIMEtype or
+   *         their namespace.
+   */
+  unsigned int getGlobalCount() const;
+
+  /**
+   * Get the path of the zim file.
+   *
+   * @return the path of the zim file as given in the constructor.
+   */
+  string getZimFilePath() const;
+
+  /**
+   * Get the Id of the zim file.
+   *
+   * @return The uuid stored in the zim file.
+   */
+  string getId() const;
+
+  /**
+   * Get a random page.
+   *
+   * @return A random Entry. The entry is picked from all entries in
+   *         the 'A' namespace.
+   *         The main entry is excluded from the potential results.
+   */
+  Entry getRandomPage() const;
+
+  /**
+   * Get the entry of the main page.
+   *
+   * @return Entry of the main page as specified in the zim file.
+   */
+  Entry getMainPage() const;
+
+  /**
+   * Get the content of a metadata.
+   *
+   * @param[in]  name The name of the metadata.
+   * @param[out] value The value will be set to the content of the metadata.
+   * @return True if it was possible to get the content of the metadata.
+   */
+  bool getMetadata(const string& name, string& value) const;
+
+  /**
+   * Get the name of the zim file.
+   *
+   * @return The name of the zim file as specified in the zim metadata.
+   */
+  string getName() const;
+
+  /**
+   * Get the title of the zim file.
+   *
+   * @return The title of zim file as specified in the zim metadata.
+   *         If no title has been set, return a title computed from the
+   *         file path.
+   */
+  string getTitle() const;
+
+  /**
+   * Get the creator of the zim file.
+   *
+   * @return The creator of the zim file as specified in the zim metadata.
+   */
+  string getCreator() const;
+
+  /**
+   * Get the publisher of the zim file.
+   *
+   * @return The publisher of the zim file as specified in the zim metadata.
+   */
+  string getPublisher() const;
+
+  /**
+   * Get the date of the zim file.
+   *
+   * @return The date of the zim file as specified in the zim metadata.
+   */
+  string getDate() const;
+
+  /**
+   * Get the description of the zim file.
+   *
+   * @return The description of the zim file as specified in the zim metadata.
+   *         If no description has been set, return the subtitle.
+   */
+  string getDescription() const;
+
+  /**
+   * Get the long description of the zim file.
+   *
+   * @return The long description of the zim file as specifed in the zim metadata.
+   */
+  string getLongDescription() const;
+
+  /**
+   * Get the language of the zim file.
+   *
+   * @return The language of the zim file as specified in the zim metadata.
+   */
+  string getLanguage() const;
+
+  /**
+   * Get the license of the zim file.
+   *
+   * @return The license of the zim file as specified in the zim metadata.
+   */
+  string getLicense() const;
+
+  /**
+   * Get the tags of the zim file.
+   *
+   * @param original If true, return the original tags as specified in the zim metadata.
+   *                 Else, try to convert it to the new 'normalized' format.
+   * @return The tags of the zim file.
+   */
+  string getTags(bool original=false) const;
+
+  /**
+   * Get the value (as a string) of a specific tag.
+   *
+   * According to https://wiki.openzim.org/wiki/Tags
+   *
+   * @return The value of the specified tag.
+   * @throw  std::out_of_range if the specified tag is not found.
+   */
+  string getTagStr(const std::string& tagName) const;
+
+  /**
+   * Get the boolean value of a specific tag.
+   *
+   * According to https://wiki.openzim.org/wiki/Tags
+   *
+   * @return The boolean value of the specified tag.
+   * @throw  std::out_of_range if the specified tag is not found.
+   *         std::domain_error if the value of the tag cannot be convert to bool.
+   */
+  bool getTagBool(const std::string& tagName) const;
+
+  /**
+   * Get the relations of the zim file.
+   *
+   * @return The relation of the zim file as specified in the zim metadata.
+   */
+  string getRelation() const;
+
+  /**
+   * Get the flavour of the zim file.
+   *
+   * @return The flavour of the zim file as specified in the zim metadata.
+   */
+  string getFlavour() const;
+
+  /**
+   * Get the source of the zim file.
+   *
+   * @return The source of the zim file as specified in the zim metadata.
+   */
+  string getSource() const;
+
+  /**
+   * Get the scraper of the zim file.
+   *
+   * @return The scraper of the zim file as specified in the zim metadata.
+   */
+  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.
+   *
+   * @param[out] content The content of the favicon.
+   * @param[out] mimeType The mimeType of the favicon.
+   * @return True if a favicon has been found.
+   */
+  bool getFavicon(string& content, string& mimeType) const;
+
+  /**
+   * Get an entry associated to an path.
+   *
+   * @param path The path of the entry.
+   * @return The entry.
+   * @throw NoEntry If no entry correspond to the path.
+   */
+  Entry getEntryFromPath(const std::string& path) const;
+
+  /**
+   * Get an entry associated to an url encoded path.
+   *
+   * Equivalent to `getEntryFromPath(urlDecode(path));`
+   *
+   * @param path The url encoded path.
+   * @return The entry.
+   * @throw NoEntry If no entry correspond to the path.
+   */
+  Entry getEntryFromEncodedPath(const std::string& path) const;
+
+  /**
+   * Get un entry associated to a title.
+   *
+   * @param title The title.
+   * @return The entry
+   * throw NoEntry If no entry correspond to the url.
+   */
+  Entry getEntryFromTitle(const std::string& title) const;
+
+  /**
+   * Search for entries with title starting with prefix (case sensitive).
+   *
+   * Suggestions are stored in an internal vector and can be retrieved using
+   * `getNextSuggestion` method.
+   * This method is not thread safe and is deprecated. Use :
+   * bool searchSuggestions(const string& prefix,
+   *                        unsigned int suggestionsCount,
+   *                        SuggestionsList_t& results);
+   *
+   * @param prefix The prefix to search.
+   * @param suggestionsCount How many suggestions to search for.
+   * @param reset If true, remove previous suggestions in the internal vector.
+   *              If false, add suggestions to the internal vector
+   *              (until internal vector size is suggestionCount (or no more
+   *               suggestion))
+   * @return True if some suggestions have been added to the internal vector.
+   */
+  DEPRECATED bool searchSuggestions(const string& prefix,
+                         unsigned int suggestionsCount,
+                         const bool reset = true);
+
+  /**
+   * Search for entries with title starting with prefix (case sensitive).
+   *
+   * Suggestions are added to the `result` vector.
+   *
+   * @param prefix The prefix to search.
+   * @param suggestionsCount How many suggestions to search for.
+   * @param result The vector where to store the suggestions.
+   * @return True if some suggestions have been added to the vector.
+   */
+
+  bool searchSuggestions(const string& prefix,
+                         unsigned int suggestionsCount,
+                         SuggestionsList_t& resuls);
+
+  /**
+   * Search for entries for the given prefix.
+   *
+   * If the zim file has a internal fulltext index, the suggestions will be
+   * searched using it.
+   * Else the suggestions will be search using `searchSuggestions` while trying
+   * to be smart about case sensitivity (using `getTitleVariants`).
+   *
+   * In any case, suggestions are stored in an internal vector and can be
+   * retrieved using `getNextSuggestion` method.
+   * The internal vector will be reset.
+   * This method is not thread safe and is deprecated. Use :
+   * bool searchSuggestionsSmart(const string& prefix,
+   *                             unsigned int suggestionsCount,
+   *                             SuggestionsList_t& results);
+   *
+   * @param prefix The prefix to search for.
+   * @param suggestionsCount How many suggestions to search for.
+   */
+  DEPRECATED bool searchSuggestionsSmart(const string& prefix,
+                              unsigned int suggestionsCount);
+
+  /**
+   * Search for entries for the given prefix.
+   *
+   * If the zim file has a internal fulltext index, the suggestions will be
+   * searched using it.
+   * Else the suggestions will be search using `searchSuggestions` while trying
+   * to be smart about case sensitivity (using `getTitleVariants`).
+   *
+   * In any case, suggestions are stored in an internal vector and can be
+   * retrieved using `getNextSuggestion` method.
+   * The internal vector will be reset.
+   *
+   * @param prefix The prefix to search for.
+   * @param suggestionsCount How many suggestions to search for.
+   * @param results The vector where to store the suggestions
+   * @return True if some suggestions have been added to the results.
+   */
+   bool searchSuggestionsSmart(const string& prefix,
+                              unsigned int suggestionsCount,
+                              SuggestionsList_t& results);
+
+
+  /**
+   * Check if the path exists in the zim file.
+   *
+   * @param path the path to check.
+   * @return True if the path exists in the zim file.
+   */
+  bool pathExists(const string& path) const;
+
+  /**
+   * Check if the zim file has a embedded fulltext index.
+   *
+   * @return True if the zim file has a embedded fulltext index
+   *         and is not split (else the fulltext is not accessible).
+   */
+  bool hasFulltextIndex() const;
+
+  /**
+   * Get potential case title variations for a title.
+   *
+   * @param title a title.
+   * @return the list of variantions.
+   */
+  std::vector<std::string> getTitleVariants(const std::string& title) const;
+
+  /**
+   * Get the next suggestion title.
+   *
+   * @param[out] title the title of the suggestion.
+   * @return True if title has been set.
+   */
+  DEPRECATED bool getNextSuggestion(string& title);
+
+  /**
+   * Get the next suggestion title and url.
+   *
+   * @param[out] title the title of the suggestion.
+   * @param[out] url the url of the suggestion.
+   * @return True if title and url have been set.
+   */
+  DEPRECATED bool getNextSuggestion(string& title, string& url);
+
+  /**
+   * Get if we can check zim file integrity (has a checksum).
+   *
+   * @return True if zim file have a checksum.
+   */
+  bool canCheckIntegrity() const;
+
+  /**
+   * Check is zim file is corrupted.
+   *
+   * @return True if zim file is corrupted.
+   */
+  bool isCorrupted() const;
+
+  /**
+   * Return the total size of the zim file.
+   *
+   * If zim file is split, return the sum of all parts' size.
+   *
+   * @return Size of the size file is KiB.
+   */
+  unsigned int getFileSize() const;
+
+  /**
+   * Get the zim file handler.
+   *
+   * @return The libzim file handler.
+   */
+  zim::Archive* getZimArchive() const;
+
+ protected:
+  std::shared_ptr<zim::Archive> zimArchive;
+  std::string zimFilePath;
+
+  SuggestionsList_t suggestions;
+  SuggestionsList_t::iterator suggestionsOffset;
+
+ private:
+  std::map<const std::string, unsigned int> parseCounterMetadata() const;
+};
+}
+
+#endif
--- a/include/search_renderer.h
+++ b/include/search_renderer.h
@@ -22,11 +22,11 @@

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

 namespace kiwix
 {

+class Searcher;
 class NameMapper;
 /**
 * The SearcherRenderer class is used to render a search result to a html page.
@@ -35,43 +35,23 @@ class SearchRenderer
 {
 public:
  /**
-   * Construct a SearchRenderer from a SearchResultSet.
+   * The default constructor.
   *
-   * The constructed version of the SearchRenderer will not introduce
-   * the book name for each result. It is better to use the other constructor
-   * with a Library pointer to have a better html page.
-   *
-   * @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
+   * @param humanReadableName The global zim's humanReadableName.
+   *                          Used to generate pagination links.
   */
+  SearchRenderer(Searcher* searcher, NameMapper* mapper);
  SearchRenderer(zim::SearchResultSet srs, NameMapper* mapper,
                 unsigned int start, unsigned int estimatedResultCount);

-  /**
-   * Construct a SearchRenderer from a SearchResultSet.
-   *
-   * @param srs The `SearchResultSet` to render.
-   * @param mapper The `NameMapper` to use to do the rendering.
-   * @param library The `Library` to use to look up book details for search results.
-   * @param start The start offset used for the srs.
-   * @param estimatedResultCount The estimatedResultCount of the whole search
-   */
-  SearchRenderer(zim::SearchResultSet srs, NameMapper* mapper, Library* library,
-                 unsigned int start, unsigned int estimatedResultCount);
-
  ~SearchRenderer();

-  /**
-   * Set the search pattern used to do the search
-   */
  void setSearchPattern(const std::string& pattern);

  /**
-   * Set the querystring used to select books
+   * Set the search content id.
   */
-  void setSearchBookQuery(const std::string& bookQuery);
+  void setSearchContent(const std::string& name);

  /**
   * Set protocol prefix.
@@ -90,25 +70,16 @@ class SearchRenderer
    this->pageLength  = pageLength;
  }

-  std::string renderTemplate(const std::string& tmpl_str);
-
  /**
   * Generate the html page with the resutls of the search.
   */
  std::string getHtml();

-    /**
-   * Generate the xml page with the resutls of the search.
-   */
-  std::string getXml();
-
-
 protected:
  std::string beautifyInteger(const unsigned int number);
  zim::SearchResultSet m_srs;
  NameMapper* mp_nameMapper;
-  Library* mp_library;
-  std::string searchBookQuery;
+  std::string searchContent;
  std::string searchPattern;
  std::string protocolPrefix;
  std::string searchProtocolPrefix;
--- a/include/searcher.h
+++ b/include/searcher.h
@@ -0,0 +1,176 @@
+/*
+ * 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
+ * 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_SEARCHER_H
+#define KIWIX_SEARCHER_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unicode/putil.h>
+#include <algorithm>
+#include <cctype>
+#include <locale>
+#include <string>
+#include <memory>
+#include <vector>
+
+#include <zim/search.h>
+
+using namespace std;
+
+namespace kiwix
+{
+class Reader;
+class Result
+{
+ public:
+  virtual ~Result(){};
+  virtual std::string get_url() = 0;
+  virtual std::string get_title() = 0;
+  virtual int get_score() = 0;
+  virtual std::string get_snippet() = 0;
+  virtual std::string get_content() = 0;
+  virtual int get_wordCount() = 0;
+  virtual int get_size() = 0;
+  virtual std::string get_zimId() = 0;
+};
+
+struct SearcherInternal;
+/**
+ * The Searcher class is reponsible to do different kind of search using the
+ * fulltext index.
+ */
+class Searcher
+{
+ public:
+  /**
+   * The default constructor.
+   */
+  Searcher();
+
+  ~Searcher();
+
+  /**
+   * Add a reader (containing embedded fulltext index) to the search.
+   *
+   * @param reader The Reader for the zim containing the fulltext index.
+   * @return true if the reader has been added.
+   *         false if the reader cannot be added (no embedded fulltext index present)
+   */
+  bool add_reader(Reader* reader);
+
+
+  Reader* get_reader(int index);
+
+  /**
+   * Start a search on the zim associated to the Searcher.
+   *
+   * Search results should be retrived using the getNextResult method.
+   *
+   * @param search The search query.
+   * @param resultStart the start offset of the search results (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 resultEnd,
+              const bool verbose = false);
+
+  /**
+   * Start a geographique search.
+   * The search return result for entry in a disc of center latitude/longitude
+   * and radius distance.
+   *
+   * Search results should be retrived using the getNextResult method.
+   *
+   * @param latitude The latitude of the center point.
+   * @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 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 resultEnd,
+                  const bool verbose = false);
+
+  /**
+   * Start a suggestion search.
+   * The search made depend of the "version" of the embedded index.
+   *  - If the index is newer enough and have a title namespace, the search is
+   *    made in the titles only.
+   *  - Else the search is made on the whole article content.
+   * In any case, the search is made "partial" (as adding '*' at the end of the query)
+   *
+   * @param search The search query.
+   * @param verbose print some info on stdout if true.
+   */
+  void suggestions(std::string& search, const bool verbose = false);
+
+  /**
+   * Get the next result of a started search.
+   * This is the method to use to loop hover the search results.
+   */
+  Result* getNextResult();
+
+  /**
+   * Restart the previous search.
+   * Next call to getNextResult will return the first result.
+   */
+  void restart_search();
+
+  /**
+   * Get a estimation of the result count.
+   */
+  unsigned int getEstimatedResultCount();
+
+  /**
+   * Get a SearchResultSet object for current search
+   */
+  zim::SearchResultSet getSearchResultSet();
+
+  unsigned int getResultStart() { return resultStart; }
+  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 resultEnd,
+                     const bool verbose = false);
+
+  std::vector<Reader*> readers;
+  std::unique_ptr<SearcherInternal> internal;
+  std::string searchPattern;
+  unsigned int estimatedResultCount;
+  unsigned int resultStart;
+  unsigned int resultEnd;
+
+ private:
+  void reset();
+
+};
+
+
+}
+
+#endif
--- a/include/server.h
+++ b/include/server.h
@@ -54,31 +54,23 @@ namespace kiwix
       void setAddress(const std::string& addr) { m_addr = addr; }
       void setPort(int port) { m_port = port; }
       void setNbThreads(int threads) { m_nbThreads = threads; }
-       void setMultiZimSearchLimit(unsigned int limit) { m_multizimSearchLimit = limit; }
-       void setIpConnectionLimit(int limit) { m_ipConnectionLimit = limit; }
       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;
-       unsigned int m_multizimSearchLimit = 0;
       bool m_verbose = false;
       bool m_withTaskbar = true;
       bool m_withLibraryButton = true;
       bool m_blockExternalLinks = false;
-       int m_ipConnectionLimit = 0;
       std::unique_ptr<InternalServer> mp_server;
  };
 }
--- a/include/tools.h
+++ b/include/tools.h
@@ -22,7 +22,6 @@

 #include <string>
 #include <vector>
-#include <map>

 namespace kiwix {

@@ -168,53 +167,5 @@ std::vector<std::string> split(const std::string& str, const std::string& delims
 * @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/meson.build
+++ b/meson.build
@@ -1,20 +1,29 @@
 project('libkiwix', 'cpp',
-  version : '12.0.0',
+  version : '10.0.0', # Also change this in android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
  license : 'GPLv3+',
  default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])

 compiler = meson.get_compiler('cpp')

-static_deps = get_option('static-linkage') or get_option('default_library') == 'static'
+wrapper = get_option('wrapper')

-# See https://github.com/kiwix/libkiwix/issues/371
-if ['arm', 'mips', 'm68k', 'ppc', 'sh4'].contains(host_machine.cpu_family())
-  extra_libs = ['-latomic']
+static_deps = wrapper.contains('android') or wrapper.contains('java') or get_option('default_library') == 'static'
+if wrapper.contains('android')
+  extra_libs = ['-llog']
 else
  extra_libs = []
 endif

-if (compiler.get_id() == 'gcc' and build_machine.system() == 'linux') or host_machine.system() == 'freebsd'
+if wrapper.contains('java')
+  add_languages('java')
+endif
+
+# See https://github.com/kiwix/libkiwix/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
@@ -35,19 +44,19 @@ else
  error('Cannot found header mustache.hpp')
 endif

-libzim_dep = dependency('libzim', version : '>=8.1.0', static:static_deps)
+libzim_dep = dependency('libzim', version : '>=7.0.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 host_machine.system() == 'windows' and static_deps
+if target_machine.system() == 'windows' and static_deps
  add_project_arguments('-DCURL_STATICLIB', language : 'cpp')
  extra_cflags += '-DCURL_STATICLIB'
 endif

-if host_machine.system() == 'windows'
+if target_machine.system() == 'windows'
  add_project_arguments('-DNOMINMAX', language: 'cpp')
 endif

@@ -56,7 +65,7 @@ all_deps = [thread_dep, libicu_dep, libzim_dep, pugixml_dep, libcurl_dep, microh
 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']
@@ -69,9 +78,6 @@ 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']

--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,2 @@
-option('static-linkage', type : 'boolean', value : false,
-  description : 'Link statically with the dependencies.')
-option('doc', type : 'boolean', value : false,
-  description : 'Build the documentations.')
+option('wrapper', type:'array', choices:['java', 'android'], value:[],
+  description: 'The wrapper to generate.')
--- a/scripts/format_code.sh
+++ b/scripts/format_code.sh
@@ -1,14 +0,0 @@
-#!/usr/bin/bash
-
-# Compute 'src' path
-SCRIPT_DIR=$(dirname "$0")
-REPO_DIR=$(readlink -f "$SCRIPT_DIR"/..)
-DIRS="src include"
-
-# Apply formating to all *.cpp and *.h files
-cd "$REPO_DIR"
-for FILE in $(find $DIRS -name '*.h' -o -name '*.cpp')
-do
-  echo $FILE
-  clang-format -i -style=file "$FILE"
-done
--- a/scripts/kiwix-compile-i18n
+++ b/scripts/kiwix-compile-i18n
@@ -1,148 +0,0 @@
-#!/usr/bin/env python3
-
-'''
-Copyright 2022 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.
-'''
-
-import argparse
-import os.path
-import re
-import json
-
-def to_identifier(name):
-    ident = re.sub(r'[^0-9a-zA-Z]', '_', name)
-    if ident[0].isnumeric():
-        return "_"+ident
-    return ident
-
-def lang_code(filename):
-    filename = os.path.basename(filename)
-    lang = to_identifier(os.path.splitext(filename)[0])
-    print(filename, '->', lang)
-    return lang
-
-from string import Template
-
-def expand_cxx_template(t, **kwargs):
-    return Template(t).substitute(**kwargs)
-
-def cxx_string_literal(s):
-    # Taking advantage of the fact the JSON string escape rules match
-    # those of C++
-    return 'u8' + json.dumps(s)
-
-string_table_cxx_template = '''
-const I18nString $TABLE_NAME[] = {
-  $TABLE_ENTRIES
-};
-'''
-
-lang_table_entry_cxx_template = '''
-    {
-        $LANG_STRING_LITERAL,
-        ARRAY_ELEMENT_COUNT($STRING_TABLE_NAME),
-        $STRING_TABLE_NAME
-    }'''
-
-cxxfile_template = '''// This file is automatically generated. Do not modify it.
-
-#include "server/i18n.h"
-
-namespace kiwix {
-namespace i18n {
-
-namespace
-{
-
-$STRING_DATA
-
-} // unnamed namespace
-
-#define ARRAY_ELEMENT_COUNT(a) (sizeof(a)/sizeof(a[0]))
-
-extern const I18nStringTable stringTables[] = {
-  $LANG_TABLE
-};
-
-extern const size_t langCount = $LANG_COUNT;
-
-} // namespace i18n
-} // namespace kiwix
-'''
-
-class Resource:
-    def __init__(self, filename):
-        filename = filename.strip()
-        self.filename = filename
-        self.lang_code = lang_code(filename)
-        with open(filename, 'r', encoding='utf-8') as f:
-            self.data = f.read()
-
-    def get_string_table_name(self):
-        return "string_table_for_" + self.lang_code
-
-    def get_string_table(self):
-        table_entries = ",\n  ".join(self.get_string_table_entries())
-        return expand_cxx_template(string_table_cxx_template,
-                    TABLE_NAME=self.get_string_table_name(),
-                    TABLE_ENTRIES=table_entries)
-
-    def get_string_table_entries(self):
-        d = json.loads(self.data)
-        for k in sorted(d.keys()):
-            if k != "@metadata":
-                key_string = cxx_string_literal(k)
-                value_string = cxx_string_literal(d[k])
-                yield '{ ' + key_string + ', ' + value_string + ' }'
-
-    def get_lang_table_entry(self):
-        return expand_cxx_template(lang_table_entry_cxx_template,
-                LANG_STRING_LITERAL=cxx_string_literal(self.lang_code),
-                STRING_TABLE_NAME=self.get_string_table_name())
-
-
-
-def gen_c_file(resources):
-    string_data = []
-    lang_table = []
-    for r in resources:
-        string_data.append(r.get_string_table())
-        lang_table.append(r.get_lang_table_entry())
-
-    return expand_cxx_template(cxxfile_template,
-                STRING_DATA="\n".join(string_data),
-                LANG_TABLE=",\n  ".join(lang_table),
-                LANG_COUNT=len(resources)
-           )
-
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--cxxfile',
-                        required=True,
-                        help='The Cpp file name to generate')
-    parser.add_argument('i18n_resource_files', nargs='+',
-                        help='The list of resources to compile.')
-    args = parser.parse_args()
-
-    resources = [Resource(filename) for filename in args.i18n_resource_files]
-
-    with open(args.cxxfile, 'w') as f:
-        f.write(gen_c_file(resources))
-
--- a/scripts/kiwix-compile-i18n.1
+++ b/scripts/kiwix-compile-i18n.1
@@ -1,18 +0,0 @@
-.TH KIWIX-COMPILE-I18N "1" "January 2022" "Kiwix" "User Commands"
-.SH NAME
-kiwix-compile-i18n \- helper to compile Kiwix i18n (internationalization) data
-.SH SYNOPSIS
-\fBkiwix\-compile\-i18n\fR [\-h] \-\-cxxfile CXXFILE i18n_resource_files ...\fR
-.SH DESCRIPTION
-.TP
-i18n_resource_files ...
-The list of i18n resources to compile.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show a help message and exit
-.TP
-\fB\-\-cxxfile\fR CXXFILE
-The Cpp file name to generate
-.TP
-.SH AUTHOR
-Veloman Yunkan <veloman.yunkan@gmail.com>
--- a/scripts/kiwix-compile-resources
+++ b/scripts/kiwix-compile-resources
@@ -52,21 +52,15 @@ resource_getter_template = """
        return RESOURCE::{identifier};
 """

-resource_cacheid_getter_template = """
-    if (name == "{common_name}")
-        return "{cacheid}";
-"""
-
 resource_decl_template = """{namespaces_open}
 extern const std::string {identifier};
 {namespaces_close}"""

 class Resource:
-    def __init__(self, base_dirs, filename, cacheid=None):
-        filename = filename
+    def __init__(self, base_dirs, filename):
+        filename = filename.strip()
        self.filename = filename
        self.identifier = full_identifier(filename)
-        self.cacheid = cacheid
        found = False
        for base_dir in base_dirs:
            try:
@@ -77,7 +71,7 @@ class Resource:
            except FileNotFoundError:
                continue
        if not found:
-            raise Exception("Resource not found: {}".format(filename))
+            raise Exception("Impossible to found {}".format(filename))

    def dump_impl(self):
        nb_row = len(self.data)//16 + (1 if len(self.data) % 16 else 0)
@@ -99,12 +93,6 @@ class Resource:
            identifier="::".join(self.identifier)
        )

-    def dump_cacheid_getter(self):
-        return resource_cacheid_getter_template.format(
-            common_name=self.filename,
-            cacheid=self.cacheid
-        )
-
    def dump_decl(self):
        return resource_decl_template.format(
            namespaces_open=" ".join("namespace {} {{".format(id) for id in self.identifier[:-1]),
@@ -114,7 +102,7 @@ class Resource:



-master_c_template = """//This file is automatically generated. Do not modify it.
+master_c_template = """//This file is automaically generated. Do not modify it.

 #include <stdlib.h>
 #include <fstream>
@@ -135,12 +123,7 @@ static std::string init_resource(const char* name, const unsigned char* content,

 const std::string& getResource_{basename}(const std::string& name) {{
 {RESOURCES_GETTER}
-    throw ResourceNotFound("Resource not found: " + name);
-}}
-
-const char* getResourceCacheId_{basename}(const std::string& name) {{
-{RESOURCE_CACHEID_GETTER}
-    return nullptr;
+    throw ResourceNotFound("Resource not found.");
 }}

 {RESOURCES}
@@ -151,7 +134,6 @@ def gen_c_file(resources, basename):
    return master_c_template.format(
       RESOURCES="\n\n".join(r.dump_impl() for r in resources),
       RESOURCES_GETTER="\n\n".join(r.dump_getter() for r in resources),
-       RESOURCE_CACHEID_GETTER="\n\n".join(r.dump_cacheid_getter() for r in resources if r.cacheid is not None),
       include_file=basename,
       basename=to_identifier(basename)
    )
@@ -177,10 +159,8 @@ class ResourceNotFound : public std::runtime_error {{
 }};

 const std::string& getResource_{basename}(const std::string& name);
-const char* getResourceCacheId_{basename}(const std::string& name);

 #define getResource(a) (getResource_{basename}(a))
-#define getResourceCacheId(a) (getResourceCacheId_{basename}(a))

 #endif // KIWIX_{BASENAME}

@@ -209,8 +189,8 @@ if __name__ == "__main__":
    base_dir = os.path.dirname(os.path.realpath(args.resource_file))
    source_dir = args.source_dir or []
    with open(args.resource_file, 'r') as f:
-        resources = [Resource([base_dir]+source_dir, *line.strip().split())
-                        for line in f.readlines()]
+        resources = [Resource([base_dir]+source_dir, filename)
+                        for filename in f.readlines()]

    h_identifier = to_identifier(os.path.basename(args.hfile))
    with open(args.hfile, 'w') as f:
--- a/scripts/kiwix-resources
+++ b/scripts/kiwix-resources
@@ -1,135 +0,0 @@
-#!/usr/bin/env python3
-
-'''
-Copyright 2022 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.
-'''
-
-import argparse
-import hashlib
-import os.path
-import re
-
-def read_resource_file(resource_file_path):
-    with open(resource_file_path, 'r') as f:
-        return [line.strip() for line in f]
-
-def list_resources(resource_file_path):
-    for resource_path in read_resource_file(resource_file_path):
-        print(resource_path)
-
-def compute_resource_revision(resource_path):
-    with open(os.path.join(OUT_DIR, resource_path), 'rb') as f:
-        return hashlib.sha1(f.read()).hexdigest()[:8]
-
-resource_revisions = {}
-
-def get_resource_revision(res):
-    if not res in resource_revisions:
-        preprocess_resource(res)
-        resource_revisions[res] = compute_resource_revision(res)
-    return resource_revisions[res]
-
-RESOURCE_WITH_CACHEID_URL_PATTERN=r'(?P<pre>.*/(?P<resource>skin/[^"?]+)\?)KIWIXCACHEID(?P<post>[^"]*)'
-
-def set_cacheid(resource_matchobj):
-    pre = resource_matchobj.group('pre')
-    resource = resource_matchobj.group('resource')
-    post = resource_matchobj.group('post')
-    cacheid = 'cacheid=' + get_resource_revision(resource)
-    return pre + cacheid + post
-
-def preprocess_text(s):
-    if 'KIWIXCACHEID' in s:
-        s = re.sub(RESOURCE_WITH_CACHEID_URL_PATTERN, set_cacheid, s)
-        assert not 'KIWIXCACHEID' in s
-    return s
-
-def get_preprocessed_resource(srcpath):
-    """Get the transformed content of a resource
-
-    If the resource at srcpath is modified by preprocessing then this function
-    returns the transformed content of the resource. Otherwise it returns None.
-    """
-    try:
-        with open(srcpath, 'r') as resource_file:
-            content = resource_file.read()
-            preprocessed_content = preprocess_text(content)
-        return preprocessed_content if preprocessed_content != content else None
-    except UnicodeDecodeError:
-        # It was a binary resource
-        return None
-
-
-def symlink_resource(src, resource_path):
-    if os.path.exists(resource_path):
-        if os.path.islink(resource_path) and os.readlink(resource_path) == src:
-            return
-        os.remove(resource_path)
-    os.symlink(src, resource_path)
-
-def preprocess_resource(resource_path):
-    print('Preprocessing', resource_path, '...')
-    resource_dir = os.path.dirname(resource_path)
-    if resource_dir != '':
-        os.makedirs(os.path.join(OUT_DIR, resource_dir), exist_ok=True)
-    srcpath = os.path.join(BASE_DIR, resource_path)
-    outpath = os.path.join(OUT_DIR, resource_path)
-    if os.path.exists(outpath):
-        os.remove(outpath)
-    preprocessed_content = get_preprocessed_resource(srcpath)
-    if preprocessed_content is None:
-        symlink_resource(srcpath, outpath)
-    else:
-        with open(outpath, 'w') as target:
-            print(preprocessed_content, end='', file=target)
-
-
-def copy_resource_list_file(src_path, dst_path):
-    with open(src_path, 'r') as src:
-        with open(dst_path, 'w') as dst:
-            for line in src:
-                res = line.strip()
-                if line.startswith("skin/") and res in resource_revisions:
-                    dst.write(res + " " + resource_revisions[res] + "\n")
-                else:
-                    dst.write(line)
-
-def preprocess_resources(resource_file_path):
-    resource_filename = os.path.basename(resource_file_path)
-    for resource in read_resource_file(resource_file_path):
-        if resource.startswith('skin/'):
-            get_resource_revision(resource)
-        else:
-            preprocess_resource(resource)
-    copy_resource_list_file(resource_file_path, os.path.join(OUT_DIR, resource_filename))
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser()
-    commands = parser.add_mutually_exclusive_group()
-    commands.add_argument('--list-all', action='store_true')
-    commands.add_argument('--preprocess', action='store_true')
-    parser.add_argument('--outdir')
-    parser.add_argument('resource_file')
-    args = parser.parse_args()
-    BASE_DIR = os.path.dirname(os.path.realpath(args.resource_file))
-    OUT_DIR = args.outdir
-
-    if args.list_all:
-        list_resources(args.resource_file)
-    elif args.preprocess:
-        preprocess_resources(args.resource_file)
--- a/scripts/meson.build
+++ b/scripts/meson.build
@@ -1,13 +1,6 @@

-res_manager = find_program('kiwix-resources')
 res_compiler = find_program('kiwix-compile-resources')

 install_data(res_compiler.path(), install_dir:get_option('bindir'))

 install_man('kiwix-compile-resources.1')
-
-i18n_compiler = find_program('kiwix-compile-i18n')
-
-install_data(i18n_compiler.path(), install_dir:get_option('bindir'))
-
-install_man('kiwix-compile-i18n.1')
--- a/src/aria2.cpp
+++ b/src/aria2.cpp
@@ -3,14 +3,12 @@
 #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

 #ifdef _WIN32
@@ -32,7 +30,7 @@ namespace kiwix {
 Aria2::Aria2():
  mp_aria(nullptr),
  m_port(42042),
-  m_secret(getNewRpcSecret()),
+  m_secret("kiwixariarpc"),
  m_curlErrorBuffer(new char[CURL_ERROR_SIZE]),
  mp_curl(nullptr)
 {
@@ -70,7 +68,7 @@ Aria2::Aria2():
  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());
@@ -197,13 +195,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
@@ -37,7 +37,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
@@ -18,6 +18,7 @@
 */

 #include "book.h"
+#include "reader.h"

 #include "tools.h"
 #include "tools/base64.h"
@@ -26,10 +27,7 @@
 #include "tools/otherTools.h"
 #include "tools/stringTools.h"
 #include "tools/pathTools.h"
-#include "tools/archiveTools.h"

-#include <zim/archive.h>
-#include <zim/item.h>
 #include <pugixml.hpp>

 namespace kiwix
@@ -40,17 +38,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)
@@ -59,38 +51,55 @@ 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_category = other.m_category;
+  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 zim::Archive& archive) {
-  m_path = archive.getFilename();
+void Book::update(const kiwix::Reader& reader)
+{
+  m_path = reader.getZimFilePath();
  m_pathValid = true;
-  m_id = std::string(archive.getUuid());
-  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_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_category = getCategoryFromTags();
-  m_articleCount = archive.getArticleCount();
-  m_mediaCount = archive.getMediaCount();
-  m_size = static_cast<uint64_t>(getArchiveFileSize(archive)) << 10;
+  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_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()
@@ -102,7 +111,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");
@@ -117,14 +126,9 @@ 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(...) {}
@@ -155,9 +159,7 @@ void Book::updateFromOpds(const pugi::xml_node& node, const std::string& urlHost
  m_language = VALUE("language");
  m_creator = node.child("author").child("name").child_value();
  m_publisher = node.child("publisher").child("name").child_value();
-  const std::string dcIssuedDate = VALUE("dc:issued");
-  m_date = dcIssuedDate.empty() ? VALUE("updated") : dcIssuedDate;
-  m_date = fromOpdsDate(m_date);
+  m_date = fromOpdsDate(VALUE("updated"));
  m_name = VALUE("name");
  m_flavour = VALUE("flavour");
  m_tags = VALUE("tags");
@@ -174,11 +176,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();
    }
 }

@@ -189,7 +188,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, "", "^.*\\\\");
@@ -211,54 +210,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 {
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -1,3 +1,3 @@

-#mesondefine LIBKIWIX_VERSION
+#mesondefine VERSION

--- a/src/entry.cpp
+++ b/src/entry.cpp
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2018-2020 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 "reader.h"
+#include <time.h>
+
+namespace kiwix
+{
+
+Entry::Entry(zim::Entry entry)
+  : entry(entry)
+{
+}
+
+size_type Entry::getSize() const
+{
+  if (entry.isRedirect()) {
+    return 0;
+  } else {
+    return entry.getItem().getSize();
+  }
+}
+
+std::string Entry::getMimetype() const
+{
+  return entry.getItem(true).getMimetype();
+}
+
+bool Entry::isRedirect() const
+{
+  return entry.isRedirect();
+}
+
+Entry Entry::getRedirectEntry() const
+{
+  if ( !entry.isRedirect() ) {
+    throw NoEntry();
+  }
+
+  return entry.getRedirectEntry();
+}
+
+Entry Entry::getFinalEntry() const
+{
+  int loopCounter = 42;
+  auto final_entry = entry;
+  while (final_entry.isRedirect() && loopCounter--) {
+    final_entry = final_entry.getRedirectEntry();
+  }
+  // Prevent infinite loops.
+  if (final_entry.isRedirect()) {
+    throw NoEntry();
+  }
+  return final_entry;
+}
+
+}
--- a/src/library.cpp
+++ b/src/library.cpp
@@ -19,6 +19,7 @@

 #include "library.h"
 #include "book.h"
+#include "reader.h"
 #include "libxml_dumper.h"

 #include "tools.h"
@@ -26,13 +27,10 @@
 #include "tools/regexTools.h"
 #include "tools/pathTools.h"
 #include "tools/stringTools.h"
-#include "tools/otherTools.h"
-#include "tools/concurrent_cache.h"

 #include <pugixml.hpp>
 #include <algorithm>
 #include <set>
-#include <cmath>
 #include <unicode/locid.h>
 #include <xapian.h>

@@ -51,152 +49,54 @@ 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();
-}
-
-template<typename Key, typename Value>
-class MultiKeyCache: public ConcurrentCache<std::set<Key>, Value>
-{
-  public:
-    explicit MultiKeyCache(size_t maxEntries)
-      : ConcurrentCache<std::set<Key>, Value>(maxEntries)
-    {}
-
-    bool drop(const Key& key)
-    {
-      std::unique_lock<std::mutex> l(this->lock_);
-      bool removed = false;
-      for(auto& cache_key: this->impl_.keys()) {
-        if(cache_key.find(key)!=cache_key.end()) {
-          removed |= this->impl_.drop(cache_key);
-        }
-      }
-      return removed;
-    }
-};
-
 } // unnamed namespace

-struct Library::Impl
+class Library::BookDB : public Xapian::WritableDatabase
 {
-  struct Entry : Book
-  {
-    Library::Revision lastUpdatedRevision = 0;
-  };
-
-  Library::Revision m_revision;
-  std::map<std::string, Entry> m_books;
-  using ArchiveCache = ConcurrentCache<std::string, std::shared_ptr<zim::Archive>>;
-  std::unique_ptr<ArchiveCache> mp_archiveCache;
-  using SearcherCache = MultiKeyCache<std::string, std::shared_ptr<ZimSearcher>>;
-  std::unique_ptr<SearcherCache> mp_searcherCache;
-  std::vector<kiwix::Bookmark> m_bookmarks;
-  Xapian::WritableDatabase m_bookDB;
-
-  unsigned int getBookCount(const bool localBooks, const bool remoteBooks) const;
-
-  Impl();
-  ~Impl();
-
-  Impl(Impl&& );
-  Impl& operator=(Impl&& );
+public:
+  BookDB() : Xapian::WritableDatabase("", Xapian::DB_BACKEND_INMEMORY) {}
 };

-Library::Impl::Impl()
-  : mp_archiveCache(new ArchiveCache(std::max(getEnvVar<int>("KIWIX_ARCHIVE_CACHE_SIZE", 1), 1))),
-    mp_searcherCache(new SearcherCache(std::max(getEnvVar<int>("KIWIX_SEARCHER_CACHE_SIZE", 1), 1))),
-    m_bookDB("", Xapian::DB_BACKEND_INMEMORY)
-{
-}
-
-Library::Impl::~Impl()
-{
-}
-
-Library::Impl::Impl(Library::Impl&& ) = default;
-Library::Impl& Library::Impl::operator=(Library::Impl&& ) = default;
-
-unsigned int
-Library::Impl::getBookCount(const bool localBooks, const bool remoteBooks) const
-{
-  unsigned int result = 0;
-  for (auto& pair: m_books) {
-    auto& book = pair.second;
-    if ((!book.getPath().empty() && localBooks)
-        || (!book.getUrl().empty() && remoteBooks)) {
-      result++;
-    }
-  }
-  return result;
-}
-
 /* Constructor */
 Library::Library()
-  : mp_impl(new Library::Impl)
+  : m_bookDB(new BookDB)
 {
 }

-Library::Library(Library&& other)
-  : mp_impl(std::move(other.mp_impl))
-{
-}
+Library::Library(Library&& ) = default;

-Library& Library::operator=(Library&& other)
-{
-  mp_impl = std::move(other.mp_impl);
-  return *this;
-}
+Library& Library::operator=(Library&& ) = default;

 /* Destructor */
-Library::~Library() = default;
+Library::~Library()
+{
+}
+

 bool Library::addBook(const Book& book)
 {
-  std::lock_guard<std::mutex> lock(m_mutex);
-  ++mp_impl->m_revision;
  /* Try to find it */
  updateBookDB(book);
  try {
-    auto& oldbook = mp_impl->m_books.at(book.getId());
-    if ( ! booksReferToTheSameArchive(oldbook, book) ) {
-      dropCache(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 = mp_impl->m_revision;
+    auto& oldbook = m_books.at(book.getId());
+    oldbook.update(book);
    return false;
  } catch (std::out_of_range&) {
-    auto& newEntry = mp_impl->m_books[book.getId()];
-    static_cast<Book&>(newEntry) = book;
-    newEntry.lastUpdatedRevision = mp_impl->m_revision;
-    size_t new_cache_size = static_cast<size_t>(std::ceil(mp_impl->getBookCount(true, true)*0.1));
-    if (getEnvVar<int>("KIWIX_ARCHIVE_CACHE_SIZE", -1) <= 0) {
-      mp_impl->mp_archiveCache->setMaxSize(new_cache_size);
-    }
-    if (getEnvVar<int>("KIWIX_SEARCHER_CACHE_SIZE", -1) <= 0) {
-      mp_impl->mp_searcherCache->setMaxSize(new_cache_size);
-    }
+    m_books[book.getId()] = book;
    return true;
  }
 }

 void Library::addBookmark(const Bookmark& bookmark)
 {
-  std::lock_guard<std::mutex> lock(m_mutex);
-  mp_impl->m_bookmarks.push_back(bookmark);
+  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=mp_impl->m_bookmarks.begin(); it!=mp_impl->m_bookmarks.end(); it++) {
+  for(auto it=m_bookmarks.begin(); it!=m_bookmarks.end(); it++) {
    if (it->getBookId() == zimId && it->getUrl() == url) {
-      mp_impl->m_bookmarks.erase(it);
+      m_bookmarks.erase(it);
      return true;
    }
  }
@@ -204,74 +104,29 @@ bool Library::removeBookmark(const std::string& zimId, const std::string& url)
 }


-void Library::dropCache(const std::string& id)
-{
-  mp_impl->mp_archiveCache->drop(id);
-  mp_impl->mp_searcherCache->drop(id);
-}

 bool Library::removeBookById(const std::string& id)
 {
-  std::lock_guard<std::mutex> lock(m_mutex);
-  mp_impl->m_bookDB.delete_document("Q" + id);
-  dropCache(id);
-  // We do not change the cache size here
-  // Most of the time, the book is remove in case of library refresh, it is
-  // often associated with addBook calls (which will properly set the cache size)
-  // Having a too big cache is not a problem here (or it would have been before)
-  // (And setMaxSize doesn't actually reduce the cache size, extra cached items
-  //  will be removed in put or getOrPut).
-  const bool bookWasRemoved = mp_impl->m_books.erase(id) == 1;
-  if ( bookWasRemoved ) {
-    ++mp_impl->m_revision;
-  }
-  return bookWasRemoved;
-}
-
-Library::Revision Library::getRevision() const
-{
-  std::lock_guard<std::mutex> lock(m_mutex);
-  return mp_impl->m_revision;
-}
-
-uint32_t Library::removeBooksNotUpdatedSince(Revision libraryRevision)
-{
-  BookIdCollection booksToRemove;
-  {
-    std::lock_guard<std::mutex> lock(m_mutex);
-    for ( const auto& entry : mp_impl->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;
+  m_bookDB->delete_document("Q" + id);
+  m_readers.erase(id);
+  m_archives.erase(id);
+  return m_books.erase(id) == 1;
 }

 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 mp_impl->m_books.at(id);
+  return m_books.at(id);
 }

-Book Library::getBookByIdThreadSafe(const std::string& id) const
+Book& Library::getBookById(const std::string& id)
 {
-  std::lock_guard<std::mutex> lock(m_mutex);
-  return getBookById(id);
+  const Library& const_self = *this;
+  return const_cast<Book&>(const_self.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: mp_impl->m_books) {
+  for(auto& it: m_books) {
    auto& book = it.second;
    if (book.getPath() == path)
      return book;
@@ -281,112 +136,102 @@ const Book& Library::getBookByPath(const std::string& path) const
  throw std::out_of_range(ss.str());
 }

+Book& Library::getBookByPath(const std::string& path)
+{
+  const Library& const_self = *this;
+  return const_cast<Book&>(const_self.getBookByPath(path));
+}
+
+std::shared_ptr<Reader> Library::getReaderById(const std::string& id)
+{
+  try {
+    return m_readers.at(id);
+  } catch (std::out_of_range& e) {}
+
+  try {
+    auto reader = make_shared<Reader>(m_archives.at(id));
+    m_readers[id] = reader;
+    return reader;
+  } catch (std::out_of_range& e) {}
+
+  auto book = getBookById(id);
+  if (!book.isPathValid())
+    return nullptr;
+
+  auto archive = make_shared<zim::Archive>(book.getPath());
+  m_archives[id] = archive;
+  auto reader = make_shared<Reader>(archive);
+  m_readers[id] = reader;
+  return reader;
+}
+
 std::shared_ptr<zim::Archive> Library::getArchiveById(const std::string& id)
 {
  try {
-    return mp_impl->mp_archiveCache->getOrPut(id,
-    [&](){
-      auto book = getBookById(id);
-      if (!book.isPathValid()) {
-        throw std::invalid_argument("");
-      }
-      return std::make_shared<zim::Archive>(book.getPath());
-    });
-  } catch (std::invalid_argument&) {
-    return nullptr;
-  }
-}
+    return m_archives.at(id);
+  } catch (std::out_of_range& e) {}

-std::shared_ptr<ZimSearcher> Library::getSearcherByIds(const BookIdSet& ids)
-{
-  assert(!ids.empty());
-  try {
-    return mp_impl->mp_searcherCache->getOrPut(ids,
-    [&](){
-      std::vector<zim::Archive> archives;
-      for(auto& id:ids) {
-        auto archive = getArchiveById(id);
-        if(!archive) {
-          throw std::invalid_argument("");
-        }
-        archives.push_back(*archive);
-      }
-      return std::make_shared<ZimSearcher>(zim::Searcher(archives));
-    });
-  } catch (std::invalid_argument&) {
+  auto book = getBookById(id);
+  if (!book.isPathValid())
    return nullptr;
-  }
+
+  auto sptr = make_shared<zim::Archive>(book.getPath());
+  m_archives[id] = sptr;
+  return sptr;
 }

 unsigned int Library::getBookCount(const bool localBooks,
                                   const bool remoteBooks) const
 {
-  std::lock_guard<std::mutex> lock(m_mutex);
-  return mp_impl->getBookCount(localBooks, remoteBooks);
+  unsigned int result = 0;
+  for (auto& pair: m_books) {
+    auto& book = pair.second;
+    if ((!book.getPath().empty() && localBooks)
+        || (book.getPath().empty() && remoteBooks)) {
+      result++;
+    }
+  }
+  return result;
 }

 bool Library::writeToFile(const std::string& path) const
 {
-  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
 {
  LibXMLDumper dumper(this);
-  // NOTE: LibXMLDumper::dumpLibXMLBookmark uses Library in a thread-safe way
-  const std::string xml = dumper.dumpLibXMLBookmark();
-  return writeTextFile(path, xml);
-}
-
-Library::AttributeCounts Library::getBookAttributeCounts(BookStrPropMemFn p) const
-{
-  std::lock_guard<std::mutex> lock(m_mutex);
-  AttributeCounts propValueCounts;
-
-  for (const auto& pair: mp_impl->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;
+  return writeTextFile(path, dumper.dumpLibXMLBookmark());
 }

 std::vector<std::string> Library::getBooksLanguages() const
 {
-  return getBookPropValueSet(&Book::getLanguage);
-}
+  std::vector<std::string> booksLanguages;
+  std::map<std::string, bool> booksLanguagesMap;

-Library::AttributeCounts Library::getBooksLanguagesWithCounts() const
-{
-  return getBookAttributeCounts(&Book::getLanguage);
+  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 booksLanguages;
 }

 std::vector<std::string> Library::getBooksCategories() const
 {
-  std::lock_guard<std::mutex> lock(m_mutex);
  std::set<std::string> categories;

-  for (const auto& pair: mp_impl->m_books) {
+  for (const auto& pair: m_books) {
    const auto& book = pair.second;
    const auto& c = book.getCategory();
    if ( !c.empty() ) {
@@ -399,23 +244,50 @@ std::vector<std::string> Library::getBooksCategories() const

 std::vector<std::string> Library::getBooksCreators() const
 {
-  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
 {
-  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
 {
  if (!onlyValidBookmarks) {
-    return mp_impl->m_bookmarks;
+    return m_bookmarks;
  }
  std::vector<kiwix::Bookmark> validBookmarks;
  auto booksId = getBooksIds();
-  std::lock_guard<std::mutex> lock(m_mutex);
-  for(auto& bookmark:mp_impl->m_bookmarks) {
+  for(auto& bookmark:m_bookmarks) {
    if (std::find(booksId.begin(), booksId.end(), bookmark.getBookId()) != booksId.end()) {
      validBookmarks.push_back(bookmark);
    }
@@ -425,16 +297,24 @@ const std::vector<kiwix::Bookmark> Library::getBookmarks(bool onlyValidBookmarks

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

-  for (auto& pair: mp_impl->m_books) {
+  for (auto& pair: m_books) {
    bookIds.push_back(pair.first);
  }

  return bookIds;
 }

+Library::BookIdCollection Library::filter(const std::string& search) const
+{
+  if (search.empty()) {
+    return getBooksIds();
+  }
+
+  return filter(Filter().query(search));
+}
+

 void Library::updateBookDB(const Book& book)
 {
@@ -466,20 +346,15 @@ void Library::updateBookDB(const Book& book)
  indexer.index_text(normalizeText(book.getName()),      1, "XN");
  indexer.index_text(normalizeText(book.getCategory()),  1, "XC");

-  for ( const auto& tag : split(normalizeText(book.getTags()), ";") ) {
+  for ( const auto& tag : split(normalizeText(book.getTags()), ";") )
    doc.add_boolean_term("XT" + tag);
-    if ( tag[0] != '_' ) {
-      indexer.increase_termpos();
-      indexer.index_text(tag);
-    }
-  }

  const std::string idterm = "Q" + book.getId();
  doc.add_boolean_term(idterm);

  doc.set_data(book.getId());

-  mp_impl->m_bookDB.replace_document(idterm, doc);
+  m_bookDB->replace_document(idterm, doc);
 }

 namespace
@@ -535,20 +410,9 @@ Xapian::Query categoryQuery(const std::string& category)
  return Xapian::Query("XC" + normalizeText(category));
 }

-Xapian::Query langQuery(const std::string& commaSeparatedLanguageList)
+Xapian::Query langQuery(const std::string& lang)
 {
-  Xapian::Query q;
-  bool firstIteration = true;
-  for ( const auto& lang : kiwix::split(commaSeparatedLanguageList, ",") ) {
-    const Xapian::Query singleLangQuery("L" + normalizeText(lang));
-    if ( firstIteration ) {
-      q = singleLangQuery;
-      firstIteration = false;
-    } else {
-      q = Xapian::Query(Xapian::Query::OP_OR, q, singleLangQuery);
-    }
-  }
-  return q;
+  return Xapian::Query("L" + normalizeText(lang));
 }

 Xapian::Query publisherQuery(const std::string& publisher)
@@ -622,10 +486,9 @@ Library::BookIdCollection Library::filterViaBookDB(const Filter& filter) const

  BookIdCollection bookIds;

-  std::lock_guard<std::mutex> lock(m_mutex);
-  Xapian::Enquire enquire(mp_impl->m_bookDB);
+  Xapian::Enquire enquire(*m_bookDB);
  enquire.set_query(query);
-  const auto results = enquire.get_mset(0, mp_impl->m_books.size());
+  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());
  }
@@ -636,10 +499,8 @@ Library::BookIdCollection Library::filterViaBookDB(const Filter& filter) const
 Library::BookIdCollection Library::filter(const Filter& filter) const
 {
  BookIdCollection result;
-  const auto preliminaryResult = filterViaBookDB(filter);
-  std::lock_guard<std::mutex> lock(m_mutex);
-  for(auto id : preliminaryResult) {
-    if(filter.accept(mp_impl->m_books.at(id))) {
+  for(auto id : filterViaBookDB(filter)) {
+    if(filter.accept(m_books.at(id))) {
      result.push_back(id);
    }
  }
@@ -707,11 +568,6 @@ std::string Comparator<PUBLISHER>::get_key(const std::string& id)

 void Library::sort(BookIdCollection& bookIds, supportedListSortBy sort, bool ascending) const
 {
-  // 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));
@@ -734,6 +590,48 @@ void Library::sort(BookIdCollection& bookIds, supportedListSortBy sort, bool asc
 }


+Library::BookIdCollection 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) const {
+
+  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)
--- a/src/libxml_dumper.cpp
+++ b/src/libxml_dumper.cpp
@@ -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
@@ -26,81 +26,28 @@

 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,
@@ -268,8 +215,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 +249,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
@@ -6,7 +6,10 @@ kiwix_sources = [
  'libxml_dumper.cpp',
  'opds_dumper.cpp',
  'downloader.cpp',
+  'reader.cpp',
+  'entry.cpp',
  'server.cpp',
+  'searcher.cpp',
  'search_renderer.cpp',
  'subprocess.cpp',
  'aria2.cpp',
@@ -25,12 +28,9 @@ kiwix_sources = [
  'server/response.cpp',
  'server/internalServer.cpp',
  'server/internalServer_catalog_v2.cpp',
-  'server/i18n.cpp',
-  'opds_catalog.cpp',
-  'version.cpp'
+  'opds_catalog.cpp'
 ]
 kiwix_sources += lib_resources
-kiwix_sources += i18n_resources

 if host_machine.system() == 'windows'
  kiwix_sources += 'subprocess_windows.cpp'
@@ -38,14 +38,22 @@ else
  kiwix_sources += 'subprocess_unix.cpp'
 endif

-install_dir = get_option('libdir')
+if wrapper.contains('android')
+  install_dir = 'kiwix-lib/jniLibs/' + meson.get_cross_property('android_abi')
+else
+  install_dir = get_option('libdir')
+endif
+
+if wrapper.contains('android') or wrapper.contains('java')
+  subdir('wrapper/java')
+endif

 config_h = configure_file(output : 'kiwix_config.h',
               configuration : conf,
               input : 'config.h.in')
 install_headers(config_h, subdir:'kiwix')

-libkiwix = library('kiwix',
+kiwixlib = library('kiwix',
                   kiwix_sources,
                   include_directories : inc,
                   dependencies : all_deps,
--- 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_dumper.cpp
+++ b/src/opds_dumper.cpp
@@ -20,7 +20,7 @@
 #include "opds_dumper.h"
 #include "book.h"

-#include "libkiwix-resources.h"
+#include "kiwixlib-resources.h"
 #include <mustache.hpp>

 #include "tools/stringTools.h"
@@ -30,9 +30,8 @@ namespace kiwix
 {

 /* Constructor */
-OPDSDumper::OPDSDumper(Library* library, NameMapper* nameMapper)
-  : library(library),
-    nameMapper(nameMapper)
+OPDSDumper::OPDSDumper(Library* library)
+  : library(library)
 {
 }
 /* Destructor */
@@ -50,41 +49,25 @@ void OPDSDumper::setOpenSearchInfo(int totalResults, int startIndex, int count)
 namespace
 {

-const std::string XML_HEADER(R"(<?xml version="1.0" encoding="UTF-8"?>)");
-
 typedef kainjow::mustache::data MustacheData;
-typedef kainjow::mustache::list BooksData;
-typedef kainjow::mustache::list IllustrationInfo;
+typedef kainjow::mustache::list BookData;

-IllustrationInfo getBookIllustrationInfo(const Book& book)
+BookData getBookData(const Library* library, const std::vector<std::string>& bookIds)
 {
-    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;
-}
-
-std::string fullEntryXML(const Book& book, const std::string& rootLocation, const std::string& contentId)
-{
-    const auto bookDate = book.getDate() + "T00:00:00Z";
-    const kainjow::mustache::object data{
-      {"root",  rootLocation},
-      {"id", book.getId()},
+  BookData bookData;
+  for ( const auto& bookId : bookIds ) {
+    const Book& book = library->getBookById(bookId);
+    const MustacheData bookUrl = book.getUrl().empty()
+                               ? MustacheData(false)
+                               : MustacheData(book.getUrl());
+    bookData.push_back(kainjow::mustache::object{
+      {"id", "urn:uuid:"+book.getId()},
      {"name", book.getName()},
      {"title", book.getTitle()},
      {"description", book.getDescription()},
      {"language", book.getLanguage()},
-      {"content_id",  urlEncode(contentId)},
-      {"updated", bookDate}, // XXX: this should be the entry update datetime
-      {"book_date", bookDate},
+      {"content_id",  book.getHumanReadableIdFromPath()},
+      {"updated", book.getDate() + "T00:00:00Z"},
      {"category", book.getCategory()},
      {"flavour", book.getFlavour()},
      {"tags", book.getTags()},
@@ -92,155 +75,57 @@ std::string fullEntryXML(const Book& book, const std::string& rootLocation, cons
      {"media_count", to_string(book.getMediaCount())},
      {"author_name", book.getCreator()},
      {"publisher_name", book.getPublisher()},
-      {"url", onlyAsNonEmptyMustacheValue(book.getUrl())},
+      {"url", bookUrl},
      {"size", to_string(book.getSize())},
-      {"icons", getBookIllustrationInfo(book)},
-    };
-    return render_template(RESOURCE::templates::catalog_v2_entry_xml, data);
-}
-
-std::string partialEntryXML(const Book& book, const std::string& rootLocation)
-{
-    const auto bookDate = book.getDate() + "T00:00:00Z";
-    const kainjow::mustache::object data{
-      {"root",  rootLocation},
-      {"endpoint_root", rootLocation + "/catalog/v2"},
-      {"id", book.getId()},
-      {"title", book.getTitle()},
-      {"updated", bookDate}, // XXX: this should be the entry update datetime
-    };
-    const auto xmlTemplate = RESOURCE::templates::catalog_v2_partial_entry_xml;
-    return render_template(xmlTemplate, data);
-}
-
-BooksData getBooksData(const Library* library, const NameMapper* nameMapper, const std::vector<std::string>& bookIds, const std::string& rootLocation, bool partial)
-{
-  BooksData booksData;
-  for ( const auto& bookId : bookIds ) {
-    try {
-      const Book book = library->getBookByIdThreadSafe(bookId);
-      const std::string contentId = nameMapper->getNameForId(bookId);
-      const auto entryXML = partial
-                          ? partialEntryXML(book, rootLocation)
-                          : fullEntryXML(book, rootLocation, contentId);
-      booksData.push_back(kainjow::mustache::object{ {"entry", entryXML} });
-    } catch ( const std::out_of_range& ) {
-      // the book was removed from the library since its id was obtained
-      // ignore it
-    }
+    });
  }

-  return booksData;
+  return bookData;
 }

-std::map<std::string, std::string> iso639_3 = {
-  {"atj", "atikamekw"},
-  {"azb", "آذربایجان دیلی"},
-  {"bcl", "central bikol"},
-  {"bgs", "tagabawa"},
-  {"bxr", "буряад хэлэн"},
-  {"cbk", "chavacano"},
-  {"cdo", "閩東語"},
-  {"dag", "Dagbani"},
-  {"diq", "dimli"},
-  {"dty", "डोटेली"},
-  {"eml", "emiliân-rumagnōl"},
-  {"fbs", "српскохрватски"},
-  {"ido", "ido"},
-  {"kbp", "kabɩyɛ"},
-  {"kld", "Gamilaraay"},
-  {"lbe", "лакку маз"},
-  {"lbj", "ལ་དྭགས་སྐད་"},
-  {"map", "Austronesian"},
-  {"mhr", "марий йылме"},
-  {"mnw", "ဘာသာမန်"},
-  {"myn", "mayan"},
-  {"nah", "nahuatl"},
-  {"nai", "north American Indian"},
-  {"nds", "plattdütsch"},
-  {"nrm", "bhasa narom"},
-  {"olo", "livvi"},
-  {"pih", "Pitcairn-Norfolk"},
-  {"pnb", "Western Panjabi"},
-  {"rmr", "Caló"},
-  {"rmy", "romani shib"},
-  {"roa", "romance languages"},
-  {"twi", "twi"}
-};
-
-std::once_flag fillLanguagesFlag;
-
-void fillLanguagesMap()
-{
-  for (auto icuLangPtr = icu::Locale::getISOLanguages(); *icuLangPtr != NULL; ++icuLangPtr) {
-    const ICULanguageInfo lang(*icuLangPtr);
-    iso639_3.insert({lang.iso3Code(), lang.selfName()});
-  }
-}
-
-std::string getLanguageSelfName(const std::string& lang) {
-  const auto itr = iso639_3.find(lang);
-  if (itr != iso639_3.end()) {
-    return itr->second;
-  }
-  return lang;
-};
-
 } // unnamed namespace

 string OPDSDumper::dumpOPDSFeed(const std::vector<std::string>& bookIds, const std::string& query) const
 {
-  const auto booksData = getBooksData(library, nameMapper, bookIds, rootLocation, false);
+  const auto bookData = getBookData(library, bookIds);
  const kainjow::mustache::object template_data{
     {"date", gen_date_str()},
     {"root", rootLocation},
     {"feed_id", gen_uuid(libraryId + "/catalog/search?"+query)},
-     {"filter", onlyAsNonEmptyMustacheValue(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 }
+     {"books", bookData }
  };

  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
+string OPDSDumper::dumpOPDSFeedV2(const std::vector<std::string>& bookIds, const std::string& query) const
 {
-  const auto endpointRoot = rootLocation + "/catalog/v2";
-  const auto booksData = getBooksData(library, nameMapper, bookIds, rootLocation, partial);
+  const auto bookData = getBookData(library, bookIds);

-  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", onlyAsNonEmptyMustacheValue(query)},
-     {"query", query.empty() ? "" : "?" + query},
+     {"endpoint_root", rootLocation + "/catalog/v2"},
+     {"feed_id", gen_uuid(libraryId + "/entries?"+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)}
+     {"books", bookData }
  };

  return render_template(RESOURCE::templates::catalog_v2_entries_xml, template_data);
 }

-std::string OPDSDumper::dumpOPDSCompleteEntry(const std::string& bookId) const
-{
-  const auto book = library->getBookById(bookId);
-  const std::string contentId = nameMapper->getNameForId(bookId);
-  return XML_HEADER
-         + "\n"
-         + fullEntryXML(book, rootLocation, contentId);
-}
-
-std::string OPDSDumper::categoriesOPDSFeed() const
+std::string OPDSDumper::categoriesOPDSFeed(const std::vector<std::string>& categories) const
 {
  const auto now = gen_date_str();
  kainjow::mustache::list categoryData;
-  for ( const auto& category : library->getBooksCategories() ) {
+  for ( const auto& category : categories ) {
    const auto urlencodedCategoryName = urlEncode(category);
    categoryData.push_back(kainjow::mustache::object{
      {"name", category},
@@ -261,33 +146,4 @@ std::string OPDSDumper::categoriesOPDSFeed() const
  );
 }

-std::string OPDSDumper::languagesOPDSFeed() const
-{
-  const auto now = gen_date_str();
-  kainjow::mustache::list languageData;
-  std::call_once(fillLanguagesFlag, fillLanguagesMap);
-  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 }
-             }
-  );
-}
-
 }
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -0,0 +1,552 @@
+/*
+ * 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
+ * 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 "reader.h"
+#include <time.h>
+
+#include <zim/search.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)
+{
+  string tmpZimFilePath = zimFilePath;
+
+  /* Remove potential trailing zimaa */
+  size_t found = tmpZimFilePath.rfind("zimaa");
+  if (found != string::npos && tmpZimFilePath.size() > 5
+      && found == tmpZimFilePath.size() - 5) {
+    tmpZimFilePath.resize(tmpZimFilePath.size() - 2);
+  }
+
+  zimArchive.reset(new zim::Archive(tmpZimFilePath));
+
+  /* initialize random seed: */
+  srand(time(nullptr));
+}
+
+Reader::Reader(const std::shared_ptr<zim::Archive> archive)
+  : zimArchive(archive),
+    zimFilePath(archive->getFilename())
+  {}
+
+#ifndef _WIN32
+Reader::Reader(int fd)
+  :  zimArchive(new zim::Archive(fd)),
+     zimFilePath("")
+{
+  /* initialize random seed: */
+  srand(time(nullptr));
+}
+
+Reader::Reader(int fd, zim::offset_type offset, zim::size_type size)
+  :  zimArchive(new zim::Archive(fd, offset, size)),
+     zimFilePath("")
+{
+  /* initialize random seed: */
+  srand(time(nullptr));
+}
+#endif // #ifndef _WIN32
+
+zim::Archive* Reader::getZimArchive() const
+{
+  return zimArchive.get();
+}
+
+MimeCounterType Reader::parseCounterMetadata() const
+{
+  try {
+    auto counterContent = zimArchive->getMetadata("Counter");
+    return parseMimetypeCounter(counterContent);
+  } catch (zim::EntryNotFound& e) {
+    return {};
+  }
+}
+
+/* Get the count of articles which can be indexed/displayed */
+unsigned int Reader::getArticleCount() const
+{
+  std::map<const std::string, unsigned int> counterMap
+      = this->parseCounterMetadata();
+  unsigned int counter = 0;
+
+  for(auto &pair:counterMap) {
+    if (startsWith(pair.first, "text/html")) {
+      counter += pair.second;
+    }
+  }
+
+  return counter;
+}
+
+/* Get the count of medias content in the ZIM file */
+unsigned int Reader::getMediaCount() const
+{
+  std::map<const std::string, unsigned int> counterMap
+      = this->parseCounterMetadata();
+  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;
+}
+
+/* Get the total of all items of a ZIM file, redirects included */
+unsigned int Reader::getGlobalCount() const
+{
+  return zimArchive->getEntryCount();
+}
+
+/* Return the UID of the ZIM file */
+string Reader::getId() const
+{
+  std::ostringstream s;
+  s << zimArchive->getUuid();
+  return s.str();
+}
+
+Entry Reader::getRandomPage() const
+{
+  try {
+    return zimArchive->getRandomEntry();
+  } catch(...) {
+    throw NoEntry();
+  }
+}
+
+Entry Reader::getMainPage() const
+{
+  return zimArchive->getMainEntry();
+}
+
+bool Reader::getFavicon(string& content, string& mimeType) const
+{
+  return kiwix::getArchiveFavicon(*zimArchive, content, mimeType);
+}
+
+string Reader::getZimFilePath() const
+{
+  return zimFilePath;
+}
+/* Return a metatag value */
+bool Reader::getMetadata(const string& name, string& value) const
+{
+  try {
+    value = zimArchive->getMetadata(name);
+    return true;
+  } catch(zim::EntryNotFound& e) {
+    return false;
+  }
+}
+
+#define METADATA(NAME) std::string v; getMetadata(NAME, v); return v;
+
+string Reader::getName() const
+{
+  return kiwix::getMetaName(*zimArchive);
+}
+
+string Reader::getTitle() const
+{
+  return kiwix::getArchiveTitle(*zimArchive);
+}
+
+string Reader::getCreator() const
+{
+  return kiwix::getMetaCreator(*zimArchive);
+}
+
+string Reader::getPublisher() const
+{
+  return kiwix::getMetaPublisher(*zimArchive);
+}
+
+string Reader::getDate() const
+{
+  return kiwix::getMetaDate(*zimArchive);
+}
+
+string Reader::getDescription() const
+{
+  return kiwix::getMetaDescription(*zimArchive);
+}
+
+string Reader::getLongDescription() const
+{
+  METADATA("LongDescription")
+}
+
+string Reader::getLanguage() const
+{
+  return kiwix::getMetaLanguage(*zimArchive);
+}
+
+string Reader::getLicense() const
+{
+  METADATA("License")
+}
+
+string Reader::getTags(bool original) const
+{
+  return kiwix::getMetaTags(*zimArchive, original);
+}
+
+
+string Reader::getTagStr(const std::string& tagName) const
+{
+  string tags_str;
+  getMetadata("Tags", tags_str);
+  return getTagValueFromTagList(convertTags(tags_str), tagName);
+}
+
+bool Reader::getTagBool(const std::string& tagName) const
+{
+  return convertStrToBool(getTagStr(tagName));
+}
+
+string Reader::getRelation() const
+{
+  METADATA("Relation")
+}
+
+string Reader::getFlavour() const
+{
+  METADATA("Flavour")
+}
+
+string Reader::getSource() const
+{
+  METADATA("Source")
+}
+
+string Reader::getScraper() const
+{
+  METADATA("Scraper")
+}
+#undef METADATA
+
+string Reader::getOrigId() const
+{
+  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;
+}
+
+Entry Reader::getEntryFromPath(const std::string& path) const
+{
+  try {
+    return kiwix::getEntryFromPath(*zimArchive, path);
+  } catch (zim::EntryNotFound& e) {
+    throw NoEntry();
+  }
+}
+
+Entry Reader::getEntryFromEncodedPath(const std::string& path) const
+{
+  return getEntryFromPath(urlDecode(path, true));
+}
+
+Entry Reader::getEntryFromTitle(const std::string& title) const
+{
+  try {
+    return zimArchive->getEntryByTitle(title);
+  } catch(zim::EntryNotFound& e) {
+    throw NoEntry();
+  }
+}
+
+bool Reader::pathExists(const string& path) const
+{
+  return zimArchive->hasEntryByPath(path);
+}
+
+/* Does the ZIM file has a fulltext index */
+bool Reader::hasFulltextIndex() const
+{
+  return zimArchive->hasFulltextIndex();
+}
+
+/* Search titles by prefix */
+
+bool Reader::searchSuggestions(const string& prefix,
+                               unsigned int suggestionsCount,
+                               const bool reset)
+{
+  /* Reset the suggestions otherwise check if the suggestions number is less
+   * than the suggestionsCount */
+  if (reset) {
+    this->suggestions.clear();
+    this->suggestionsOffset = this->suggestions.begin();
+  } else {
+    if (this->suggestions.size() > suggestionsCount) {
+      return false;
+    }
+  }
+
+  auto ret =  searchSuggestions(prefix, suggestionsCount, this->suggestions);
+
+  /* Set the cursor to the begining */
+  this->suggestionsOffset = this->suggestions.begin();
+
+  return ret;
+}
+
+
+bool Reader::searchSuggestions(const string& prefix,
+                               unsigned int suggestionsCount,
+                               SuggestionsList_t& results)
+{
+  bool retVal = false;
+
+  /* Return if no prefix */
+  if (prefix.size() == 0) {
+    return false;
+  }
+
+  for (auto& entry: zimArchive->findByTitle(prefix)) {
+    if (results.size() >= suggestionsCount) {
+      break;
+    }
+    /* 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();
+
+    /* 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;
+    for (suggestionItr = results.begin();
+         suggestionItr != results.end();
+         suggestionItr++) {
+      int result = normalizedArticleTitle.compare((*suggestionItr).getNormalizedTitle());
+      if (result == 0 && articleFinalUrl.compare((*suggestionItr).getPath()) == 0) {
+        insert = false;
+        break;
+      } else if (result < 0) {
+        break;
+      }
+    }
+
+    /* Insert if possible */
+    if (insert) {
+      SuggestionItem suggestion(entry.getTitle(), normalizedArticleTitle, articleFinalUrl);
+      results.insert(suggestionItr, suggestion);
+    }
+
+    /* Suggestions where found */
+    retVal = true;
+  }
+
+  return retVal;
+}
+
+std::vector<std::string> Reader::getTitleVariants(
+    const std::string& title) const
+{
+  return kiwix::getTitleVariants(title);
+}
+
+
+bool Reader::searchSuggestionsSmart(const string& prefix,
+                                    unsigned int suggestionsCount)
+{
+  this->suggestions.clear();
+  this->suggestionsOffset = this->suggestions.begin();
+
+  auto ret = searchSuggestionsSmart(prefix, suggestionsCount, this->suggestions);
+
+  this->suggestionsOffset = this->suggestions.begin();
+
+  return ret;
+}
+
+/* Try also a few variations of the prefix to have better results */
+bool Reader::searchSuggestionsSmart(const string& prefix,
+                                    unsigned int suggestionsCount,
+                                    SuggestionsList_t& results)
+{
+  std::vector<std::string> variants = this->getTitleVariants(prefix);
+  bool retVal = false;
+
+  /* Try to search in the title using fulltext search database */
+
+  auto suggestionSearcher = zim::Searcher(*zimArchive);
+  zim::Query suggestionQuery;
+  suggestionQuery.setQuery(prefix, true);
+  auto suggestionSearch = suggestionSearcher.search(suggestionQuery);
+
+  if (suggestionSearch.getEstimatedMatches()) {
+    const auto suggestions = suggestionSearch.getResults(0, suggestionsCount);
+    for (auto current = suggestions.begin();
+         current != suggestions.end();
+         current++) {
+      SuggestionItem suggestion(current.getTitle(), kiwix::normalize(current.getTitle()),
+                                current.getPath(), current.getSnippet());
+      results.push_back(suggestion);
+    }
+    retVal = true;
+  } else {
+    for (std::vector<std::string>::iterator variantsItr = variants.begin();
+         variantsItr != variants.end();
+         variantsItr++) {
+      retVal = this->searchSuggestions(*variantsItr, suggestionsCount, results)
+               || retVal;
+    }
+  }
+
+  return retVal;
+}
+
+/* Get next suggestion */
+bool Reader::getNextSuggestion(string& title)
+{
+  if (this->suggestionsOffset != this->suggestions.end()) {
+    /* title */
+    title = (*(this->suggestionsOffset)).getTitle();
+
+    /* increment the cursor for the next call */
+    this->suggestionsOffset++;
+
+    return true;
+  }
+
+  return false;
+}
+
+bool Reader::getNextSuggestion(string& title, string& url)
+{
+  if (this->suggestionsOffset != this->suggestions.end()) {
+    /* title */
+    title = (*(this->suggestionsOffset)).getTitle();
+    url = (*(this->suggestionsOffset)).getPath();
+
+    /* increment the cursor for the next call */
+    this->suggestionsOffset++;
+
+    return true;
+  }
+
+  return false;
+}
+
+/* Check if the file has as checksum */
+bool Reader::canCheckIntegrity() const
+{
+  return zimArchive->hasChecksum();
+}
+
+/* Return true if corrupted, false otherwise */
+bool Reader::isCorrupted() const
+{
+  try {
+    if (zimArchive->check() == true) {
+      return false;
+    }
+  } catch (exception& e) {
+    cerr << e.what() << endl;
+    return true;
+  }
+
+  return true;
+}
+
+/* Return the file size, works also for splitted files */
+unsigned int Reader::getFileSize() const
+{
+  return zimArchive->getFilesize() / 1024;
+}
+
+}
--- a/src/search_renderer.cpp
+++ b/src/search_renderer.cpp
@@ -21,33 +21,36 @@
 #include <cmath>

 #include "search_renderer.h"
+#include "searcher.h"
+#include "reader.h"
 #include "library.h"
 #include "name_mapper.h"

-#include "tools/archiveTools.h"
-
 #include <zim/search.h>

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

 namespace kiwix
 {

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

-SearchRenderer::SearchRenderer(zim::SearchResultSet srs, NameMapper* mapper, Library* library,
+SearchRenderer::SearchRenderer(zim::SearchResultSet srs, NameMapper* mapper,
                      unsigned int start, unsigned int estimatedResultCount)
    : m_srs(srs),
      mp_nameMapper(mapper),
-      mp_library(library),
      protocolPrefix("zim://"),
-      searchProtocolPrefix("search://"),
+      searchProtocolPrefix("search://?"),
      estimatedResultCount(estimatedResultCount),
      resultStart(start)
 {}
@@ -57,12 +60,12 @@ SearchRenderer::~SearchRenderer() = default;

 void SearchRenderer::setSearchPattern(const std::string& pattern)
 {
-  searchPattern = pattern;
+  this->searchPattern = pattern;
 }

-void SearchRenderer::setSearchBookQuery(const std::string& bookQuery)
+void SearchRenderer::setSearchContent(const std::string& name)
 {
-  searchBookQuery = bookQuery;
+  this->searchContent = name;
 }

 void SearchRenderer::setProtocolPrefix(const std::string& prefix)
@@ -75,162 +78,81 @@ void SearchRenderer::setSearchProtocolPrefix(const std::string& prefix)
  this->searchProtocolPrefix = prefix;
 }

-std::string extractValueFromQuery(const std::string& query, const std::string& key) {
-  const std::string p = key + "=";
-  const size_t i = query.find(p);
-  if (i == std::string::npos) {
-    return "";
-  }
-  std::string r = query.substr(i + p.size());
-  return r.substr(0, r.find("&"));
-}
-
-kainjow::mustache::data buildQueryData
-(
-  const std::string& searchProtocolPrefix,
-  const std::string& pattern,
-  const std::string& bookQuery
-) {
-  kainjow::mustache::data query;
-  query.set("pattern", kiwix::encodeDiples(pattern));
-  std::ostringstream ss;
-  ss << searchProtocolPrefix << "?pattern=" << urlEncode(pattern);
-  ss << "&" << bookQuery;
-  query.set("unpaginatedQuery", ss.str());
-  auto lang = extractValueFromQuery(bookQuery, "books.filter.lang");
-  if(!lang.empty()) {
-    query.set("lang", lang);
-  }
-  return query;
-}
-
-kainjow::mustache::data buildPagination(
-  unsigned int pageLength,
-  unsigned int resultsCount,
-  unsigned int resultsStart
-)
+std::string SearchRenderer::getHtml()
 {
-  assert(pageLength!=0);
-  kainjow::mustache::data pagination;
-  kainjow::mustache::data pages{kainjow::mustache::data::type::list};
+  kainjow::mustache::data results{kainjow::mustache::data::type::list};

-  if (resultsCount == 0) {
-    // Easy case
-    pagination.set("itemsPerPage", to_string(pageLength));
-    pagination.set("hasPages", false);
-    pagination.set("pages", pages);
-    return pagination;
-  }
-
-  // First we want to display pages starting at a multiple of `pageLength`
-  // so, let's calculate the start index of the current page.
-  auto currentPage = resultsStart/pageLength;
-  auto lastPage = ((resultsCount-1)/pageLength);
-  auto lastPageStart = lastPage*pageLength;
-  auto nbPages = lastPage + 1;
-
-  auto firstPageGenerated = currentPage > 4 ? currentPage-4 : 0;
-  auto lastPageGenerated = std::min(currentPage+4, lastPage);
-
-  if (nbPages != 1) {
-    if (firstPageGenerated!=0) {
-      kainjow::mustache::data page;
-      page.set("label", "◀");
-      page.set("start", to_string(0));
-      page.set("current", false);
-      pages.push_back(page);
-    }
-
-    for (auto i=firstPageGenerated; i<=lastPageGenerated; i++) {
-      kainjow::mustache::data page;
-      page.set("label", to_string(i+1));
-      page.set("start", to_string(i*pageLength));
-      page.set("current", bool(i == currentPage));
-      pages.push_back(page);
-    }
-
-    if (lastPageGenerated!=lastPage) {
-      kainjow::mustache::data page;
-      page.set("label", "▶");
-      page.set("start", to_string(lastPageStart));
-      page.set("current", false);
-      pages.push_back(page);
-    }
-  }
-
-  pagination.set("itemsPerPage", to_string(pageLength));
-  pagination.set("hasPages", firstPageGenerated < lastPageGenerated);
-  pagination.set("pages", pages);
-  return pagination;
-}
-
-std::string SearchRenderer::renderTemplate(const std::string& tmpl_str)
-{
-  const std::string absPathPrefix = protocolPrefix;
-  // Build the results list
-  kainjow::mustache::data items{kainjow::mustache::data::type::list};
  for (auto it = m_srs.begin(); it != m_srs.end(); it++) {
    kainjow::mustache::data result;
-    const std::string zim_id(it.getZimId());
-    const auto path = mp_nameMapper->getNameForId(zim_id) + "/" + it.getPath();
    result.set("title", it.getTitle());
-    result.set("absolutePath", absPathPrefix + urlEncode(path));
+    result.set("url", it.getPath());
    result.set("snippet", it.getSnippet());
-    if (mp_library) {
-      result.set("bookTitle", mp_library->getBookById(zim_id).getTitle());
-    }
+    std::ostringstream s;
+    s << it.getZimId();
+    result.set("resultContentId", mp_nameMapper->getNameForId(s.str()));
+
    if (it.getWordCount() >= 0) {
      result.set("wordCount", kiwix::beautifyInteger(it.getWordCount()));
    }

-    items.push_back(result);
+    results.push_back(result);
  }
-  kainjow::mustache::data results;
-  results.set("items", items);
-  results.set("count", kiwix::beautifyInteger(estimatedResultCount));
-  results.set("hasResults", estimatedResultCount != 0);
-  results.set("start", kiwix::beautifyInteger(resultStart));
-  results.set("end", kiwix::beautifyInteger(std::min(resultStart+pageLength-1, estimatedResultCount)));

-  // pagination
-  auto pagination = buildPagination(
-    pageLength,
-    estimatedResultCount,
-    resultStart
-  );
+  // pages
+  kainjow::mustache::data pages{kainjow::mustache::data::type::list};

-  kainjow::mustache::data query = buildQueryData(
-    searchProtocolPrefix,
-    searchPattern,
-    searchBookQuery
-  );
+  auto resultEnd = 0U;
+  auto currentPage = 0U;
+  auto pageStart = 0U;
+  auto pageEnd = 0U;
+  auto lastPageStart = 0U;
+  if (pageLength) {
+    currentPage = resultStart/pageLength;
+    pageStart = currentPage > 4 ? currentPage-4 : 0;
+    pageEnd = currentPage + 5;
+    if (pageEnd > estimatedResultCount / pageLength) {
+      pageEnd = (estimatedResultCount + pageLength - 1) / pageLength;
+    }
+    if (estimatedResultCount > pageLength) {
+      lastPageStart = ((estimatedResultCount-1)/pageLength)*pageLength;
+    }
+  }

+  resultEnd = resultStart+pageLength; //setting result end
+
+  for (unsigned int i = pageStart; i < pageEnd; i++) {
+    kainjow::mustache::data page;
+    page.set("label", to_string(i + 1));
+    page.set("start", to_string(i * pageLength));
+
+    if (i == currentPage) {
+      page.set("selected", true);
+    }
+    pages.push_back(page);
+  }
+
+  std::string template_str = RESOURCE::templates::search_result_html;
+  kainjow::mustache::mustache tmpl(template_str);

  kainjow::mustache::data allData;
-  allData.set("searchProtocolPrefix", searchProtocolPrefix);
  allData.set("results", results);
-  allData.set("pagination", pagination);
-  allData.set("query", query);
-
-  kainjow::mustache::mustache tmpl(tmpl_str);
+  allData.set("pages", pages);
+  allData.set("hasResults", estimatedResultCount != 0);
+  allData.set("hasPages", pageStart != pageEnd);
+  allData.set("count", kiwix::beautifyInteger(estimatedResultCount));
+  allData.set("searchPattern", kiwix::encodeDiples(this->searchPattern));
+  allData.set("searchPatternEncoded", urlEncode(this->searchPattern));
+  allData.set("resultStart", to_string(resultStart + 1));
+  allData.set("resultEnd", to_string(min(resultEnd, estimatedResultCount)));
+  allData.set("pageLength", to_string(pageLength));
+  allData.set("resultLastPageStart", to_string(lastPageStart));
+  allData.set("protocolPrefix", this->protocolPrefix);
+  allData.set("searchProtocolPrefix", this->searchProtocolPrefix);
+  allData.set("contentId", this->searchContent);

  std::stringstream ss;
  tmpl.render(allData, [&ss](const std::string& str) { ss << str; });
-  if (!tmpl.is_valid()) {
-    throw std::runtime_error("Error while rendering search results: " + tmpl.error_message());
-  }
  return ss.str();
 }

-std::string SearchRenderer::getHtml()
-{
-  return renderTemplate(RESOURCE::templates::search_result_html);
-}
-
-std::string SearchRenderer::getXml()
-{
-  return renderTemplate(RESOURCE::templates::search_result_xml);
-}
-
-
 }
--- a/src/searcher.cpp
+++ b/src/searcher.cpp
@@ -0,0 +1,278 @@
+/*
+ * 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
+ * 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 "searcher.h"
+#include "reader.h"
+
+#include <zim/search.h>
+
+#include <mustache.hpp>
+#include <cmath>
+#include "tools/stringTools.h"
+#include "kiwixlib-resources.h"
+
+#define MAX_SEARCH_LEN 140
+
+namespace kiwix
+{
+class _Result : public Result
+{
+ public:
+  _Result(zim::SearchResultSet::iterator iterator);
+  virtual ~_Result(){};
+
+  virtual std::string get_url();
+  virtual std::string get_title();
+  virtual int get_score();
+  virtual std::string get_snippet();
+  virtual std::string get_content();
+  virtual int get_wordCount();
+  virtual int get_size();
+  virtual std::string get_zimId();
+
+ private:
+  zim::SearchResultSet::iterator iterator;
+};
+
+struct SearcherInternal : zim::SearchResultSet {
+  explicit SearcherInternal(const zim::SearchResultSet& srs)
+    : zim::SearchResultSet(srs)
+    , current_iterator(srs.begin())
+  {
+  }
+
+  zim::SearchResultSet::iterator current_iterator;
+};
+
+/* Constructor */
+Searcher::Searcher()
+    : searchPattern(""),
+      estimatedResultCount(0),
+      resultStart(0),
+      resultEnd(0)
+{
+  loadICUExternalTables();
+}
+
+/* Destructor */
+Searcher::~Searcher()
+{
+}
+
+bool Searcher::add_reader(Reader* reader)
+{
+  if (!reader->hasFulltextIndex()) {
+      return false;
+  }
+  this->readers.push_back(reader);
+  return true;
+}
+
+
+Reader* Searcher::get_reader(int readerIndex)
+{
+  return readers.at(readerIndex);
+}
+
+/* Search strings in the database */
+void Searcher::search(const std::string& search,
+                      unsigned int resultStart,
+                      unsigned int resultEnd,
+                      const bool verbose)
+{
+  this->reset();
+
+  if (verbose == true) {
+    cout << "Performing query `" << search << "'" << endl;
+  }
+
+  this->searchPattern = search;
+  this->resultStart = resultStart;
+  this->resultEnd = resultEnd;
+  /* Try to find results */
+  if (resultStart != resultEnd) {
+    /* Perform the search */
+    string unaccentedSearch = removeAccents(search);
+    std::vector<zim::Archive> archives;
+    for (auto current = this->readers.begin(); current != this->readers.end();
+         current++) {
+      if ( (*current)->hasFulltextIndex() ) {
+          archives.push_back(*(*current)->getZimArchive());
+      }
+    }
+    zim::Searcher searcher(archives);
+    zim::Query query;
+    query.setQuery(unaccentedSearch, false);
+    query.setVerbose(verbose);
+    zim::Search search = searcher.search(query);
+    internal.reset(new SearcherInternal(search.getResults(resultStart, resultEnd)));
+    this->estimatedResultCount = search.getEstimatedMatches();
+  }
+
+  return;
+}
+
+
+void Searcher::geo_search(float latitude, float longitude, float distance,
+                          unsigned int resultStart,
+                          unsigned int resultEnd,
+                          const bool verbose)
+{
+  this->reset();
+
+  if (verbose == true) {
+    cout << "Performing geo query `" << distance << "&(" << latitude << ";" << longitude << ")'" << endl;
+  }
+
+  /* Perform the search */
+  std::ostringstream oss;
+  oss << "Articles located less than " << distance << " meters of " << latitude << ";" << longitude;
+  this->searchPattern = oss.str();
+  this->resultStart = resultStart;
+  this->resultEnd = resultEnd;
+
+  /* Try to find results */
+  if (resultStart == resultEnd) {
+    return;
+  }
+
+  std::vector<zim::Archive> archives;
+  for (auto current = this->readers.begin(); current != this->readers.end();
+       current++) {
+    archives.push_back(*(*current)->getZimArchive());
+  }
+  zim::Searcher searcher(archives);
+  zim::Query query;
+  query.setVerbose(verbose);
+  query.setQuery("", false);
+  query.setGeorange(latitude, longitude, distance);
+  zim::Search search = searcher.search(query);
+  internal.reset(new SearcherInternal(search.getResults(resultStart, resultEnd)));
+  this->estimatedResultCount = search.getEstimatedMatches();
+}
+
+
+void Searcher::restart_search()
+{
+  if (internal.get()) {
+    internal->current_iterator = internal->begin();
+  }
+}
+
+Result* Searcher::getNextResult()
+{
+  if (internal.get() &&
+             internal->current_iterator != internal->end()) {
+    Result* result = new _Result(internal->current_iterator);
+    internal->current_iterator++;
+    return result;
+  }
+  return NULL;
+}
+
+/* Reset the results */
+void Searcher::reset()
+{
+  this->estimatedResultCount = 0;
+  this->searchPattern = "";
+  return;
+}
+
+void Searcher::suggestions(std::string& searchPattern, const bool verbose)
+{
+  this->reset();
+
+  if (verbose == true) {
+    cout << "Performing suggestion query `" << searchPattern << "`" << endl;
+  }
+
+  this->searchPattern = searchPattern;
+  this->resultStart = 0;
+  this->resultEnd = 10;
+  string unaccentedSearch = removeAccents(searchPattern);
+
+  std::vector<zim::Archive> archives;
+  for (auto current = this->readers.begin(); current != this->readers.end();
+       current++) {
+    archives.push_back(*(*current)->getZimArchive());
+  }
+  zim::Searcher searcher(archives);
+  zim::Query query;
+  query.setVerbose(verbose);
+  query.setQuery(unaccentedSearch, true);
+  zim::Search search = searcher.search(query);
+  internal.reset(new SearcherInternal(search.getResults(resultStart, resultEnd)));
+  this->estimatedResultCount = search.getEstimatedMatches();
+}
+
+/* Return the result count estimation */
+unsigned int Searcher::getEstimatedResultCount()
+{
+  return this->estimatedResultCount;
+}
+
+zim::SearchResultSet Searcher::getSearchResultSet()
+{
+  return *(this->internal);
+}
+
+_Result::_Result(zim::SearchResultSet::iterator iterator)
+    : iterator(iterator)
+{
+}
+
+std::string _Result::get_url()
+{
+  return iterator.getPath();
+}
+std::string _Result::get_title()
+{
+  return iterator.getTitle();
+}
+int _Result::get_score()
+{
+  return iterator.getScore();
+}
+std::string _Result::get_snippet()
+{
+  return iterator.getSnippet();
+}
+std::string _Result::get_content()
+{
+  return iterator->getItem(true).getData();
+}
+int _Result::get_size()
+{
+  return iterator.getSize();
+}
+int _Result::get_wordCount()
+{
+  return iterator.getWordCount();
+}
+std::string _Result::get_zimId()
+{
+  std::ostringstream s;
+  s << iterator.getZimId();
+  return s.str();
+}
+
+
+}
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -24,7 +24,6 @@

 #include <string>

-#include <zim/item.h>
 #include "server/internalServer.h"

 namespace kiwix {
@@ -46,13 +45,10 @@ bool Server::start() {
    m_port,
    m_root,
    m_nbThreads,
-    m_multizimSearchLimit,
    m_verbose,
    m_withTaskbar,
    m_withLibraryButton,
-    m_blockExternalLinks,
-    m_indexTemplateString,
-    m_ipConnectionLimit));
+    m_blockExternalLinks));
  return mp_server->start();
 }

@@ -74,14 +70,4 @@ void Server::setRoot(const std::string& root)
  }
 }

-int Server::getPort()
-{
-  return mp_server->getPort();
-}
-
-std::string Server::getAddress()
-{
-  return mp_server->getAddress();
-}
-
 }
--- a/src/server/etag.cpp
+++ b/src/server/etag.cpp
@@ -37,11 +37,11 @@ namespace {
 // into the ETag for ETag::Option opt.
 // IMPORTANT: The characters in all_options must come in sorted order (so that
 // IMPORTANT: isValidOptionsString() works correctly).
-const char all_options[] = "Zz";
+const char all_options[] = "cz";

 static_assert(ETag::OPTION_COUNT == sizeof(all_options) - 1, "");

-bool isValidETagBody(const std::string& s)
+bool isValidServerId(const std::string& s)
 {
  return !s.empty() && s.find_first_of("\"/") == std::string::npos;
 }
@@ -83,17 +83,17 @@ bool ETag::get_option(Option opt) const

 std::string ETag::get_etag() const
 {
-  if ( m_body.empty() )
+  if ( m_serverId.empty() )
    return std::string();

-  return "\"" + m_body + "/" + m_options + "\"";
+  return "\"" + m_serverId + "/" + m_options + "\"";
 }

-ETag::ETag(const std::string& body, const std::string& options)
+ETag::ETag(const std::string& serverId, const std::string& options)
 {
-  if ( isValidETagBody(body) && isValidOptionsString(options) )
+  if ( isValidServerId(serverId) && isValidOptionsString(options) )
  {
-    m_body = body;
+    m_serverId = serverId;
    m_options = options;
  }
 }
@@ -115,7 +115,7 @@ ETag ETag::parse(std::string s)
  return ETag(s.substr(0, i), s.substr(i+1));
 }

-ETag ETag::match(const std::string& etags, const std::string& body)
+ETag ETag::match(const std::string& etags, const std::string& server_id)
 {
  std::istringstream ss(etags);
  std::string etag_str;
@@ -125,7 +125,7 @@ ETag ETag::match(const std::string& etags, const std::string& body)
      etag_str.pop_back();

    const ETag etag = parse(etag_str);
-    if ( etag && etag.m_body == body )
+    if ( etag && etag.m_serverId == server_id )
      return etag;
  }

--- a/src/server/etag.h
+++ b/src/server/etag.h
@@ -28,11 +28,10 @@ namespace kiwix {
 // The ETag string used by Kiwix server (more precisely, its value inside the
 // double quotes) consists of two parts:
 //
-// 1. Body    -  A string uniquely identifying the object or state from which
-//               the resource has been obtained.
+// 1. ServerId - The string obtained on server start up
 //
-// 2. Options -  Zero or more characters encoding the type of the ETag and/or
-//               the values of some of the headers of the response
+// 2. Options -  Zero or more characters encoding the values of some of the
+//               headers of the response
 //
 // The two parts are separated with a slash (/) symbol (which is always present,
 // even when the the options part is empty). Neither portion of a Kiwix ETag
@@ -41,7 +40,7 @@ namespace kiwix {
 //
 //   "abcdefghijklmn/"
 //   "1234567890/z"
-//   "6f1d19d0-633f-087b-fb55-7ac324ff9baf/Zz"
+//   "1234567890/cz"
 //
 // The options part of the Kiwix ETag allows to correctly set the required
 // headers when responding to a conditional If-None-Match request with a 304
@@ -52,7 +51,7 @@ class ETag
 {
  public: // types
    enum Option {
-      ZIM_CONTENT,
+      CACHEABLE_ENTITY,
      COMPRESSED_CONTENT,
      OPTION_COUNT
    };
@@ -60,10 +59,10 @@ class ETag
  public: // functions
    ETag() {}

-    void set_body(const std::string& s) { m_body = s; }
+    void set_server_id(const std::string& id) { m_serverId = id; }
    void set_option(Option opt);

-    explicit operator bool() const { return !m_body.empty(); }
+    explicit operator bool() const { return !m_serverId.empty(); }

    bool get_option(Option opt) const;
    std::string get_etag() const;
@@ -77,7 +76,7 @@ class ETag
    static ETag parse(std::string s);

  private: // data
-    std::string m_body;
+    std::string m_serverId;
    std::string m_options;
 };

--- a/src/server/i18n.cpp
+++ b/src/server/i18n.cpp
@@ -1,192 +0,0 @@
-/*
- * Copyright 2022 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 "i18n.h"
-
-#include "tools/otherTools.h"
-
-#include <algorithm>
-#include <map>
-
-namespace kiwix
-{
-
-const char* I18nStringTable::get(const std::string& key) const
-{
-  const I18nString* const begin = entries;
-  const I18nString* const end = begin + entryCount;
-  const I18nString* found = std::lower_bound(begin, end, key,
-      [](const I18nString& a, const std::string& k) {
-        return a.key < k;
-  });
-  return (found == end || found->key != key) ? nullptr : found->value;
-}
-
-namespace i18n
-{
-// this data is generated by the i18n resource compiler
-extern const I18nStringTable stringTables[];
-extern const size_t langCount;
-}
-
-namespace
-{
-
-class I18nStringDB
-{
-public: // functions
-  I18nStringDB() {
-    for ( size_t i = 0; i < kiwix::i18n::langCount; ++i ) {
-      const auto& t = kiwix::i18n::stringTables[i];
-      lang2TableMap[t.lang] = &t;
-    }
-    enStrings = lang2TableMap.at("en");
-  };
-
-  std::string get(const std::string& lang, const std::string& key) const {
-    const char* s = getStringsFor(lang)->get(key);
-    if ( s == nullptr ) {
-      s = enStrings->get(key);
-      if ( s == nullptr ) {
-        throw std::runtime_error("Invalid message id");
-      }
-    }
-    return s;
-  }
-
-  size_t getStringCount(const std::string& lang) const {
-    try {
-      return lang2TableMap.at(lang)->entryCount;
-    } catch(const std::out_of_range&) {
-      return 0;
-    }
-  }
-
-private: // functions
-  const I18nStringTable* getStringsFor(const std::string& lang) const {
-    try {
-      return lang2TableMap.at(lang);
-    } catch(const std::out_of_range&) {
-      return enStrings;
-    }
-  }
-
-private: // data
-  std::map<std::string, const I18nStringTable*> lang2TableMap;
-  const I18nStringTable* enStrings;
-};
-
-const I18nStringDB& getStringDb()
-{
-  static const I18nStringDB stringDb;
-  return stringDb;
-}
-
-} // unnamed namespace
-
-std::string getTranslatedString(const std::string& lang, const std::string& key)
-{
-  return getStringDb().get(lang, key);
-}
-
-namespace i18n
-{
-
-std::string expandParameterizedString(const std::string& lang,
-                                      const std::string& key,
-                                      const Parameters& params)
-{
-  const std::string tmpl = getTranslatedString(lang, key);
-  return render_template(tmpl, params);
-}
-
-} // namespace i18n
-
-std::string ParameterizedMessage::getText(const std::string& lang) const
-{
-  return i18n::expandParameterizedString(lang, msgId, params);
-}
-
-namespace
-{
-
-LangPreference parseSingleLanguagePreference(const std::string& s)
-{
-  const size_t langStart = s.find_first_not_of(" \t\n");
-  if ( langStart == std::string::npos ) {
-    return {"", 0};
-  }
-
-  const size_t langEnd = s.find(';', langStart);
-  if ( langEnd == std::string::npos ) {
-    return {s.substr(langStart), 1};
-  }
-
-  const std::string lang = s.substr(langStart, langEnd - langStart);
-  // We don't care about langEnd == langStart which will result in an empty
-  // language name - it will be dismissed by parseUserLanguagePreferences()
-
-  float q = 1.0;
-  int nCharsScanned;
-  if ( 1 == sscanf(s.c_str() + langEnd + 1, "q=%f%n", &q, &nCharsScanned)
-       && langEnd + 1 + nCharsScanned == s.size() ) {
-    return {lang, q};
-  }
-
-  return {"", 0};
-}
-
-} // unnamed namespace
-
-UserLangPreferences parseUserLanguagePreferences(const std::string& s)
-{
-  UserLangPreferences result;
-  std::istringstream iss(s);
-  std::string singleLangPrefStr;
-  while ( std::getline(iss, singleLangPrefStr, ',') )
-  {
-    const auto langPref = parseSingleLanguagePreference(singleLangPrefStr);
-    if ( !langPref.lang.empty() && langPref.preference > 0 ) {
-      result.push_back(langPref);
-    }
-  }
-
-  return result;
-}
-
-std::string selectMostSuitableLanguage(const UserLangPreferences& prefs)
-{
-  if ( prefs.empty() ) {
-    return "en";
-  }
-
-  std::string bestLangSoFar("en");
-  float bestScoreSoFar = 0;
-  const auto& stringDb = getStringDb();
-  for ( const auto& entry : prefs ) {
-    const float score = entry.preference * stringDb.getStringCount(entry.lang);
-    if ( score > bestScoreSoFar ) {
-      bestScoreSoFar = score;
-      bestLangSoFar = entry.lang;
-    }
-  }
-  return bestLangSoFar;
-}
-
-} // namespace kiwix
--- a/src/server/i18n.h
+++ b/src/server/i18n.h
@@ -1,106 +0,0 @@
-/*
- * Copyright 2022 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_SERVER_I18N
-#define KIWIX_SERVER_I18N
-
-#include <string>
-#include <mustache.hpp>
-
-namespace kiwix
-{
-
-struct I18nString {
-  const char* const key;
-  const char* const value;
-};
-
-struct I18nStringTable {
-  const char* const lang;
-  const size_t entryCount;
-  const I18nString* const entries;
-
-  const char* get(const std::string& key) const;
-};
-
-std::string getTranslatedString(const std::string& lang, const std::string& key);
-
-namespace i18n
-{
-
-typedef kainjow::mustache::object Parameters;
-
-std::string expandParameterizedString(const std::string& lang,
-                                      const std::string& key,
-                                      const Parameters& params);
-
-class GetTranslatedString
-{
-public:
-  explicit GetTranslatedString(const std::string& lang) : m_lang(lang) {}
-
-  std::string operator()(const std::string& key) const
-  {
-    return getTranslatedString(m_lang, key);
-  }
-
-  std::string operator()(const std::string& key, const Parameters& params) const
-  {
-    return expandParameterizedString(m_lang, key, params);
-  }
-
-private:
-  const std::string m_lang;
-};
-
-} // namespace i18n
-
-struct ParameterizedMessage
-{
-public: // types
-  typedef kainjow::mustache::object Parameters;
-
-public: // functions
-  ParameterizedMessage(const std::string& msgId, const Parameters& params)
-    : msgId(msgId)
-    , params(params)
-  {}
-
-  std::string getText(const std::string& lang) const;
-
-private: // data
-  const std::string msgId;
-  const Parameters  params;
-};
-
-struct LangPreference
-{
-  const std::string lang;
-  const float preference;
-};
-
-typedef std::vector<LangPreference> UserLangPreferences;
-
-UserLangPreferences parseUserLanguagePreferences(const std::string& s);
-
-std::string selectMostSuitableLanguage(const UserLangPreferences& prefs);
-
-} // namespace kiwix
-
-#endif // KIWIX_SERVER_I18N
--- a/src/server/internalServer.cpp
+++ b/src/server/internalServer.cpp
--- a/src/server/internalServer.h
+++ b/src/server/internalServer.h
@@ -28,9 +28,6 @@ extern "C" {
 #include "library.h"
 #include "name_mapper.h"

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

 #include <atomic>
@@ -39,55 +36,11 @@ extern "C" {
 #include "server/request_context.h"
 #include "server/response.h"

-#include "tools/concurrent_cache.h"
-
 namespace kiwix {

-struct GeoQuery {
-  GeoQuery()
-    : GeoQuery(0, 0, -1)
-  {}
-
-  GeoQuery(float latitude, float longitude, float distance)
-    : latitude(latitude), longitude(longitude), distance(distance)
-  {}
-  float latitude;
-  float longitude;
-  float distance;
-
-  explicit operator bool() const {
-    return distance >= 0;
-  }
-
-  friend bool operator<(const GeoQuery& l, const GeoQuery& r)
-  {
-      return std::tie(l.latitude, l.longitude, l.distance)
-           < std::tie(r.latitude, r.longitude, r.distance); // keep the same order
-  }
-};
-
-class SearchInfo {
-  public:
-    SearchInfo(const std::string& pattern, GeoQuery geoQuery, const Library::BookIdSet& bookIds, const std::string& bookFilterString);
-
-    zim::Query getZimQuery(bool verbose) const;
-    const Library::BookIdSet& getBookIds() const { return bookIds; }
-
-    friend bool operator<(const SearchInfo& l, const SearchInfo& r)
-    {
-        return std::tie(l.bookIds, l.pattern, l.geoQuery)
-             < std::tie(r.bookIds, r.pattern, r.geoQuery); // keep the same order
-    }
-
-  public: //data
-    std::string pattern;
-    GeoQuery geoQuery;
-    Library::BookIdSet bookIds;
-    std::string bookFilterQuery;
-};
-
-
 typedef kainjow::mustache::data MustacheData;
+
+class Entry;
 class OPDSDumper;

 class InternalServer {
@@ -98,14 +51,11 @@ class InternalServer {
                   int port,
                   std::string root,
                   int nbThreads,
-                   unsigned int multizimSearchLimit,
                   bool verbose,
                   bool withTaskbar,
                   bool withLibraryButton,
-                   bool blockExternalLinks,
-                   std::string indexTemplateString,
-                   int ipConnectionLimit);
-    virtual ~InternalServer();
+                   bool blockExternalLinks);
+    virtual ~InternalServer() = default;

    MHD_Result handlerCallback(struct MHD_Connection* connection,
                               const char* url,
@@ -116,78 +66,54 @@ class InternalServer {
                               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_viewer_settings(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_entries(const RequestContext& request);
    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_meta(const RequestContext& request);
    std::unique_ptr<Response> handle_search(const RequestContext& request);
-    std::unique_ptr<Response> handle_search_request(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_catch(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::unique_ptr<Response> handle_locally_customized_resource(const RequestContext& request);

    std::vector<std::string> search_catalog(const RequestContext& request,
                                            kiwix::OPDSDumper& opdsDumper);

    MustacheData get_default_data() const;

-    std::pair<std::string, Library::BookIdSet> selectBooks(const RequestContext& r) const;
-    SearchInfo getSearchInfo(const RequestContext& r) const;
-
-    bool isLocallyCustomizedResource(const std::string& url) const;
-
-    std::string getLibraryId() const;
-
-  private: // types
-    class LockableSuggestionSearcher;
-    typedef ConcurrentCache<SearchInfo, std::shared_ptr<zim::Search>> SearchCache;
-    typedef ConcurrentCache<std::string, std::shared_ptr<LockableSuggestionSearcher>> SuggestionSearcherCache;
+    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;
-    unsigned int m_multizimSearchLimit;
    std::atomic_bool m_verbose;
    bool m_withTaskbar;
    bool m_withLibraryButton;
    bool m_blockExternalLinks;
-    std::string m_indexTemplateString;
-    int m_ipConnectionLimit;
    struct MHD_Daemon* mp_daemon;

    Library* mp_library;
    NameMapper* mp_nameMapper;

-    SearchCache searchCache;
-    SuggestionSearcherCache suggestionSearcherCache;
-
    std::string m_server_id;
-
-    class CustomizedResources;
-    std::unique_ptr<CustomizedResources> m_customizedResources;
+    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);
+    friend std::unique_ptr<ContentResponse> ContentResponse::build(const InternalServer& server, const std::string& content, const std::string& mimetype, bool isHomePage);
    friend std::unique_ptr<Response> ItemResponse::build(const InternalServer& server, const RequestContext& request, const zim::Item& item);
+    friend std::unique_ptr<Response> Response::build_500(const InternalServer& server, const std::string& msg);
+
 };

 }
--- a/src/server/internalServer_catalog_v2.cpp
+++ b/src/server/internalServer_catalog_v2.cpp
@@ -24,7 +24,7 @@
 #include "request_context.h"
 #include "response.h"
 #include "tools/otherTools.h"
-#include "libkiwix-resources.h"
+#include "kiwixlib-resources.h"

 #include <mustache.hpp>

@@ -43,8 +43,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2(const RequestContext
  try {
    url  = request.get_url_part(2);
  } catch (const std::out_of_range&) {
-    return HTTP404Response(*this, request)
-           + urlNotFoundMsg;
+    return Response::build_404(*this, request, "", "");
  }

  if (url == "root.xml") {
@@ -56,51 +55,38 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2(const RequestContext
        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);
+    return handle_catalog_v2_entries(request);
  } 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 HTTP404Response(*this, request)
-           + urlNotFoundMsg;
+    return Response::build_404(*this, request, "", "");
  }
 }

 std::unique_ptr<Response> InternalServer::handle_catalog_v2_root(const RequestContext& request)
 {
-  const std::string libraryId = getLibraryId();
  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(libraryId)},
-               {"all_entries_feed_id", gen_uuid(libraryId + "/entries")},
-               {"partial_entries_feed_id", gen_uuid(libraryId + "/partial_entries")},
-               {"category_list_feed_id", gen_uuid(libraryId + "/categories")},
-               {"language_list_feed_id", gen_uuid(libraryId + "/languages")}
+               {"feed_id", gen_uuid(m_library_id)},
+               {"all_entries_feed_id", gen_uuid(m_library_id + "/entries")},
+               {"category_list_feed_id", gen_uuid(m_library_id + "/categories")}
             },
             "application/atom+xml;profile=opds-catalog;kind=navigation"
  );
 }

-std::unique_ptr<Response> InternalServer::handle_catalog_v2_entries(const RequestContext& request, bool partial)
+std::unique_ptr<Response> InternalServer::handle_catalog_v2_entries(const RequestContext& request)
 {
-  OPDSDumper opdsDumper(mp_library, mp_nameMapper);
+  OPDSDumper opdsDumper(mp_library);
  opdsDumper.setRootLocation(m_root);
-  opdsDumper.setLibraryId(getLibraryId());
+  opdsDumper.setLibraryId(m_library_id);
  const auto bookIds = search_catalog(request, opdsDumper);
-  const auto opdsFeed = opdsDumper.dumpOPDSFeedV2(bookIds, request.get_query(), partial);
+  const auto opdsFeed = opdsDumper.dumpOPDSFeedV2(bookIds, request.get_query());
  return ContentResponse::build(
             *this,
             opdsFeed,
@@ -108,66 +94,16 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2_entries(const Reques
  );
 }

-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 HTTP404Response(*this, request)
-           + urlNotFoundMsg;
-  }
-
-  OPDSDumper opdsDumper(mp_library, mp_nameMapper);
-  opdsDumper.setRootLocation(m_root);
-  opdsDumper.setLibraryId(getLibraryId());
-  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, mp_nameMapper);
+  OPDSDumper opdsDumper(mp_library);
  opdsDumper.setRootLocation(m_root);
-  opdsDumper.setLibraryId(getLibraryId());
+  opdsDumper.setLibraryId(m_library_id);
  return ContentResponse::build(
             *this,
-             opdsDumper.categoriesOPDSFeed(),
+             opdsDumper.categoriesOPDSFeed(mp_library->getBooksCategories()),
             "application/atom+xml;profile=opds-catalog;kind=navigation"
  );
 }

-std::unique_ptr<Response> InternalServer::handle_catalog_v2_languages(const RequestContext& request)
-{
-  OPDSDumper opdsDumper(mp_library, mp_nameMapper);
-  opdsDumper.setRootLocation(m_root);
-  opdsDumper.setLibraryId(getLibraryId());
-  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 bookId  = request.get_url_part(3);
-    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 HTTP404Response(*this, request)
-           + urlNotFoundMsg;
-  }
-}
-
 } // namespace kiwix
--- a/src/server/request_context.cpp
+++ b/src/server/request_context.cpp
@@ -25,10 +25,8 @@
 #include <sstream>
 #include <cstdio>
 #include <atomic>
-#include <cctype>

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

 namespace kiwix {

@@ -68,33 +66,29 @@ fullURL2LocalURL(const std::string& full_url, const std::string& rootLocation)
 } // unnamed namespace

 RequestContext::RequestContext(struct MHD_Connection* connection,
-                               std::string _rootLocation,
+                               std::string rootLocation,
                               const std::string& _url,
                               const std::string& _method,
                               const std::string& version) :
-  rootLocation(_rootLocation),
  full_url(_url),
-  url(fullURL2LocalURL(_url, _rootLocation)),
+  url(fullURL2LocalURL(_url, rootLocation)),
  method(str2RequestMethod(_method)),
  version(version),
  requestIndex(s_requestIndex++),
-  acceptEncodingGzip(false),
+  acceptEncodingDeflate(false),
  byteRange_()
 {
  MHD_get_connection_values(connection, MHD_HEADER_KIND, &RequestContext::fill_header, this);
  MHD_get_connection_values(connection, MHD_GET_ARGUMENT_KIND, &RequestContext::fill_argument, this);
-  MHD_get_connection_values(connection, MHD_COOKIE_KIND, &RequestContext::fill_cookie, this);

  try {
-    acceptEncodingGzip =
-        (get_header(MHD_HTTP_HEADER_ACCEPT_ENCODING).find("gzip") != std::string::npos);
+    acceptEncodingDeflate =
+        (get_header(MHD_HTTP_HEADER_ACCEPT_ENCODING).find("deflate") != std::string::npos);
  } catch (const std::out_of_range&) {}

  try {
    byteRange_ = ByteRange::parse(get_header(MHD_HTTP_HEADER_RANGE));
  } catch (const std::out_of_range&) {}
-
-  userlang = determine_user_language();
 }

 RequestContext::~RequestContext()
@@ -112,23 +106,7 @@ MHD_Result RequestContext::fill_argument(void *__this, enum MHD_ValueKind kind,
                                         const char *key, const char* value)
 {
  RequestContext *_this = static_cast<RequestContext*>(__this);
-  _this->arguments[key].push_back(value == nullptr ? "" : value);
-  if ( ! _this->queryString.empty() ) {
-    _this->queryString += "&";
-  }
-  _this->queryString += urlEncode(key);
-  if ( value ) {
-    _this->queryString += "=";
-    _this->queryString += urlEncode(value);
-  }
-  return MHD_YES;
-}
-
-MHD_Result RequestContext::fill_cookie(void *__this, enum MHD_ValueKind kind,
-                                         const char *key, const char* value)
-{
-  RequestContext *_this = static_cast<RequestContext*>(__this);
-  _this->cookies[key] = value == nullptr ? "" : value;
+  _this->arguments[key] = value == nullptr ? "" : value;
  return MHD_YES;
 }

@@ -143,19 +121,13 @@ void RequestContext::print_debug_info() const {
    printf(" - %s : '%s'\n", it->first.c_str(), it->second.c_str());
  }
  printf("arguments :\n");
-  for (auto& pair:arguments) {
-    printf(" - %s :", pair.first.c_str());
-    bool first = true;
-    for (auto& v: pair.second) {
-      printf("%s %s", first?"":",", v.c_str());
-      first = false;
-    }
-    printf("\n");
+  for (auto it=arguments.begin(); it!=arguments.end(); it++) {
+    printf(" - %s : '%s'\n", it->first.c_str(), it->second.c_str());
  }
  printf("Parsed : \n");
  printf("full_url: %s\n", full_url.c_str());
  printf("url   : %s\n", url.c_str());
-  printf("acceptEncodingGzip : %d\n", acceptEncodingGzip);
+  printf("acceptEncodingDeflate : %d\n", acceptEncodingDeflate);
  printf("has_range : %d\n", byteRange_.kind() != ByteRange::NONE);
  printf("is_valid_url : %d\n", is_valid_url());
  printf(".............\n");
@@ -194,10 +166,6 @@ std::string RequestContext::get_full_url() const {
  return full_url;
 }

-std::string RequestContext::get_root_path() const {
-  return rootLocation.empty() ? "/" : rootLocation;
-}
-
 bool RequestContext::is_valid_url() const {
  return !url.empty();
 }
@@ -208,46 +176,21 @@ ByteRange RequestContext::get_range() const {

 template<>
 std::string RequestContext::get_argument(const std::string& name) const {
-  return arguments.at(name)[0];
+  return arguments.at(name);
 }

 std::string RequestContext::get_header(const std::string& name) const {
  return headers.at(lcAll(name));
 }

-std::string RequestContext::get_user_language() const
-{
-  return userlang.lang;
-}
-
-bool RequestContext::user_language_comes_from_cookie() const
-{
-  return userlang.selectedBy == UserLanguage::SelectorKind::COOKIE;
-}
-
-RequestContext::UserLanguage RequestContext::determine_user_language() const
-{
-  try {
-    return {UserLanguage::SelectorKind::QUERY_PARAM, get_argument("userlang")};
-  } catch(const std::out_of_range&) {}
-
-  try {
-     return {UserLanguage::SelectorKind::COOKIE, cookies.at("userlang")};
-  } catch(const std::out_of_range&) {}
-
-  try {
-    const std::string acceptLanguage = get_header("Accept-Language");
-    const auto userLangPrefs = parseUserLanguagePreferences(acceptLanguage);
-    const auto lang = selectMostSuitableLanguage(userLangPrefs);
-    return {UserLanguage::SelectorKind::ACCEPT_LANGUAGE_HEADER, lang};
-  } catch(const std::out_of_range&) {}
-
-  return {UserLanguage::SelectorKind::DEFAULT, "en"};
-}
-
-std::string RequestContext::get_requested_format() const
-{
-  return get_optional_param<std::string>("format", "html");
+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
@@ -25,11 +25,9 @@
 #include <string>
 #include <sstream>
 #include <map>
-#include <vector>
 #include <stdexcept>

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

 extern "C" {
 #include "microhttpd_wrapper.h"
@@ -70,11 +68,10 @@ class RequestContext {
    std::string get_header(const std::string& name) const;
    template<typename T=std::string>
    T get_argument(const std::string& name) const {
-        return extractFromString<T>(get_argument(name));
-    }
-
-    std::vector<std::string> get_arguments(const std::string& name) const {
-      return arguments.at(name);
+        std::istringstream stream(arguments.at(name));
+        T v;
+        stream >> v;
+        return v;
    }

    template<class T>
@@ -91,72 +88,27 @@ class RequestContext {
    std::string get_url() const;
    std::string get_url_part(int part) const;
    std::string get_full_url() const;
-    std::string get_root_path() const;
-
-    std::string get_query() const { return queryString; }
-
-    template<class F>
-    std::string get_query(F filter) const {
-      std::string q;
-      const char* sep = "";
-      for ( const auto& a : arguments ) {
-        if (!filter(a.first)) {
-          continue;
-        }
-        for (const auto& v: a.second) {
-          q += sep + urlEncode(a.first) + '=' + urlEncode(v);
-          sep = "&";
-        }
-      }
-      return q;
-    }
+    std::string get_query() const;

    ByteRange get_range() const;

-    bool can_compress() const { return acceptEncodingGzip; }
-
-    std::string get_user_language() const;
-    std::string get_requested_format() const;
-
-    bool user_language_comes_from_cookie() const;
-
-  private: // types
-    struct UserLanguage
-    {
-      enum SelectorKind
-      {
-        QUERY_PARAM,
-        COOKIE,
-        ACCEPT_LANGUAGE_HEADER,
-        DEFAULT
-      };
-
-      SelectorKind selectedBy;
-      std::string  lang;
-    };
+    bool can_compress() const { return acceptEncodingDeflate; }

  private: // data
-    std::string rootLocation;
    std::string full_url;
    std::string url;
    RequestMethod method;
    std::string version;
    unsigned long long requestIndex;

-    bool acceptEncodingGzip;
+    bool acceptEncodingDeflate;

    ByteRange byteRange_;
    std::map<std::string, std::string> headers;
-    std::map<std::string, std::vector<std::string>> arguments;
-    std::map<std::string, std::string> cookies;
-    std::string queryString;
-    UserLanguage userlang;
+    std::map<std::string, std::string> arguments;

  private: // functions
-    UserLanguage determine_user_language() const;
-
    static MHD_Result fill_header(void *, enum MHD_ValueKind, const char*, const char*);
-    static MHD_Result fill_cookie(void *, enum MHD_ValueKind, const char*, const char*);
    static MHD_Result fill_argument(void *, enum MHD_ValueKind, const char*, const char*);
 };

--- a/src/server/response.cpp
+++ b/src/server/response.cpp
@@ -20,28 +20,18 @@
 #include "response.h"
 #include "request_context.h"
 #include "internalServer.h"
-#include "libkiwix-resources.h"
+#include "kiwixlib-resources.h"

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

 #include "string.h"
 #include <mustache.hpp>
 #include <zlib.h>

-#include <array>

-// This is somehow a magic value.
-// If this value is too small, we will compress (and lost cpu time) too much
-// content.
-// If this value is too big, we will not compress enough content and send too
-// much data.
-// If we assume that MTU is 1500 Bytes it is useless to compress
-// content smaller as the content will be sent in one packet anyway.
-// 1400 Bytes seems to be a common accepted limit.
-#define KIWIX_MIN_CONTENT_SIZE_TO_COMPRESS 1400
+#define KIWIX_MIN_CONTENT_SIZE_TO_DEFLATE 100

 namespace kiwix {

@@ -53,69 +43,20 @@ std::string get_mime_type(const zim::Item& item)
 {
  try {
    return item.getMimetype();
-  } catch (std::exception& e) {
+  } catch (exception& e) {
    return "application/octet-stream";
  }
 }

 bool is_compressible_mime_type(const std::string& mimeType)
 {
-  return mimeType.find("text/") != std::string::npos
-      || mimeType.find("application/javascript") != std::string::npos
-      || mimeType.find("application/atom") != std::string::npos
-      || mimeType.find("application/opensearchdescription") != std::string::npos
-      || mimeType.find("application/json") != std::string::npos
-
-      // Web fonts
-      || mimeType.find("application/font-") != std::string::npos
-      || mimeType.find("application/x-font-") != std::string::npos
-      || mimeType.find("application/vnd.ms-fontobject") != std::string::npos
-      || mimeType.find("font/") != std::string::npos;
+  return mimeType.find("text/") != string::npos
+      || mimeType.find("application/javascript") != string::npos
+      || mimeType.find("application/atom") != string::npos
+      || mimeType.find("application/opensearchdescription") != string::npos
+      || mimeType.find("application/json") != string::npos;
 }

-bool compress(std::string &content) {
-  z_stream strm;
-  strm.zalloc = Z_NULL;
-  strm.zfree = Z_NULL;
-  strm.opaque = Z_NULL;
-
-  auto ret = deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 31, 8,
-                          Z_DEFAULT_STRATEGY);
-  if (ret != Z_OK) { return false; }
-
-  strm.avail_in = static_cast<decltype(strm.avail_in)>(content.size());
-  strm.next_in =
-      const_cast<Bytef *>(reinterpret_cast<const Bytef *>(content.data()));
-
-  std::string compressed;
-
-  std::array<char, 16384> buff{};
-  do {
-    strm.avail_out = buff.size();
-    strm.next_out = reinterpret_cast<Bytef *>(buff.data());
-    ret = deflate(&strm, Z_FINISH);
-    assert(ret != Z_STREAM_ERROR);
-    compressed.append(buff.data(), buff.size() - strm.avail_out);
-  } while (strm.avail_out == 0);
-
-  assert(ret == Z_STREAM_END);
-  assert(strm.avail_in == 0);
-
-  content.swap(compressed);
-
-  deflateEnd(&strm);
-  return true;
-}
-
-
-const char* getCacheControlHeader(Response::Kind k)
-{
-  switch(k) {
-    case Response::STATIC_RESOURCE: return "max-age=31536000, immutable";
-    case Response::ZIM_CONTENT:     return "max-age=3600, must-revalidate";
-    default:                        return "max-age=0, must-revalidate";
-  }
-}

 } // unnamed namespace

@@ -126,13 +67,6 @@ Response::Response(bool verbose)
  add_header(MHD_HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN, "*");
 }

-void Response::set_kind(Kind k)
-{
-  m_kind = k;
-  if ( k == ZIM_CONTENT )
-    m_etag.set_option(ETag::ZIM_CONTENT);
-}
-
 std::unique_ptr<Response> Response::build(const InternalServer& server)
 {
  return std::unique_ptr<Response>(new Response(server.m_verbose.load()));
@@ -143,124 +77,23 @@ std::unique_ptr<Response> Response::build_304(const InternalServer& server, cons
  auto response = Response::build(server);
  response->set_code(MHD_HTTP_NOT_MODIFIED);
  response->m_etag = etag;
-  if ( etag.get_option(ETag::ZIM_CONTENT) ) {
-    response->set_kind(Response::ZIM_CONTENT);
-  }
  if ( etag.get_option(ETag::COMPRESSED_CONTENT) ) {
    response->add_header(MHD_HTTP_HEADER_VARY, "Accept-Encoding");
  }
  return response;
 }

-const UrlNotFoundMsg urlNotFoundMsg;
-const InvalidUrlMsg invalidUrlMsg;
-
-std::string ContentResponseBlueprint::getMessage(const std::string& msgId) const
+std::unique_ptr<Response> Response::build_404(const InternalServer& server, const RequestContext& request, const std::string& bookName, const std::string& bookTitle, const std::string& details)
 {
-  return getTranslatedString(m_request.get_user_language(), msgId);
-}
+  MustacheData results;
+  results.set("url", request.get_full_url());
+  results.set("details", details);

-std::unique_ptr<ContentResponse> ContentResponseBlueprint::generateResponseObject() const
-{
-  auto r = ContentResponse::build(m_server, m_template, m_data, m_mimeType);
-  r->set_code(m_httpStatusCode);
-  return r;
-}
+  auto response = ContentResponse::build(server, RESOURCE::templates::_404_html, results, "text/html");
+  response->set_code(MHD_HTTP_NOT_FOUND);
+  response->set_taskbar(bookName, bookTitle);

-HTTPErrorResponse::HTTPErrorResponse(const InternalServer& server,
-                                     const RequestContext& request,
-                                     int httpStatusCode,
-                                     const std::string& pageTitleMsgId,
-                                     const std::string& headingMsgId,
-                                     const std::string& cssUrl)
-  : ContentResponseBlueprint(&server,
-                             &request,
-                             httpStatusCode,
-                             request.get_requested_format() == "html" ? "text/html; charset=utf-8" : "application/xml; charset=utf-8",
-                             request.get_requested_format() == "html" ? RESOURCE::templates::error_html : RESOURCE::templates::error_xml)
-{
-  kainjow::mustache::list emptyList;
-  this->m_data = kainjow::mustache::object{
-                    {"CSS_URL", onlyAsNonEmptyMustacheValue(cssUrl) },
-                    {"PAGE_TITLE",   getMessage(pageTitleMsgId)},
-                    {"PAGE_HEADING", getMessage(headingMsgId)},
-                    {"details", emptyList}
-  };
-}
-
-HTTP404Response::HTTP404Response(const InternalServer& server,
-                                 const RequestContext& request)
-  : HTTPErrorResponse(server,
-                      request,
-                      MHD_HTTP_NOT_FOUND,
-                      "404-page-title",
-                      "404-page-heading")
-{
-}
-
-HTTPErrorResponse& HTTP404Response::operator+(UrlNotFoundMsg /*unused*/)
-{
-  const std::string requestUrl = m_request.get_full_url();
-  return *this + ParameterizedMessage("url-not-found", {{"url", requestUrl}});
-}
-
-HTTPErrorResponse& HTTPErrorResponse::operator+(const std::string& msg)
-{
-  m_data["details"].push_back({"p", msg});
-  return *this;
-}
-
-HTTPErrorResponse& HTTPErrorResponse::operator+(const ParameterizedMessage& details)
-{
-  return *this + details.getText(m_request.get_user_language());
-}
-
-HTTPErrorResponse& HTTPErrorResponse::operator+=(const ParameterizedMessage& details)
-{
-  // operator+() is already a state-modifying operator (akin to operator+=)
-  return *this + details;
-}
-
-
-HTTP400Response::HTTP400Response(const InternalServer& server,
-                                 const RequestContext& request)
-  : HTTPErrorResponse(server,
-                      request,
-                      MHD_HTTP_BAD_REQUEST,
-                      "400-page-title",
-                      "400-page-heading")
-{
-}
-
-HTTPErrorResponse& HTTP400Response::operator+(InvalidUrlMsg /*unused*/)
-{
-  std::string requestUrl = m_request.get_full_url();
-  const auto query = m_request.get_query();
-  if (!query.empty()) {
-    requestUrl += "?" + encodeDiples(query);
-  }
-  kainjow::mustache::mustache msgTmpl(R"(The requested URL "{{{url}}}" is not a valid request.)");
-  return *this + msgTmpl.render({"url", requestUrl});
-}
-
-HTTP500Response::HTTP500Response(const InternalServer& server,
-                                 const RequestContext& request)
-  : HTTPErrorResponse(server,
-                      request,
-                      MHD_HTTP_INTERNAL_SERVER_ERROR,
-                      "500-page-title",
-                      "500-page-heading")
-{
-  // operator+() is a state-modifying operator (akin to operator+=)
-  *this + "An internal server error occured. We are sorry about that :/";
-}
-
-std::unique_ptr<ContentResponse> HTTP500Response::generateResponseObject() const
-{
-  const std::string mimeType = "text/html;charset=utf-8";
-  auto r = ContentResponse::build(m_server, m_template, m_data, mimeType);
-  r->set_code(m_httpStatusCode);
-  return r;
+  return std::move(response);
 }

 std::unique_ptr<Response> Response::build_416(const InternalServer& server, size_t resourceLength)
@@ -276,6 +109,17 @@ std::unique_ptr<Response> Response::build_416(const InternalServer& server, size
  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, true, false, false, false, content, "text/html"));
+  response->set_code(MHD_HTTP_INTERNAL_SERVER_ERROR);
+  return response;
+}
+

 std::unique_ptr<Response> Response::build_redirect(const InternalServer& server, const std::string& redirectUrl)
 {
@@ -311,7 +155,7 @@ static ssize_t callback_reader_from_item(void* cls,
 {
  RunningResponse* response = static_cast<RunningResponse*>(cls);

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

@@ -341,12 +185,59 @@ void print_response_info(int retCode, MHD_Response* response)
 }


+void ContentResponse::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("title", m_bookTitle);
+  data.set("withlibrarybutton", m_withLibraryButton);
+  auto head_content = render_template(RESOURCE::templates::head_taskbar_html, data);
+  m_content = prependToFirstOccurence(
+    m_content,
+    "</head[ \\t]*>",
+    head_content);
+
+  auto taskbar_part = render_template(RESOURCE::templates::taskbar_part_html, data);
+  m_content = appendToFirstOccurence(
+    m_content,
+    "<body[^>]*>",
+    taskbar_part);
+}
+
+
+void ContentResponse::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,
+    "</head[ \\t]*>",
+    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
 {
  return request.can_compress()
      && is_compressible_mime_type(m_mimeType)
-      && (m_content.size() > KIWIX_MIN_CONTENT_SIZE_TO_COMPRESS);
+      && (m_content.size() > KIWIX_MIN_CONTENT_SIZE_TO_DEFLATE);
+}
+
+bool
+ContentResponse::contentDecorationAllowed() const
+{
+    return (startsWith(m_mimeType, "text/html")
+         && m_mimeType.find(";raw=true") == std::string::npos);
 }

 MHD_Response*
@@ -359,17 +250,46 @@ Response::create_mhd_response(const RequestContext& request)
 MHD_Response*
 ContentResponse::create_mhd_response(const RequestContext& request)
 {
-  const bool isCompressed = can_compress(request) && compress(m_content);
+  if (contentDecorationAllowed()) {
+    inject_root_link();
+
+    if (m_withTaskbar) {
+      introduce_taskbar();
+    }
+    if (m_blockExternalLinks) {
+      inject_externallinks_blocker();
+    }
+  }
+
+  bool shouldCompress = can_compress(request);
+  if (shouldCompress) {
+    std::vector<Bytef> compr_buffer(compressBound(m_content.size()));
+    uLongf comprLen = compr_buffer.capacity();
+    int err = compress(&compr_buffer[0],
+                       &comprLen,
+                       (const Bytef*)(m_content.data()),
+                       m_content.size());
+    if (err == Z_OK && comprLen > 2 && comprLen < (m_content.size() + 2)) {
+      /* /!\ Internet Explorer has a bug with deflate compression.
+         It can not handle the first two bytes (compression headers)
+         We need to chunk them off (move the content 2bytes)
+         It has no incidence on other browsers
+         See http://www.subbu.org/blog/2008/03/ie7-deflate-or-not and comments */
+      m_content = string((char*)&compr_buffer[2], comprLen - 2);
+      m_etag.set_option(ETag::COMPRESSED_CONTENT);
+    } else {
+      shouldCompress = false;
+    }
+  }

  MHD_Response* response = MHD_create_response_from_buffer(
    m_content.size(), const_cast<char*>(m_content.data()), MHD_RESPMEM_MUST_COPY);

-  if (isCompressed) {
-    m_etag.set_option(ETag::COMPRESSED_CONTENT);
+  if (shouldCompress) {
    MHD_add_response_header(
        response, MHD_HTTP_HEADER_VARY, "Accept-Encoding");
    MHD_add_response_header(
-        response, MHD_HTTP_HEADER_CONTENT_ENCODING, "gzip");
+        response, MHD_HTTP_HEADER_CONTENT_ENCODING, "deflate");
  }
  return response;
 }
@@ -379,7 +299,7 @@ MHD_Result Response::send(const RequestContext& request, MHD_Connection* connect
  MHD_Response* response = create_mhd_response(request);

  MHD_add_response_header(response, MHD_HTTP_HEADER_CACHE_CONTROL,
-                          getCacheControlHeader(m_kind));
+    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());
@@ -387,13 +307,6 @@ MHD_Result Response::send(const RequestContext& request, MHD_Connection* connect
    MHD_add_response_header(response, p.first.c_str(), p.second.c_str());
  }

-  if ( ! request.user_language_comes_from_cookie() ) {
-    const std::string cookie = "userlang=" + request.get_user_language()
-                               + ";Path=" + request.get_root_path()
-                               + ";Max-Age=31536000";
-    MHD_add_response_header(response, MHD_HTTP_HEADER_SET_COOKIE, cookie.c_str());
-  }
-
  if (m_returnCode == MHD_HTTP_OK && m_byteRange.kind() == ByteRange::RESOLVED_PARTIAL_CONTENT)
    m_returnCode = MHD_HTTP_PARTIAL_CONTENT;

@@ -405,35 +318,42 @@ MHD_Result Response::send(const RequestContext& request, MHD_Connection* connect
  return ret;
 }

-ContentResponse::ContentResponse(const std::string& root, bool verbose, const std::string& content, const std::string& mimetype) :
+void ContentResponse::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 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_mimeType(mimetype),
+  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)
+std::unique_ptr<ContentResponse> ContentResponse::build(const InternalServer& server, const std::string& content, const std::string& mimetype, bool isHomePage)
 {
   return std::unique_ptr<ContentResponse>(new ContentResponse(
        server.m_root,
        server.m_verbose.load(),
+        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)
-{
+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);
+  return ContentResponse::build(server, content, mimetype, isHomePage);
 }

 ItemResponse::ItemResponse(bool verbose, const zim::Item& item, const std::string& mimetype, const ByteRange& byterange) :
@@ -442,7 +362,7 @@ ItemResponse::ItemResponse(bool verbose, const zim::Item& item, const std::strin
  m_mimeType(mimetype)
 {
  m_byteRange = byterange;
-  set_kind(Response::ZIM_CONTENT);
+  set_cacheable();
  add_header(MHD_HTTP_HEADER_CONTENT_TYPE, m_mimeType);
 }

@@ -454,14 +374,14 @@ std::unique_ptr<Response> ItemResponse::build(const InternalServer& server, cons
  if (noRange && is_compressible_mime_type(mimetype)) {
    // Return a contentResponse
    auto response = ContentResponse::build(server, item.getData(), mimetype);
-    response->set_kind(Response::ZIM_CONTENT);
+    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_kind(Response::ZIM_CONTENT);
+    response->set_cacheable();
    return response;
  }

--- a/src/server/response.h
+++ b/src/server/response.h
@@ -26,48 +26,37 @@

 #include <mustache.hpp>
 #include "byte_range.h"
+#include "entry.h"
 #include "etag.h"
-#include "i18n.h"
-
-#include <zim/item.h>

 extern "C" {
 #include "microhttpd_wrapper.h"
 }

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

 class InternalServer;
 class RequestContext;

-class Response {
-  public:
-    enum Kind
-    {
-      STATIC_RESOURCE,
-      ZIM_CONTENT,
-      DYNAMIC_CONTENT
-    };
+class EntryResponse;

+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 RequestContext& request, 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);

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

    void set_code(int code) { m_returnCode = code; }
-    void set_kind(Kind k);
-    Kind get_kind() const { return m_kind; }
-    void set_etag_body(const std::string& id) { m_etag.set_body(id); }
+    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; }
@@ -77,7 +66,6 @@ class Response {
    MHD_Response* create_error_response(const RequestContext& request) const;

  protected: // data
-    Kind m_kind = DYNAMIC_CONTENT;
    bool m_verbose;
    int m_returnCode;
    ByteRange m_byteRange;
@@ -90,127 +78,33 @@ class Response {

 class ContentResponse : public Response {
  public:
-    ContentResponse(
-      const std::string& root,
-      bool verbose,
-      const std::string& content,
-      const std::string& mimetype);
+    ContentResponse(const std::string& root, bool verbose, 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);
+    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);

-    static std::unique_ptr<ContentResponse> build(
-      const InternalServer& server,
-      const std::string& content,
-      const std::string& mimetype);
-
-    static std::unique_ptr<ContentResponse> build(
-      const InternalServer& server,
-      const std::string& template_str,
-      kainjow::mustache::data data,
-      const std::string& mimetype);
+    void set_taskbar(const std::string& bookName, const std::string& bookTitle);

  private:
    MHD_Response* create_mhd_response(const RequestContext& request);

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


  private:
    std::string m_root;
    std::string m_content;
    std::string m_mimeType;
+    bool m_withTaskbar;
+    bool m_withLibraryButton;
+    bool m_blockExternalLinks;
+    std::string m_bookName;
+    std::string m_bookTitle;
 };

-class ContentResponseBlueprint
-{
-public: // functions
-  ContentResponseBlueprint(const InternalServer* server,
-                           const RequestContext* request,
-                           int httpStatusCode,
-                           const std::string& mimeType,
-                           const std::string& templateStr)
-    : m_server(*server)
-    , m_request(*request)
-    , m_httpStatusCode(httpStatusCode)
-    , m_mimeType(mimeType)
-    , m_template(templateStr)
-  {}
-
-  virtual ~ContentResponseBlueprint() = default;
-
-  operator std::unique_ptr<ContentResponse>() const
-  {
-    return generateResponseObject();
-  }
-
-  operator std::unique_ptr<Response>() const
-  {
-    return operator std::unique_ptr<ContentResponse>();
-  }
-
-
-protected: // functions
-  std::string getMessage(const std::string& msgId) const;
-  virtual std::unique_ptr<ContentResponse> generateResponseObject() const;
-
-public: //data
-  const InternalServer& m_server;
-  const RequestContext& m_request;
-  const int m_httpStatusCode;
-  const std::string m_mimeType;
-  const std::string m_template;
-  kainjow::mustache::data m_data;
-};
-
-struct HTTPErrorResponse : ContentResponseBlueprint
-{
-  HTTPErrorResponse(const InternalServer& server,
-                    const RequestContext& request,
-                    int httpStatusCode,
-                    const std::string& pageTitleMsgId,
-                    const std::string& headingMsgId,
-                    const std::string& cssUrl = "");
-
-  HTTPErrorResponse& operator+(const std::string& msg);
-  HTTPErrorResponse& operator+(const ParameterizedMessage& errorDetails);
-  HTTPErrorResponse& operator+=(const ParameterizedMessage& errorDetails);
-};
-
-class UrlNotFoundMsg {};
-
-extern const UrlNotFoundMsg urlNotFoundMsg;
-
-struct HTTP404Response : HTTPErrorResponse
-{
-  HTTP404Response(const InternalServer& server,
-                  const RequestContext& request);
-
-  using HTTPErrorResponse::operator+;
-  HTTPErrorResponse& operator+(UrlNotFoundMsg /*unused*/);
-};
-
-class InvalidUrlMsg {};
-
-extern const InvalidUrlMsg invalidUrlMsg;
-
-struct HTTP400Response : HTTPErrorResponse
-{
-  HTTP400Response(const InternalServer& server,
-                  const RequestContext& request);
-
-  using HTTPErrorResponse::operator+;
-  HTTPErrorResponse& operator+(InvalidUrlMsg /*unused*/);
-};
-
-struct HTTP500Response : HTTPErrorResponse
-{
-  HTTP500Response(const InternalServer& server,
-                  const RequestContext& request);
-
-private: // overrides
-  // generateResponseObject() is overriden in order to produce a minimal
-  // response without any need for additional resources from the server
-  std::unique_ptr<ContentResponse> generateResponseObject() const override;
-};
-
 class ItemResponse : public Response {
  public:
    ItemResponse(bool verbose, const zim::Item& item, const std::string& mimetype, const ByteRange& byterange);
--- a/src/tools/archiveTools.cpp
+++ b/src/tools/archiveTools.cpp
@@ -69,6 +69,18 @@ std::string getMetaTags(const zim::Archive& archive, bool original) {
  return join(tags, ";");
 }

+bool getArchiveFavicon(const zim::Archive& archive,
+                           std::string& content, std::string& mimeType){
+  try {
+    auto item = archive.getIllustrationItem();
+    content = item.getData();
+    mimeType = item.getMimetype();
+    return true;
+  } catch(zim::EntryNotFound& e) {};
+
+  return false;
+}
+
 std::string getMetaLanguage(const zim::Archive& archive) {
  return getMetadata(archive, "Language");
 }
@@ -89,26 +101,6 @@ std::string getMetaPublisher(const zim::Archive& archive) {
  return getMetadata(archive, "Publisher");
 }

-std::string getMetaFlavour(const zim::Archive& archive) {
-  return getMetadata(archive, "Flavour");
-}
-
-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;
-}
-
-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);
@@ -125,4 +117,5 @@ zim::Entry getEntryFromPath(const zim::Archive& archive, const std::string& path
  }
  throw zim::EntryNotFound("Cannot find entry for non empty path");
 }
+
 } // kiwix
--- a/src/tools/archiveTools.h
+++ b/src/tools/archiveTools.h
@@ -21,7 +21,6 @@
 #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
@@ -34,22 +33,14 @@ namespace kiwix
    std::string getArchiveTitle(const zim::Archive& archive);
    std::string getMetaDescription(const zim::Archive& archive);
    std::string getMetaTags(const zim::Archive& archive, bool original = false);
+    bool getArchiveFavicon(const zim::Archive& archive,
+                           std::string& content, std::string& mimeType);
    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);
-
-    bool getArchiveFavicon(const zim::Archive& archive, unsigned size,
-                           std::string& content, std::string& mimeType);
-
-    unsigned int getArchiveMediaCount(const zim::Archive& archive);
-    unsigned int getArchiveArticleCount(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);
 }

--- a/src/tools/concurrent_cache.h
+++ b/src/tools/concurrent_cache.h
@@ -1,208 +0,0 @@
-
-/*
- * Copyright (C) 2021 Matthieu Gautier <mgautier@kymeria.fr>
- * Copyright (C) 2020 Veloman Yunkan
- *
- * 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 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
- * NON-INFRINGEMENT.  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 St, Fifth Floor, Boston, MA  02110-1301 USA
- *
- */
-
-#ifndef ZIM_CONCURRENT_CACHE_H
-#define ZIM_CONCURRENT_CACHE_H
-
-#include "lrucache.h"
-
-#include <future>
-#include <mutex>
-
-namespace kiwix
-{
-
-/**
-   ConcurrentCache implements a concurrent thread-safe cache
-
-   Compared to kiwix::lru_cache, each access operation is slightly more expensive.
-   However, different slots of the cache can be safely accessed concurrently
-   with minimal blocking. Concurrent access to the same element is also
-   safe, and, in case of a cache miss, will block until that element becomes
-   available.
- */
-template <typename Key, typename Value>
-class ConcurrentCache
-{
-private: // types
-  typedef std::shared_future<Value> ValuePlaceholder;
-  typedef lru_cache<Key, ValuePlaceholder> Impl;
-
-public: // types
-  explicit ConcurrentCache(size_t maxEntries)
-    : impl_(maxEntries)
-  {}
-
-  // Gets the entry corresponding to the given key. If the entry is not in the
-  // cache, it is obtained by calling f() (without any arguments) and the
-  // result is put into the cache.
-  //
-  // The cache as a whole is locked only for the duration of accessing
-  // the respective slot. If, in the case of the a cache miss, the generation
-  // of the missing element takes a long time, only attempts to access that
-  // element will block - the rest of the cache remains open to concurrent
-  // access.
-  template<class F>
-  Value getOrPut(const Key& key, F f)
-  {
-    std::promise<Value> valuePromise;
-    std::unique_lock<std::mutex> l(lock_);
-    const auto x = impl_.getOrPut(key, valuePromise.get_future().share());
-    l.unlock();
-    if ( x.miss() ) {
-      try {
-        valuePromise.set_value(f());
-      } catch (std::exception& e) {
-        drop(key);
-        throw;
-      }
-    }
-
-    return x.value().get();
-  }
-
-  bool drop(const Key& key)
-  {
-    std::unique_lock<std::mutex> l(lock_);
-    return impl_.drop(key);
-  }
-
-  size_t setMaxSize(size_t new_size) {
-    std::unique_lock<std::mutex> l(lock_);
-    return  impl_.setMaxSize(new_size);
-  }
-
-protected: // data
-  Impl impl_;
-  std::mutex lock_;
-};
-
-
-/**
-  WeakStore represent a thread safe store (map) of weak ptr.
-  It allows to store weak_ptr from shared_ptr and retrieve shared_ptr from
-  potential non expired weak_ptr.
-  It is not limited in size.
-*/
-template<typename Key, typename Value>
-class WeakStore {
-  private: // types
-    typedef std::weak_ptr<Value> WeakValue;
-
-  public:
-    explicit WeakStore() = default;
-
-    std::shared_ptr<Value> get(const Key& key)
-    {
-      std::lock_guard<std::mutex> l(m_lock);
-      auto it = m_weakMap.find(key);
-      if (it != m_weakMap.end()) {
-        auto shared = it->second.lock();
-        if (shared) {
-          return shared;
-        } else {
-          m_weakMap.erase(it);
-        }
-      }
-      throw std::runtime_error("No weak ptr");
-    }
-
-    void add(const Key& key, std::shared_ptr<Value> shared)
-    {
-      std::lock_guard<std::mutex> l(m_lock);
-      m_weakMap[key] = WeakValue(shared);
-    }
-
-
-  private: //data
-    std::map<Key, WeakValue> m_weakMap;
-    std::mutex m_lock;
-};
-
-template <typename Key, typename RawValue>
-class ConcurrentCache<Key, std::shared_ptr<RawValue>>
-{
-private: // types
-  typedef std::shared_ptr<RawValue> Value;
-  typedef std::shared_future<Value> ValuePlaceholder;
-  typedef lru_cache<Key, ValuePlaceholder> Impl;
-
-public: // types
-  explicit ConcurrentCache(size_t maxEntries)
-    : impl_(maxEntries)
-  {}
-
-  // Gets the entry corresponding to the given key. If the entry is not in the
-  // cache, it is obtained by calling f() (without any arguments) and the
-  // result is put into the cache.
-  //
-  // The cache as a whole is locked only for the duration of accessing
-  // the respective slot. If, in the case of the a cache miss, the generation
-  // of the missing element takes a long time, only attempts to access that
-  // element will block - the rest of the cache remains open to concurrent
-  // access.
-  template<class F>
-  Value getOrPut(const Key& key, F f)
-  {
-    std::promise<Value> valuePromise;
-    std::unique_lock<std::mutex> l(lock_);
-    const auto x = impl_.getOrPut(key, valuePromise.get_future().share());
-    l.unlock();
-    if ( x.miss() ) {
-      // Try to get back the shared_ptr from the weak_ptr first.
-      try {
-        valuePromise.set_value(m_weakStore.get(key));
-      } catch(const std::runtime_error& e) {
-        try {
-          const auto value = f();
-          valuePromise.set_value(value);
-          m_weakStore.add(key, value);
-        } catch (std::exception& e) {
-          drop(key);
-          throw;
-        }
-      }
-    }
-
-    return x.value().get();
-  }
-
-  bool drop(const Key& key)
-  {
-    std::unique_lock<std::mutex> l(lock_);
-    return impl_.drop(key);
-  }
-
-  size_t setMaxSize(size_t new_size) {
-    std::unique_lock<std::mutex> l(lock_);
-    return  impl_.setMaxSize(new_size);
-  }
-
-protected: // data
-  std::mutex lock_;
-  Impl impl_;
-  WeakStore<Key, RawValue> m_weakStore;
-};
-
-} // namespace kiwix
-
-#endif // ZIM_CONCURRENT_CACHE_H
-
--- a/src/tools/lrucache.h
+++ b/src/tools/lrucache.h
@@ -1,175 +0,0 @@
-/*
- * Copyrigth (c) 2021, Matthieu Gautier <mgautier@kymeria.fr>
- * Copyright (c) 2020, Veloman Yunkan
- * Copyright (c) 2014, lamerman
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of lamerman nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * File:   lrucache.hpp
- * Author: Alexander Ponomarev
- *
- * Created on June 20, 2013, 5:09 PM
- */
-
-#ifndef _LRUCACHE_HPP_INCLUDED_
-#define _LRUCACHE_HPP_INCLUDED_
-
-#include <map>
-#include <list>
-#include <set>
-#include <cstddef>
-#include <stdexcept>
-#include <cassert>
-
-namespace kiwix {
-
-template<typename key_t, typename value_t>
-class lru_cache {
-public: // types
-  typedef typename std::pair<key_t, value_t> key_value_pair_t;
-  typedef typename std::list<key_value_pair_t>::iterator list_iterator_t;
-
-  enum AccessStatus {
-    HIT, // key was found in the cache
-    PUT, // key was not in the cache but was created by the getOrPut() access
-    MISS // key was not in the cache; get() access failed
-  };
-
-  class AccessResult
-  {
-    const AccessStatus status_;
-    const value_t val_;
-  public:
-    AccessResult(const value_t& val, AccessStatus status)
-      : status_(status), val_(val)
-    {}
-    AccessResult() : status_(MISS), val_() {}
-
-    bool hit() const { return status_ == HIT; }
-    bool miss() const { return !hit(); }
-    const value_t& value() const
-    {
-      if ( status_ == MISS )
-        throw std::range_error("There is no such key in cache");
-      return val_;
-    }
-
-    operator const value_t& () const { return value(); }
-  };
-
-public: // functions
-  explicit lru_cache(size_t max_size) :
-    _max_size(max_size) {
-  }
-
-  // If 'key' is present in the cache, returns the associated value,
-  // otherwise puts the given value into the cache (and returns it with
-  // a status of a cache miss).
-  AccessResult getOrPut(const key_t& key, const value_t& value) {
-    auto it = _cache_items_map.find(key);
-    if (it != _cache_items_map.end()) {
-      _cache_items_list.splice(_cache_items_list.begin(), _cache_items_list, it->second);
-      return AccessResult(it->second->second, HIT);
-    } else {
-      putMissing(key, value);
-      return AccessResult(value, PUT);
-    }
-  }
-
-  void put(const key_t& key, const value_t& value) {
-    auto it = _cache_items_map.find(key);
-    if (it != _cache_items_map.end()) {
-      _cache_items_list.splice(_cache_items_list.begin(), _cache_items_list, it->second);
-      it->second->second = value;
-    } else {
-      putMissing(key, value);
-    }
-  }
-
-  AccessResult get(const key_t& key) {
-    auto it = _cache_items_map.find(key);
-    if (it == _cache_items_map.end()) {
-      return AccessResult();
-    } else {
-      _cache_items_list.splice(_cache_items_list.begin(), _cache_items_list, it->second);
-      return AccessResult(it->second->second, HIT);
-    }
-  }
-
-  bool drop(const key_t& key) {
-    try {
-      auto list_it = _cache_items_map.at(key);
-      _cache_items_list.erase(list_it);
-      _cache_items_map.erase(key);
-      return true;
-    } catch (std::out_of_range& e) {
-      return false;
-    }
-  }
-
-  bool exists(const key_t& key) const {
-    return _cache_items_map.find(key) != _cache_items_map.end();
-  }
-
-  size_t size() const {
-    return _cache_items_map.size();
-  }
-
-  size_t setMaxSize(size_t new_size) {
-    size_t previous = _max_size;
-    _max_size = new_size;
-    return previous;
-  }
-
-  std::set<key_t> keys() const  {
-    std::set<key_t> keys;
-    for(auto& item:_cache_items_map) {
-      keys.insert(item.first);
-    }
-    return keys;
-  }
-
-private: // functions
-  void putMissing(const key_t& key, const value_t& value) {
-    assert(_cache_items_map.find(key) == _cache_items_map.end());
-    _cache_items_list.push_front(key_value_pair_t(key, value));
-    _cache_items_map[key] = _cache_items_list.begin();
-    while (_cache_items_map.size() > _max_size) {
-      _cache_items_map.erase(_cache_items_list.back().first);
-      _cache_items_list.pop_back();
-    }
-  }
-
-private: // data
-  std::list<key_value_pair_t> _cache_items_list;
-  std::map<key_t, list_iterator_t> _cache_items_map;
-  size_t _max_size;
-};
-
-} // namespace kiwix
-
-#endif  /* _LRUCACHE_HPP_INCLUDED_ */
--- 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
@@ -32,15 +32,12 @@
 #endif

 #include "tools/stringTools.h"
-#include "server/i18n.h"
-#include "libkiwix-resources.h"

 #include <map>
 #include <sstream>
 #include <pugixml.hpp>

 #include <zim/uuid.h>
-#include <zim/suggestion_iterator.h>


 static std::map<std::string, std::string> codeisomapping {
@@ -291,6 +288,67 @@ 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);
@@ -312,86 +370,13 @@ std::string kiwix::gen_uuid(const std::string& s)
  return kiwix::to_string(zim::Uuid::generate(s));
 }

-kainjow::mustache::data kiwix::onlyAsNonEmptyMustacheValue(const std::string& s)
-{
-  return s.empty()
-       ? kainjow::mustache::data(false)
-       : kainjow::mustache::data(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();
 }
-
-namespace
-{
-
-std::string escapeBackslashes(const std::string& s)
-{
-  std::string es;
-  es.reserve(s.size());
-  for (char c : s) {
-    if ( c == '\\' ) {
-      es.push_back('\\');
-    }
-    es.push_back(c);
-  }
-  return es;
-}
-
-std::string makeFulltextSearchSuggestion(const std::string& lang,
-                                         const std::string& queryString)
-{
-  return kiwix::i18n::expandParameterizedString(lang, "suggest-full-text-search",
-               {
-                  {"SEARCH_TERMS", queryString}
-               }
-         );
-}
-
-} // unnamed namespace
-
-kiwix::Suggestions::Suggestions()
-  : m_data(kainjow::mustache::data::type::list)
-{
-}
-
-void kiwix::Suggestions::add(const zim::SuggestionItem& suggestion)
-{
-  kainjow::mustache::data result;
-
-  const std::string label = suggestion.hasSnippet()
-                          ? suggestion.getSnippet()
-                          : suggestion.getTitle();
-
-  result.set("label", escapeBackslashes(label));
-  result.set("value", escapeBackslashes(suggestion.getTitle()));
-  result.set("kind", "path");
-  result.set("path", escapeBackslashes(suggestion.getPath()));
-  result.set("first", m_data.is_empty_list());
-  m_data.push_back(result);
-}
-
-void kiwix::Suggestions::addFTSearchSuggestion(const std::string& uiLang,
-                                               const std::string& queryString)
-{
-  kainjow::mustache::data result;
-  const std::string label = makeFulltextSearchSuggestion(uiLang, queryString);
-  result.set("label", escapeBackslashes(label));
-  result.set("value", escapeBackslashes(queryString + " "));
-  result.set("kind", "pattern");
-  result.set("first", m_data.is_empty_list());
-  m_data.push_back(result);
-}
-
-std::string kiwix::Suggestions::getJSON() const
-{
-  kainjow::mustache::data data;
-  data.set("suggestions", m_data);
-
-  return render_template(RESOURCE::templates::suggestion_json, data);
-}
--- a/src/tools/otherTools.h
+++ b/src/tools/otherTools.h
@@ -23,20 +23,13 @@
 #include <string>
 #include <vector>
 #include <map>
-#include <cstdlib>
 #include <zim/zim.h>
 #include <mustache.hpp>

-#include "stringTools.h"
-
 namespace pugi {
  class xml_node;
 }

-namespace zim {
-  class SuggestionItem;
-}
-
 namespace kiwix
 {
  std::string nodeToString(const pugi::xml_node& node);
@@ -49,44 +42,13 @@ 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);

-  // if s is empty then returns kainjow::mustache::data(false)
-  // otherwise kainjow::mustache::data(value)
-  kainjow::mustache::data onlyAsNonEmptyMustacheValue(const std::string& s);
-
  std::string render_template(const std::string& template_str, kainjow::mustache::data data);
-
-  template<typename T>
-  T getEnvVar(const char* name, const T& defaultValue)
-  {
-    try {
-      const char* envString = std::getenv(name);
-      if (envString == nullptr) {
-        throw std::runtime_error("Environment variable not set");
-      }
-      return extractFromString<T>(envString);
-    } catch (...) {}
-
-    return defaultValue;
-  }
-
-  class Suggestions
-  {
-  public:
-    Suggestions();
-
-    void add(const zim::SuggestionItem& suggestion);
-
-    void addFTSearchSuggestion(const std::string& uiLang,
-                               const std::string& query);
-
-    std::string getJSON() const;
-
-  private:
-    kainjow::mustache::data m_data;
-  };
 }

 #endif
--- a/src/tools/pathTools.cpp
+++ b/src/tools/pathTools.cpp
@@ -269,7 +269,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 +302,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
 }

@@ -507,7 +505,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(".");
--- a/src/tools/pathTools.h
+++ b/src/tools/pathTools.h
@@ -29,10 +29,13 @@ std::wstring Utf8ToWide(const std::string& str);

 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);
 bool writeTextFile(const std::string& path, const std::string& content);
+std::string getMimeTypeForFile(const std::string& filename);

 #endif

--- a/src/tools/regexTools.cpp
+++ b/src/tools/regexTools.cpp
@@ -75,3 +75,41 @@ std::string replaceRegex(const std::string& content,
  uresult.toUTF8String(tmp);
  return tmp;
 }
+
+std::string appendToFirstOccurence(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->end(status), ureplacement);
+    std::string tmp;
+    ucontent.toUTF8String(tmp);
+    return tmp;
+  }
+
+  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/regexTools.h
+++ b/src/tools/regexTools.h
@@ -26,5 +26,11 @@ bool matchRegex(const std::string& content, const std::string& regex);
 std::string replaceRegex(const std::string& content,
                         const std::string& replacement,
                         const std::string& regex);
+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/src/tools/stringTools.cpp
+++ b/src/tools/stringTools.cpp
@@ -49,24 +49,6 @@ void kiwix::loadICUExternalTables()
 #endif
 }

-kiwix::ICULanguageInfo::ICULanguageInfo(const std::string& langCode)
-  : locale(langCode.c_str())
-{}
-
-std::string kiwix::ICULanguageInfo::iso3Code() const
-{
-  return locale.getISO3Language();
-}
-
-std::string kiwix::ICULanguageInfo::selfName() const
-{
-  icu::UnicodeString langSelfNameICUString;
-  locale.getDisplayLanguage(locale, langSelfNameICUString);
-  std::string langSelfName;
-  langSelfNameICUString.toUTF8String(langSelfName);
-  return langSelfName;
-}
-
 std::string kiwix::removeAccents(const std::string& text)
 {
  loadICUExternalTables();
@@ -161,14 +143,15 @@ std::string kiwix::encodeDiples(const std::string& str)
  return result;
 }

-namespace
-{
+/* urlEncode() based on javascript encodeURI() &
+   encodeURIComponent(). Mostly code from rstudio/httpuv (GPLv3) */

 bool isReservedUrlChar(char c)
 {
  switch (c) {
  case ';':
  case ',':
+  case '/':
  case '?':
  case ':':
  case '@':
@@ -176,22 +159,22 @@ bool isReservedUrlChar(char c)
  case '=':
  case '+':
  case '$':
-  case '#':
    return true;
  default:
    return false;
  }
 }

-bool isHarmlessUriChar(char c)
+bool needsEscape(char c, bool encodeReserved)
 {
  if (c >= 'a' && c <= 'z')
-    return true;
+    return false;
  if (c >= 'A' && c <= 'Z')
-    return true;
+    return false;
  if (c >= '0' && c <= '9')
-    return true;
-
+    return false;
+  if (isReservedUrlChar(c))
+    return encodeReserved;
  switch (c) {
  case '-':
  case '_':
@@ -202,46 +185,8 @@ bool isHarmlessUriChar(char c)
  case '\'':
  case '(':
  case ')':
-  case '/':
-    return true;
-  }
-  return false;
-}
-
-bool mustBeUriEncodedFor(kiwix::URIComponentKind target, char c)
-{
-  if (isHarmlessUriChar(c))
    return false;
-
-  switch (c) {
-  case '/': // There is no reason to encode the path separator in the general
-            // case. It must be encoded only in a path component when its
-            // semantics of a path separator has to be suppressed.
-            return false;
-
-  case '@': // In a relative URL of the form abc@def/xyz (with no / in abc)
-            // a non-encoded @ will make "abc" and "def" to be interpreted as
-            // username and host components, respectively
-            return target == kiwix::URIComponentKind::PATH;
-
-  case ':': // In a relative URL of the form abc:def/xyz (with no / in abc)
-            // a non-encoded : will make "abc" and "def" to be interpreted as
-            // host and port components, respectively
-            return target == kiwix::URIComponentKind::PATH;
-
-  case '?': // A non-encoded '?' acts as a separator between the path
-            // and query components
-            return target == kiwix::URIComponentKind::PATH;
-
-  case '&': return target == kiwix::URIComponentKind::QUERY;
-  case '=': return target == kiwix::URIComponentKind::QUERY;
-  case '+': return target == kiwix::URIComponentKind::QUERY;
-
-  case '#': // A non-encoded '#' in either path or query-component
-            // would mark the beginning of the fragment component
-            return true;
  }
-
  return true;
 }

@@ -267,43 +212,23 @@ int hexToInt(char c) {
  }
 }

-} // unnamed namespace
-
-std::string kiwix::urlEncode(const std::string& value)
+std::string kiwix::urlEncode(const std::string& value, bool encodeReserved)
 {
  std::ostringstream os;
  os << std::hex << std::uppercase;
-  for (const char c : value) {
-    if (isHarmlessUriChar(c)) {
-      os << c;
+  for (std::string::const_iterator it = value.begin();
+       it != value.end();
+       it++) {
+
+    if (!needsEscape(*it, encodeReserved)) {
+      os << *it;
    } else {
-      const unsigned int charVal = static_cast<unsigned char>(c);
-      os << '%' << std::setw(2) << std::setfill('0') << charVal;
+      os << '%' << std::setw(2) << static_cast<unsigned int>(static_cast<unsigned char>(*it));
    }
  }
  return os.str();
 }

-namespace kiwix
-{
-
-std::string uriEncode(URIComponentKind target, const std::string& value)
-{
-  std::ostringstream os;
-  os << std::hex << std::uppercase;
-  for (const char c : value) {
-    if ( mustBeUriEncodedFor(target, c)  ) {
-      const unsigned int charVal = static_cast<unsigned char>(c);
-      os << '%' << std::setw(2) << std::setfill('0') << charVal;
-    } else {
-      os << c;
-    }
-  }
-  return os.str();
-}
-
-} // namespace kiwix
-
 std::string kiwix::urlDecode(const std::string& value, bool component)
 {
  std::ostringstream os;
@@ -324,15 +249,15 @@ std::string kiwix::urlDecode(const std::string& value, bool component)
      int iHi = hexToInt(hi);
      int iLo = hexToInt(lo);
      if (iHi < 0 || iLo < 0) {
-        // Invalid escape sequence
-        os << '%' << hi << lo;
-        continue;
+	// Invalid escape sequence
+	os << '%' << hi << lo;
+	continue;
      }
      char c = (char)(iHi << 4 | iLo);
      if (!component && isReservedUrlChar(c)) {
-        os << '%' << hi << lo;
+	os << '%' << hi << lo;
      } else {
-        os << c;
+	os << c;
      }
    } else {
      os << *it;
@@ -480,8 +405,3 @@ std::vector<std::string> kiwix::getTitleVariants(const std::string& title) {
  variants.push_back(kiwix::toTitle(title));
  return variants;
 }
-
-template<>
-std::string kiwix::extractFromString(const std::string& str) {
-  return str;
-}
--- a/src/tools/stringTools.h
+++ b/src/tools/stringTools.h
@@ -21,12 +21,10 @@
 #define KIWIX_STRINGTOOLS_H

 #include <unicode/unistr.h>
-#include <unicode/locid.h>

 #include <string>
 #include <vector>
 #include <sstream>
-#include <stdexcept>

 namespace kiwix
 {
@@ -42,35 +40,9 @@ std::string encodeDiples(const std::string& str);
 std::string removeAccents(const std::string& text);
 void loadICUExternalTables();

-class ICULanguageInfo
-{
-public:
-  explicit ICULanguageInfo(const std::string& langCode);
-
-  std::string iso3Code() const;
-  std::string selfName() const;
-
-private:
-  const icu::Locale locale;
-};
-
-
-/* urlEncode() is the equivalent of JS encodeURIComponent(), with the only
- * difference that the slash (/) symbol is NOT encoded. */
-std::string urlEncode(const std::string& value);
+std::string urlEncode(const std::string& value, bool encodeReserved = false);
 std::string urlDecode(const std::string& value, bool component = false);

-// Only URI components that are of interest to libkiwix
-// are included in the below enumeration type
-enum class URIComponentKind
-{
-  PATH,
-  QUERY
-};
-
-// Encode 'value' for usage in a URI componenet specified by 'target'
-std::string uriEncode(URIComponentKind target, const std::string& value);
-
 std::string join(const std::vector<std::string>& list, const std::string& sep);

 std::string ucAll(const std::string& word);
@@ -93,15 +65,9 @@ T extractFromString(const std::string& str) {
    std::istringstream iss(str);
    T ret;
    iss >> ret;
-    if(iss.fail() || !iss.eof()) {
-        throw std::invalid_argument("no conversion");
-    }
    return ret;
 }

-template<>
-std::string extractFromString(const std::string& str);
-
 bool startsWith(const std::string& base, const std::string& start);

 std::vector<std::string> getTitleVariants(const std::string& title);
--- 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/AndroidManifest.xml
+++ b/src/wrapper/java/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+
+  package="kiwix.org.kiwixlib"
+>
+
+  <application android:allowBackup="true"
+    android:label="@string/app_name"
+    android:supportsRtl="true"
+  >
+
+  </application>
+
+</manifest>
--- a/src/wrapper/java/book.cpp
+++ b/src/wrapper/java/book.cpp
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2020 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 <jni.h>
+#include "org_kiwix_kiwixlib_Book.h"
+
+#include "utils.h"
+#include "book.h"
+
+JNIEXPORT void JNICALL
+Java_org_kiwix_kiwixlib_Book_allocate(
+  JNIEnv* env, jobject thisObj)
+{
+  allocate<kiwix::Book>(env, thisObj);
+}
+
+JNIEXPORT void JNICALL
+Java_org_kiwix_kiwixlib_Book_dispose(JNIEnv* env, jobject thisObj)
+{
+  dispose<kiwix::Book>(env, thisObj);
+}
+
+#define BOOK (getPtr<kiwix::Book>(env, thisObj))
+
+METHOD(void, Book, update__Lorg_kiwix_kiwixlib_Book_2, jobject otherBook)
+{
+  BOOK->update(*getPtr<kiwix::Book>(env, otherBook));
+}
+
+METHOD(void, Book, update__Lorg_kiwix_kiwixlib_JNIKiwixReader_2, jobject reader)
+{
+  BOOK->update(**Handle<kiwix::Reader>::getHandle(env, reader));
+}
+
+#define GETTER(retType, name) JNIEXPORT retType JNICALL \
+Java_org_kiwix_kiwixlib_Book_##name (JNIEnv* env, jobject thisObj) \
+{ \
+  auto cRet = BOOK->name(); \
+  retType ret = c2jni(cRet, env); \
+  return ret; \
+}
+
+GETTER(jstring, getId)
+GETTER(jstring, getPath)
+GETTER(jboolean, isPathValid)
+GETTER(jstring, getTitle)
+GETTER(jstring, getDescription)
+GETTER(jstring, getLanguage)
+GETTER(jstring, getCreator)
+GETTER(jstring, getPublisher)
+GETTER(jstring, getDate)
+GETTER(jstring, getUrl)
+GETTER(jstring, getName)
+GETTER(jstring, getFlavour)
+GETTER(jstring, getCategory)
+GETTER(jstring, getTags)
+GETTER(jlong, getArticleCount)
+GETTER(jlong, getMediaCount)
+GETTER(jlong, getSize)
+GETTER(jstring, getFavicon)
+GETTER(jstring, getFaviconUrl)
+GETTER(jstring, getFaviconMimeType)
+
+METHOD(jstring, Book, getTagStr, jstring tagName) try {
+  auto cRet = BOOK->getTagStr(jni2c(tagName, env));
+  return c2jni(cRet, env);
+} catch(...) {
+  return c2jni<std::string>("", env);
+}
+
+#undef GETTER
--- a/src/wrapper/java/filter.cpp
+++ b/src/wrapper/java/filter.cpp
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2019-2020 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 <jni.h>
+#include "org_kiwix_kiwixlib_Filter.h"
+
+#include "library.h"
+#include "utils.h"
+
+/* Kiwix Reader JNI functions */
+METHOD0(void, Filter, allocate) {
+  allocate<kiwix::Filter>(env, thisObj);
+}
+
+METHOD0(void, Filter, dispose) {
+  dispose<kiwix::Library>(env, thisObj);
+}
+
+#define FILTER (getPtr<kiwix::Filter>(env, thisObj))
+
+#define FORWARD(name, args_type) \
+METHOD(jobject, Filter, name, args_type value) { \
+  FILTER->name(jni2c(value, env)); \
+  return thisObj; \
+}
+
+#define FORWARDA(name, args_type) \
+METHOD(jobject, Filter, name, jobjectArray value) { \
+  FILTER->name(jni2c<args_type>(value, env)); \
+  return thisObj; \
+}
+
+
+
+FORWARD(local, jboolean)
+FORWARD(remote, jboolean)
+FORWARD(valid, jboolean)
+FORWARDA(acceptTags, jstring)
+FORWARDA(rejectTags, jstring)
+FORWARD(lang, jstring)
+FORWARD(publisher, jstring)
+FORWARD(creator, jstring)
+FORWARD(maxSize, jlong)
+FORWARD(query, jstring)
+
+
--- a/src/wrapper/java/kiwixicu.cpp
+++ b/src/wrapper/java/kiwixicu.cpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2013 Emmanuel Engelhart <kelson@kiwix.org>
+ * Copyright (C) 2017 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 <jni.h>
+#include "org_kiwix_kiwixlib_JNIICU.h"
+
+#include <iostream>
+#include <string>
+
+#include "unicode/putil.h"
+
+#include "utils.h"
+
+std::mutex globalLock;
+
+JNIEXPORT void JNICALL Java_org_kiwix_kiwixlib_JNIICU_setDataDirectory(
+    JNIEnv* env, jclass kclass, jstring dirStr)
+{
+  std::string cPath = jni2c(dirStr, env);
+
+  Lock l;
+  try {
+    u_setDataDirectory(cPath.c_str());
+  } catch (...) {
+    std::cerr << "Unable to set data directory " << cPath << std::endl;
+  }
+}
--- a/src/wrapper/java/kiwixreader.cpp
+++ b/src/wrapper/java/kiwixreader.cpp
@@ -0,0 +1,561 @@
+/*
+ * Copyright (C) 2013 Emmanuel Engelhart <kelson@kiwix.org>
+ * Copyright (C) 2017 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 <jni.h>
+#include <exception>
+#include "org_kiwix_kiwixlib_JNIKiwixReader.h"
+
+#include "tools/base64.h"
+#include "reader.h"
+#include "utils.h"
+
+/* Kiwix Reader JNI functions */
+JNIEXPORT jlong JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getNativeReader(
+    JNIEnv* env, jobject obj, jstring filename)
+{
+  std::string cPath = jni2c(filename, env);
+
+  LOG("Attempting to create reader with: %s", cPath.c_str());
+  Lock l;
+  try {
+    kiwix::Reader* reader = new kiwix::Reader(cPath);
+    return reinterpret_cast<jlong>(new Handle<kiwix::Reader>(reader));
+  } catch (std::exception& e) {
+    LOG("Error opening ZIM file");
+    LOG(e.what());
+    return 0;
+  }
+}
+
+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)
+{
+  Handle<kiwix::Reader>::dispose(env, obj);
+}
+
+#define READER (Handle<kiwix::Reader>::getHandle(env, obj))
+
+/* Kiwix library functions */
+JNIEXPORT jstring JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixReader_getMainPage(JNIEnv* env, jobject obj)
+{
+  jstring url;
+
+  try {
+    std::string cUrl = READER->getMainPage().getPath();
+    url = c2jni(cUrl, env);
+  } catch (std::exception& e) {
+    LOG("Unable to get ZIM main page");
+    LOG(e.what());
+    url = NULL;
+  }
+  return url;
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixReader_getId(JNIEnv* env, jobject obj)
+{
+  jstring id;
+
+  try {
+    std::string cId = READER->getId();
+    id = c2jni(cId, env);
+  } catch (std::exception& e) {
+    LOG("Unable to get ZIM id");
+    LOG(e.what());
+    id = NULL;
+  }
+
+  return id;
+}
+
+JNIEXPORT jint JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixReader_getFileSize(JNIEnv* env, jobject obj)
+{
+  jint size = 0;
+
+  try {
+    int cSize = READER->getFileSize();
+    size = c2jni(cSize, env);
+  } catch (std::exception& e) {
+    LOG("Unable to get ZIM file size");
+    LOG(e.what());
+  }
+
+  return size;
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixReader_getCreator(JNIEnv* env, jobject obj)
+{
+  jstring creator;
+
+  try {
+    std::string cCreator = READER->getCreator();
+    creator = c2jni(cCreator, env);
+  } catch (std::exception& e) {
+    LOG("Unable to get ZIM creator");
+    LOG(e.what());
+    creator = NULL;
+  }
+
+  return creator;
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixReader_getPublisher(JNIEnv* env, jobject obj)
+{
+  jstring publisher;
+
+  try {
+    std::string cPublisher = READER->getPublisher();
+    publisher = c2jni(cPublisher, env);
+  } catch (std::exception& e) {
+    LOG("Unable to get ZIM publish");
+    LOG(e.what());
+    publisher = NULL;
+  }
+  return publisher;
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixReader_getName(JNIEnv* env, jobject obj)
+{
+  jstring name;
+
+  try {
+    std::string cName = READER->getName();
+    name = c2jni(cName, env);
+  } catch (std::exception& e) {
+    LOG("Unable to get ZIM name");
+    LOG(e.what());
+    name = NULL;
+  }
+  return name;
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixReader_getFavicon(JNIEnv* env, jobject obj)
+{
+  jstring favicon;
+
+  try {
+    std::string cContent;
+    std::string cMime;
+    READER->getFavicon(cContent, cMime);
+    favicon = c2jni(
+        base64_encode(cContent),
+        env);
+  } catch (std::exception& e) {
+    LOG("Unable to get ZIM favicon");
+    LOG(e.what());
+    favicon = NULL;
+  }
+  return favicon;
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixReader_getDate(JNIEnv* env, jobject obj)
+{
+  jstring date;
+
+  try {
+    std::string cDate = READER->getDate();
+    date = c2jni(cDate, env);
+  } catch (std::exception& e) {
+    LOG("Unable to get ZIM date");
+    LOG(e.what());
+    date = NULL;
+  }
+  return date;
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixReader_getLanguage(JNIEnv* env, jobject obj)
+{
+  jstring language;
+
+  try {
+    std::string cLanguage = READER->getLanguage();
+    language = c2jni(cLanguage, env);
+  } catch (std::exception& e) {
+    LOG("Unable to get ZIM language");
+    LOG(e.what());
+    language = NULL;
+  }
+
+  return language;
+}
+
+JNIEXPORT jstring JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getMimeType(
+    JNIEnv* env, jobject obj, jstring url)
+{
+  jstring mimeType;
+
+  std::string cUrl = jni2c(url, env);
+  try {
+    auto entry = READER->getEntryFromEncodedPath(cUrl);
+    auto cMimeType = entry.getMimetype();
+    mimeType = c2jni(cMimeType, env);
+  } catch (std::exception& e) {
+    LOG("Unable to get mime-type for url: %s", cUrl.c_str());
+    LOG(e.what());
+    mimeType = NULL;
+  }
+  return mimeType;
+}
+
+JNIEXPORT jstring JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_checkUrl(
+     JNIEnv* env, jobject obj, jstring url)
+{
+  jstring finalUrl;
+  std::string cUrl = jni2c(url, env);
+  try {
+    auto entry = READER->getEntryFromEncodedPath(cUrl);
+    entry = entry.getFinalEntry();
+    finalUrl = c2jni(entry.getPath(), env);
+  } catch (std::exception& e) {
+    finalUrl = c2jni(std::string(), env);
+  }
+  return finalUrl;
+}
+
+JNIEXPORT jbyteArray JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getContent(
+    JNIEnv* env, jobject obj, jobject url, jobject titleObj, jobject mimeTypeObj, jobject sizeObj)
+{
+  /* Default values */
+  setStringObjValue("", titleObj, env);
+  setStringObjValue("", mimeTypeObj, env);
+  setIntObjValue(0, sizeObj, env);
+  jbyteArray data = env->NewByteArray(0);
+
+  /* Retrieve the content */
+  std::string cUrl = getStringObjValue(url, env);
+  unsigned int cSize = 0;
+
+  try {
+    auto entry = READER->getEntryFromEncodedPath(cUrl);
+    bool isRedirect = entry.isRedirect();
+    entry = entry.getFinalEntry();
+    cSize = entry.getSize();
+    setIntObjValue(cSize, sizeObj, env);
+    setStringObjValue(entry.getMimetype(), mimeTypeObj, env);
+    setStringObjValue(entry.getTitle(), titleObj, env);
+    if (isRedirect) {
+      setStringObjValue(entry.getPath(), url, env);
+    } else {
+      data = env->NewByteArray(cSize);
+      env->SetByteArrayRegion(
+          data, 0, cSize, reinterpret_cast<const jbyte*>(entry.getBlob().data()));
+    }
+  } catch (std::exception& e) {
+    LOG("Unable to get content for url: %s", cUrl.c_str());
+    LOG(e.what());
+  }
+
+  return data;
+}
+
+JNIEXPORT jbyteArray JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getContentPart(
+    JNIEnv* env, jobject obj, jstring url, jint offset, jint len, jobject sizeObj)
+{
+  jbyteArray data = env->NewByteArray(0);
+  setIntObjValue(0, sizeObj, env);
+
+  /* Default values */
+  /* Retrieve the content */
+  std::string cUrl = jni2c(url, env);
+  unsigned int cOffset = jni2c(offset, env);
+  unsigned int cLen = jni2c(len, env);
+  try {
+    auto entry = READER->getEntryFromEncodedPath(cUrl);
+    entry = entry.getFinalEntry();
+
+    if (cLen == 0) {
+      setIntObjValue(entry.getSize(), sizeObj, env);
+    } else if (cOffset+cLen < entry.getSize()) {
+      auto blob = entry.getBlob(cOffset, cLen);
+      data = env->NewByteArray(cLen);
+      env->SetByteArrayRegion(
+          data, 0, cLen, reinterpret_cast<const jbyte*>(blob.data()));
+      setIntObjValue(cLen, sizeObj, env);
+    }
+  } catch (std::exception& e) {
+    LOG("Unable to get partial content for url: %s (%u : %u)", cUrl.c_str(), cOffset, cLen);
+    LOG(e.what());
+  }
+  return data;
+}
+
+JNIEXPORT jlong JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixReader_getArticleSize(
+    JNIEnv* env, jobject obj, jstring url)
+{
+  std::string cUrl = jni2c(url, env);
+  try {
+    auto entry = READER->getEntryFromEncodedPath(cUrl);
+    entry = entry.getFinalEntry();
+    return c2jni(entry.getSize(), env);
+  } catch(std::exception& e) {
+    LOG("Unable to get size for url : %s", cUrl.c_str());
+    LOG(e.what());
+  }
+  return c2jni(0, env);
+}
+
+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);
+
+   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);
+  } catch (std::exception& e) {
+    LOG("Unable to get direct access info for url: %s", cUrl.c_str());
+    LOG(e.what());
+  }
+  return dai;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixReader_searchSuggestions(JNIEnv* env,
+                                                         jobject obj,
+                                                         jstring prefix,
+                                                         jint count)
+{
+  jboolean retVal = JNI_FALSE;
+  std::string cPrefix = jni2c(prefix, env);
+  unsigned int cCount = jni2c(count, env);
+
+  try {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+    if (READER->searchSuggestionsSmart(cPrefix, cCount)) {
+      retVal = JNI_TRUE;
+    }
+#pragma GCC diagnostic pop
+  } catch (std::exception& e) {
+    LOG("Unable to get search results for pattern: %s", cPrefix.c_str());
+    LOG(e.what());
+  }
+
+  return retVal;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixReader_getNextSuggestion(JNIEnv* env,
+                                                         jobject obj,
+                                                         jobject titleObj,
+                                                         jobject urlObj)
+{
+  jboolean retVal = JNI_FALSE;
+  std::string cTitle;
+  std::string cUrl;
+
+  try {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+    if (READER->getNextSuggestion(cTitle, cUrl)) {
+      setStringObjValue(cTitle, titleObj, env);
+      setStringObjValue(cUrl, urlObj, env);
+      retVal = JNI_TRUE;
+    }
+#pragma GCC diagnostic pop
+  } catch (std::exception& e) {
+    LOG("Unable to get next suggestion");
+    LOG(e.what());
+  }
+
+  return retVal;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixReader_getPageUrlFromTitle(JNIEnv* env,
+                                                           jobject obj,
+                                                           jstring title,
+                                                           jobject urlObj)
+{
+  std::string cTitle = jni2c(title, env);
+
+  try {
+    auto entry = READER->getEntryFromTitle(cTitle);
+    entry = entry.getFinalEntry();
+    setStringObjValue(entry.getPath(), urlObj, env);
+    return JNI_TRUE;
+  } catch (std::exception& e) {
+    LOG("Unable to get url for title %s: ", cTitle.c_str());
+    LOG(e.what());
+  }
+
+  return JNI_FALSE;
+}
+
+JNIEXPORT jstring JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getTitle(
+    JNIEnv* env, jobject obj)
+{
+  jstring title;
+
+  try {
+    std::string cTitle = READER->getTitle();
+    title = c2jni(cTitle, env);
+  } catch (std::exception& e) {
+    LOG("Unable to get zim title");
+    LOG(e.what());
+    title = NULL;
+  }
+  return title;
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixReader_getDescription(JNIEnv* env, jobject obj)
+{
+  jstring description;
+
+  try {
+    std::string cDescription = READER->getDescription();
+    description = c2jni(cDescription, env);
+  } catch (std::exception& e) {
+    LOG("Unable to get zim description");
+    LOG(e.what());
+    description = NULL;
+  }
+  return description;
+}
+
+JNIEXPORT jint JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixReader_getArticleCount(JNIEnv* env, jobject obj)
+{
+  jint articleCount = 0;
+  try {
+    auto cArticleCount = READER->getArticleCount();
+    articleCount = c2jni(cArticleCount, env);
+  } catch (std::exception& e) {
+    LOG("Unable to get article count.");
+    LOG(e.what());
+  }
+  return articleCount;
+}
+
+JNIEXPORT jint JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixReader_getMediaCount(JNIEnv* env, jobject obj)
+{
+  jint mediaCount = 0;
+  try {
+    auto cMediaCount = READER->getMediaCount();
+    mediaCount = c2jni(cMediaCount, env);
+  } catch (std::exception& e) {
+    LOG("Unable to get media count.");
+    LOG(e.what());
+  }
+  return mediaCount;
+}
+
+
+JNIEXPORT jboolean JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getRandomPage(
+    JNIEnv* env, jobject obj, jobject urlObj)
+{
+  jboolean retVal = JNI_FALSE;
+  std::string cUrl;
+
+  try {
+    std::string cUrl = READER->getRandomPage().getPath();
+    setStringObjValue(cUrl, urlObj, env);
+    retVal = JNI_TRUE;
+  } catch (std::exception& e) {
+    LOG("Unable to get random page");
+    LOG(e.what());
+  }
+  return retVal;
+}
--- a/src/wrapper/java/kiwixsearcher.cpp
+++ b/src/wrapper/java/kiwixsearcher.cpp
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2013 Emmanuel Engelhart <kelson@kiwix.org>
+ * Copyright (C) 2017 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 "org_kiwix_kiwixlib_JNIKiwixSearcher.h"
+#include "org_kiwix_kiwixlib_JNIKiwixSearcher_Result.h"
+
+#include "reader.h"
+#include "searcher.h"
+#include "utils.h"
+
+#define SEARCHER (Handle<kiwix::Searcher>::getHandle(env, obj))
+#define RESULT (Handle<kiwix::Result>::getHandle(env, obj))
+
+
+JNIEXPORT void JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixSearcher_dispose(JNIEnv* env, jobject obj)
+{
+  Handle<kiwix::Searcher>::dispose(env, obj);
+}
+
+/* Kiwix Reader JNI functions */
+JNIEXPORT jlong JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixSearcher_getNativeHandle(JNIEnv* env,
+                                                          jobject obj)
+{
+  kiwix::Searcher* searcher = new kiwix::Searcher();
+  return reinterpret_cast<jlong>(new Handle<kiwix::Searcher>(searcher));
+}
+
+/* Kiwix library functions */
+JNIEXPORT void JNICALL Java_org_kiwix_kiwixlib_JNIKiwixSearcher_addReader(
+    JNIEnv* env, jobject obj, jobject reader)
+{
+  auto searcher = SEARCHER;
+
+  searcher->add_reader(*(Handle<kiwix::Reader>::getHandle(env, reader)));
+}
+
+JNIEXPORT void JNICALL Java_org_kiwix_kiwixlib_JNIKiwixSearcher_search(
+    JNIEnv* env, jobject obj, jstring query, jint count)
+{
+  std::string cquery = jni2c(query, env);
+  unsigned int ccount = jni2c(count, env);
+
+  SEARCHER->search(cquery, 0, ccount);
+}
+
+JNIEXPORT jobject JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixSearcher_getNextResult(JNIEnv* env,
+                                                         jobject obj)
+{
+  jobject result = nullptr;
+
+  kiwix::Result* cresult = SEARCHER->getNextResult();
+  if (cresult != nullptr) {
+    jclass resultclass
+        = env->FindClass("org/kiwix/kiwixlib/JNIKiwixSearcher$Result");
+    jmethodID ctor = env->GetMethodID(
+        resultclass, "<init>", "(Lorg/kiwix/kiwixlib/JNIKiwixSearcher;JLorg/kiwix/kiwixlib/JNIKiwixSearcher;)V");
+    result = env->NewObject(resultclass, ctor, obj, reinterpret_cast<jlong>(new Handle<kiwix::Result>(cresult)), obj);
+  }
+  return result;
+}
+
+JNIEXPORT void JNICALL Java_org_kiwix_kiwixlib_JNIKiwixSearcher_00024Result_dispose(
+    JNIEnv* env, jobject obj)
+{
+  Handle<kiwix::Result>::dispose(env, obj);
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixSearcher_00024Result_getUrl(JNIEnv* env,
+                                                        jobject obj)
+{
+  try {
+    return c2jni(RESULT->get_url(), env);
+  } catch (...) {
+    return nullptr;
+  }
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixSearcher_00024Result_getTitle(JNIEnv* env,
+                                                          jobject obj)
+{
+  try {
+    return c2jni(RESULT->get_title(), env);
+  } catch (...) {
+    return nullptr;
+  }
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixSearcher_00024Result_getSnippet(JNIEnv* env,
+                                                            jobject obj)
+{
+  return c2jni(RESULT->get_snippet(), env);
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixSearcher_00024Result_getContent(JNIEnv* env,
+                                                            jobject obj)
+{
+  return c2jni(RESULT->get_content(), env);
+}
--- a/src/wrapper/java/kiwixserver.cpp
+++ b/src/wrapper/java/kiwixserver.cpp
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2013 Emmanuel Engelhart <kelson@kiwix.org>
+ * Copyright (C) 2017 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 <jni.h>
+#include "org_kiwix_kiwixlib_JNIKiwixServer.h"
+
+#include "tools/base64.h"
+#include "server.h"
+#include "utils.h"
+
+/* Kiwix Reader JNI functions */
+JNIEXPORT jlong JNICALL Java_org_kiwix_kiwixlib_JNIKiwixServer_getNativeServer(
+    JNIEnv* env, jobject obj, jobject jLibrary)
+{
+  LOG("Attempting to create server");
+  Lock l;
+  try {
+    auto library = getPtr<kiwix::Library>(env, jLibrary);
+    kiwix::Server* server = new kiwix::Server(library);
+    return reinterpret_cast<jlong>(new Handle<kiwix::Server>(server));
+  } catch (std::exception& e) {
+    LOG("Error creating the server");
+    LOG(e.what());
+    return 0;
+  }
+}
+
+JNIEXPORT void JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixServer_dispose(JNIEnv* env, jobject obj)
+{
+  Handle<kiwix::Server>::dispose(env, obj);
+}
+
+#define SERVER (Handle<kiwix::Server>::getHandle(env, obj))
+
+/* Kiwix library functions */
+JNIEXPORT void JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixServer_setRoot(JNIEnv* env, jobject obj, jstring jRoot)
+{
+  std::string root = jni2c(jRoot, env);
+  SERVER->setRoot(root);
+}
+
+JNIEXPORT void JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixServer_setAddress(JNIEnv* env, jobject obj, jstring jAddress)
+{
+  std::string address = jni2c(jAddress, env);
+  SERVER->setAddress(address);
+}
+
+JNIEXPORT void JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixServer_setPort(JNIEnv* env, jobject obj, int port)
+{
+  SERVER->setPort(port);
+}
+
+JNIEXPORT void JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixServer_setNbThreads(JNIEnv* env, jobject obj, int threads)
+{
+  SERVER->setNbThreads(threads);
+}
+
+JNIEXPORT void JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixServer_setTaskbar(JNIEnv* env, jobject obj, jboolean withTaskbar, jboolean withLibraryButton)
+{
+  SERVER->setTaskbar(withTaskbar, withLibraryButton);
+}
+
+JNIEXPORT void JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixServer_setBlockExternalLinks(JNIEnv* env, jobject obj, jboolean blockExternalLinks)
+{
+  SERVER->setBlockExternalLinks(blockExternalLinks);
+}
+
+JNIEXPORT jboolean JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixServer_start(JNIEnv* env, jobject obj)
+{
+  return SERVER->start();
+}
+
+JNIEXPORT void JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixServer_stop(JNIEnv* env, jobject obj)
+{
+  SERVER->stop();
+}
--- a/src/wrapper/java/library.cpp
+++ b/src/wrapper/java/library.cpp
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2019-2020 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 <jni.h>
+#include "org_kiwix_kiwixlib_Library.h"
+
+#include "library.h"
+#include "reader.h"
+#include "utils.h"
+
+/* Kiwix Reader JNI functions */
+JNIEXPORT void JNICALL
+Java_org_kiwix_kiwixlib_Library_allocate(
+    JNIEnv* env, jobject thisObj)
+{
+  allocate<kiwix::Library>(env, thisObj);
+}
+
+JNIEXPORT void JNICALL
+Java_org_kiwix_kiwixlib_Library_dispose(JNIEnv* env, jobject thisObj)
+{
+  dispose<kiwix::Library>(env, thisObj);
+}
+
+#define LIBRARY (getPtr<kiwix::Library>(env, thisObj))
+
+/* Kiwix library functions */
+JNIEXPORT jboolean JNICALL
+Java_org_kiwix_kiwixlib_Library_addBook(
+  JNIEnv* env, jobject thisObj, jstring path)
+{
+  auto cPath = jni2c(path, env);
+
+  try {
+    kiwix::Reader reader(cPath);
+    kiwix::Book book;
+    book.update(reader);
+    return LIBRARY->addBook(book);
+  } catch (std::exception& e) {
+    LOG("Unable to add the book");
+    LOG(e.what()); }
+  return false;
+}
+
+METHOD(jobject, Library, getBookById, jstring id) {
+  auto cId = jni2c(id, env);
+  auto cBook = new kiwix::Book(LIBRARY->getBookById(cId));
+  jclass cls = env->FindClass("org/kiwix/kiwixlib/Book");
+  jmethodID constructorId = env->GetMethodID(cls, "<init>", "()V");
+  jobject book = env->NewObject(cls, constructorId);
+  setPtr(env, book, cBook);
+  return book;
+}
+
+METHOD(jint, Library, getBookCount, jboolean localBooks, jboolean remoteBooks) {
+  return LIBRARY->getBookCount(localBooks, remoteBooks);
+}
+
+METHOD0(jobjectArray, Library, getBooksIds) {
+  return c2jni(LIBRARY->getBooksIds(), env);
+}
+
+METHOD(jobjectArray, Library, filter, jobject filterObj) {
+  auto filter = getPtr<kiwix::Filter>(env, filterObj);
+  return c2jni(LIBRARY->filter(*filter), env);
+}
+
+METHOD0(jobjectArray, Library, getBooksLanguages) {
+  return c2jni(LIBRARY->getBooksLanguages(), env);
+}
+
+METHOD0(jobjectArray, Library, getBooksCreators) {
+  return c2jni(LIBRARY->getBooksCreators(), env);
+}
+
+METHOD0(jobjectArray, Library, getBooksPublisher) {
+  return c2jni(LIBRARY->getBooksPublishers(), env);
+}
+
--- a/src/wrapper/java/manager.cpp
+++ b/src/wrapper/java/manager.cpp
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2020 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 <jni.h>
+#include "org_kiwix_kiwixlib_Manager.h"
+
+#include "manager.h"
+#include "utils.h"
+
+
+JNIEXPORT void JNICALL
+Java_org_kiwix_kiwixlib_Manager_allocate(
+  JNIEnv* env, jobject thisObj, jobject libraryObj)
+{
+  auto lib = getPtr<kiwix::Library>(env, libraryObj);
+  allocate<kiwix::Manager>(env, thisObj, lib);
+}
+
+JNIEXPORT void JNICALL
+Java_org_kiwix_kiwixlib_Manager_dispose(JNIEnv* env, jobject thisObj)
+{
+  dispose<kiwix::Manager>(env, thisObj);
+}
+
+#define MANAGER (getPtr<kiwix::Manager>(env, thisObj))
+
+/* Kiwix manager functions */
+JNIEXPORT jboolean JNICALL
+Java_org_kiwix_kiwixlib_Manager_readFile(
+  JNIEnv* env, jobject thisObj, jstring path)
+{
+  auto cPath = jni2c(path, env);
+
+  try {
+    return MANAGER->readFile(cPath);
+  } catch (std::exception& e) {
+    LOG("Unable to get readFile");
+    LOG(e.what());
+  }
+  return false;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_org_kiwix_kiwixlib_Manager_readXml(
+  JNIEnv* env, jobject thisObj, jstring content, jstring libraryPath)
+{
+  auto cContent = jni2c(content, env);
+  auto cPath = jni2c(libraryPath, env);
+
+  try {
+    return MANAGER->readXml(cContent, false, cPath);
+  } catch (std::exception& e) {
+    LOG("Unable to get ZIM id");
+    LOG(e.what());
+  }
+
+  return false;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_org_kiwix_kiwixlib_Manager_readOpds(
+  JNIEnv* env, jobject thisObj, jstring content, jstring urlHost)
+{
+  auto cContent = jni2c(content, env);
+  auto cUrl = jni2c(urlHost, env);
+
+  try {
+    return MANAGER->readOpds(cContent, cUrl);
+  } catch (std::exception& e) {
+    LOG("Unable to get ZIM id");
+    LOG(e.what());
+  }
+
+  return false;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_org_kiwix_kiwixlib_Manager_readBookmarkFile(
+  JNIEnv* env, jobject thisObj, jstring path)
+{
+  auto cPath = jni2c(path, env);
+
+  try {
+    return MANAGER->readBookmarkFile(cPath);
+  } catch (std::exception& e) {
+    LOG("Unable to get ZIM id");
+    LOG(e.what());
+  }
+
+  return false;
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_kiwix_kiwixlib_Manager_addBookFromPath(
+  JNIEnv* env, jobject thisObj,
+  jstring pathToOpen, jstring pathToSave, jstring url, jboolean checkMetaData)
+{
+  auto cPathToOpen = jni2c(pathToOpen, env);
+  auto cPathToSave = jni2c(pathToSave, env);
+  auto cUrl = jni2c(url, env);
+  jstring id = NULL;
+
+  try {
+    auto cId = MANAGER->addBookFromPathAndGetId(cPathToOpen, cPathToSave, cUrl, checkMetaData);
+    if ( !cId.empty() ) {
+      id = c2jni(cId, env);
+    }
+  } catch (std::exception& e) {
+    LOG("Unable to get ZIM file size");
+    LOG(e.what());
+  }
+
+  return id;
+}
--- a/src/wrapper/java/meson.build
+++ b/src/wrapper/java/meson.build
@@ -0,0 +1,55 @@
+
+java_sources = files([
+  'org/kiwix/kiwixlib/JNIICU.java',
+  'org/kiwix/kiwixlib/Book.java',
+  'org/kiwix/kiwixlib/JNIKiwixReader.java',
+  'org/kiwix/kiwixlib/Library.java',
+  'org/kiwix/kiwixlib/Manager.java',
+  'org/kiwix/kiwixlib/Filter.java',
+  'org/kiwix/kiwixlib/JNIKiwixSearcher.java',
+  'org/kiwix/kiwixlib/JNIKiwixServer.java',
+  'org/kiwix/kiwixlib/JNIKiwixInt.java',
+  'org/kiwix/kiwixlib/JNIKiwixString.java',
+  'org/kiwix/kiwixlib/JNIKiwixBool.java',
+  'org/kiwix/kiwixlib/JNIKiwixException.java',
+  'org/kiwix/kiwixlib/DirectAccessInfo.java'
+])
+
+kiwix_jni = custom_target('jni',
+  input: java_sources,
+  output: ['org_kiwix_kiwixlib_JNIKiwix.h',
+           'org_kiwix_kiwixlib_Book.h',
+           'org_kiwix_kiwixlib_JNIKiwixReader.h',
+           'org_kiwix_kiwixlib_Library.h',
+           'org_kiwix_kiwixlib_Manager.h',
+           'org_kiwix_kiwixlib_Filter.h',
+           'org_kiwix_kiwixlib_JNIKiwixServer.h',
+           'org_kiwix_kiwixlib_JNIKiwixSearcher.h',
+           'org_kiwix_kiwixlib_JNIKiwixSearcher_Result.h'],
+  command:['javac', '-d', '@OUTDIR@', '-h', '@OUTDIR@', '@INPUT@']
+)
+
+jni_sources = files([
+     'kiwixicu.cpp',
+     'book.cpp',
+     'kiwixreader.cpp',
+     'library.cpp',
+     'manager.cpp',
+     'filter.cpp',
+     'kiwixsearcher.cpp',
+     'kiwixserver.cpp',
+])
+
+kiwix_sources += jni_sources + [kiwix_jni]
+
+if 'java' in wrapper
+  kiwix_jar = jar('kiwixlib', java_sources)
+  #junit_jar = files('org/kiwix/testing/junit-4.13.jar')
+  #test_jar = jar('testing', 'org/kiwix/testing/test.java',
+  #               link_with: [kiwix_jar, junit_jar])
+  #test('javatest', test_jar)
+endif
+
+install_subdir('org', install_dir: 'kiwix-lib/java', exclude_directories: ['kiwix/testing'])
+install_subdir('res', install_dir: 'kiwix-lib')
+install_data('AndroidManifest.xml', install_dir: 'kiwix-lib')
--- a/src/wrapper/java/org/kiwix/kiwixlib/Book.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/Book.java
@@ -0,0 +1,48 @@
+
+package org.kiwix.kiwixlib;
+
+public class Book
+{
+  public Book() { allocate(); }
+
+
+  public native void update(Book book);
+  public native void update(JNIKiwixReader reader);
+
+  @Override
+  protected void finalize() { dispose();  }
+
+  public native String getId();
+  public native String getPath();
+  public native boolean isPathValid();
+  public native String getTitle();
+  public native String getDescription();
+  public native String getLanguage();
+  public native String getCreator();
+  public native String getPublisher();
+  public native String getDate();
+  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
+   *
+   * @param tagName the tag name to search for.
+   * @return The value of the tag. If the tag is not found, return empty string.
+   */
+  public native String getTagStr(String tagName);
+
+  public native long getArticleCount();
+  public native long getMediaCount();
+  public native long getSize();
+
+  public native String getFavicon();
+  public native String getFaviconUrl();
+  public native String getFaviconMimeType();
+
+  private native void allocate();
+  private native void dispose();
+  private long nativeHandle;
+}
--- a/src/wrapper/java/org/kiwix/kiwixlib/DirectAccessInfo.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/DirectAccessInfo.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+package org.kiwix.kiwixlib;
+
+public class DirectAccessInfo
+{
+  public String filename;
+  public long offset;
+}
--- a/src/wrapper/java/org/kiwix/kiwixlib/Filter.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/Filter.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2019-2020 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.
+ */
+
+package org.kiwix.kiwixlib;
+
+public class Filter
+{
+
+  public native Filter local(boolean accept);
+  public native Filter remote(boolean accept);
+  public native Filter valid(boolean accept);
+  public native Filter acceptTags(String[] tags);
+  public native Filter rejectTags(String[] tags);
+  public native Filter lang(String lang);
+  public native Filter publisher(String publisher);
+  public native Filter creator(String creator);
+  public native Filter maxSize(long size);
+  public native Filter query(String query);
+
+
+  public Filter() { allocate(); }
+
+  @Override
+  protected void finalize() { dispose(); }
+  private native void allocate();
+  private native void dispose();
+  private long nativeHandle;
+}
--- a/src/wrapper/java/org/kiwix/kiwixlib/JNIICU.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/JNIICU.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2013 Emmanuel Engelhart <kelson@kiwix.org>
+ * Copyright (C) 2017 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.
+ */
+
+package org.kiwix.kiwixlib;
+
+public class JNIICU
+{
+  static public native void setDataDirectory(String icuDataDir);
+}
--- a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwix.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwix.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2013 Emmanuel Engelhart <kelson@kiwix.org>
+ * Copyright (C) 2017 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.
+ */
+
+package org.kiwix.kiwixlib;
+
+import android.content.Context;
+import com.getkeepsafe.relinker.ReLinker;
+import org.kiwix.kiwixlib.JNIICU;
+
+public class JNIKiwix
+{
+  public JNIKiwix(final Context context){
+    ReLinker.loadLibrary(context, "kiwix");
+  }
+
+  public void setDataDirectory(String icuDataDir) {
+    JNIICU.setDataDirectory(icuDataDir);
+  }
+}
--- a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixBool.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixBool.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2013 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.
+ */
+
+package org.kiwix.kiwixlib;
+
+public class JNIKiwixBool
+{
+  public boolean value;
+}
--- a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixException.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixException.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2017 Matthieu Gautier <mgautier@kymeria.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.
+ */
+
+package org.kiwix.kiwixlib;
+
+public class JNIKiwixException extends Exception
+{
+  public JNIKiwixException(String message) {
+    super(message);
+  }
+}
--- a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixInt.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixInt.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2013 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.
+ */
+
+package org.kiwix.kiwixlib;
+
+public class JNIKiwixInt
+{
+  public int value;
+}
--- a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixReader.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixReader.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2013 Emmanuel Engelhart <kelson@kiwix.org>
+ * Copyright (C) 2017 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.
+ */
+
+package org.kiwix.kiwixlib;
+
+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;
+
+public class JNIKiwixReader
+{
+  public native String getMainPage();
+
+  public native String getTitle();
+
+  public native String getId();
+
+  public native String getLanguage();
+
+  public native String getMimeType(String url);
+
+  /**
+   * Check if a url exists and is a redirect or not.
+   *
+   * Return an empty string if the url doesn't exist in the reader.
+   * Return the url of the "final" entry.
+   * - equal to the input url if the entry is not a redirection.
+   * - different if the url is a redirection (and the webview should redirect to it).
+   */
+  public native String checkUrl(String url);
+
+  /**
+   * Get the content of a article.
+   *
+   * Return a byte array of the content of the article.
+   * Set the title, mimeType to the title and mimeType of the article.
+   * Set the size to the size of the returned array.
+   *
+   * If the entry doesn't exist :
+   *  - return a empty byte array
+   *  - set all arguments (except url) to empty/0.
+   * If the entry exist but is a redirection :
+   *  - return an empty byte array
+   *  - set all arguments (including url) to information of the targeted article.
+   */
+  public native byte[] getContent(JNIKiwixString url,
+                                  JNIKiwixString title,
+                                  JNIKiwixString mimeType,
+                                  JNIKiwixInt size);
+
+  /**
+   * getContentPart.
+   *
+   * Get only a part of the content of the article.
+   * Return a byte array of `len` size starting from offset `offset`.
+   * Set `size` to the number of bytes read
+   * (`len` if everything is ok, 0 in case of error).
+   * If `len` == 0, no bytes are read but `size` is set to the total size of the
+   * article.
+   */
+  public native byte[] getContentPart(String url,
+                                      int offest,
+                                      int len,
+                                      JNIKiwixInt size);
+
+  /**
+   *
+   * Get the size of an article.
+   *
+   * @param   url The url of the article.
+   * @return  The size of the final (redirections are resolved) article (in byte).
+   *          Return 0 if the article is not found.
+   */
+  public native long getArticleSize(String url);
+
+  /**
+   * getDirectAccessInformation.
+   *
+   * Return information giving where the content is located in the zim file.
+   *
+   * Some contents (binary content) are stored uncompressed in the zim file.
+   * Knowing this information, it could be interesting to directly open
+   * 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.
+   *
+   * 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 boolean searchSuggestions(String prefix, int count);
+
+  public native boolean getNextSuggestion(JNIKiwixString title, JNIKiwixString url);
+
+  public native boolean getPageUrlFromTitle(String title, JNIKiwixString url);
+
+  public native String getDescription();
+
+  public native String getDate();
+
+  public native String getFavicon();
+
+  public native String getCreator();
+
+  public native String getPublisher();
+
+  public native String getName();
+
+  public native int getFileSize();
+
+  public native int getArticleCount();
+
+  public native int getMediaCount();
+
+  public native boolean getRandomPage(JNIKiwixString url);
+
+  public JNIKiwixSearcher search(String query, int count)
+  {
+    JNIKiwixSearcher searcher = new JNIKiwixSearcher();
+    searcher.addKiwixReader(this);
+    searcher.search(query, count);
+    return searcher;
+  }
+
+  public JNIKiwixReader(String filename) throws JNIKiwixException
+  {
+    nativeHandle = getNativeReader(filename);
+    if (nativeHandle == 0) {
+        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/JNIKiwixSearcher.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixSearcher.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2013 Emmanuel Engelhart <kelson@kiwix.org>
+ * Copyright (C) 2017 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.
+ */
+
+
+package org.kiwix.kiwixlib;
+
+import org.kiwix.kiwixlib.JNIKiwixReader;
+import java.util.Vector;
+
+public class JNIKiwixSearcher
+{
+  public class Result
+  {
+    private long nativeHandle;
+    private JNIKiwixSearcher searcher;
+    public Result(long handle, JNIKiwixSearcher _searcher)
+    {
+      nativeHandle = handle;
+      searcher = _searcher;
+    }
+    public native String getUrl();
+    public native String getTitle();
+    public native String getContent();
+    public native String getSnippet();
+    public native void dispose();
+  }
+
+  public JNIKiwixSearcher()
+  {
+    nativeHandle = getNativeHandle();
+    usedReaders = new Vector();
+  }
+  public native void dispose();
+
+  private native long getNativeHandle();
+  private long nativeHandle;
+  private Vector usedReaders;
+
+  public native void addReader(JNIKiwixReader reader);
+  public void addKiwixReader(JNIKiwixReader reader)
+  {
+    addReader(reader);
+    usedReaders.addElement(reader);
+  };
+
+  public native void search(String query, int count);
+
+  public native Result getNextResult();
+  public native boolean hasMoreResult();
+}
--- a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixServer.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixServer.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 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.
+ */
+
+package org.kiwix.kiwixlib;
+
+import org.kiwix.kiwixlib.JNIKiwixException;
+import org.kiwix.kiwixlib.Library;
+
+public class JNIKiwixServer
+{
+  public native void setRoot(String root);
+
+  public native void setAddress(String address);
+
+  public native void setPort(int port);
+
+  public native void setNbThreads(int nbTreads);
+
+  public native void setTaskbar(boolean withTaskBar, boolean witLibraryButton);
+
+  public native void setBlockExternalLinks(boolean blockExternalLinks);
+
+  public native boolean start();
+
+  public native void stop();
+
+  public JNIKiwixServer(Library library)
+  {
+    nativeHandle = getNativeServer(library);
+  }
+
+  private native long getNativeServer(Library library);
+  private long nativeHandle;
+}
--- a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixString.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Emmanuel Engelhart <kelson@kiwix.org>
+ * Copyright (C) 2013 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
@@ -17,18 +17,21 @@
 * MA 02110-1301, USA.
 */

-#ifndef KIWIX_VERSION_H
-#define KIWIX_VERSION_H
+package org.kiwix.kiwixlib;

-#include <string>
-#include <vector>
-#include <iostream>
-
-namespace kiwix
+public class JNIKiwixString
 {
-  typedef std::vector<std::pair<std::string, std::string>> LibVersions;
-  LibVersions getVersions();
-  void printVersions(std::ostream& out = std::cout);
-}
+  public String value;

-#endif // KIWIX_VERSION_H
+  public JNIKiwixString(String value) {
+    this.value = value;
+  }
+
+  public JNIKiwixString() {
+    this("");
+  }
+
+  public String getValue() {
+    return value;
+  }
+}
--- a/src/wrapper/java/org/kiwix/kiwixlib/Library.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/Library.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2019-2020 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.
+ */
+
+package org.kiwix.kiwixlib;
+
+import org.kiwix.kiwixlib.Book;
+import org.kiwix.kiwixlib.JNIKiwixException;
+
+public class Library
+{
+  public native boolean addBook(String path) throws JNIKiwixException;
+
+  public native Book getBookById(String id);
+  public native int  getBookCount(boolean localBooks, boolean remoteBooks);
+
+  public native String[] getBooksIds();
+  public native String[] filter(Filter filter);
+
+  public native String[] getBooksLanguages();
+  public native String[] getBooksCreators();
+  public native String[] getBooksPublishers();
+
+  public Library()
+  {
+    allocate();
+  }
+
+  @Override
+  protected void finalize() { dispose(); }
+  private native void allocate();
+  private native void dispose();
+  private long nativeHandle;
+}
--- a/Show More
+++ b/Show More