New version 3.0.3

2025-12-26 16:08:03 -05:00 · 2018-11-12 12:25:16 +01:00
546 changed files with 158468 additions and 44906 deletions
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -1,12 +0,0 @@
-codecov:
-  notify:
-    require_ci_to_pass: yes
-
-coverage:
-  status:
-    project:
-      default:
-        threshold: 1%
-
-ignore:
-  - "test"
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-github: kiwix
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: # https://kiwix.org/support-us/
--- a/.github/move.yml
+++ b/.github/move.yml
@@ -1,27 +0,0 @@
-# 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/stale.yml
+++ b/.github/stale.yml
@@ -1,15 +0,0 @@
-daysUntilClose: false
-staleLabel: stale
-
-issues:
-  daysUntilStale: 60
-  markComment: >
-    This issue has been automatically marked as stale because it has not had
-    recent activity. It will be now be reviewed manually. Thank you
-    for your contributions.
-pulls:
-   daysUntilStale: 7
-   markComment: >
-     This pull request has been automatically marked as stale because it has not had
-     recent activity. It will be now be reviewed manually. Thank you
-     for your contributions.
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,163 +0,0 @@
-name: CI
-
-on: [push]
-
-jobs:
-  Macos:
-    runs-on: macos-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v1
-      - name: Setup python 3.5
-        uses: actions/setup-python@v1
-        with:
-          python-version: '3.5'
-      - name: Install packages
-        run: |
-          brew update
-          brew install gcovr pkg-config ninja
-      - name: Install python modules
-        run: pip3 install meson==0.49.2 pytest
-      - name: Install deps
-        shell: bash
-        run: |
-          ARCHIVE_NAME=deps2_osx_native_dyn_kiwix-lib.tar.xz
-          wget -O- http://tmp.kiwix.org/ci/${ARCHIVE_NAME} | tar -xJ -C $HOME
-      - name: Compile
-        shell: bash
-        run: |
-          export PKG_CONFIG_PATH=$HOME/BUILD_native_dyn/INSTALL/lib/pkgconfig
-          export CPPFLAGS="-I$HOME/BUILD_native_dyn/INSTALL/include"
-          meson . build --default-library=shared -Db_coverage=true
-          cd build
-          ninja
-      - name: Test
-        shell: bash
-        run: |
-          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:
-      fail-fast: false
-      matrix:
-        name:
-          - native_static
-          - native_dyn
-          - native_dyn_bionic
-          - android_arm
-          - android_arm64
-          - win32_static
-          - win32_dyn
-        include:
-          - name: native_static
-            target: native_static
-            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: xenial
-            lib_postfix: '/x86_64-linux-gnu'
-          - name: android_arm64
-            target: android_arm64
-            image_variant: xenial
-            lib_postfix: '/x86_64-linux-gnu'
-          - name: win32_static
-            target: win32_static
-            image_variant: f31
-            lib_postfix: '64'
-          - name: win32_dyn
-            target: win32_dyn
-            image_variant: f31
-            lib_postfix: '64'
-    env:
-      HOME: /home/runner
-    runs-on: ubuntu-latest
-    container:
-      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: |
-        from subprocess import check_call
-        from os import environ
-        command = [
-          'git', 'clone',
-          'https://github.com/${{github.repository}}',
-          '--depth=1',
-          '--branch', '${{steps.extract_branch.outputs.branch}}'
-        ]
-        check_call(command, cwd=environ['HOME'])
-    - name: Install deps
-      shell: bash
-      run: |
-        ARCHIVE_NAME=deps2_${OS_NAME}_${{matrix.target}}_kiwix-lib.tar.xz
-        wget -O- http://tmp.kiwix.org/ci/${ARCHIVE_NAME} | tar -xJ -C /home/runner
-    - name: Compile
-      shell: bash
-      run: |
-        meson --version
-        if [[ "${{matrix.target}}" =~ .*_dyn ]]; then
-          MESON_OPTION="--default-library=shared"
-        else
-          MESON_OPTION="--default-library=static"
-        fi
-        if [[ "${{matrix.target}}" =~ native_.* ]]; then
-          MESON_OPTION="$MESON_OPTION -Db_coverage=true"
-        else
-          MESON_OPTION="$MESON_OPTION --cross-file $HOME/BUILD_${{matrix.target}}/meson_cross_file.txt"
-        fi
-        if [[ "${{matrix.target}}" =~ android_.* ]]; then
-          MESON_OPTION="$MESON_OPTION -Dandroid=true"
-        fi
-        cd $HOME/libkiwix
-        meson . build ${MESON_OPTION}
-        cd build
-        ninja
-      env:
-        PKG_CONFIG_PATH: "/home/runner/BUILD_${{matrix.target}}/INSTALL/lib/pkgconfig:/home/runner/BUILD_${{matrix.target}}/INSTALL/lib${{matrix.lib_postfix}}/pkgconfig"
-        CPPFLAGS: "-I/home/runner/BUILD_${{matrix.target}}/INSTALL/include"
-    - name: Test
-      if: startsWith(matrix.target, 'native_')
-      shell: bash
-      run: |
-        cd $HOME/libkiwix/build
-        meson test --verbose
-        ninja coverage
-      env:
-        LD_LIBRARY_PATH: "/home/runner/BUILD_${{matrix.target}}/INSTALL/lib:/home/runner/BUILD_${{matrix.target}}/INSTALL/lib${{matrix.lib_postfix}}"
-        SKIP_BIG_MEMORY_TEST: 1
-    - name: Publish coverage
-      shell: bash
-      run: |
-        cd $HOME/libkiwix
-        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_') && matrix.image_variant == 'xenial'
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -1,87 +0,0 @@
-name: Packages
-on: [push, pull_request]
-
-jobs:
-  build-deb:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        distro: [ubuntu-hirsute, ubuntu-groovy, ubuntu-focal, ubuntu-bionic]
-    steps:
-      - uses: actions/checkout@v2
-
-      # Determine which PPA we should upload to
-      - name: PPA
-        id: ppa
-        run: |
-          if [[ $REF == refs/tags* ]]
-          then
-            echo "::set-output name=ppa::kiwixteam/release"
-          else
-            echo "::set-output name=ppa::kiwixteam/dev"
-          fi
-        env:
-          REF: ${{ github.ref }}
-
-      - uses: legoktm/gh-action-auto-dch@master
-        with:
-          fullname: Kiwix builder
-          email: release+launchpad@kiwix.org
-          distro: ${{ matrix.distro }}
-
-      - 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 }}
-
-      - uses: legoktm/gh-action-build-deb@ubuntu-focal
-        if: matrix.distro == 'ubuntu-focal'
-        name: Build package for ubuntu-focal
-        id: build-ubuntu-focal
-        with:
-          args: --no-sign
-          ppa: ${{ steps.ppa.outputs.ppa }}
-
-      - uses: legoktm/gh-action-build-deb@ubuntu-bionic
-        if: matrix.distro == 'ubuntu-bionic'
-        name: Build package for ubuntu-bionic
-        id: build-ubuntu-bionic
-        with:
-          args: --no-sign
-          ppa: ${{ steps.ppa.outputs.ppa }}
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: Packages for ${{ matrix.distro }}
-          path: output
-
-      - uses: legoktm/gh-action-dput@master
-        name: Upload dev package
-        # 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
-          packages: output/*_source.changes
-
-      - uses: legoktm/gh-action-dput@master
-        name: Upload release package
-        # Only upload on pushes to master or tag
-        if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && startswith(matrix.distro, 'ubuntu-')
-        with:
-          gpg_key: ${{ secrets.LAUNCHPAD_GPG }}
-          repository: ppa:kiwixteam/release
-          packages: output/*_source.changes
-
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +0,0 @@
-.idea/
-*.swp
-subprojects/googletest-release*
-*.class
-build/
-.vscode/
-builddir/
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,36 @@
+language: cpp
+dist: trusty
+sudo: false
+cache: ccache
+before_install:
+- PATH=$PATH:$HOME/bin
+install: travis/install_deps.sh
+script: travis/compile.sh
+env:
+  matrix:
+    - PLATFORM="native_static"
+    - PLATFORM="native_dyn"
+    - PLATFORM="win32_static"
+    - PLATFORM="win32_dyn"
+    - PLATFORM="android_arm"
+    - PLATFORM="android_arm64"
+addons:
+  apt:
+    packages:
+      - cmake
+      - python3-pip
+      - libbz2-dev
+      - ccache
+      - zlib1g-dev
+      - uuid-dev
+      - libctpp2-dev
+      - ctpp2-utils
+      - libmicrohttpd-dev
+      - g++-mingw-w64-i686
+      - gcc-mingw-w64-i686
+      - gcc-mingw-w64-base
+      - mingw-w64-tools
+matrix:
+  include:
+    - env: PLATFORM="native_dyn"
+      os: osx
--- a/4
+++ b/4
@@ -77,7 +77,7 @@ modification follow.

  "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
-
+ 
  "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
@@ -510,7 +510,7 @@ actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
-
+  
  If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
--- a/272
+++ b/272
@@ -1,274 +1,3 @@
-libkiwix 10.0.0
-===============
-
- * ...
-
-kiwix-lib 9.4.1
-===============
-
- * Fix `M/Counter` parsing.
- * [SERVER] Adjust body padding-top for taskbar
- * Fix potential crash when stoping a server not started.
- * Various fix in build system and the CI.
-
-kiwix-lib 9.4.0
-===============
-
- * [SERVER] Make the headers handling case insensitive.
- * [SERVER] Make server answer 204 http status code for empty search
- * [PACKAGING] Made CI build deb packages.
- * [SERVER] Add a way to prevent taskbar and external link bloquer at article
-   level.
- * Fix meson file to be compatible with meson 0.45
- * [SERVER] Update search requests to use pageStart/pageLength instead of
-   pageStart/pageEnd arguments.
- * [SERVER] Set a fixed favicon size in the main page.
- * [SERVER] Refactor the response system code to better handling future new
-   libzim api.
- * Fix segmentation fault around exchange with aria2 process making
-   kiwix-desktop crash at exit.
-
-kiwix-lib 9.3.1
-===============
-
- * Fix handling of samba path on windows.
- * Do not include `kiwix_config.h` in public header.
- * Fix compilation with libmicrohttpd v0.97.1
- * Increase default test timeout to 160seconds/test.
- * Add automatic debian packaging.
- * Use non-minified version of jquery-ui.js
- * Pass `-latomic` compile option for sh4 architecture.
- * Make mesion install `kiwix-compile-resources` man page.
-
-kiwix-lib 9.3.0
-===============
-
- * Add a thread safe method to search suggestions.
-   Old methods are now deprecated.
-
-kiwix-lib 9.2.3
-===============
-
- * Add test on byte-range
- * Fix compilation on bionic and windows.
- * Allow building using debian packaged kainjow-mustache
- * Pass `-latomic` compile option for architectures that need it
-
-kiwix-lib 9.2.2
-===============
-
- * Fix handling on empty content in byte range management (wrong assert)
-
-kiwix-lib 9.2.1
-===============
-
- * Fix support of byte range request.
-
-kiwix-lib 9.2
-=============
-
- * Add tests
- * Refactoring server code.
- * [SERVER] Add HEAD, Etag and If-None-Match support.
- * [SERVER] Compress opds catalog answers.
-
-kiwix-lib 9.1.2
-===============
-
- * Do not use the pathToSave if it is empty.
-
-kiwix-lib 9.1.1
-===============
-
- * Fix the detection of the dataDirectory on windows.
-
-kiwix-lib 9.1.0
-===============
-
- * [JAVA] Add a method to get the size of an article.
- * Add a new method to the libray to get the book by path.
- * Add a option to make the server blocks external link.
-   Links are intercepted by js an redirected to a "portail" page.
- * [ODPS] Correctly handle book's articleCount and mediaCount.
-
-kiwix-lib 9.0.1
-===============
-
- * [JAVA] Use a long to store the offset of an article in the zim file instead
-    of an int.
-
-kiwix-lib 9.0.0
-===============
-
- * [OPDS] Correctly set the id of the OPDS stream.
- * [OPDS] Do not try to filter the catalog if no filter field is given in the
-   request.
- * [WINDOWS] Correctly convert path to wide chars when opening the library.xml
- * [LIBRARY] Remove the function the read file using a native path.
-   All path must be utf8, no need to pass a native path along the utf8 path.
- * [TEST] Fix tests using the main function of gtest instead of custom one.
- * [CI] Move to github CI instead of Travis.
- * The `Book::update` method always update the book's fields. Even if they are
-   not empty.
- * [JAVA] Add wrapping around the library manager (opds parsing)
- * [ARIA2] Add api option to start download with option (destination folder)
- * [OPDS] Fixes about opds parsing, generation (missing attributes)
-   and requesting (server)
- * Add methods on `Book` to get specific tag values (was on `Reader` only)
- * Add flavour attribute to `Book`
- * Fix opensearch description.
- * Trust the given library.xml (by default) instead of reading the value from
-   the zim files.
- * [OPDS] Be able to filter the content by name or size.
- * [WINDOWS] Fix launching subcommand when there is spaces in the path.
-
-kiwix-lib 8.2.2
-===============
-
- * Improve a few compilation scripts
-
-kiwix-lib 8.2.1
-===============
-
- * Reintroduce kiwix-serve taskbar
-
-kiwix-lib 8.2.0
-===============
-
- * More debug information if aria2c command fails
- * Allow to set kiwix-serve port
- * Better (dead) bookmarks mgmt
-
-kiwix-lib 8.1.0
-===============
-
- * Fix pathTools manipulation.
- * Add missing implementation of getArticleCount and getMediaCount on android.
- * Correctly convert windows path to utf8.
- * Add code coverage in the CI
-
-kiwix-lib 8.0.1
-===============
-
- * Fix join function
-
-kiwix-lib 8.0.0
-===============
-
- * Add new methods to get all (and new) metadata from the zim file.
- * Add methods to get the value of a specific tag.
- * [API Change] Convert tags value to the new convention.
- * [API Change] Rename `getMatatag` method to `getMetadata`
- * [ABI Change] Correctly detect executable path in appimage.
-
-kiwix-lib 7.0.0
-===============
-
- * [API break] Add a argument to kiwix-serve to specify the library to use.
-
-kiwix-lib 6.0.4
-===============
-
- * Fix HTML rendering of the search result if there is no result.
- * Do not crash at html rendering if request ask for 0 results (start == end)
- * Correctly find the executable path if we are using AppImage
-
-kiwix-lib 6.0.3
-===============
-
- * force one column suggestion in kiwix-serve suggestions
- * fix fulltext search link in suggestions
- * UI fixes in kiwix-serve rendering
-
-kiwix-lib 6.0.2
-===============
-
- * Correctly set the groupId in the pom file.
-
-kiwix-lib 6.0.1
-===============
-
- * Generate the pom file for android/maven
-
-kiwix-lib 6.0.0
-===============
-
- * Move the server code in kiwix-lib (from kiwix-serve).
- * Add unit test on regex functions.
- * Fix computerAbsolutePath (thread safe, memory leak).
- * Correctly set the book's path as valid if we construct the book from a
-   reader.
- * [JNI] Add a method to know if a article is a redirection.
- * Do not embed the gtest dependency.
- * [JNI] Add a constructor to JNIKiwixString.
- * Change order of search of the favicon urls.
- * Clean a lot of unecessary includes in headers. (potential "API break")
-
-kiwix-lib 5.2.0
-===============
-
- * kiwix-serve integration (as a seperated process).
- * Fix crash in the suggestion search.
- * Better API to filter the library books.
- * New kiwix-lib application for android. (.aar)
- * Use ReLinker to link with libkiwix.so in android.
- * Correctly set the verbosity of zim search.
-
-kiwix-lib 5.1.0
-===============
-
- * Add function to pause, resume and stop downloads.
- * Add zim's tags in the opds stream.
- * Addapt to new libzim 5.0.0 API.
-
-kiwix-lib 5.0.0
-===============
-
- * Remove error message when trying to open an wrong zim file.
- * Rewrite `makeTmpDirectory` to not use uuid functions on windows.
- * [API break] Remove `getNetworkInterfaces` and `getBestPublicIp`.
- * Remove rpath
- * Detect infinite (and too long) redirect loops.
-
-kiwix-lib 4.1.0
-===============
-
- * Allow the library to be filtered by tags.
- * Fix language mapping.
- * Update README about mustache dependency.
-
-kiwix-lib 4.0.1
-===============
-
- * Fix "maybe uninitialize variable" issue.
- * Ensure path are stored correctly (absolute path) in the library.
- * [CI] Use the new deps archive xz
-
-kiwix-lib 4.0.0
-===============
-
- * [API break] Remove support for external index.
- * Move to the mustache templating system instead of ctpp2.
- * Make meson.build works for meson>=0.43.0
- * [API break] Move the basic tools from the `common` directory to `tools`.
-
-kiwix-lib 3.1.1
-===============
-
- * The OPDS feed book's date must be the date of the book, not the date of the
- feed generation.
- * Convert the standard opds date to our format (YYYY-MM-DD)
- * Remove duplicate language attribute in the libxml dumper.
- * Create the datadirectory to not fail to write a file in a non-existent
-   directory
-
-kiwix-lib 3.1.0
-===============
-
- * Add a method to get the favicon url of book (if available).
- * Move dump code of library.xml in a specific class.
- * Add a first support to bookmarks
-
 kiwix-lib 3.0.3
 ===============

@@ -276,7 +5,6 @@ kiwix-lib 3.0.3
 ('eng').
 * Correctly write the 'ArticleCount' and 'MediaCount' in the library.xml.
 * Correctly fill the book size for the zim file size.
- * Fix launch of aria2c.

 kiwix-lib 3.0.2
 ===============
--- a/README.md
+++ b/README.md
@@ -1,53 +1,44 @@
-Libkiwix
-========
+Kiwix library
+=============

-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, ...).
-
-[![Repositories](https://img.shields.io/repology/repositories/libkiwix?label=repositories)](https://github.com/kiwix/libkiwix/wiki/Repology)
-[![Build Status](https://github.com/kiwix/libkiwix/workflows/CI/badge.svg?query=branch%3Amaster)](https://github.com/kiwix/libkiwix/actions?query=branch%3Amaster)
-[![CodeFactor](https://www.codefactor.io/repository/github/kiwix/libkiwix/badge)](https://www.codefactor.io/repository/github/kiwix/libkiwix)
-[![Codecov](https://codecov.io/gh/kiwix/libkiwix/branch/master/graph/badge.svg)](https://codecov.io/gh/kiwix/libkiwix)
-[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+The Kiwix library provides the Kiwix software core. It contains the
+code shared by all Kiwix ports (Windows, Linux, OSX, Android, ...).

 Disclaimer
 ----------

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

 Preamble
 --------

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

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

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

-To test the code:
-* [Google Test](https://github.com/google/googletest) (package `googletest` on Ubuntu)
-
-The following dependency needs to be available at runtime:
-* [Aria2](https://aria2.github.io/) (package `aria2` on Ubuntu)
+* ICU ................................... http://site.icu-project.org/
+(package libicu-dev on Ubuntu)
+* ZIM ........................................ http://www.openzim.org/
+(package libzim-dev on Ubuntu)
+* Pugixml ........................................ http://pugixml.org/
+(package libpugixml-dev on Ubuntu)
+* ctpp2 ........................................ http://ctpp.havoc.ru/
+(package libctpp2-dev on Ubuntu)
+* Xapian ......................................... https://xapian.org/
+(package libxapian-dev on Ubuntu)
+* libaria2 .................................. https://aria2.github.io/
+(no package on Ubuntu)

 These dependencies may or may not be packaged by your operating
 system. They may also be packaged but only in an older version. The
@@ -56,79 +47,75 @@ In the worse case, you will have to download and compile bleeding edge
 version by hand.

 If you want to install these dependencies locally, then use the
-`libkiwix` directory as install prefix.
+kiwix-lib directory as install prefix.
+
+If you compile ctpp2 from source and want to compile the Kiwix library
+statically then you will probably need to rename ctpp2 static library
+from ctpp2-st.a to ctpp2.a.

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

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

 Install first the few common compilation tools:
-* [Meson](https://mesonbuild.com/)
-* [Ninja](https://ninja-build.org/)
-* [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/)
+* Meson
+* Ninja
+* Pkg-config

 These tools should be packaged if you use a cutting edge operating
-system. If not, have a look to the [Troubleshooting](#Troubleshooting)
-section.
+system. If not, have a look to the "Troubleshooting" section.

 Compilation
 -----------

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

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

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

-Testing
-------
-
-To run the automated tests:
-```bash
-cd build
-meson test
-```
-
 Installation
 ------------

-If you want to install the Libkiwix and the headers you just have
+If you want to install the Kiwix library and the headers you just have
 compiled on your system, here we go:
-```bash
+
+```
 ninja -C build install
 ```

-You might need to run the command as root (or using `sudo`), depending
+You might need to run the command as root (or using 'sudo'), depending
 where you want to install the libraries. After the installation
-succeeded, you may need to run `ldconfig` (as `root`).
+succeeded, you may need to run ldconfig (as root).

 Uninstallation
 ------------

 If you want to uninstall the Kiwix library:
-```bash
+
+```
 ninja -C build uninstall
 ```

-Like for the installation, you might need to run the command as `root`
-(or using `sudo`).
+Like for the installation, you might need to run the command as root
+(or using 'sudo').

 Troubleshooting
 ---------------

 If you need to install Meson "manually":
-```bash
+```
 virtualenv -p python3 ./ # Create virtualenv
 source bin/activate      # Activate the virtualenv
 pip3 install meson       # Install Meson
@@ -136,7 +123,7 @@ hash -r                  # Refresh bash paths
 ```

 If you need to install Ninja "manually":
-```bash
+```
 git clone git://github.com/ninja-build/ninja.git
 cd ninja
 git checkout release
@@ -146,10 +133,6 @@ 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
@@ -159,5 +142,4 @@ repository.
 License
 -------

-[GPLv3](https://www.gnu.org/licenses/gpl-3.0) or later, see
-[COPYING](COPYING) for more details.
+GPLv3 or later, see COPYING for more details.
--- a/android-kiwix-lib-publisher/.gitignore
+++ b/android-kiwix-lib-publisher/.gitignore
@@ -1,13 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
--- a/android-kiwix-lib-publisher/build.gradle
+++ b/android-kiwix-lib-publisher/build.gradle
@@ -1,25 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    repositories {
-        google()
-        jcenter()
-
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
--- a/android-kiwix-lib-publisher/gradle.properties
+++ b/android-kiwix-lib-publisher/gradle.properties
@@ -1,15 +0,0 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-# Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
--- a/android-kiwix-lib-publisher/gradle/wrapper/gradle-wrapper.jar
+++ b/android-kiwix-lib-publisher/gradle/wrapper/gradle-wrapper.jar
--- a/android-kiwix-lib-publisher/gradle/wrapper/gradle-wrapper.properties
+++ b/android-kiwix-lib-publisher/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +0,0 @@
-#Wed Jun 19 15:28:39 BST 2019
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
--- a/android-kiwix-lib-publisher/gradlew
+++ b/android-kiwix-lib-publisher/gradlew
@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
--- a/android-kiwix-lib-publisher/gradlew.bat
+++ b/android-kiwix-lib-publisher/gradlew.bat
@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
--- a/android-kiwix-lib-publisher/kiwixLibAndroid/.gitignore
+++ b/android-kiwix-lib-publisher/kiwixLibAndroid/.gitignore
@@ -1 +0,0 @@
-/build
--- a/android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
+++ b/android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
@@ -1,64 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'maven'
-
-android {
-    compileSdkVersion 28
-    defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    implementation 'com.getkeepsafe.relinker:relinker:1.3.1'
-}
-
-task writePom {
-  pom {
-    project {
-        groupId 'org.kiwix.kiwixlib'
-        artifactId 'kiwixlib'
-        version '10.0.0' + (System.env.KIWIXLIB_BUILDVERSION == null ? '' : '-'+System.env.KIWIXLIB_BUILDVERSION)
-        packaging 'aar'
-        name 'kiwixlib'
-        url 'https://github.com/kiwix/libkiwix'
-        licenses {
-            license {
-                name 'GPLv3'
-                url 'https://www.gnu.org/licenses/gpl-3.0.en.html'
-            }
-        }
-      developers {
-          developer {
-              id 'kiwix'
-              name 'kiwix'
-              email 'contact@kiwix.org'
-          }
-      }
-      scm {
-          connection 'https://github.com/kiwix/libkiwix.git'
-          developerConnection 'https://github.com/kiwix/libkiwix.git'
-          url 'https://github.com/kiwix/libkiwix'
-      }
-    }
-  }.withXml {
-    def dependenciesNode = asNode().appendNode('dependencies')
-
-    //Iterate over the implementation dependencies, adding a <dependency> node for each
-    configurations.implementation.allDependencies.each {
-      def dependencyNode = dependenciesNode.appendNode('dependency')
-      dependencyNode.appendNode('groupId', it.group)
-      dependencyNode.appendNode('artifactId', it.name)
-      dependencyNode.appendNode('version', it.version)
-    }
-  }.writeTo("$buildDir/pom.xml")
-}
-
--- a/android-kiwix-lib-publisher/kiwixLibAndroid/proguard-rules.pro
+++ b/android-kiwix-lib-publisher/kiwixLibAndroid/proguard-rules.pro
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
--- a/android-kiwix-lib-publisher/kiwixLibAndroid/src/main/AndroidManifest.xml
+++ b/android-kiwix-lib-publisher/kiwixLibAndroid/src/main/AndroidManifest.xml
@@ -1,10 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.kiwix.kiwixlib">
-
-    <application
-        android:allowBackup="true"
-        android:supportsRtl="true">
-
-    </application>
-
-</manifest>
--- a/android-kiwix-lib-publisher/settings.gradle
+++ b/android-kiwix-lib-publisher/settings.gradle
@@ -1 +0,0 @@
-include ':kiwixLibAndroid'
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +0,0 @@
-libkiwix (0.0.0) unstable; urgency=medium
-
-  * Initial release
-
- -- Kunal Mehta <legoktm@debian.org>  Wed, 08 Jul 2020 18:12:32 -0700
--- a/debian/control
+++ b/debian/control
@@ -1,46 +0,0 @@
-Source: libkiwix
-Priority: optional
-Maintainer: Kiwix team <kiwix@kiwix.org>
-Build-Depends: debhelper-compat (= 13),
- meson,
- pkg-config,
- libzim-dev (>= 6.1.8),
- libcurl4-gnutls-dev,
- libicu-dev,
- libgtest-dev,
- libkainjow-mustache-dev,
- liblzma-dev,
- libmicrohttpd-dev,
- libpugixml-dev,
- zlib1g-dev
-Standards-Version: 4.5.0
-Section: libs
-Homepage: https://github.com/kiwix/libkiwix
-Rules-Requires-Root: no
-
-Package: libkiwix-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Depends: libkiwix10 (= ${binary:Version}), ${misc:Depends}, python3,
- libzim-dev (>= 6.0.0),
- libicu-dev,
- libpugixml-dev,
- libcurl4-gnutls-dev,
- libmicrohttpd-dev
-Description: library of common code for Kiwix (development)
- Kiwix is an offline Wikipedia reader. libkiwix provides the
- software core for Kiwix, and contains the code shared by all
- Kiwix ports (Windows, Linux, OSX, Android, etc.).
- .
- This package contains development files.
-
-Package: libkiwix10
-Architecture: any
-Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}, aria2
-Conflicts: libkiwix0, libkiwix3, libkiwix9
-Description: library of common code for Kiwix
- Kiwix is an offline Wikipedia reader. libkiwix provides the
- software core for Kiwix, and contains the code shared by all
- Kiwix ports (Windows, Linux, OSX, Android, etc.).
--- a/debian/copyright
+++ b/debian/copyright
@@ -1 +0,0 @@
-See COPYING in the repository root.
--- a/debian/libkiwix-dev.install
+++ b/debian/libkiwix-dev.install
@@ -1,4 +0,0 @@
-usr/include
-usr/lib/*/libkiwix.so
-usr/lib/*/pkgconfig
-usr/bin
--- a/debian/libkiwix-dev.manpages
+++ b/debian/libkiwix-dev.manpages
@@ -1 +0,0 @@
-usr/share/man/man1/kiwix-compile-resources.1*
--- a/debian/libkiwix10.install
+++ b/debian/libkiwix10.install
@@ -1 +0,0 @@
-usr/lib/*/libkiwix.so.*
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +0,0 @@
-#!/usr/bin/make -f
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-%:
-	dh $@ --buildsystem=meson
-
-override_dh_auto_test:
-	dh_auto_test -- -t 3
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +0,0 @@
-3.0 (native)
--- a/include/book.h
+++ b/include/book.h
@@ -28,6 +28,7 @@ class xml_node;

 namespace kiwix
 {
+enum supportedIndexType { UNKNOWN, XAPIAN };

 class OPDSDumper;
 class Reader;
@@ -45,12 +46,14 @@ class Book
  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;
+  std::string getHumanReadableIdFromPath();

  bool readOnly() const { return m_readOnly; }
  const std::string& getId() const { return m_id; }
  const std::string& getPath() const { return m_path; }
  bool isPathValid() const { return m_pathValid; }
+  const std::string& getIndexPath() const { return m_indexPath; }
+  const supportedIndexType& getIndexType() const { return m_indexType; }
  const std::string& getTitle() const { return m_title; }
  const std::string& getDescription() const { return m_description; }
  const std::string& getLanguage() const { return m_language; }
@@ -59,17 +62,12 @@ class Book
  const std::string& getDate() const { return m_date; }
  const std::string& getUrl() const { return m_url; }
  const std::string& getName() const { return m_name; }
-  std::string getCategory() const;
  const std::string& getTags() const { return m_tags; }
-  std::string getTagStr(const std::string& tagName) const;
-  bool getTagBool(const std::string& tagName) const;
-  const std::string& getFlavour() const { return m_flavour; }
  const std::string& getOrigId() const { return m_origId; }
  const uint64_t& getArticleCount() const { return m_articleCount; }
  const uint64_t& getMediaCount() const { return m_mediaCount; }
  const uint64_t& getSize() const { return m_size; }
  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; }

@@ -77,6 +75,8 @@ class Book
  void setId(const std::string& id) { m_id = id; }
  void setPath(const std::string& path);
  void setPathValid(bool valid) { m_pathValid = valid; }
+  void setIndexPath(const std::string& indexPath);
+  void setIndexType(supportedIndexType indexType) { m_indexType = indexType;}
  void setTitle(const std::string& title) { m_title = title; }
  void setDescription(const std::string& description) { m_description = description; }
  void setLanguage(const std::string& language) { m_language = language; }
@@ -85,7 +85,6 @@ class Book
  void setDate(const std::string& date) { m_date = date; }
  void setUrl(const std::string& url) { m_url = url; }
  void setName(const std::string& name) { m_name = name; }
-  void setFlavour(const std::string& flavour) { m_flavour = flavour; }
  void setTags(const std::string& tags) { m_tags = tags; }
  void setOrigId(const std::string& origId) { m_origId = origId; }
  void setArticleCount(uint64_t articleCount) { m_articleCount = articleCount; }
@@ -95,30 +94,27 @@ class Book
  void setFaviconMimeType(const std::string& faviconMimeType) { m_faviconMimeType = faviconMimeType; }
  void setDownloadId(const std::string& downloadId) { m_downloadId = downloadId; }

- private:
-  std::string getCategoryFromTags() const;
-
 protected:
  std::string m_id;
  std::string m_downloadId;
  std::string m_path;
-  bool m_pathValid = false;
+  bool m_pathValid;
+  std::string m_indexPath;
+  supportedIndexType m_indexType;
  std::string m_title;
  std::string m_description;
-  std::string m_category;
  std::string m_language;
  std::string m_creator;
  std::string m_publisher;
  std::string m_date;
  std::string m_url;
  std::string m_name;
-  std::string m_flavour;
  std::string m_tags;
  std::string m_origId;
-  uint64_t m_articleCount = 0;
-  uint64_t m_mediaCount = 0;
-  bool m_readOnly = false;
-  uint64_t m_size = 0;
+  uint64_t m_articleCount;
+  uint64_t m_mediaCount;
+  bool m_readOnly;
+  uint64_t m_size;
  mutable std::string m_favicon;
  std::string m_faviconUrl;
  std::string m_faviconMimeType;
--- a/include/bookmark.h
+++ b/include/bookmark.h
@@ -1,68 +0,0 @@
-/*
- * Copyright 2018 Matthieu Gautier <mgautier@kymeria.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU  General Public License as published by
- * 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_BOOKMARK_H
-#define KIWIX_BOOKMARK_H
-
-#include <string>
-
-namespace pugi {
-class xml_node;
-}
-
-namespace kiwix
-{
-
-/**
- * A class to store information about a bookmark (an article in a book)
- */
-class Bookmark
-{
- public:
-  Bookmark();
-  ~Bookmark();
-
-  void updateFromXml(const pugi::xml_node& node);
-
-  const std::string& getBookId() const { return m_bookId; }
-  const std::string& getBookTitle()  const { return m_bookTitle; }
-  const std::string& getUrl() const { return m_url; }
-  const std::string& getTitle() const { return m_title; }
-  const std::string& getLanguage() const { return m_language; }
-  const std::string& getDate() const { return m_date; }
-
-  void setBookId(const std::string& bookId) { m_bookId = bookId; }
-  void setBookTitle(const std::string& bookTitle) { m_bookTitle = bookTitle; }
-  void setUrl(const std::string& url) { m_url = url; }
-  void setTitle(const std::string& title) { m_title = title; }
-  void setLanguage(const std::string& language) { m_language = language; }
-  void setDate(const std::string& date) { m_date = date; }
-
- protected:
-  std::string m_bookId;
-  std::string m_bookTitle;
-  std::string m_url;
-  std::string m_title;
-  std::string m_language;
-  std::string m_date;
-};
-
-}
-
-#endif
--- a/include/common/base64.h
+++ b/include/common/base64.h
--- a/include/common/networkTools.h
+++ b/include/common/networkTools.h
@@ -20,10 +20,13 @@
 #ifndef KIWIX_NETWORKTOOLS_H
 #define KIWIX_NETWORKTOOLS_H

+#include <map>
 #include <string>

 namespace kiwix
 {
+std::map<std::string, std::string> getNetworkInterfaces();
+std::string getBestPublicIp();
 std::string download(const std::string& url);
 }

--- a/include/common/otherTools.h
+++ b/include/common/otherTools.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Emmanuel Engelhart <kelson@kiwix.org>
+ * Copyright 2014 Emmanuel Engelhart <kelson@kiwix.org>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU  General Public License as published by
@@ -17,8 +17,22 @@
 * MA 02110-1301, USA.
 */

-#include <microhttpd.h>
+#ifndef KIWIX_OTHERTOOLS_H
+#define KIWIX_OTHERTOOLS_H
+
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <pugixml.hpp>
+
+namespace kiwix
+{
+void sleep(unsigned int milliseconds);
+std::string nodeToString(pugi::xml_node node);
+std::string converta2toa3(const std::string& a2code);
+}

-#if MHD_VERSION < 0x00097002
-typedef int MHD_Result;
 #endif
--- a/include/common/pathTools.h
+++ b/include/common/pathTools.h
@@ -0,0 +1,64 @@
+/*
+ * 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_PATHTOOLS_H
+#define KIWIX_PATHTOOLS_H
+
+#include <fcntl.h>
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <fstream>
+#include <ios>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <vector>
+
+#ifdef _WIN32
+#include <direct.h>
+#endif
+
+#include "stringTools.h"
+
+using namespace std;
+
+bool isRelativePath(const string& path);
+string computeAbsolutePath(const string path, const string relativePath);
+string computeRelativePath(const string path, const string absolutePath);
+string removeLastPathElement(const string path,
+                             const bool removePreSeparator = false,
+                             const bool removePostSeparator = false);
+string appendToDirectory(const string& directoryPath, const string& filename);
+
+unsigned int getFileSize(const string& path);
+string getFileSizeAsString(const string& path);
+string getFileContent(const string& path);
+bool fileExists(const string& path);
+bool makeDirectory(const string& path);
+string makeTmpDirectory();
+bool copyFile(const string& sourcePath, const string& destPath);
+string getLastPathElement(const string& path);
+string getExecutablePath();
+string getCurrentDirectory();
+string getDataDirectory();
+bool writeTextFile(const string& path, const string& content);
+#endif
--- a/include/common/regexTools.h
+++ b/include/common/regexTools.h
@@ -20,6 +20,9 @@
 #ifndef KIWIX_REGEXTOOLS_H
 #define KIWIX_REGEXTOOLS_H

+#include <unicode/regex.h>
+#include <unicode/ucnv.h>
+#include <map>
 #include <string>

 bool matchRegex(const std::string& content, const std::string& regex);
@@ -27,10 +30,7 @@ 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 regex,
                                   const std::string& replacement);
-std::string prependToFirstOccurence(const std::string& content,
-                                    const std::string& regex,
-                                    const std::string& replacement);

 #endif
--- a/include/common/stringTools.h
+++ b/include/common/stringTools.h
@@ -22,12 +22,19 @@

 #include <unicode/unistr.h>

+#include <fstream>
+#include <iomanip>
+#include <iostream>
+#include <sstream>
 #include <string>
 #include <vector>
-#include <sstream>
+
+#include "pathTools.h"

 namespace kiwix
 {
+#ifndef __ANDROID__
+
 std::string beautifyInteger(uint64_t number);
 std::string beautifyFileSize(uint64_t number);
 void printStringInHexadecimal(const char* s);
@@ -37,14 +44,18 @@ void stringReplacement(std::string& str,
                       const std::string& newStr);
 std::string encodeDiples(const std::string& str);

+#endif
+
 std::string removeAccents(const std::string& text);
 void loadICUExternalTables();

 std::string urlEncode(const std::string& value, bool encodeReserved = false);
 std::string urlDecode(const std::string& value, bool component = false);

-std::vector<std::string> split(const std::string& str, const std::string& delims, bool trimEmpty = true, bool keepDelim = false);
-std::string join(const std::vector<std::string>& list, const std::string& sep);
+std::vector<std::string> split(const std::string&, const std::string&);
+std::vector<std::string> split(const char*, const char*);
+std::vector<std::string> split(const std::string&, const char*);
+std::vector<std::string> split(const char*, const std::string&);

 std::string ucAll(const std::string& word);
 std::string lcAll(const std::string& word);
@@ -68,7 +79,5 @@ T extractFromString(const std::string& str) {
    iss >> ret;
    return ret;
 }
-
-bool startsWith(const std::string& base, const std::string& start);
 } //namespace kiwix
 #endif
--- a/include/ctpp2/CTPP2VMStringLoader.hpp
+++ b/include/ctpp2/CTPP2VMStringLoader.hpp
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2013 Renaud Gaudin <reg@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 _CTPP2_VM_STRING_LOADER_HPP__
+#define _CTPP2_VM_STRING_LOADER_HPP__ 1
+
+#include <ctpp2/CTPP2VMLoader.hpp>
+#include <ctpp2/CTPP2Util.hpp>
+#include <ctpp2/CTPP2Exception.hpp>
+#include <ctpp2/CTPP2VMExecutable.hpp>
+#include <ctpp2/CTPP2VMInstruction.hpp>
+#include <ctpp2/CTPP2VMMemoryCore.hpp>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <iostream>
+#include <string>
+
+/**
+  @file VMStringLoader.hpp
+  @brief Load program core from file
+*/
+
+namespace CTPP // C++ Template Engine
+{
+// FWD
+struct VMExecutable;
+
+/**
+  @class VMStringLoader CTPP2VMStringLoader.hpp <CTPP2VMStringLoader.hpp>
+  @brief Load program core from file
+*/
+class CTPP2DECL VMStringLoader:
+  public VMLoader
+{
+public:
+	/**
+	*/
+	VMStringLoader(CCHAR_P rawContent, size_t rawContentSize);
+	/**
+	  @brief Get ready-to-run program
+	*/
+	const VMMemoryCore * GetCore() const;
+
+	/**
+	  @brief A destructor
+	*/
+	~VMStringLoader() throw();
+private:
+	/** Program core             */
+	VMExecutable  * oCore;
+	/** Ready-to-run program     */
+	VMMemoryCore  * pVMMemoryCore;
+};
+
+} // namespace CTPP
+#endif // _CTPP2_VM_STRING_LOADER_HPP__
+// End.
--- a/include/downloader.h
+++ b/include/downloader.h
@@ -23,8 +23,8 @@
 #include <string>
 #include <vector>
 #include <map>
+#include <pthread.h>
 #include <memory>
-#include <stdexcept>

 namespace kiwix
 {
@@ -54,9 +54,6 @@ class Download {
      m_status(K_UNKNOWN),
      m_did(did) {};
  void updateStatus(bool follow=false);
-  void pauseDownload();
-  void resumeDownload();
-  void cancelDownload();
  StatusResult getStatus()          { return m_status; }
  std::string  getDid()             { return m_did; }
  std::string  getFollowedBy()      { return m_followedBy; }
@@ -92,7 +89,7 @@ class Downloader

  void close();

-  Download* startDownload(const std::string& uri, const std::vector<std::pair<std::string, std::string>>& options = {});
+  Download* startDownload(const std::string& uri);
  Download* getDownload(const std::string& did);

  size_t getNbDownload() { return m_knownDownloads.size(); }
--- a/include/entry.h
+++ b/include/entry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2020 Matthieu Gautier <mgautier@kymeria.fr>
+ * Copyright 2018 Matthieu Gautier <mgautier@kymeria.fr>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU  General Public License as published by
@@ -21,11 +21,9 @@
 #define KIWIX_ENTRY_H

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

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

    /**
@@ -57,15 +62,15 @@ class Entry
     *
     * @return the path of the entry.
     */
-    std::string getPath() const { return entry.getPath(); }
-
+    std::string getPath() const;
+    
    /**
     * Get the title of the entry.
     *
     * @return the title of the entry.
     */
-    std::string getTitle() const { return entry.getTitle(); }
-
+    std::string getTitle() const;
+        
    /**
     * Get the content of the entry.
     *
@@ -74,8 +79,8 @@ class Entry
     *
     * @return the content of the entry.
     */
-    std::string getContent() const { return entry.getItem().getData(); }
-
+    std::string getContent() const;
+        
    /**
     * Get the blob of the entry.
     *
@@ -84,8 +89,8 @@ class Entry
     * @param offset The starting offset of the blob.
     * @return the blob of the entry.
     */
-    zim::Blob   getBlob(offset_type offset = 0) const { return entry.getItem().getData(offset); }
-
+    zim::Blob   getBlob(offset_type offset = 0) const;
+        
    /**
     * Get the blob of the entry.
     *
@@ -95,15 +100,15 @@ class Entry
     * @param size The size of the blob.
     * @return the blob of the entry.
     */
-    zim::Blob   getBlob(offset_type offset, size_type size) const { return entry.getItem().getData(offset, size); }
-
+    zim::Blob   getBlob(offset_type offset, size_type size) const;
+        
    /**
     * Get the info for direct access to the content of the entry.
     *
     * Some entry (ie binary ones) have their content plain stored
     * in the zim file. Knowing the offset where the content is stored
     * an user can directly read the content in the zim file bypassing the
-     * libkiwix/libzim.
+     * kiwix-lib/libzim.
     *
     * @return A pair specifying where to read the content.
     *         The string is the real file to read (may be different that .zim
@@ -111,8 +116,8 @@ class Entry
     *         The offset is the offset to read in the file.
     *         Return <"",0> if is not possible to read directly.
     */
-    zim::Item::DirectAccessInfo getDirectAccessInfo() const { return entry.getItem().getDirectAccessInformation(); }
-
+    std::pair<std::string, offset_type> getDirectAccessInfo() const;
+        
    /**
     * Get the size of the entry.
     *
@@ -126,8 +131,8 @@ class Entry
     * @return the mime_type of the entry.
     */
    std::string getMimetype() const;
-
-
+    
+    
    /**
     * Get if the entry is a redirect entry.
     *
@@ -168,14 +173,17 @@ class Entry
    Entry getFinalEntry() const;

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

  private:
-    zim::Entry entry;
+    zim::Article article;
+    mutable zim::Article final_article;
+
+    bool good() const { return article.good(); }
 };

 }
--- a/include/kiwixserve.h
+++ b/include/kiwixserve.h
@@ -1,30 +0,0 @@
-#ifndef KIWIXLIB_KIWIX_SERVE_H_
-#define KIWIXLIB_KIWIX_SERVE_H_
-
-#include <memory>
-#include <string>
-
-class Subprocess;
-namespace kiwix {
-
-class KiwixServe
-{
-  public:
-    KiwixServe(const std::string& libraryPath, int port = 8181);
-    ~KiwixServe();
-
-    void run();
-    void shutDown();
-    bool isRunning();
-    int getPort() { return m_port; }
-    int setPort(int port);
-
-  private:
-  std::unique_ptr<Subprocess> mp_kiwixServe;
-  int m_port;
-  std::string m_libraryPath;
-};
-
-}; //end namespace kiwix
-
-#endif // KIWIXLIB_KIWIX_SERVE_H_
--- a/include/library.h
+++ b/include/library.h
@@ -23,19 +23,14 @@
 #include <string>
 #include <vector>
 #include <map>
-#include <memory>
-
-#include "book.h"
-#include "bookmark.h"
-#include "common.h"

 #define KIWIX_LIBRARY_VERSION "20110515"

 namespace kiwix
 {

+class Book;
 class OPDSDumper;
-class Library;

 enum supportedListSortBy { UNSORTED, TITLE, SIZE, DATE, CREATOR, PUBLISHER };
 enum supportedListMode {
@@ -47,124 +42,17 @@ enum supportedListMode {
  VALID = 1 << 4,
  NOVALID = 1 << 5
 };
-
-class Filter {
-  public: // types
-    using Tags = std::vector<std::string>;
-
-  private: // data
-    uint64_t activeFilters;
-    Tags _acceptTags;
-    Tags _rejectTags;
-    std::string _category;
-    std::string _lang;
-    std::string _publisher;
-    std::string _creator;
-    size_t _maxSize;
-    std::string _query;
-    bool _queryIsPartial;
-    std::string _name;
-
-  public: // functions
-    Filter();
-    ~Filter() = default;
-
-    /**
-     *  Set the filter to check local.
-     *
-     *  A local book is a book with a path.
-     *  If accept is true, only local book are accepted.
-     *  If accept is false, only non local book are accepted.
-     */
-    Filter& local(bool accept);
-
-    /**
-     *  Set the filter to check remote.
-     *
-     *  A remote book is a book with a url.
-     *  If accept is true, only remote book are accepted.
-     *  If accept is false, only non remote book are accepted.
-     */
-    Filter& remote(bool accept);
-
-    /**
-     *  Set the filter to check validity.
-     *
-     *  A valid book is a book with a path pointing to a existing zim file.
-     *  If accept is true, only valid book are accepted.
-     *  If accept is false, only non valid book are accepted.
-     */
-    Filter& valid(bool accept);
-
-    /**
-     * Set the filter to only accept book with corresponding tag.
-     */
-    Filter& acceptTags(const Tags& tags);
-    Filter& rejectTags(const Tags& tags);
-
-    Filter& category(std::string category);
-    Filter& lang(std::string lang);
-    Filter& publisher(std::string publisher);
-    Filter& creator(std::string creator);
-    Filter& maxSize(size_t size);
-    Filter& query(std::string query, bool partial=true);
-    Filter& name(std::string name);
-
-    bool hasQuery() const;
-    const std::string& getQuery() const { return _query; }
-    bool queryIsPartial() const { return _queryIsPartial; }
-
-    bool hasName() const;
-    const std::string& getName() const { return _name; }
-
-    bool hasCategory() const;
-    const std::string& getCategory() const { return _category; }
-
-    bool hasLang() const;
-    const std::string& getLang() const { return _lang; }
-
-    bool hasPublisher() const;
-    const std::string& getPublisher() const { return _publisher; }
-
-    bool hasCreator() const;
-    const std::string& getCreator() const { return _creator; }
-
-    const Tags& getAcceptTags() const { return _acceptTags; }
-    const Tags& getRejectTags() const { return _rejectTags; }
-
-private: // functions
-    friend class Library;
-
-    bool accept(const Book& book) const;
-};
-
-
 /**
 * A Library store several books.
 */
 class Library
 {
-  std::map<std::string, kiwix::Book> m_books;
-  std::map<std::string, std::shared_ptr<Reader>> m_readers;
-  std::vector<kiwix::Bookmark> m_bookmarks;
-  class BookDB;
-  std::unique_ptr<BookDB> m_bookDB;
-
- public:
-  typedef std::vector<std::string> BookIdCollection;
-
+  std::map<std::string, kiwix::Book> books;
 public:
  Library();
  ~Library();

-  /**
-   * Library is not a copiable object. However it can be moved.
-   */
-  Library(const Library& ) = delete;
-  Library(Library&& );
-  void operator=(const Library& ) = delete;
-  Library& operator=(Library&& );
-
+  std::string version;
  /**
   * Add a book to the library.
   *
@@ -177,27 +65,7 @@ class Library
   */
  bool addBook(const Book& book);

-  /**
-   * Add a bookmark to the library.
-   *
-   * @param bookmark the book to add.
-   */
-  void addBookmark(const Bookmark& bookmark);
-
-  /**
-   * Remove a bookmarkk
-   *
-   * @param zimId The zimId of the bookmark.
-   * @param url The url of the bookmark.
-   * @return True if the bookmark has been removed.
-   */
-  bool removeBookmark(const std::string& zimId, const std::string& url);
-
-  const Book& getBookById(const std::string& id) const;
  Book& getBookById(const std::string& id);
-  const Book& getBookByPath(const std::string& path) const;
-  Book& getBookByPath(const std::string& path);
-  std::shared_ptr<Reader> getReaderById(const std::string& id);

  /**
   * Remove a book from the library.
@@ -211,17 +79,9 @@ class Library
   * Write the library to a file.
   *
   * @param path the path of the file to write to.
-   * @return True if the library has been correctly saved.
+   * @return True if the library has been correctly save.
   */
-  bool writeToFile(const std::string& path) const;
-
-  /**
-   * Write the library bookmarks to a file.
-   *
-   * @param path the path of the file to write to.
-   * @return True if the library has been correctly saved.
-   */
-  bool writeBookmarksToFile(const std::string& path) const;
+  bool writeToFile(const std::string& path);

  /**
   * Get the number of book in the library.
@@ -230,49 +90,35 @@ class Library
   * @param remoteBooks If we must count remote books (books with an url)
   * @return The number of books.
   */
-  unsigned int getBookCount(const bool localBooks, const bool remoteBooks) const;
+  unsigned int getBookCount(const bool localBooks, const bool remoteBooks);

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

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

  /**
   * Get all book publishers of the books in the library.
   *
   * @return A list of book publishers.
   */
-  std::vector<std::string> getBooksPublishers() const;
-
-  /**
-   * Get all bookmarks.
-   *
-   * @return A list of bookmarks
-   */
-  const std::vector<kiwix::Bookmark> getBookmarks(bool onlyValidBookmarks = true) const;
+  std::vector<std::string> getBooksPublishers();

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

  /**
   * Filter the library and generate a new one with the keep elements.
@@ -282,27 +128,9 @@ class Library
   * @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;
+  std::vector<std::string> filter(const std::string& search);


-  /**
-   * Filter the library and return the id of the keep elements.
-   *
-   * @param filter The filter to use.
-   * @return The list of bookIds corresponding to the filter.
-   */
-  BookIdCollection filter(const Filter& filter) const;
-
-
-  /**
-   * Sort (in place) bookIds using the given comparator.
-   *
-   * @param bookIds the list of book Ids to sort
-   * @param comparator how to sort the books
-   * @return The sorted list of books
-   */
-  void sort(BookIdCollection& bookIds, supportedListSortBy sortBy, bool ascending) const;
-
  /**
   * List books in the library.
   *
@@ -325,24 +153,17 @@ class Library
   *                Set to 0 to cancel this filter.
   * @return The list of bookIds corresponding to the query.
   */
-  DEPRECATED BookIdCollection listBooksIds(
+  std::vector<std::string> listBooksIds(
    int supportedListMode = ALL,
    supportedListSortBy sortBy = UNSORTED,
    const std::string& search = "",
    const std::string& language = "",
    const std::string& creator = "",
    const std::string& publisher = "",
-    const std::vector<std::string>& tags = {},
-    size_t maxSize = 0) const;
+    size_t maxSize = 0);

  friend class OPDSDumper;
-  friend class libXMLDumper;
-
-private: // functions
-  BookIdCollection filterViaBookDB(const Filter& filter) const;
-  void updateBookDB(const Book& book);
 };
-
 }

 #endif
--- a/include/libxml_dumper.h
+++ b/include/libxml_dumper.h
@@ -1,83 +0,0 @@
-/*
- * Copyright 2018 Matthieu Gautier <mgautier@kymeria.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU  General Public License as published by
- * 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_LIBXML_DUMPER_H
-#define KIWIX_LIBXML_DUMPER_H
-
-#include <string>
-#include <vector>
-
-#include <pugixml.hpp>
-
-#include "library.h"
-
-namespace kiwix
-{
-
-/**
- * A tool to dump a `Library` into a basic library.xml
- *
- */
-class LibXMLDumper
-{
- public:
-  LibXMLDumper() = default;
-  LibXMLDumper(const Library* library);
-  ~LibXMLDumper();
-
-  /**
-   * Dump the library.xml
-   *
-   * @param id The id of the library.
-   * @return The library.xml content.
-   */
-  std::string dumpLibXMLContent(const std::vector<std::string>& bookIds);
-
-
-  /**
-   * Dump the bookmark of the library.
-   *
-   * @return The bookmark.xml content.
-   */
-  std::string dumpLibXMLBookmark();
-
-  /**
-   * Set the base directory used.
-   *
-   * @param baseDir the base directory to use.
-   */
-  void setBaseDir(const std::string& baseDir) { this->baseDir = baseDir; }
-
-  /**
-   * Set the library to dump.
-   *
-   * @param library The library to dump.
-   */
-  void setLibrary(const Library* library) { this->library = library; }
-
- protected:
-  const kiwix::Library* library;
-  std::string baseDir;
- private:
-  void handleBook(Book book, pugi::xml_node root_node);
-  void handleBookmark(Bookmark bookmark, pugi::xml_node root_node);
-};
-}
-
-#endif // KIWIX_OPDS_DUMPER_H
--- a/include/manager.h
+++ b/include/manager.h
@@ -38,7 +38,6 @@ class LibraryManipulator {
 public:
  virtual ~LibraryManipulator() {}
  virtual bool addBookToLibrary(Book book) = 0;
-  virtual void addBookmarkToLibrary(Bookmark bookmark) = 0;
 };

 class DefaultLibraryManipulator : public LibraryManipulator {
@@ -49,15 +48,15 @@ class DefaultLibraryManipulator : public LibraryManipulator {
  bool addBookToLibrary(Book book) {
    return library->addBook(book);
  }
-  void addBookmarkToLibrary(Bookmark bookmark) {
-    library->addBookmark(bookmark);
-  }
 private:
   kiwix::Library* library;
 };

 /**
 * A tool to manage a `Library`.
+ *
+ * A `Manager` handle a internal `Library`.
+ * This `Library` can be retrived with `cloneLibrary` method.
 */
 class Manager
 {
@@ -69,12 +68,26 @@ class Manager
  /**
   * Read a `library.xml` and add book in the file to the library.
   *
-   * @param path The (utf8) path to the `library.xml`.
+   * @param path The path to the `library.xml`.
   * @param readOnly Set if the libray path could be overwritten latter with
   *                 updated content.
   * @return True if file has been properly parsed.
   */
-  bool readFile(const std::string& path, bool readOnly = true, bool trustLibrary = true);
+  bool readFile(const std::string& path, const bool readOnly = true);
+
+  /**
+   * Read a `library.xml` and add book in the file to the library.
+   *
+   * @param nativePath The path of the `library.xml`
+   * @param UTF8Path The utf8 version (?) of the path. Also the path where the
+   *                 library will be writen i readOnly is False.
+   * @param readOnly Set if the libray path could be overwritten latter with
+   *                 updated content.
+   * @return True if file has been properly parsed.
+   */
+  bool readFile(const std::string& nativePath,
+                const std::string& UTF8Path,
+                const bool readOnly = true);

  /**
   * Load a library content store in the string.
@@ -87,8 +100,7 @@ class Manager
   */
  bool readXml(const std::string& xml,
               const bool readOnly = true,
-               const std::string& libraryPath = "",
-               bool trustLibrary = true);
+               const std::string& libraryPath = "");

  /**
   * Load a library content stored in a OPDS stream.
@@ -101,15 +113,6 @@ class Manager
   */
  bool readOpds(const std::string& content, const std::string& urlHost);

-
-  /**
-   * Load a bookmark file.
-   *
-   * @param path The path of the file to read.
-   * @return True if the content has been properly parsed.
-   */
-  bool readBookmarkFile(const std::string& path);
-
  /**
   * Add a book to the library.
   *
@@ -142,6 +145,55 @@ class Manager
                       const std::string& url = "",
                       const bool checkMetaData = false);

+  /**
+   * Get the book corresponding to an id.
+   *
+   * @param[in] id The id of the book
+   * @param[out] book The book corresponding to the id.
+   * @return True if the book has been found.
+   */
+  bool getBookById(const std::string& id, Book& book);
+
+  /**
+   * Update the "last open date" of a book
+   *
+   * @param id the id of the book.
+   * @return True if the book is in the library.
+   */
+  bool updateBookLastOpenDateById(const std::string& id);
+
+  /**
+   * Remove (set to empty) paths of all books in the library.
+   */
+  void removeBookPaths();
+
+  /**
+   * List books in the library.
+   *
+   * The books list will be available in public vector member `bookIdList`.
+   *
+   * @param mode The mode of listing :
+   *             - LASTOPEN sort by last opened book.
+   *             - LOCAL list only local file.
+   *             - REMOTE list only remote file.
+   * @param sortBy Attribute to sort by the book list.
+   * @param maxSize Do not list book bigger than maxSize MiB.
+   *                Set to 0 to cancel this filter.
+   * @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 search List only books with search in the title, description or
+   *               language.
+   * @return True
+   */
+  bool listBooks(const supportedListMode mode,
+                 const supportedListSortBy sortBy,
+                 const unsigned int maxSize,
+                 const std::string& language,
+                 const std::string& creator,
+                 const std::string& publisher,
+                 const std::string& search);
+
  std::string writableLibraryPath;

  bool m_hasSearchResult = false;
@@ -155,12 +207,13 @@ class Manager

  bool readBookFromPath(const std::string& path, Book* book);
  bool parseXmlDom(const pugi::xml_document& doc,
-                   bool readOnly,
-                   const std::string& libraryPath,
-                   bool trustLibrary);
+                   const bool readOnly,
+                   const std::string& libraryPath);
  bool parseOpdsDom(const pugi::xml_document& doc,
                    const std::string& urlHost);

+ private:
+  void checkAndCleanBookPaths(Book& book, const std::string& libraryPath);
 };
 }

--- a/include/meson.build
+++ b/include/meson.build
@@ -1,30 +1,35 @@
 headers = [
  'book.h',
-  'bookmark.h',
  'common.h',
  'library.h',
  'manager.h',
-  'libxml_dumper.h',
  'opds_dumper.h',
  'downloader.h',
  'reader.h',
  'entry.h',
-  'searcher.h',
-  'search_renderer.h',
-  'server.h',
-  'kiwixserve.h',
-  'name_mapper.h'
+  'searcher.h'
 ]

+if xapian_dep.found()
+  headers += ['xapianSearcher.h']
+endif
+
 install_headers(headers, subdir:'kiwix')

 install_headers(
-  'tools/base64.h',
-  'tools/networkTools.h',
-  'tools/otherTools.h',
-  'tools/pathTools.h',
-  'tools/regexTools.h',
-  'tools/stringTools.h',
-  subdir:'kiwix/tools'
+  'common/base64.h',
+  'common/networkTools.h',
+  'common/otherTools.h',
+  'common/pathTools.h',
+  'common/regexTools.h',
+  'common/stringTools.h',
+  subdir:'kiwix/common'
 )

+if has_ctpp2_dep
+  install_headers(
+    'ctpp2/CTPP2VMStringLoader.hpp',
+    subdir:'kiwix/ctpp2'
+  )
+endif
+
--- a/include/name_mapper.h
+++ b/include/name_mapper.h
@@ -1,61 +0,0 @@
-/*
- * Copyright 2019 Matthieu Gautier <mgautier@kymeria.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU  General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef KIWIX_NAMEMAPPER_H
-#define KIWIX_NAMEMAPPER_H
-
-#include <string>
-#include <map>
-
-namespace kiwix
-{
-
-class Library;
-
-class NameMapper {
-  public:
-    virtual ~NameMapper() = default;
-    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) { return id; };
-    virtual std::string getIdForName(const std::string& name) { return name; };
-};
-
-class HumanReadableNameMapper : public NameMapper {
-  private:
-    std::map<std::string, std::string> m_idToName;
-    std::map<std::string, std::string> m_nameToId;
-
-  public:
-    HumanReadableNameMapper(kiwix::Library& library, bool withAlias);
-    virtual ~HumanReadableNameMapper() = default;
-    virtual std::string getNameForId(const std::string& id);
-    virtual std::string getIdForName(const std::string& name);
-};
-
-
-
-}
-
-#endif
--- a/include/opds_dumper.h
+++ b/include/opds_dumper.h
@@ -26,9 +26,9 @@

 #include <pugixml.hpp>

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

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

  /**
-   * Dump the OPDS feed.
-   *
-   * @param bookIds the ids of the books to include in the feed
-   * @param query the query used to obtain the list of book ids
-   * @return The OPDS feed.
-   */
-  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 std::vector<std::string>& categories) const;
-
-  /**
-   * Set the id of the library.
+   * Set the id of the opds stream.
   *
   * @param id the id to use.
   */
-  void setLibraryId(const std::string& id) { this->libraryId = id;}
+  void setId(const std::string& id) { this->id = id;}
+
+  /**
+   * Set the title oft the opds stream.
+   *
+   * @param title the title to use.
+   */
+  void setTitle(const std::string& title) { this->title = title; }

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

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

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

--- a/include/reader.h
+++ b/include/reader.h
@@ -21,63 +21,28 @@
 #define KIWIX_READER_H

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

 using namespace std;

 namespace kiwix
 {

-/**
- * The SuggestionItem is a helper class that contains the info about a single
- * suggestion item.
- */
-
-class SuggestionItem
-{
-  // Functions
-  private:
-    // Create a sugggestion item.
-    explicit SuggestionItem(std::string title, std::string normalizedTitle,
-                            std::string path, std::string snippet = "") :
-      title(title),
-      normalizedTitle(normalizedTitle),
-      path(path),
-      snippet(snippet) {}
-
-  public:
-    const std::string getTitle()           {return title;}
-    const std::string getNormalizedTitle() {return normalizedTitle;}
-    const std::string getPath()            {return path;}
-    const std::string getSnippet()         {return snippet;}
-
-    const bool hasSnippet()                {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:
@@ -90,12 +55,8 @@ class Reader
   *                    unsplitted path as if the file were not splitted
   *                    (.zim extesion).
   */
-  explicit Reader(const string zimFilePath);
-#ifndef _WIN32
-  explicit Reader(int fd);
-  Reader(int fd, zim::offset_type offset, zim::size_type size);
-#endif
-  ~Reader() = default;
+  Reader(const string zimFilePath);
+  ~Reader();

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

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

+  /**
+   * Get the url of the first page.
+   *
+   * Deprecated : Use `getFirstPage` instead.
+   *
+   * @return Url of the first entry in the 'A' namespace.
+   */
+  DEPRECATED string getFirstPageUrl() const;
+
+  /**
+   * Get the entry of the first page.
+   *
+   * @return The first entry in the 'A' namespace.
+   */
+  Entry getFirstPage() const;
+
+  /**
+   * Get the url of the main page.
+   *
+   * Deprecated : Use `getMainPage` instead.
+   *
+   * @return Url of the main page as specified in the zim file.
+   */
+  DEPRECATED string getMainPageUrl() const;
+
  /**
   * Get the entry of the main page.
   *
@@ -161,14 +158,7 @@ class Reader
   * @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;
+  bool getMetatag(const string& name, string& value) const;

  /**
   * Get the title of the zim file.
@@ -179,6 +169,42 @@ class Reader
   */
  string getTitle() 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 language of the zim file.
+   *
+   * @return The language of the zim file as specified in the zim metadata.
+   */
+  string getLanguage() 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 tags of the zim file.
+   *
+   * @return The tags of the zim file as specified in the zim metadata.
+   */
+  string getTags() 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 creator of the zim file.
   *
@@ -193,100 +219,6 @@ class Reader
   */
  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.
   *
@@ -335,15 +267,93 @@ class Reader
   */
  Entry getEntryFromTitle(const std::string& title) const;

+  /**
+   * Get the url of a page specified by a title.
+   *
+   * @param[in] title the title of the page.
+   * @param[out] url the url of the page.
+   * @return True if the page can be found.
+   */
+  DEPRECATED bool getPageUrlFromTitle(const string& title, string& url) const;
+
+  /**
+   * Get the mimetype of a entry specified by a url.
+   *
+   * @param[in] url the url of the entry.
+   * @param[out] mimeType the mimeType of the entry.
+   * @return True if the mimeType has been found.
+   */
+  DEPRECATED bool getMimeTypeByUrl(const string& url, string& mimeType) const;
+
+  /**
+   * Get the content of an entry specifed by a url.
+   *
+   * Alias to `getContentByEncodedUrl`
+   */
+  DEPRECATED bool getContentByUrl(const string& url,
+                       string& content,
+                       string& title,
+                       unsigned int& contentLength,
+                       string& contentType) const;
+
+  /**
+   * Get the content of an entry specified by a url encoded url.
+   *
+   * Equivalent to getContentByDecodedUrl(urlDecode(url), ...).
+   */
+  DEPRECATED bool getContentByEncodedUrl(const string& url,
+                              string& content,
+                              string& title,
+                              unsigned int& contentLength,
+                              string& contentType,
+                              string& baseUrl) const;
+
+  /**
+   * Get the content of an entry specified by an url encoded url.
+   *
+   * Equivalent to getContentByEncodedUrl but without baseUrl.
+   */
+  DEPRECATED bool getContentByEncodedUrl(const string& url,
+                              string& content,
+                              string& title,
+                              unsigned int& contentLength,
+                              string& contentType) const;
+
+  /**
+   * Get the content of an entry specified by a url.
+   *
+   * @param[in] url The url of the entry.
+   * @param[out] content The content of the entry.
+   * @param[out] title the title of the entry.
+   * @param[out] contentLength The size of the entry (size of content).
+   * @param[out] contentType The mimeType of the entry.
+   * @param[out] baseUrl Return the true url of the entry.
+   *                     If the specified entry is a redirection, contains
+   *                     the url of the targeted entry.
+   * @return True if the entry has been found.
+   */
+  DEPRECATED bool getContentByDecodedUrl(const string& url,
+                              string& content,
+                              string& title,
+                              unsigned int& contentLength,
+                              string& contentType,
+                              string& baseUrl) const;
+  /**
+   * Get the content of an entry specified by a url.
+   *
+   * Equivalent to getContentByDecodedUrl but withou the baseUrl.
+   */
+  DEPRECATED bool getContentByDecodedUrl(const string& url,
+                              string& content,
+                              string& title,
+                              unsigned int& contentLength,
+                              string& contentType) const;
+
  /**
   * Search for entries with title starting with prefix (case sensitive).
   *
   * 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.
@@ -351,27 +361,12 @@ class Reader
   *              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.
+   * @return True if some suggestions where added to the internal vector.
   */
-  DEPRECATED bool searchSuggestions(const string& prefix,
+  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.
   *
@@ -383,38 +378,22 @@ class Reader
   * 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,
+  bool searchSuggestionsSmart(const string& prefix,
                              unsigned int suggestionsCount);

  /**
-   * Search for entries for the given prefix.
+   * Check if the url exists in the zim file.
   *
-   * 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`).
+   * Deprecated : Use `pathExists` instead.
   *
-   * 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.
+   * @param url the url to check.
+   * @return True if the url exits in the zim file.
   */
-   bool searchSuggestionsSmart(const string& prefix,
-                              unsigned int suggestionsCount,
-                              SuggestionsList_t& results);
-
+  DEPRECATED bool urlExists(const string& url) const;

  /**
   * Check if the path exists in the zim file.
@@ -446,7 +425,7 @@ class Reader
   * @param[out] title the title of the suggestion.
   * @return True if title has been set.
   */
-  DEPRECATED bool getNextSuggestion(string& title);
+  bool getNextSuggestion(string& title);

  /**
   * Get the next suggestion title and url.
@@ -455,7 +434,7 @@ class Reader
   * @param[out] url the url of the suggestion.
   * @return True if title and url have been set.
   */
-  DEPRECATED bool getNextSuggestion(string& title, string& url);
+  bool getNextSuggestion(string& title, string& url);

  /**
   * Get if we can check zim file integrity (has a checksum).
@@ -471,6 +450,16 @@ class Reader
   */
  bool isCorrupted() const;

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

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

-  SuggestionsList_t suggestions;
-  SuggestionsList_t::iterator suggestionsOffset;
+  std::vector<std::vector<std::string>> suggestions;
+  std::vector<std::vector<std::string>>::iterator suggestionsOffset;

 private:
  std::map<const std::string, unsigned int> parseCounterMetadata() const;
--- a/include/search_renderer.h
+++ b/include/search_renderer.h
@@ -1,91 +0,0 @@
-/*
- * 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_SEARCH_RENDERER_H
-#define KIWIX_SEARCH_RENDERER_H
-
-#include <string>
-
-namespace kiwix
-{
-
-class Searcher;
-class NameMapper;
-/**
- * The SearcherRenderer class is used to render a search result to a html page.
- */
-class SearchRenderer
-{
- public:
-  /**
-   * The default constructor.
-   *
-   * @param humanReadableName The global zim's humanReadableName.
-   *                          Used to generate pagination links.
-   */
-  SearchRenderer(Searcher* searcher, NameMapper* mapper);
-
-  ~SearchRenderer();
-
-  void setSearchPattern(const std::string& pattern);
-
-  /**
-   * Set the search content id.
-   */
-  void setSearchContent(const std::string& name);
-
-  /**
-   * Set protocol prefix.
-   */
-  void setProtocolPrefix(const std::string& prefix);
-
-  /**
-   * Set search protocol prefix.
-   */
-  void setSearchProtocolPrefix(const std::string& prefix);
-
-  /**
-   * set result count per page
-   */
-  void setPageLength(unsigned int pageLength){
-    this->pageLength  = pageLength;
-  }
-
-  /**
-   * Generate the html page with the resutls of the search.
-   */
-  std::string getHtml();
-
- protected:
-  std::string beautifyInteger(const unsigned int number);
-  Searcher* mp_searcher;
-  NameMapper* mp_nameMapper;
-  std::string searchContent;
-  std::string searchPattern;
-  std::string protocolPrefix;
-  std::string searchProtocolPrefix;
-  unsigned int pageLength;
-  unsigned int estimatedResultCount;
-  unsigned int resultStart;
-};
-
-
-}
-
-#endif
--- a/include/searcher.h
+++ b/include/searcher.h
@@ -27,10 +27,11 @@
 #include <cctype>
 #include <locale>
 #include <string>
-#include <memory>
 #include <vector>
-#include "tools/pathTools.h"
-#include "tools/stringTools.h"
+#include <vector>
+#include "common/pathTools.h"
+#include "common/stringTools.h"
+#include "kiwix_config.h"

 using namespace std;

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

 struct SearcherInternal;
 /**
 * The Searcher class is reponsible to do different kind of search using the
 * fulltext index.
+ *
+ * Historically, there are two kind of fulltext index :
+ *  - The legacy one, is the external fulltext index. A directory stored outside
+ *    of the zim file.
+ *  - The new one, a embedded fulltext index in the zim file.
+ *
+ * Legacy external fulltext index has to be considered as obsolet format with
+ * less functionnalities:
+ *  - No multi zim search ;
+ *  - No geo_search ;
+ *  - No suggestions search ;
+ *
+ * To reflect this, there is two Search creation "API":
+ *  - One for the external fulltext index, using the constructor taking a
+ *    xapianDirectoryPath) ;
+ *  - One for the embedded fulltext index, using a "empty" constructor and the
+ *  `add_reader` method".
+ *
+ *  On top of that, the Searcher may (if compiled with ctpp2) be used to
+ *  generate a html page for the search result. This use a template that need a
+ *  humanReaderName. This feature is only used by kiwix-serve and this should be
+ *  move outside of Searcher (and with a better API). If you don't use the html
+ *  rendering (getHtml method), you better should simply ignore the different
+ *  humanReadeableName attributes (or give an empty string).
 */
 class Searcher
 {
 public:
  /**
   * The default constructor.
+   *
+   * @param humanReadableName The global zim's humanReadableName.
+   *                          Used to generate pagination links.
   */
-  Searcher();
+  Searcher(const string& humanReadableName = "");

+  /**
+   * The constructor for legacy external fulltext index.
+   *
+   * @param xapianDirectoryPath The path to the external index directory.
+   * @param reader The reader associated to the external index.
+   *               It will be used retrive the article content or generate
+   *               the snippet.
+   * @param humanReadableName The humanReadableName for the zim.
+   */
+  Searcher(const string& xapianDirectoryPath,
+           Reader* reader,
+           const string& humanReadableName);
  ~Searcher();

  /**
   * Add a reader (containing embedded fulltext index) to the search.
   *
   * @param reader The Reader for the zim containing the fulltext index.
+   * @param humanReaderName The human readable name of the reader.
   * @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);
+  bool add_reader(Reader* reader, const std::string& humanReaderName);

  /**
   * Start a search on the zim associated to the Searcher.
@@ -88,7 +126,7 @@ class Searcher
   * @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,
+  void search(std::string& search,
              unsigned int resultStart,
              unsigned int resultEnd,
              const bool verbose = false);
@@ -142,8 +180,24 @@ class Searcher
   */
  unsigned int getEstimatedResultCount();

-  unsigned int getResultStart() { return resultStart; }
-  unsigned int getResultEnd() { return resultEnd; }
+  /**
+   * Set protocol prefix.
+   * Only used by getHtml.
+   */
+  bool setProtocolPrefix(const std::string prefix);
+
+  /**
+   * Set search protocol prefix.
+   * Only used by getHtml.
+   */
+  bool setSearchProtocolPrefix(const std::string prefix);
+
+#ifdef ENABLE_CTPP2
+  /**
+   * Generate the html page with the resutls of the search.
+   */
+  string getHtml();
+#endif

 protected:
  std::string beautifyInteger(const unsigned int number);
@@ -154,11 +208,16 @@ class Searcher
                     const bool verbose = false);

  std::vector<Reader*> readers;
-  std::unique_ptr<SearcherInternal> internal;
+  std::vector<std::string> humanReaderNames;
+  SearcherInternal* internal;
  std::string searchPattern;
+  std::string protocolPrefix;
+  std::string searchProtocolPrefix;
+  unsigned int resultCountPerPage;
  unsigned int estimatedResultCount;
  unsigned int resultStart;
  unsigned int resultEnd;
+  std::string contentHumanReadableId;

 private:
  void reset();
--- a/include/server.h
+++ b/include/server.h
@@ -1,78 +0,0 @@
-/*
- * Copyright 2019 Matthieu Gautier <mgautier@kymeria.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU  General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef KIWIX_SERVER_H
-#define KIWIX_SERVER_H
-
-#include <string>
-#include <memory>
-
-namespace kiwix
-{
-  class Library;
-  class NameMapper;
-  class InternalServer;
-
-  class Server {
-     public:
-       /**
-        * The default constructor.
-        *
-        * @param library The library to serve.
-        */
-       Server(Library* library, NameMapper* nameMapper=nullptr);
-
-       virtual ~Server();
-
-       /**
-        * Serve the content.
-        */
-       bool start();
-
-       /**
-        * Stop the daemon.
-        */
-       void stop();
-
-       void setRoot(const std::string& root);
-       void setAddress(const std::string& addr) { m_addr = addr; }
-       void setPort(int port) { m_port = port; }
-       void setNbThreads(int threads) { m_nbThreads = threads; }
-       void setVerbose(bool verbose) { m_verbose = verbose; }
-       void setTaskbar(bool withTaskbar, bool withLibraryButton)
-        { m_withTaskbar = withTaskbar; m_withLibraryButton = withLibraryButton; }
-       void setBlockExternalLinks(bool blockExternalLinks)
-        { m_blockExternalLinks = blockExternalLinks; }
-
-     protected:
-       Library* mp_library;
-       NameMapper* mp_nameMapper;
-       std::string m_root = "";
-       std::string m_addr = "";
-       int m_port = 80;
-       int m_nbThreads = 1;
-       bool m_verbose = false;
-       bool m_withTaskbar = true;
-       bool m_withLibraryButton = true;
-       bool m_blockExternalLinks = false;
-       std::unique_ptr<InternalServer> mp_server;
-  };
-}
-
-#endif
--- a/include/tools/otherTools.h
+++ b/include/tools/otherTools.h
@@ -1,56 +0,0 @@
-/*
- * Copyright 2014 Emmanuel Engelhart <kelson@kiwix.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU  General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef KIWIX_OTHERTOOLS_H
-#define KIWIX_OTHERTOOLS_H
-
-#include <string>
-#include <vector>
-#include <map>
-#include <zim/zim.h>
-#include <mustache.hpp>
-
-namespace pugi {
-  class xml_node;
-}
-
-namespace kiwix
-{
-  void sleep(unsigned int milliseconds);
-  std::string nodeToString(const pugi::xml_node& node);
-  std::string converta2toa3(const std::string& a2code);
-
-  /*
-   * Convert all format tag string to new format
-   */
-  std::vector<std::string> convertTags(const std::string& tags_str);
-  std::string getTagValueFromTagList(const std::vector<std::string>& tagList,
-                                     const std::string& tagName);
-  bool convertStrToBool(const std::string& value);
-
-  using MimeCounterType = std::map<const std::string, zim::entry_index_type>;
-  MimeCounterType parseMimetypeCounter(const std::string& counterData);
-
-  std::string gen_date_str();
-  std::string gen_uuid(const std::string& s);
-
-  std::string render_template(const std::string& template_str, kainjow::mustache::data data);
-}
-
-#endif
--- a/include/tools/pathTools.h
+++ b/include/tools/pathTools.h
@@ -1,48 +0,0 @@
-/*
- * 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_PATHTOOLS_H
-#define KIWIX_PATHTOOLS_H
-
-#include <string>
-
-#ifdef _WIN32
-std::string WideToUtf8(const std::wstring& wstr);
-std::wstring Utf8ToWide(const std::string& str);
-#endif
-bool isRelativePath(const std::string& path);
-std::string computeAbsolutePath(const std::string& path, const std::string& relativePath);
-std::string computeRelativePath(const std::string& path, const std::string& absolutePath);
-std::string removeLastPathElement(const std::string& path);
-std::string appendToDirectory(const std::string& directoryPath, const std::string& filename);
-
-unsigned int getFileSize(const std::string& path);
-std::string getFileSizeAsString(const std::string& path);
-std::string getFileContent(const std::string& path);
-bool fileExists(const std::string& path);
-bool makeDirectory(const std::string& path);
-std::string makeTmpDirectory();
-bool copyFile(const std::string& sourcePath, const std::string& destPath);
-std::string getLastPathElement(const std::string& path);
-std::string getExecutablePath(bool realPathOnly = false);
-std::string getCurrentDirectory();
-std::string getDataDirectory();
-bool writeTextFile(const std::string& path, const std::string& content);
-std::string getMimeTypeForFile(const std::string& filename);
-#endif
--- a/include/xapianSearcher.h
+++ b/include/xapianSearcher.h
@@ -0,0 +1,98 @@
+/*
+ * 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_XAPIAN_SEARCHER_H
+#define KIWIX_XAPIAN_SEARCHER_H
+
+#include <xapian.h>
+#include "reader.h"
+#include "searcher.h"
+
+#include <map>
+#include <string>
+
+using namespace std;
+
+namespace kiwix
+{
+class XapianSearcher;
+
+class XapianResult : public Result
+{
+ public:
+  XapianResult(XapianSearcher* searcher, Xapian::MSetIterator& iterator);
+  virtual ~XapianResult(){};
+
+  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 int get_readerIndex() { return 0; };
+
+ private:
+  XapianSearcher* searcher;
+  Xapian::MSetIterator iterator;
+  Xapian::Document document;
+};
+
+class NoXapianIndexInZim : public exception
+{
+  virtual const char* what() const throw()
+  {
+    return "There is no fulltext index in the zim file";
+  }
+};
+
+class XapianSearcher
+{
+  friend class XapianResult;
+
+ public:
+  XapianSearcher(const string& xapianDirectoryPath, Reader* reader);
+  virtual ~XapianSearcher(){};
+  void searchInIndex(string& search,
+                     const unsigned int resultStart,
+                     const unsigned int resultEnd,
+                     const bool verbose = false);
+  virtual Result* getNextResult();
+  void restart_search();
+
+  Xapian::MSet results;
+
+ protected:
+  void closeIndex();
+  void openIndex(const string& xapianDirectoryPath);
+  void setup_queryParser();
+
+  Reader* reader;
+  Xapian::Database readableDatabase;
+  std::string language;
+  std::string stopwords;
+  Xapian::QueryParser queryParser;
+  Xapian::Stem stemmer;
+  Xapian::SimpleStopper stopper;
+  Xapian::MSetIterator current_result;
+  std::map<std::string, int> valuesmap;
+};
+}
+
+#endif
--- a/meson.build
+++ b/meson.build
@@ -1,54 +1,23 @@
-project('libkiwix', 'cpp',
-  version : '10.0.0', # Also change this in android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
-  license : 'GPLv3+',
+project('kiwix-lib', 'cpp',
+  version : '3.0.3',
+  license : 'GPL',
  default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])

 compiler = meson.get_compiler('cpp')
+find_library_in_compiler = meson.version().version_compare('>=0.31.0')

-wrapper = get_option('wrapper')
-
-static_deps = wrapper.contains('android') or wrapper.contains('java') or get_option('default_library') == 'static'
-if wrapper.contains('android')
+static_deps = get_option('android') or get_option('default_library') == 'static'
+if get_option('android')
  extra_libs = ['-llog']
 else
  extra_libs = []
 endif

-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
-  thread_dep = dependency('', required:false)
-endif
+thread_dep = dependency('threads')
 libicu_dep = dependency('icu-i18n', static:static_deps)
+libzim_dep = dependency('libzim', version : '>=4.0.0', static:static_deps)
 pugixml_dep = dependency('pugixml', static:static_deps)
 libcurl_dep = dependency('libcurl', static:static_deps)
-microhttpd_dep = dependency('libmicrohttpd', static:static_deps)
-zlib_dep = dependency('zlib', static:static_deps)
-xapian_dep = dependency('xapian-core', static:static_deps)
-
-if compiler.has_header('mustache.hpp')
-  extra_include = []
-elif compiler.has_header('mustache.hpp', args: '-I/usr/include/kainjow')
-  extra_include = ['/usr/include/kainjow']
-else
-  error('Cannot found header mustache.hpp')
-endif
-
-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 target_machine.system() == 'windows' and static_deps
@@ -56,16 +25,77 @@ if target_machine.system() == 'windows' and static_deps
  extra_cflags += '-DCURL_STATICLIB'
 endif

-if target_machine.system() == 'windows'
-  add_project_arguments('-DNOMINMAX', language: 'cpp')
+
+
+ctpp2_include_path = ''
+has_ctpp2_dep = false
+ctpp2_prefix_install = get_option('ctpp2-install-prefix')
+ctpp2_link_args = []
+if ctpp2_prefix_install == ''
+  if compiler.has_header('ctpp2/CTPP2Logger.hpp')
+    if find_library_in_compiler
+      ctpp2_lib = compiler.find_library('ctpp2')
+    else
+      ctpp2_lib = find_library('ctpp2')
+    endif
+    ctpp2_link_args = ['-lctpp2']
+    if meson.is_cross_build() and host_machine.system() == 'windows'
+      if find_library_in_compiler
+        iconv_lib = compiler.find_library('iconv', required:false)
+      else
+        iconv_lib = find_library('iconv', required:false)
+      endif
+      if iconv_lib.found()
+        ctpp2_link_args += ['-liconv']
+      endif
+    endif
+    has_ctpp2_dep = true
+    ctpp2_dep = declare_dependency(link_args:ctpp2_link_args)
+  else
+    message('ctpp2/CTPP2Logger.hpp not found. Compiling without CTPP2 support')
+  endif
+else
+  if not find_library_in_compiler
+    error('For custom ctpp2_prefix_install you need a meson version >=0.31.0')
+  endif
+  ctpp2_include_path = ctpp2_prefix_install + '/include'
+  ctpp2_include_args = ['-I'+ctpp2_include_path]
+  if compiler.has_header('ctpp2/CTPP2Logger.hpp', args:ctpp2_include_args)
+    ctpp2_include_dir = include_directories(ctpp2_include_path, is_system:true)
+    ctpp2_lib_path = join_paths(ctpp2_prefix_install, get_option('libdir'))
+    message(ctpp2_lib_path)
+    ctpp2_lib = compiler.find_library('ctpp2', dirs:ctpp2_lib_path, required:false)
+    if not ctpp2_lib.found()
+      ctpp2_lib_path = join_paths(ctpp2_prefix_install, 'lib')
+      message(ctpp2_lib_path)
+      ctpp2_lib = compiler.find_library('ctpp2', dirs:ctpp2_lib_path)
+    endif
+    ctpp2_link_args = ['-L'+ctpp2_lib_path, '-lctpp2']
+    if meson.is_cross_build() and host_machine.system() == 'windows'
+      iconv_lib = compiler.find_library('iconv', required:false)
+      if iconv_lib.found()
+        ctpp2_link_args += ['-liconv']
+      endif
+    endif
+    has_ctpp2_dep = true
+    ctpp2_dep = declare_dependency(include_directories:ctpp2_include_dir, link_args:ctpp2_link_args)
+  else
+    message('ctpp2/CTPP2Logger.hpp not found. Compiling without CTPP2 support')
+  endif
 endif

-all_deps = [thread_dep, libicu_dep, libzim_dep, pugixml_dep, libcurl_dep, microhttpd_dep, zlib_dep, xapian_dep]
+xapian_dep = dependency('xapian-core', required:false, static:static_deps)

-inc = include_directories('include', extra_include)
+all_deps = [thread_dep, libicu_dep, libzim_dep, xapian_dep, pugixml_dep, libcurl_dep]
+if has_ctpp2_dep
+  all_deps += [ctpp2_dep]
+endif
+
+inc = include_directories('include')

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

 if build_machine.system() == 'windows'
     extra_link_args = ['-lshlwapi', '-lwinmm']
@@ -79,7 +109,17 @@ subdir('static')
 subdir('src')
 subdir('test')

-pkg_requires = ['libzim', 'icu-i18n', 'pugixml', 'libcurl', 'libmicrohttpd', 'xapian-core']
+pkg_requires = ['libzim', 'icu-i18n', 'pugixml', 'libcurl']
+if xapian_dep.found()
+    pkg_requires += ['xapian-core']
+endif
+
+if has_ctpp2_dep
+  extra_libs += ctpp2_link_args
+  if ctpp2_include_path != ''
+    extra_cflags = ' -I'+ctpp2_include_path
+  endif
+endif

 pkg_conf = configuration_data()
 pkg_conf.set('prefix', get_option('prefix'))
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,2 +1,4 @@
-option('wrapper', type:'array', choices:['java', 'android'], value:[],
-  description: 'The wrapper to generate.')
+option('ctpp2-install-prefix', type : 'string', value : '',
+  description : 'Prefix where ctpp libs has been installed')
+option('android', type : 'boolean', value : false,
+  description : 'Do we make a kiwix-lib for android')
--- a/scripts/ctpp2c.sh
+++ b/scripts/ctpp2c.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+
+ctpp2c=$1
+SOURCE=$(pwd)/$2
+DEST=$3
+
+$ctpp2c $SOURCE $DEST
--- a/scripts/kiwix-compile-resources
+++ b/scripts/kiwix-compile-resources
@@ -81,12 +81,12 @@ class Resource:
            data_identifier="_".join([""]+self.identifier),
            resource_content=",\n    ".join(", ".join("{:#04x}".format(i) for i in r) for r in sliced),
            resource_len=len(self.data),
-            namespaces_open=" ".join("namespace {} {{".format(id) for id in self.identifier[:-1]),
+            namespaces_open=" ".join("namespace {} {{".format(id) for id in self.identifier[:-1]), 
            namespaces_close=" ".join(["}"]*(len(self.identifier)-1)),
            identifier=self.identifier[-1],
            env_identifier="RES_"+"_".join(self.identifier)+"_PATH"
        )
-
+    
    def dump_getter(self):
        return resource_getter_template.format(
            common_name=self.filename,
@@ -95,11 +95,11 @@ class Resource:

    def dump_decl(self):
        return resource_decl_template.format(
-            namespaces_open=" ".join("namespace {} {{".format(id) for id in self.identifier[:-1]),
+            namespaces_open=" ".join("namespace {} {{".format(id) for id in self.identifier[:-1]), 
            namespaces_close=" ".join(["}"]*(len(self.identifier)-1)),
            identifier=self.identifier[-1]
        )
-
+    


 master_c_template = """//This file is automaically generated. Do not modify it.
@@ -113,7 +113,7 @@ static std::string init_resource(const char* name, const unsigned char* content,
    char * resPath = getenv(name);
    if (NULL == resPath)
        return std::string(reinterpret_cast<const char*>(content), len);
-
+    
    std::ifstream ifs(resPath);
    if (!ifs.good())
        return std::string(reinterpret_cast<const char*>(content), len);
@@ -137,7 +137,7 @@ def gen_c_file(resources, basename):
       include_file=basename,
       basename=to_identifier(basename)
    )
-
+ 


 master_h_template = """//This file is automaically generated. Do not modify it.
--- a/scripts/kiwix-compile-resources.1
+++ b/scripts/kiwix-compile-resources.1
@@ -1,20 +0,0 @@
-.TH KIWIX-COMPILE-RESOURCES "1" "August 2017" "Kiwix" "User Commands"
-.SH NAME
-kiwix-compile-resources \- helper to compile and generate some Kiwix resources
-.SH SYNOPSIS
-\fBkiwix\-compile\-resources\fR [\-h] [\-\-cxxfile CXXFILE] [\-\-hfile HFILE] resource_file\fR
-.SH DESCRIPTION
-.TP
-resource_file
-The list of 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
-\fB\-\-hfile\fR HFILE
-The h file name to generate
-.SH AUTHOR
-Matthieu Gautier <mgautier@kymeria.fr>
--- a/scripts/meson.build
+++ b/scripts/meson.build
@@ -1,6 +1,5 @@

 res_compiler = find_program('kiwix-compile-resources')
+intermediate_ctpp2c = find_program('ctpp2c.sh')

 install_data(res_compiler.path(), install_dir:get_option('bindir'))
-
-install_man('kiwix-compile-resources.1')
--- a/src/wrapper/java/AndroidManifest.xml
+++ b/src/wrapper/java/AndroidManifest.xml
--- a/src/wrapper/java/kiwixicu.cpp
+++ b/src/wrapper/java/kiwixicu.cpp
@@ -19,7 +19,7 @@
 */

 #include <jni.h>
-#include "org_kiwix_kiwixlib_JNIICU.h"
+#include "org_kiwix_kiwixlib_JNIKiwix.h"

 #include <iostream>
 #include <string>
@@ -28,10 +28,10 @@

 #include "utils.h"

-std::mutex globalLock;
+pthread_mutex_t globalLock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER;

-JNIEXPORT void JNICALL Java_org_kiwix_kiwixlib_JNIICU_setDataDirectory(
-    JNIEnv* env, jclass kclass, jstring dirStr)
+JNIEXPORT void JNICALL Java_org_kiwix_kiwixlib_JNIKiwix_setDataDirectory(
+    JNIEnv* env, jobject obj, jstring dirStr)
 {
  std::string cPath = jni2c(dirStr, env);

--- a/src/wrapper/java/kiwixreader.cpp
+++ b/src/wrapper/java/kiwixreader.cpp
@@ -20,10 +20,11 @@


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

-#include "tools/base64.h"
+#include "common/base64.h"
 #include "reader.h"
 #include "utils.h"

@@ -33,84 +34,18 @@ JNIEXPORT jlong JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getNativeReader(
 {
  std::string cPath = jni2c(filename, env);

-  LOG("Attempting to create reader with: %s", cPath.c_str());
+  __android_log_print(ANDROID_LOG_INFO, "kiwix", "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());
+    __android_log_print(ANDROID_LOG_WARN, "kiwix", "Error opening ZIM file");
+    __android_log_print(ANDROID_LOG_WARN, "kiwix", 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)
 {
@@ -129,8 +64,8 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getMainPage(JNIEnv* env, jobject obj)
    std::string cUrl = READER->getMainPage().getPath();
    url = c2jni(cUrl, env);
  } catch (std::exception& e) {
-    LOG("Unable to get ZIM main page");
-    LOG(e.what());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get ZIM main page");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
    url = NULL;
  }
  return url;
@@ -145,8 +80,8 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getId(JNIEnv* env, jobject obj)
    std::string cId = READER->getId();
    id = c2jni(cId, env);
  } catch (std::exception& e) {
-    LOG("Unable to get ZIM id");
-    LOG(e.what());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get ZIM id");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
    id = NULL;
  }

@@ -156,14 +91,14 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getId(JNIEnv* env, jobject obj)
 JNIEXPORT jint JNICALL
 Java_org_kiwix_kiwixlib_JNIKiwixReader_getFileSize(JNIEnv* env, jobject obj)
 {
-  jint size = 0;
+  jint size;

  try {
    int cSize = READER->getFileSize();
-    size = c2jni(cSize, env);
+    size = c2jni(cSize);
  } catch (std::exception& e) {
-    LOG("Unable to get ZIM file size");
-    LOG(e.what());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get ZIM file size");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
  }

  return size;
@@ -178,8 +113,8 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getCreator(JNIEnv* env, jobject obj)
    std::string cCreator = READER->getCreator();
    creator = c2jni(cCreator, env);
  } catch (std::exception& e) {
-    LOG("Unable to get ZIM creator");
-    LOG(e.what());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get ZIM creator");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
    creator = NULL;
  }

@@ -195,8 +130,8 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getPublisher(JNIEnv* env, jobject obj)
    std::string cPublisher = READER->getPublisher();
    publisher = c2jni(cPublisher, env);
  } catch (std::exception& e) {
-    LOG("Unable to get ZIM publish");
-    LOG(e.what());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get ZIM publish");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
    publisher = NULL;
  }
  return publisher;
@@ -211,8 +146,8 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getName(JNIEnv* env, jobject obj)
    std::string cName = READER->getName();
    name = c2jni(cName, env);
  } catch (std::exception& e) {
-    LOG("Unable to get ZIM name");
-    LOG(e.what());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get ZIM name");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
    name = NULL;
  }
  return name;
@@ -231,8 +166,8 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getFavicon(JNIEnv* env, jobject obj)
        base64_encode(cContent),
        env);
  } catch (std::exception& e) {
-    LOG("Unable to get ZIM favicon");
-    LOG(e.what());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get ZIM favicon");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
    favicon = NULL;
  }
  return favicon;
@@ -247,8 +182,8 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getDate(JNIEnv* env, jobject obj)
    std::string cDate = READER->getDate();
    date = c2jni(cDate, env);
  } catch (std::exception& e) {
-    LOG("Unable to get ZIM date");
-    LOG(e.what());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get ZIM date");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
    date = NULL;
  }
  return date;
@@ -263,8 +198,8 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getLanguage(JNIEnv* env, jobject obj)
    std::string cLanguage = READER->getLanguage();
    language = c2jni(cLanguage, env);
  } catch (std::exception& e) {
-    LOG("Unable to get ZIM language");
-    LOG(e.what());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get ZIM language");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
    language = NULL;
  }

@@ -282,30 +217,15 @@ JNIEXPORT jstring JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getMimeType(
    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());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get mime-type for url: %s", cUrl.c_str());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", 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)
+    JNIEnv* env, jobject obj, jstring url, jobject titleObj, jobject mimeTypeObj, jobject sizeObj)
 {
  /* Default values */
  setStringObjValue("", titleObj, env);
@@ -314,27 +234,24 @@ JNIEXPORT jbyteArray JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getContent(
  jbyteArray data = env->NewByteArray(0);

  /* Retrieve the content */
-  std::string cUrl = getStringObjValue(url, env);
+  std::string cUrl = jni2c(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);
+
+    data = env->NewByteArray(cSize);
+    env->SetByteArrayRegion(
+        data, 0, cSize, reinterpret_cast<const jbyte*>(entry.getBlob().data()));
+
    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());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get content for url: %s", cUrl.c_str());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
  }

  return data;
@@ -349,8 +266,8 @@ JNIEXPORT jbyteArray JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getContentPa
  /* Default values */
  /* Retrieve the content */
  std::string cUrl = jni2c(url, env);
-  unsigned int cOffset = jni2c(offset, env);
-  unsigned int cLen = jni2c(len, env);
+  unsigned int cOffset = jni2c(offset);
+  unsigned int cLen = jni2c(len);
  try {
    auto entry = READER->getEntryFromEncodedPath(cUrl);
    entry = entry.getFinalEntry();
@@ -365,48 +282,32 @@ JNIEXPORT jbyteArray JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getContentPa
      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());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get partial content for url: %s (%u : %u)", cUrl.c_str(), cOffset, cLen);
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", 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);
+   jclass classPair = env->FindClass("org/kiwix/kiwixlib/Pair");
+   jmethodID midPairinit = env->GetMethodID(classPair, "<init>", "()V");
+   jobject pair = env->NewObject(classPair, midPairinit);
+   setPairObjValue("", 0, pair, env);

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

 JNIEXPORT jboolean JNICALL
@@ -417,18 +318,15 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_searchSuggestions(JNIEnv* env,
 {
  jboolean retVal = JNI_FALSE;
  std::string cPrefix = jni2c(prefix, env);
-  unsigned int cCount = jni2c(count, env);
+  unsigned int cCount = jni2c(count);

  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());
+    __android_log_print(ANDROID_LOG_WARN, "kiwix", "Unable to get search results for pattern: %s", cPrefix.c_str());
+    __android_log_print(ANDROID_LOG_WARN, "kiwix", e.what());
  }

  return retVal;
@@ -437,25 +335,19 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_searchSuggestions(JNIEnv* env,
 JNIEXPORT jboolean JNICALL
 Java_org_kiwix_kiwixlib_JNIKiwixReader_getNextSuggestion(JNIEnv* env,
                                                         jobject obj,
-                                                         jobject titleObj,
-                                                         jobject urlObj)
+                                                         jobject titleObj)
 {
  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)) {
+    if (READER->getNextSuggestion(cTitle)) {
      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());
+    __android_log_print(ANDROID_LOG_WARN, "kiwix", "Unable to get next suggestion");
+    __android_log_print(ANDROID_LOG_WARN, "kiwix", e.what());
  }

  return retVal;
@@ -475,8 +367,8 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getPageUrlFromTitle(JNIEnv* env,
    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());
+    __android_log_print(ANDROID_LOG_WARN, "kiwix", "Unable to get url for title %s: ", cTitle.c_str());
+    __android_log_print(ANDROID_LOG_WARN, "kiwix", e.what());
  }

  return JNI_FALSE;
@@ -491,8 +383,8 @@ JNIEXPORT jstring JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getTitle(
    std::string cTitle = READER->getTitle();
    title = c2jni(cTitle, env);
  } catch (std::exception& e) {
-    LOG("Unable to get zim title");
-    LOG(e.what());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get zim title");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
    title = NULL;
  }
  return title;
@@ -507,42 +399,13 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getDescription(JNIEnv* env, jobject obj)
    std::string cDescription = READER->getDescription();
    description = c2jni(cDescription, env);
  } catch (std::exception& e) {
-    LOG("Unable to get zim description");
-    LOG(e.what());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get zim description");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", 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)
 {
@@ -554,8 +417,8 @@ JNIEXPORT jboolean JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getRandomPage(
    setStringObjValue(cUrl, urlObj, env);
    retVal = JNI_TRUE;
  } catch (std::exception& e) {
-    LOG("Unable to get random page");
-    LOG(e.what());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get random page");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
  }
  return retVal;
 }
--- a/src/wrapper/java/kiwixsearcher.cpp
+++ b/src/wrapper/java/kiwixsearcher.cpp
@@ -19,6 +19,7 @@
 */


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

@@ -51,14 +52,14 @@ JNIEXPORT void JNICALL Java_org_kiwix_kiwixlib_JNIKiwixSearcher_addReader(
 {
  auto searcher = SEARCHER;

-  searcher->add_reader(*(Handle<kiwix::Reader>::getHandle(env, reader)));
+  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);
+  unsigned int ccount = jni2c(count);

  SEARCHER->search(cquery, 0, ccount);
 }
--- a/src/android/meson.build
+++ b/src/android/meson.build
@@ -0,0 +1,26 @@
+
+kiwix_jni = custom_target('jni',
+  input: ['org/kiwix/kiwixlib/JNIKiwix.java',
+          'org/kiwix/kiwixlib/JNIKiwixReader.java',
+          'org/kiwix/kiwixlib/JNIKiwixSearcher.java',
+          'org/kiwix/kiwixlib/JNIKiwixInt.java',
+          'org/kiwix/kiwixlib/JNIKiwixString.java',
+          'org/kiwix/kiwixlib/JNIKiwixBool.java',
+          'org/kiwix/kiwixlib/JNIKiwixException.java',
+          'org/kiwix/kiwixlib/Pair.java'],
+  output: ['org_kiwix_kiwixlib_JNIKiwix.h',
+           'org_kiwix_kiwixlib_JNIKiwixReader.h',
+           'org_kiwix_kiwixlib_JNIKiwixSearcher.h',
+           'org_kiwix_kiwixlib_JNIKiwixSearcher_Result.h'],
+  command:['javac', '-d', '@OUTDIR@', '-h', '@OUTDIR@', '@INPUT@']
+)
+
+kiwix_sources += [
+    'android/kiwix.cpp',
+    'android/kiwixreader.cpp',
+    'android/kiwixsearcher.cpp',
+    kiwix_jni]
+
+install_subdir('org', install_dir: 'kiwix-lib/java')
+install_subdir('res', install_dir: 'kiwix-lib')
+install_data('AndroidManifest.xml', install_dir: 'kiwix-lib')
--- a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwix.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwix.java
@@ -20,17 +20,12 @@

 package org.kiwix.kiwixlib;

-import android.content.Context;
-import com.getkeepsafe.relinker.ReLinker;
-import org.kiwix.kiwixlib.JNIICU;
+import org.kiwix.kiwixlib.JNIKiwixReader;
+import org.kiwix.kiwixlib.JNIKiwixString;

 public class JNIKiwix
 {
-  public JNIKiwix(final Context context){
-    ReLinker.loadLibrary(context, "kiwix");
-  }
+  static { System.loadLibrary("kiwix"); }

-  public void setDataDirectory(String icuDataDir) {
-    JNIICU.setDataDirectory(icuDataDir);
-  }
+  public native void setDataDirectory(String icuDataDir);
 }
--- a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixBool.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixBool.java
--- a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixException.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixException.java
--- a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixInt.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixInt.java
--- a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixReader.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixReader.java
@@ -24,8 +24,7 @@ import org.kiwix.kiwixlib.JNIKiwixException;
 import org.kiwix.kiwixlib.JNIKiwixString;
 import org.kiwix.kiwixlib.JNIKiwixInt;
 import org.kiwix.kiwixlib.JNIKiwixSearcher;
-import org.kiwix.kiwixlib.DirectAccessInfo;
-import java.io.FileDescriptor;
+import org.kiwix.kiwixlib.Pair;

 public class JNIKiwixReader
 {
@@ -39,31 +38,7 @@ public class JNIKiwixReader

  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,
+  public native byte[] getContent(String url,
                                  JNIKiwixString title,
                                  JNIKiwixString mimeType,
                                  JNIKiwixInt size);
@@ -83,16 +58,6 @@ public class JNIKiwixReader
                                      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.
   *
@@ -103,17 +68,17 @@ public class JNIKiwixReader
   * the zim file (or zim part) and directly read the content from it (and so
   * bypassing the libzim).
   *
-   * Return a `DirectAccessInfo` (filename, offset) where the content is located.
+   * Return a `Pair` (filename, offset) where the content is located.
   *
   * If the content cannot be directly accessed (content is compressed or zim
   * file is cut in the middle of the content), the filename is an empty string
   * and offset is zero.
   */
-  public native DirectAccessInfo getDirectAccessInformation(String url);
+  public native Pair getDirectAccessInformation(String url);

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

-  public native boolean getNextSuggestion(JNIKiwixString title, JNIKiwixString url);
+  public native boolean getNextSuggestion(JNIKiwixString title);

  public native boolean getPageUrlFromTitle(String title, JNIKiwixString url);

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

  }
  public native void dispose();

  private native long getNativeReader(String filename);
-  private native long getNativeReaderByFD(FileDescriptor fd);
-  private native long getNativeReaderEmbedded(FileDescriptor fd, long offset, long size);
  private long nativeHandle;
 }
--- a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixSearcher.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixSearcher.java
--- a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixString.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixString.java
@@ -22,16 +22,4 @@ package org.kiwix.kiwixlib;
 public class JNIKiwixString
 {
  public String value;
-
-  public JNIKiwixString(String value) {
-    this.value = value;
-  }
-
-  public JNIKiwixString() {
-    this("");
-  }
-
-  public String getValue() {
-    return value;
-  }
 }
--- a/src/wrapper/java/org/kiwix/kiwixlib/DirectAccessInfo.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/DirectAccessInfo.java
@@ -19,8 +19,8 @@

 package org.kiwix.kiwixlib;

-public class DirectAccessInfo
+public class Pair
 {
  public String filename;
-  public long offset;
+  public int offset;
 }
--- a/src/wrapper/java/res/values/strings.xml
+++ b/src/wrapper/java/res/values/strings.xml
--- a/src/android/utils.h
+++ b/src/android/utils.h
@@ -0,0 +1,150 @@
+/*
+ * 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.
+ */
+
+
+#ifndef _ANDROID_JNI_UTILS_H
+#define _ANDROID_JNI_UTILS_H
+
+#include <jni.h>
+
+#include <pthread.h>
+#include <string>
+
+extern pthread_mutex_t globalLock;
+
+inline jfieldID getHandleField(JNIEnv* env, jobject obj)
+{
+  jclass c = env->GetObjectClass(obj);
+  // J is the type signature for long:
+  return env->GetFieldID(c, "nativeHandle", "J");
+}
+
+class Lock
+{
+ protected:
+  pthread_mutex_t* lock;
+
+ public:
+  Lock() : lock(&globalLock) { pthread_mutex_lock(lock); }
+  Lock(const Lock&) = delete;
+  Lock& operator=(const Lock&) = delete;
+  Lock(Lock&& other) : lock(&globalLock) { other.lock = nullptr; }
+  virtual ~Lock()
+  {
+    if (lock) {
+      pthread_mutex_unlock(lock);
+    }
+  }
+};
+
+template <class T>
+class LockedHandle;
+
+template <class T>
+class Handle
+{
+ protected:
+  T* h;
+
+ public:
+  Handle(T* h) : h(h){};
+
+  // No destructor. This must and will be handled by dispose method.
+
+  static LockedHandle<T> getHandle(JNIEnv* env, jobject obj)
+  {
+    jlong handle = env->GetLongField(obj, getHandleField(env, obj));
+    return LockedHandle<T>(reinterpret_cast<Handle<T>*>(handle));
+  }
+
+  static void dispose(JNIEnv* env, jobject obj)
+  {
+    auto lHandle = getHandle(env, obj);
+    auto handle = lHandle.h;
+    delete handle->h;
+    delete handle;
+  }
+  friend class LockedHandle<T>;
+};
+
+template <class T>
+struct LockedHandle : public Lock {
+  Handle<T>* h;
+  LockedHandle(Handle<T>* h) : h(h) {}
+  T* operator->() { return h->h; }
+  T* operator*() { return h->h; }
+  operator bool() const { return (h->h != nullptr); }
+};
+
+/* c2jni type conversion functions */
+inline jboolean c2jni(const bool& val) { return val ? JNI_TRUE : JNI_FALSE; }
+inline jstring c2jni(const std::string& val, JNIEnv* env)
+{
+  return env->NewStringUTF(val.c_str());
+}
+
+inline jint c2jni(const int val) { return (jint)val; }
+inline jint c2jni(const unsigned val) { return (unsigned)val; }
+/* jni2c type conversion functions */
+inline bool jni2c(const jboolean& val) { return val == JNI_TRUE; }
+inline std::string jni2c(const jstring& val, JNIEnv* env)
+{
+  const char* chars = env->GetStringUTFChars(val, 0);
+  std::string ret(chars);
+  env->ReleaseStringUTFChars(val, chars);
+  return ret;
+}
+
+inline int jni2c(const jint val) { return (int)val; }
+/* Method to deal with variable passed by reference */
+inline void setStringObjValue(const std::string& value,
+                              const jobject obj,
+                              JNIEnv* env)
+{
+  jclass objClass = env->GetObjectClass(obj);
+  jfieldID objFid = env->GetFieldID(objClass, "value", "Ljava/lang/String;");
+  env->SetObjectField(obj, objFid, c2jni(value, env));
+}
+
+inline void setIntObjValue(const int value, const jobject obj, JNIEnv* env)
+{
+  jclass objClass = env->GetObjectClass(obj);
+  jfieldID objFid = env->GetFieldID(objClass, "value", "I");
+  env->SetIntField(obj, objFid, value);
+}
+
+inline void setBoolObjValue(const bool value, const jobject obj, JNIEnv* env)
+{
+  jclass objClass = env->GetObjectClass(obj);
+  jfieldID objFid = env->GetFieldID(objClass, "value", "Z");
+  env->SetIntField(obj, objFid, c2jni(value));
+}
+
+inline void setPairObjValue(const std::string& filename, const int offset,
+                            const jobject obj, JNIEnv* env)
+{
+  jclass objClass = env->GetObjectClass(obj);
+  jfieldID filenameFid = env->GetFieldID(objClass, "filename", "Ljava/lang/String;");
+  env->SetObjectField(obj, filenameFid, c2jni(filename, env));
+  jfieldID offsetFid = env->GetFieldID(objClass, "offset", "I");
+  env->SetIntField(obj, offsetFid, offset);
+}
+
+#endif // _ANDROID_JNI_UTILS_H
--- a/src/aria2.cpp
+++ b/src/aria2.cpp
@@ -2,40 +2,23 @@

 #include "aria2.h"
 #include "xmlrpc.h"
-#include <iostream>
 #include <sstream>
 #include <thread>
 #include <chrono>
-#include <tools/otherTools.h>
-#include <tools/pathTools.h>
-#include <tools/stringTools.h>
+#include <common/otherTools.h>
+#include <common/pathTools.h>
 #include <downloader.h> // For AriaError

-#ifdef _WIN32
-# define ARIA2_CMD "aria2c.exe"
-#else
-# define ARIA2_CMD "aria2c"
-# include <unistd.h>
-#endif
-
-
-#define LOG_ARIA_ERROR() \
-  { \
-    std::cerr << "ERROR: aria2 RPC request failed. (" << res << ")." << std::endl; \
-    std::cerr << (m_curlErrorBuffer[0] ? m_curlErrorBuffer.get() : curl_easy_strerror(res)) << std::endl; \
-  }
-
 namespace kiwix {

 Aria2::Aria2():
  mp_aria(nullptr),
  m_port(42042),
  m_secret("kiwixariarpc"),
-  m_curlErrorBuffer(new char[CURL_ERROR_SIZE]),
-  mp_curl(nullptr)
+  mp_curl(nullptr),
+  m_lock(PTHREAD_MUTEX_INITIALIZER)
 {
  m_downloadDir = getDataDirectory();
-  makeDirectory(m_downloadDir);
  std::vector<const char*> callCmd;

  std::string rpc_port = "--rpc-listen-port=" + to_string(m_port);
@@ -53,17 +36,11 @@ Aria2::Aria2():
  std::string rpc_secret = "--rpc-secret=" + m_secret;
  m_secret = "token:"+m_secret;

-  std::string aria2cmd = appendToDirectory(
-    removeLastPathElement(getExecutablePath(true)),
-    ARIA2_CMD);
-  if (fileExists(aria2cmd)) {
-    // A local aria2c exe exists (packaged with kiwix-desktop), use it.
-    callCmd.push_back(aria2cmd.c_str());
-  } else {
-    // Try to use a potential installed aria2c.
-    callCmd.push_back(ARIA2_CMD);
-  }
-  callCmd.push_back("--follow-metalink=mem");
+#ifdef _WIN32
+  callCmd.push_back("aria2c.exe");
+#else
+  callCmd.push_back("aria2c");
+#endif
  callCmd.push_back("--enable-rpc");
  callCmd.push_back(rpc_secret.c_str());
  callCmd.push_back(rpc_port.c_str());
@@ -84,38 +61,28 @@ Aria2::Aria2():
  callCmd.push_back("--max-concurrent-downloads=42");
  callCmd.push_back("--rpc-max-request-size=6M");
  callCmd.push_back("--file-allocation=none");
-  std::string launchCmd;
-  for (auto &cmd : callCmd) {
-      launchCmd.append(cmd).append(" ");
-  }
  mp_aria = Subprocess::run(callCmd);
  mp_curl = curl_easy_init();
-
  curl_easy_setopt(mp_curl, CURLOPT_URL, "http://localhost/rpc");
  curl_easy_setopt(mp_curl, CURLOPT_PORT, m_port);
  curl_easy_setopt(mp_curl, CURLOPT_POST, 1L);
-  curl_easy_setopt(mp_curl, CURLOPT_ERRORBUFFER, m_curlErrorBuffer.get());

  int watchdog = 50;
  while(--watchdog) {
-    sleep(10);
-    m_curlErrorBuffer[0] = 0;
+    std::this_thread::sleep_for(std::chrono::microseconds(100));
    auto res = curl_easy_perform(mp_curl);
    if (res == CURLE_OK) {
      break;
-    } else if (watchdog == 1) {
-      LOG_ARIA_ERROR();
    }
  }
  if (!watchdog) {
    curl_easy_cleanup(mp_curl);
-    throw std::runtime_error("Cannot connect to aria2c rpc. Aria2c launch cmd : " + launchCmd);
+    throw std::runtime_error("Cannot connect to aria2c rpc");
  }
 }

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

@@ -127,56 +94,47 @@ void Aria2::close()

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

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

-std::string Aria2::addUri(const std::vector<std::string>& uris, const std::vector<std::pair<std::string, std::string>>& options)
+std::string Aria2::addUri(const std::vector<std::string>& uris)
 {
  MethodCall methodCall("aria2.addUri", m_secret);
  auto uriParams = methodCall.newParamValue().getArray();
  for (auto& uri : uris) {
    uriParams.addValue().set(uri);
  }
-  for (auto& option : options) {
-    methodCall.newParamValue().getStruct().addMember(option.first).getValue().set(option.second);
-  }
  auto ret = doRequest(methodCall);
  MethodResponse response(ret);
  return response.getParamValue(0).getAsS();
@@ -200,6 +158,7 @@ std::vector<std::string> Aria2::tellActive()
  MethodCall methodCall("aria2.tellActive", m_secret);
  auto statusArray = methodCall.newParamValue().getArray();
  statusArray.addValue().set(std::string("gid"));
+  statusArray.addValue().set(std::string("following"));
  auto responseContent = doRequest(methodCall);
  MethodResponse response(responseContent);
  std::vector<std::string> activeGID;
@@ -214,27 +173,6 @@ std::vector<std::string> Aria2::tellActive()
  return activeGID;
 }

-std::vector<std::string> Aria2::tellWaiting()
-{
-  MethodCall methodCall("aria2.tellWaiting", m_secret);
-  methodCall.newParamValue().set(0);
-  methodCall.newParamValue().set(99); // max number of downloads to be returned, don't know how to set this properly assumed that there will not be more than 99 paused downloads.
-  auto statusArray = methodCall.newParamValue().getArray();
-  statusArray.addValue().set(std::string("gid"));
-  auto responseContent = doRequest(methodCall);
-  MethodResponse response(responseContent);
-  std::vector<std::string> waitingGID;
-  int index = 0;
-  while(true) {
-    try {
-      auto structNode = response.getParamValue(0).getArray().getValue(index++).getStruct();
-      auto gidNode = structNode.getMember("gid");
-      waitingGID.push_back(gidNode.getValue().getAsS());
-    } catch (InvalidRPCNode& e) { break; }
-  }
-  return waitingGID;
-}
-
 void Aria2::saveSession()
 {
  MethodCall methodCall("aria2.saveSession", m_secret);
@@ -248,25 +186,5 @@ void Aria2::shutdown()
  doRequest(methodCall);
 }

-void Aria2::pause(const std::string& gid)
-{
-    MethodCall methodCall("aria2.pause", m_secret);
-    methodCall.newParamValue().set(gid);
-    doRequest(methodCall);
-}
-
-void Aria2::unpause(const std::string& gid)
-{
-    MethodCall methodCall("aria2.unpause", m_secret);
-    methodCall.newParamValue().set(gid);
-    doRequest(methodCall);
-}
-
-void Aria2::remove(const std::string& gid)
-{
-    MethodCall methodCall("aria2.remove", m_secret);
-    methodCall.newParamValue().set(gid);
-    doRequest(methodCall);
-}

 } // end namespace kiwix
--- a/src/aria2.h
+++ b/src/aria2.h
@@ -12,8 +12,8 @@
 #include "xmlrpc.h"

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

 namespace kiwix {

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

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

@@ -35,15 +34,11 @@ class Aria2
    virtual ~Aria2();
    void close();

-    std::string addUri(const std::vector<std::string>& uri, const std::vector<std::pair<std::string, std::string>>& options = {});
+    std::string addUri(const std::vector<std::string>& uri);
    std::string tellStatus(const std::string& gid, const std::vector<std::string>& statusKey);
    std::vector<std::string> tellActive();
-    std::vector<std::string> tellWaiting();
    void saveSession();
    void shutdown();
-    void pause(const std::string& gid);
-    void unpause(const std::string& gid);
-    void remove(const std::string& gid);
 };

 }; //end namespace kiwix
--- a/src/book.cpp
+++ b/src/book.cpp
@@ -20,19 +20,16 @@
 #include "book.h"
 #include "reader.h"

-#include "tools/base64.h"
-#include "tools/regexTools.h"
-#include "tools/networkTools.h"
-#include "tools/otherTools.h"
+#include "common/base64.h"
+#include "common/regexTools.h"
+#include "common/networkTools.h"

 #include <pugixml.hpp>

 namespace kiwix
 {
 /* Constructor */
-Book::Book() :
-  m_pathValid(false),
-  m_readOnly(false)
+Book::Book() : m_readOnly(false)
 {
 }
 /* Destructor */
@@ -45,56 +42,52 @@ bool Book::update(const kiwix::Book& other)
  if (m_readOnly)
    return false;

-  if (m_id != other.m_id)
-    return false;
-
  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;
+  if (m_path.empty()) {
+    m_path = other.m_path;
+  }

+  if (m_url.empty()) {
+    m_url = other.m_url;
+  }
+
+  if (m_tags.empty()) {
+    m_tags = other.m_tags;
+  }
+
+  if (m_name.empty()) {
+    m_name = other.m_name;
+  }
+
+  if (m_indexPath.empty()) {
+    m_indexPath = other.m_indexPath;
+    m_indexType = other.m_indexType;
+  }
+
+  if (m_faviconMimeType.empty()) {
+    m_favicon = other.m_favicon;
+    m_faviconMimeType = other.m_faviconMimeType;
+  }
  return true;
 }

 void Book::update(const kiwix::Reader& reader)
 {
  m_path = reader.getZimFilePath();
-  m_pathValid = true;
  m_id = reader.getId();
-  m_title = reader.getTitle();
  m_description = reader.getDescription();
  m_language = reader.getLanguage();
+  m_date = reader.getDate();
  m_creator = reader.getCreator();
  m_publisher = reader.getPublisher();
-  m_date = reader.getDate();
+  m_title = reader.getTitle();
  m_name = reader.getName();
-  m_flavour = reader.getFlavour();
  m_tags = reader.getTags();
-  m_category = getCategoryFromTags();
  m_origId = reader.getOrigId();
  m_articleCount = reader.getArticleCount();
  m_mediaCount = reader.getMediaCount();
  m_size = static_cast<uint64_t>(reader.getFileSize()) << 10;
-  m_pathValid = true;

  reader.getFavicon(m_favicon, m_faviconMimeType);
 }
@@ -108,41 +101,36 @@ void Book::updateFromXml(const pugi::xml_node& node, const std::string& baseDir)
    path = computeAbsolutePath(baseDir, path);
  }
  m_path = path;
-  m_pathValid = fileExists(path);
+  path = ATTR("indexPath");
+  if (!path.empty()) {
+    if (isRelativePath(path)) {
+      path = computeAbsolutePath(baseDir, path);
+    }
+    m_indexPath = path;
+    m_indexType = XAPIAN;
+  }
  m_title = ATTR("title");
+  m_name = ATTR("name");
+  m_tags = ATTR("tags");
  m_description = ATTR("description");
  m_language = ATTR("language");
+  m_date = ATTR("date");
  m_creator = ATTR("creator");
  m_publisher = ATTR("publisher");
-  m_date = ATTR("date");
  m_url = ATTR("url");
-  m_name = ATTR("name");
-  m_flavour = ATTR("flavour");
-  m_tags = ATTR("tags");
  m_origId = ATTR("origId");
  m_articleCount = strtoull(ATTR("articleCount"), 0, 0);
  m_mediaCount = strtoull(ATTR("mediaCount"), 0, 0);
  m_size = strtoull(ATTR("size"), 0, 0) << 10;
  m_favicon = base64_decode(ATTR("favicon"));
  m_faviconMimeType = ATTR("faviconMimeType");
-  m_faviconUrl = ATTR("faviconUrl");
  try {
    m_downloadId = ATTR("downloadId");
  } catch(...) {}
-  const auto catattr = node.attribute("category");
-  m_category = catattr.empty() ? getCategoryFromTags() : catattr.value();
 }
 #undef ATTR


-static std::string fromOpdsDate(const std::string& date)
-{
-  //The opds date use the standard <YYYY>-<MM>-<DD>T<HH>:<mm>:<SS>Z
-  //and we want <YYYY>-<MM>-<DD>. That's easy, let's take the first 10 char
-  return date.substr(0, 10);
-}
-
-
 #define VALUE(name) node.child(name).child_value()
 void Book::updateFromOpds(const pugi::xml_node& node, const std::string& urlHost)
 {
@@ -150,20 +138,11 @@ void Book::updateFromOpds(const pugi::xml_node& node, const std::string& urlHost
  if (!m_id.compare(0, 9, "urn:uuid:")) {
    m_id.erase(0, 9);
  }
-  // No path on opds.
  m_title = VALUE("title");
-  m_description = VALUE("summary");
+  m_description = VALUE("description");
  m_language = VALUE("language");
+  m_date = VALUE("updated");
  m_creator = node.child("author").child("name").child_value();
-  m_publisher = node.child("publisher").child("name").child_value();
-  m_date = fromOpdsDate(VALUE("updated"));
-  m_name = VALUE("name");
-  m_flavour = VALUE("flavour");
-  m_tags = VALUE("tags");
-  const auto catnode = node.child("category");
-  m_category = catnode.empty() ? getCategoryFromTags() : catnode.child_value();
-  m_articleCount = strtoull(VALUE("articleCount"), 0, 0);
-  m_mediaCount = strtoull(VALUE("mediaCount"), 0, 0);
  for(auto linkNode = node.child("link"); linkNode;
           linkNode = linkNode.next_sibling("link")) {
    std::string rel = linkNode.attribute("rel").value();
@@ -181,7 +160,7 @@ void Book::updateFromOpds(const pugi::xml_node& node, const std::string& urlHost
 }
 #undef VALUE

-std::string Book::getHumanReadableIdFromPath() const
+std::string Book::getHumanReadableIdFromPath()
 {
  std::string id = m_path;
  if (!id.empty()) {
@@ -207,6 +186,13 @@ void Book::setPath(const std::string& path)
   : path;
 }

+void Book::setIndexPath(const std::string& indexPath)
+{
+  m_indexPath = isRelativePath(indexPath)
+    ? computeAbsolutePath(getCurrentDirectory(), indexPath)
+    : indexPath;
+}
+
 const std::string& Book::getFavicon() const {
  if (m_favicon.empty() && !m_faviconUrl.empty()) {
    try {
@@ -218,29 +204,4 @@ const std::string& Book::getFavicon() const {
  return m_favicon;
 }

-std::string Book::getTagStr(const std::string& tagName) const {
-  return getTagValueFromTagList(convertTags(m_tags), tagName);
-}
-
-bool Book::getTagBool(const std::string& tagName) const {
-  return convertStrToBool(getTagStr(tagName));
-}
-
-std::string Book::getCategory() const
-{
-  return m_category;
-}
-
-std::string Book::getCategoryFromTags() const
-{
-  try
-  {
-    return getTagStr("category");
-  }
-  catch ( const std::out_of_range& )
-  {
-    return "";
-  }
-}
-
 }
--- a/src/bookmark.cpp
+++ b/src/bookmark.cpp
@@ -1,47 +0,0 @@
-/*
- * Copyright 2018 Matthieu Gautier <mgautier@kymeria.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU  General Public License as published by
- * 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 "bookmark.h"
-
-#include <pugixml.hpp>
-
-namespace kiwix
-{
-/* Constructor */
-Bookmark::Bookmark()
-{
-}
-
-/* Destructor */
-Bookmark::~Bookmark()
-{
-}
-
-void Bookmark::updateFromXml(const pugi::xml_node& node)
-{
-  auto bookNode = node.child("book");
-  m_bookId = bookNode.child("id").child_value();
-  m_bookTitle = bookNode.child("title").child_value();
-  m_language = bookNode.child("language").child_value();
-  m_date = bookNode.child("date").child_value();
-  m_title = node.child("title").child_value();
-  m_url = node.child("url").child_value();
-}
-
-}
--- a/src/common/base64.cpp
+++ b/src/common/base64.cpp
@@ -1,4 +1,4 @@
-/*
+/* 
   base64.cpp and base64.h

   Copyright (C) 2004-2008 René Nyffenegger
@@ -24,10 +24,10 @@
   René Nyffenegger rene.nyffenegger@adp-gmbh.ch
 */

-#include <tools/base64.h>
+#include <common/base64.h>
 #include <iostream>

-static const std::string base64_chars =
+static const std::string base64_chars = 
             "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
             "abcdefghijklmnopqrstuvwxyz"
  "0123456789+/";
--- a/src/common/networkTools.cpp
+++ b/src/common/networkTools.cpp
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2012 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 <common/networkTools.h>
+
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
+#include <net/if.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
+#endif
+
+#include <curl/curl.h>
+
+#include <sstream>
+#include <iostream>
+
+
+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 == (SOCKET)SOCKET_ERROR) {
+    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);
+
+    /* Add to the map */
+    std::string interfaceName = std::string(inet_ntoa(pAddress->sin_addr));
+    std::string interfaceIp = std::string(inet_ntoa(pAddress->sin_addr));
+    interfaces.insert(
+        std::pair<std::string, std::string>(interfaceName, interfaceIp));
+  }
+#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)");
+    exit(EXIT_FAILURE);
+  }
+
+  /* Go through each interface */
+  int i;
+  size_t len;
+  struct ifreq* ifreq;
+  ifreq = ifconf.ifc_req;
+  for (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.insert(
+            std::pair<std::string, std::string>(interfaceName, interfaceIp));
+      } else {
+        perror("getnameinfo()");
+      }
+    }
+
+/* some systems have ifr_addr.sa_len and adjust the length that
+ * way, but not mine. weird */
+#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()
+{
+  std::map<std::string, std::string> interfaces = kiwix::getNetworkInterfaces();
+
+#ifndef _WIN32
+  const char* const prioritizedNames[]
+      = {"eth0", "eth1", "wlan0", "wlan1", "en0", "en1"};
+  const int count = (sizeof prioritizedNames) / (sizeof prioritizedNames[0]);
+  for (int i = 0; i < count; ++i) {
+    std::map<std::string, std::string>::const_iterator it
+        = interfaces.find(prioritizedNames[i]);
+    if (it != interfaces.end()) {
+      return it->second;
+    }
+  }
+#endif
+
+  for (std::map<std::string, std::string>::iterator iter = interfaces.begin();
+       iter != interfaces.end();
+       ++iter) {
+    std::string interfaceIp = iter->second;
+    if (interfaceIp.length() >= 7 && interfaceIp.substr(0, 7) == "192.168") {
+      return interfaceIp;
+    }
+  }
+
+  for (std::map<std::string, std::string>::iterator iter = interfaces.begin();
+       iter != interfaces.end();
+       ++iter) {
+    std::string interfaceIp = iter->second;
+    if (interfaceIp.length() >= 7 && interfaceIp.substr(0, 7) == "172.16.") {
+      return interfaceIp;
+    }
+  }
+
+  for (std::map<std::string, std::string>::iterator iter = interfaces.begin();
+       iter != interfaces.end();
+       ++iter) {
+    std::string interfaceIp = iter->second;
+    if (interfaceIp.length() >= 3 && interfaceIp.substr(0, 3) == "10.") {
+      return interfaceIp;
+    }
+  }
+
+  return "127.0.0.1";
+}
+
+size_t write_callback_to_iss(char* ptr, size_t size, size_t nmemb, void* userdata)
+{
+  auto str = static_cast<std::stringstream*>(userdata);
+  str->write(ptr, nmemb);
+  return nmemb;
+}
+
+std::string kiwix::download(const std::string& url) {
+  auto curl = curl_easy_init();
+  std::stringstream ss;
+  curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+  curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
+  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &write_callback_to_iss);
+  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &ss);
+  auto res = curl_easy_perform(curl);
+  if (res != CURLE_OK) {
+    curl_easy_cleanup(curl);
+    throw std::runtime_error("Cannot perform request");
+  }
+  long response_code;
+  curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response_code);
+  curl_easy_cleanup(curl);
+  if (response_code != 200) {
+    throw std::runtime_error("Invalid return code from server");
+  }
+  return ss.str();
+}
--- a/src/common/otherTools.cpp
+++ b/src/common/otherTools.cpp
@@ -0,0 +1,326 @@
+/*
+ * Copyright 2014 Emmanuel Engelhart <kelson@kiwix.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU  General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <common/otherTools.h>
+#include <map>
+
+static std::map<std::string, std::string> codeisomapping {
+//a
+  { "ad", "and" },
+  { "ae", "are" },
+  { "af", "afg" },
+  { "ag", "atg" },
+  { "ai", "aia" },
+  { "al", "alb" },
+  { "am", "arm" },
+  { "an", "ant" },
+  { "ao", "ago" },
+  { "aq", "ata" },
+  { "ar", "arg" },
+  { "as", "asm" },
+  { "at", "aut" },
+  { "au", "aus" },
+  { "aw", "abw" },
+  { "ax", "ala" },
+  { "az", "aze" },
+//b
+  { "ba", "bih" },
+  { "bb", "brb" },
+  { "bd", "bgd" },
+  { "be", "bel" },
+  { "bf", "bfa" },
+  { "bg", "bgr" },
+  { "bh", "bhr" },
+  { "bi", "bdi" },
+  { "bj", "ben" },
+  { "bl", "blm" },
+  { "bn", "brn" },
+  { "bm", "bmu" },
+  { "bo", "bol" },
+  { "br", "bra" },
+  { "bs", "bhs" },
+  { "bt", "btn" },
+  { "bv", "bvt" },
+  { "bw", "bwa" },
+  { "by", "blr" },
+  { "bz", "blz" },
+//c
+  { "ca", "can" },
+  { "cc", "cck" },
+  { "cd", "cod" },
+  { "cf", "caf" },
+  { "cg", "cog" },
+  { "ch", "che" },
+  { "ci", "civ" },
+  { "ck", "cok" },
+  { "cl", "chl" },
+  { "cm", "cmr" },
+  { "cn", "chn" },
+  { "co", "col" },
+  { "cr", "cri" },
+  { "cu", "cub" },
+  { "cv", "cpv" },
+  { "cx", "cxr" },
+  { "cy", "cyp" },
+  { "cz", "cze" },
+//d
+  { "de", "deu" },
+  { "dj", "dji" },
+  { "dk", "dnk" },
+  { "dm", "dma" },
+  { "do", "dom" },
+  { "dz", "dza" },
+//e
+  { "ec", "ecu" },
+  { "ee", "est" },
+  { "eg", "egy" },
+  { "eh", "esh" },
+  { "en", "eng" },
+  { "er", "eri" },
+  { "es", "esp" },
+  { "et", "eth" },
+//f
+  { "fi", "fin" },
+  { "fj", "fji" },
+  { "fk", "flk" },
+  { "fm", "fsm" },
+  { "fo", "fro" },
+  { "fr", "fra" },
+//g
+  { "ga", "gab" },
+  { "gb", "gbr" },
+  { "gd", "grd" },
+  { "ge", "geo" },
+  { "gf", "guf" },
+  { "gg", "ggy" },
+  { "gh", "gha" },
+  { "gi", "gib" },
+  { "gl", "grl" },
+  { "gm", "gmb" },
+  { "gn", "gin" },
+  { "gp", "glp" },
+  { "gq", "gnq" },
+  { "gr", "grc" },
+  { "gs", "sgs" },
+  { "gt", "gtm" },
+  { "gu", "gum" },
+  { "gw", "gnb" },
+  { "gy", "guy" },
+//h
+  { "hk", "hkg" },
+  { "hm", "hmd" },
+  { "hn", "hnd" },
+  { "hr", "hrv" },
+  { "ht", "hti" },
+  { "hu", "hun" },
+//i
+  { "id", "idn" },
+  { "ie", "irl" },
+  { "il", "isr" },
+  { "im", "imn" },
+  { "in", "ind" },
+  { "io", "iot" },
+  { "iq", "irq" },
+  { "ir", "irn" },
+  { "is", "isl" },
+  { "it", "ita" },
+//j
+  { "je", "jey" },
+  { "jm", "jam" },
+  { "jo", "jor" },
+  { "jp", "jpn" },
+//k
+  { "ke", "ken" },
+  { "kg", "kgz" },
+  { "kh", "khm" },
+  { "ki", "kir" },
+  { "km", "com" },
+  { "kn", "kna" },
+  { "kp", "prk" },
+  { "kr", "kor" },
+  { "kw", "kwt" },
+  { "ky", "cym" },
+  { "kz", "kaz" },
+//l
+  { "la", "lao" },
+  { "lb", "lbn" },
+  { "lc", "lca" },
+  { "li", "lie" },
+  { "lk", "lka" },
+  { "lr", "lbr" },
+  { "ls", "lso" },
+  { "lt", "ltu" },
+  { "lu", "lux" },
+  { "lv", "lva" },
+  { "ly", "lby" },
+//m
+  { "ma", "mar" },
+  { "mc", "mco" },
+  { "md", "mda" },
+  { "me", "mne" },
+  { "mf", "maf" },
+  { "mg", "mdg" },
+  { "mh", "mhl" },
+  { "mk", "mkd" },
+  { "ml", "mli" },
+  { "mm", "mmr" },
+  { "mn", "mng" },
+  { "mo", "mac" },
+  { "mp", "mnp" },
+  { "mq", "mtq" },
+  { "mr", "mrt" },
+  { "ms", "msr" },
+  { "mt", "mlt" },
+  { "mu", "mus" },
+  { "mv", "mdv" },
+  { "mw", "mwi" },
+  { "mx", "mex" },
+  { "my", "mys" },
+  { "mz", "moz" },
+//n
+  { "na", "nam" },
+  { "nc", "ncl" },
+  { "ne", "ner" },
+  { "nf", "nfk" },
+  { "ng", "nga" },
+  { "ni", "nic" },
+  { "nl", "nld" },
+  { "no", "nor" },
+  { "np", "npl" },
+  { "nr", "nru" },
+  { "nu", "niu" },
+  { "nz", "nzl" },
+//o
+  { "om", "omn" },
+//p
+  { "pa", "pan" },
+  { "pe", "per" },
+  { "pf", "pyf" },
+  { "pg", "png" },
+  { "ph", "phl" },
+  { "pk", "pak" },
+  { "pl", "pol" },
+  { "pm", "spm" },
+  { "pn", "pcn" },
+  { "pr", "pri" },
+  { "ps", "pse" },
+  { "pt", "prt" },
+  { "pw", "plw" },
+  { "py", "pry" },
+//q
+  { "qa", "qat" },
+//r
+  { "re", "reu" },
+  { "ro", "rou" },
+  { "rs", "srb" },
+  { "ru", "rus" },
+  { "rw", "rwa" },
+//s
+  { "sa", "sau" },
+  { "sb", "slb" },
+  { "sc", "syc" },
+  { "sd", "sdn" },
+  { "se", "swe" },
+  { "sg", "sgp" },
+  { "sh", "shn" },
+  { "si", "svn" },
+  { "sj", "sjm" },
+  { "sk", "svk" },
+  { "sl", "sle" },
+  { "sm", "smr" },
+  { "sn", "sen" },
+  { "so", "som" },
+  { "sr", "sur" },
+  { "ss", "ssd" },
+  { "st", "stp" },
+  { "sv", "slv" },
+  { "sy", "syr" },
+  { "sz", "swz" },
+//t
+  { "tc", "tca" },
+  { "td", "tcd" },
+  { "tf", "atf" },
+  { "tg", "tgo" },
+  { "th", "tha" },
+  { "tj", "tjk" },
+  { "tk", "tkl" },
+  { "tl", "tls" },
+  { "tm", "tkm" },
+  { "tn", "tun" },
+  { "to", "ton" },
+  { "tr", "tur" },
+  { "tt", "tto" },
+  { "tv", "tuv" },
+  { "tw", "twn" },
+  { "tz", "tza" },
+//u
+  { "ua", "ukr" },
+  { "ug", "uga" },
+  { "um", "umi" },
+  { "us", "usa" },
+  { "uy", "ury" },
+  { "uz", "uzb" },
+//v
+  { "va", "vat" },
+  { "vc", "vct" },
+  { "ve", "ven" },
+  { "vg", "vgb" },
+  { "vi", "vir" },
+  { "vn", "vnm" },
+  { "vu", "vut" },
+//w
+  { "wf", "wlf" },
+  { "ws", "wsm" },
+//y
+  { "ye", "yem" },
+  { "yt", "myt" },
+// z
+  { "za", "zaf" },
+  { "zm", "zmb" },
+  { "zw", "zwe" }
+};
+
+void kiwix::sleep(unsigned int milliseconds)
+{
+#ifdef _WIN32
+  Sleep(milliseconds);
+#else
+  usleep(1000 * milliseconds);
+#endif
+}
+
+
+struct XmlStringWriter: pugi::xml_writer
+{
+  std::string result;
+  virtual void write(const void* data, size_t size){
+    result.append(static_cast<const char*>(data), size);
+  }
+};
+
+std::string kiwix::nodeToString(pugi::xml_node node)
+{
+  XmlStringWriter writer;
+  node.print(writer, "  ");
+  return writer.result;
+}
+
+std::string kiwix::converta2toa3(const std::string& a2code){
+  return codeisomapping.at(a2code);
+}
--- a/src/common/pathTools.cpp
+++ b/src/common/pathTools.cpp
@@ -0,0 +1,335 @@
+/*
+ * Copyright 2011-2014 Emmanuel Engelhart <kelson@kiwix.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU  General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <common/pathTools.h>
+
+#ifdef __APPLE__
+#include <limits.h>
+#include <mach-o/dyld.h>
+#elif _WIN32
+#include <direct.h>
+#include <windows.h>
+#include "shlwapi.h"
+#define getcwd _getcwd  // stupid MSFT "deprecation" warning
+#endif
+
+#ifdef _WIN32
+#else
+#include <unistd.h>
+#endif
+
+#ifdef _WIN32
+const std::string SEPARATOR("\\");
+#else
+const std::string SEPARATOR("/");
+#include <unistd.h>
+#endif
+
+#include <stdlib.h>
+
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
+
+bool isRelativePath(const string& path)
+{
+#ifdef _WIN32
+  return path.empty() || path.substr(1, 2) == ":\\" ? false : true;
+#else
+  return path.empty() || path.substr(0, 1) == "/" ? false : true;
+#endif
+}
+
+string computeRelativePath(const string path, const string absolutePath)
+{
+  std::vector<std::string> pathParts = kiwix::split(path, SEPARATOR);
+  std::vector<std::string> absolutePathParts
+      = kiwix::split(absolutePath, SEPARATOR);
+
+  unsigned int commonCount = 0;
+  while (commonCount < pathParts.size()
+         && commonCount < absolutePathParts.size()
+         && pathParts[commonCount] == absolutePathParts[commonCount]) {
+      commonCount++;
+  }
+
+  string relativePath;
+#ifdef _WIN32
+  /* On Windows you have a token more because the root is represented
+     by a letter */
+  if (commonCount == 0) {
+    relativePath = ".." + SEPARATOR;
+  }
+#endif
+
+  for (unsigned int i = commonCount; i < pathParts.size(); i++) {
+    relativePath += ".." + SEPARATOR;
+  }
+  for (unsigned int i = commonCount; i < absolutePathParts.size(); i++) {
+    relativePath += absolutePathParts[i];
+    relativePath += i + 1 < absolutePathParts.size() ? SEPARATOR : "";
+  }
+  return relativePath;
+}
+
+/* Warning: the relative path must be with slashes */
+string computeAbsolutePath(const string path, const string relativePath)
+{
+  string absolutePath;
+
+  if (path.empty()) {
+    char* path = NULL;
+    size_t size = 0;
+
+#ifdef _WIN32
+    path = _getcwd(path, size);
+#else
+    path = getcwd(path, size);
+#endif
+
+    absolutePath = string(path) + SEPARATOR;
+  } else {
+    absolutePath = path.substr(path.length() - 1, 1) == SEPARATOR
+                       ? path
+                       : path + SEPARATOR;
+  }
+
+#if _WIN32
+  char* cRelativePath = _strdup(relativePath.c_str());
+#else
+  char* cRelativePath = strdup(relativePath.c_str());
+#endif
+  char* token = strtok(cRelativePath, "/");
+
+  while (token != NULL) {
+    if (string(token) == "..") {
+      absolutePath = removeLastPathElement(absolutePath, true, false);
+      token = strtok(NULL, "/");
+    } else if (strcmp(token, ".") && strcmp(token, "")) {
+      absolutePath += string(token);
+      token = strtok(NULL, "/");
+      if (token != NULL) {
+        absolutePath += SEPARATOR;
+      }
+    } else {
+      token = strtok(NULL, "/");
+    }
+  }
+
+  return absolutePath;
+}
+
+string removeLastPathElement(const string path,
+                             const bool removePreSeparator,
+                             const bool removePostSeparator)
+{
+  string newPath = path;
+  size_t offset = newPath.find_last_of(SEPARATOR);
+  if (removePreSeparator &&
+#ifndef _WIN32
+      offset != newPath.find_first_of(SEPARATOR) &&
+#endif
+      offset == newPath.length() - 1) {
+    newPath = newPath.substr(0, offset);
+    offset = newPath.find_last_of(SEPARATOR);
+  }
+  newPath = removePostSeparator ? newPath.substr(0, offset)
+                                : newPath.substr(0, offset + 1);
+  return newPath;
+}
+
+string appendToDirectory(const string& directoryPath, const string& filename)
+{
+  string newPath = directoryPath + SEPARATOR + filename;
+  return newPath;
+}
+
+string getLastPathElement(const string& path)
+{
+  return path.substr(path.find_last_of(SEPARATOR) + 1);
+}
+
+unsigned int getFileSize(const string& path)
+{
+#ifdef _WIN32
+  struct _stat filestatus;
+  _stat(path.c_str(), &filestatus);
+#else
+  struct stat filestatus;
+  stat(path.c_str(), &filestatus);
+#endif
+
+  return filestatus.st_size / 1024;
+}
+
+string getFileSizeAsString(const string& path)
+{
+  ostringstream convert;
+  convert << getFileSize(path);
+  return convert.str();
+}
+
+string getFileContent(const string& path)
+{
+  std::ifstream f(path, std::ios::in|std::ios::ate);
+  std::string content;
+  if (f.is_open()) {
+    auto size = f.tellg();
+    content.reserve(size);
+    f.seekg(0, std::ios::beg);
+    content.assign((std::istreambuf_iterator<char>(f)),
+                    std::istreambuf_iterator<char>());
+  }
+  return content;
+}
+
+bool fileExists(const string& path)
+{
+#ifdef _WIN32
+  return PathFileExists(path.c_str());
+#else
+  bool flag = false;
+  fstream fin;
+  fin.open(path.c_str(), ios::in);
+  if (fin.is_open()) {
+    flag = true;
+  }
+  fin.close();
+  return flag;
+#endif
+}
+
+bool makeDirectory(const string& path)
+{
+#ifdef _WIN32
+  int status = _mkdir(path.c_str());
+#else
+  int status = mkdir(path.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
+#endif
+  return status == 0;
+}
+
+string makeTmpDirectory()
+{
+#ifdef _WIN32
+  char cbase[MAX_PATH+1];
+  int base_len = GetTempPath(MAX_PATH+1, cbase);
+  UUID uuid;
+  UuidCreate(&uuid);
+  char* dir_name;
+  UuidToString(&uuid, reinterpret_cast<unsigned char**>(&dir_name));
+  string dir(cbase, base_len);
+  dir += dir_name;
+  _mkdir(dir.c_str());
+  RpcStringFree(reinterpret_cast<unsigned char**>(&dir_name));
+#else
+  string base = "/tmp";
+  auto _template = base + "/kiwix-lib_XXXXXX";
+  char* _template_array = new char[_template.size()+1];
+  memcpy(_template_array, _template.c_str(), _template.size());
+  string dir = mkdtemp(_template_array);
+  delete[] _template_array;
+#endif
+  return dir;
+}
+
+/* Try to create a link and if does not work then make a copy */
+bool copyFile(const string& sourcePath, const string& destPath)
+{
+  try {
+#ifndef _WIN32
+    if (link(sourcePath.c_str(), destPath.c_str()) != 0) {
+#endif
+      std::ifstream infile(sourcePath.c_str(), std::ios_base::binary);
+      std::ofstream outfile(destPath.c_str(), std::ios_base::binary);
+      outfile << infile.rdbuf();
+#ifndef _WIN32
+    }
+#endif
+  } catch (exception& e) {
+    cerr << e.what() << endl;
+    return false;
+  }
+
+  return true;
+}
+
+string getExecutablePath()
+{
+  char binRootPath[PATH_MAX];
+
+#ifdef _WIN32
+  GetModuleFileName(NULL, binRootPath, PATH_MAX);
+  return std::string(binRootPath);
+#elif __APPLE__
+  uint32_t max = (uint32_t)PATH_MAX;
+  _NSGetExecutablePath(binRootPath, &max);
+  return std::string(binRootPath);
+#else
+  ssize_t size = readlink("/proc/self/exe", binRootPath, PATH_MAX);
+  if (size != -1) {
+    return std::string(binRootPath, size);
+  }
+#endif
+
+  return "";
+}
+
+bool writeTextFile(const string& path, const string& content)
+{
+  std::ofstream file;
+  file.open(path.c_str());
+  file << content;
+  file.close();
+  return true;
+}
+
+string getCurrentDirectory()
+{
+  char* a_cwd = getcwd(NULL, 0);
+  string s_cwd(a_cwd);
+  free(a_cwd);
+  return s_cwd;
+}
+
+string getDataDirectory()
+{
+#ifdef _WIN32
+  char* cDataDir = ::getenv("APPDATA");
+#else
+  char* cDataDir = ::getenv("KIWIX_DATA_DIR");
+#endif
+  std::string dataDir = cDataDir==nullptr ? "" : cDataDir;
+  if (!dataDir.empty())
+    return dataDir;
+#ifdef _WIN32
+  cDataDir = ::getenv("USERPROFILE");
+  dataDir = cDataDir==nullptr ? getCurrentDirectory() : cDataDir;
+#else
+  cDataDir = ::getenv("XDG_DATA_HOME");
+  dataDir = cDataDir==nullptr ? "" : cDataDir;
+  if (dataDir.empty()) {
+    cDataDir = ::getenv("HOME");
+    dataDir = cDataDir==nullptr ? getCurrentDirectory() : cDataDir;
+    dataDir = appendToDirectory(dataDir, ".local");
+    dataDir = appendToDirectory(dataDir, "share");
+  }
+#endif
+  return appendToDirectory(dataDir, "kiwix");
+}
--- a/src/common/regexTools.cpp
+++ b/src/common/regexTools.cpp
@@ -17,47 +17,41 @@
 * MA 02110-1301, USA.
 */

-#include <tools/regexTools.h>
+#include <common/regexTools.h>

-#include <unicode/regex.h>
-#include <unicode/ucnv.h>
+std::map<std::string, icu::RegexMatcher*> regexCache;

-#include <memory>
-#include <map>
-#include <stdexcept>
-#include <mutex>
-
-std::map<std::string, std::shared_ptr<icu::RegexPattern>> regexCache;
-static std::mutex regexLock;
-
-std::unique_ptr<icu::RegexMatcher> buildMatcher(const std::string& regex, icu::UnicodeString& content)
+icu::RegexMatcher* buildRegex(const std::string& regex)
 {
-  std::shared_ptr<icu::RegexPattern> pattern;
+  icu::RegexMatcher* matcher;
+  auto itr = regexCache.find(regex);
+
  /* Regex is in cache */
-  try {
-    pattern = regexCache.at(regex);
-  } catch (std::out_of_range&) {
-    // Redo the search with a lock to avoid race condition.
-    std::lock_guard<std::mutex> l(regexLock);
-    try {
-      pattern = regexCache.at(regex);
-    } catch (std::out_of_range&) {
-      UErrorCode status = U_ZERO_ERROR;
-      UParseError pe;
-      icu::UnicodeString uregex(regex.c_str());
-      pattern.reset(icu::RegexPattern::compile(uregex, UREGEX_CASE_INSENSITIVE, pe, status));
-      regexCache[regex] = pattern;
-    }
+  if (itr != regexCache.end()) {
+    matcher = itr->second;
  }
-  UErrorCode status = U_ZERO_ERROR;
-  return std::unique_ptr<icu::RegexMatcher>(pattern->matcher(content, status));
+
+  /* Regex needs to be parsed (and cached) */
+  else {
+    UErrorCode status = U_ZERO_ERROR;
+    icu::UnicodeString uregex(regex.c_str());
+    matcher = new icu::RegexMatcher(uregex, UREGEX_CASE_INSENSITIVE, status);
+    regexCache[regex] = matcher;
+  }
+
+  return matcher;
 }

+/* todo */
+void freeRegexCache()
+{
+}
 bool matchRegex(const std::string& content, const std::string& regex)
 {
  ucnv_setDefaultName("UTF-8");
  icu::UnicodeString ucontent(content.c_str());
-  auto matcher = buildMatcher(regex, ucontent);
+  auto matcher = buildRegex(regex);
+  matcher->reset(ucontent);
  return matcher->find();
 }

@@ -66,9 +60,10 @@ std::string replaceRegex(const std::string& content,
                         const std::string& regex)
 {
  ucnv_setDefaultName("UTF-8");
-  icu::UnicodeString ureplacement(replacement.c_str());
  icu::UnicodeString ucontent(content.c_str());
-  auto matcher = buildMatcher(regex, ucontent);
+  icu::UnicodeString ureplacement(replacement.c_str());
+  auto matcher = buildRegex(regex);
+  matcher->reset(ucontent);
  UErrorCode status = U_ZERO_ERROR;
  auto uresult = matcher->replaceAll(ureplacement, status);
  std::string tmp;
@@ -77,13 +72,15 @@ std::string replaceRegex(const std::string& content,
 }

 std::string appendToFirstOccurence(const std::string& content,
-                                   const std::string& regex,
+                                   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);
+  auto matcher = buildRegex(regex);
+  matcher->reset(ucontent);
+
  if (matcher->find()) {
    UErrorCode status = U_ZERO_ERROR;
    ucontent.insert(matcher->end(status), ureplacement);
@@ -94,22 +91,3 @@ std::string appendToFirstOccurence(const std::string& content,

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

-#include <tools/stringTools.h>
+#include <common/stringTools.h>

-#include <tools/pathTools.h>
 #include <unicode/normlzr.h>
 #include <unicode/rep.h>
 #include <unicode/translit.h>
@@ -27,10 +26,6 @@
 #include <unicode/uniset.h>
 #include <unicode/ustring.h>

-
-#include <iostream>
-#include <iomanip>
-
 /* tell ICU where to find its dat file (tables) */
 void kiwix::loadICUExternalTables()
 {
@@ -41,7 +36,7 @@ void kiwix::loadICUExternalTables()
      = computeAbsolutePath(executableDirectory, "icudt58l.dat");
  try {
    u_setDataDirectory(datPath.c_str());
-  } catch (std::exception& e) {
+  } catch (exception& e) {
    std::cerr << e.what() << std::endl;
  }
 #endif
@@ -62,6 +57,8 @@ std::string kiwix::removeAccents(const std::string& text)
  return unaccentedText;
 }

+#ifndef __ANDROID__
+
 /* Prepare integer for display */
 std::string kiwix::beautifyInteger(uint64_t number)
 {
@@ -141,6 +138,8 @@ std::string kiwix::encodeDiples(const std::string& str)
  return result;
 }

+#endif
+
 /* urlEncode() based on javascript encodeURI() &
   encodeURIComponent(). Mostly code from rstudio/httpuv (GPLv3) */

@@ -267,46 +266,36 @@ std::string kiwix::urlDecode(const std::string& value, bool component)

 /* Split string in a token array */
 std::vector<std::string> kiwix::split(const std::string& str,
-                                      const std::string& delims,
-                                      bool trimEmpty,
-                                      bool keepDelim)
+                                      const std::string& delims = " *-")
 {
-  std::string::size_type lastPos = 0;
-  std::string::size_type pos = 0;
+  std::string::size_type lastPos = str.find_first_not_of(delims, 0);
+  std::string::size_type pos = str.find_first_of(delims, lastPos);
  std::vector<std::string> tokens;
-  while( (pos = str.find_first_of(delims, lastPos)) < str.length() )
-  {
-    auto token = str.substr(lastPos, pos - lastPos);
-    if (!trimEmpty || !token.empty()) {
-      tokens.push_back(token);
-    }
-    if (keepDelim) {
-      tokens.push_back(str.substr(pos, 1));
-    }
-    lastPos = pos + 1;
+
+  while (std::string::npos != pos || std::string::npos != lastPos) {
+    tokens.push_back(str.substr(lastPos, pos - lastPos));
+    lastPos = str.find_first_not_of(delims, pos);
+    pos = str.find_first_of(delims, lastPos);
  }

-  auto token = str.substr(lastPos);
-  if (!trimEmpty || !token.empty()) {
-    tokens.push_back(token);
-  }
  return tokens;
 }

-std::string kiwix::join(const std::vector<std::string>& list, const std::string& sep)
+std::vector<std::string> kiwix::split(const char* lhs, const char* rhs)
 {
-  std::stringstream ss;
-  bool first = true;
-  for (auto& s:list) {
-    if (!first) {
-      ss << sep;
-    }
-    first = false;
-    ss << s;
-  }
-  return ss.str();
+  const std::string m1(lhs), m2(rhs);
+  return split(m1, m2);
 }

+std::vector<std::string> kiwix::split(const char* lhs, const std::string& rhs)
+{
+  return split(lhs, rhs.c_str());
+}
+
+std::vector<std::string> kiwix::split(const std::string& lhs, const char* rhs)
+{
+  return split(lhs.c_str(), rhs);
+}

 std::string kiwix::ucFirst(const std::string& word)
 {
@@ -387,11 +376,3 @@ std::string kiwix::normalize(const std::string& word)
 {
  return kiwix::lcAll(word);
 }
-
-
-bool kiwix::startsWith(const std::string& base, const std::string& start)
-{
-   return start.length() <= base.length()
-        && std::equal(start.begin(), start.end(), base.begin());
-}
-
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -1,3 +1,4 @@

 #mesondefine VERSION

+#mesondefine ENABLE_CTPP2
--- a/src/ctpp2/CTPP2VMStringLoader.cpp
+++ b/src/ctpp2/CTPP2VMStringLoader.cpp
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2013 Renaud Gaudin <reg@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 <ctpp2/CTPP2VMStringLoader.hpp>
+
+namespace CTPP // C++ Template Engine
+{
+
+//
+// Convert byte order
+//
+static void ConvertExecutable(VMExecutable * oCore)
+{
+	// Code entry point
+	oCore -> entry_point = Swap32(oCore -> entry_point);
+	// Offset of code segment
+	oCore -> code_offset = Swap32(oCore -> code_offset);
+
+	// Code segment size
+	oCore -> code_size   = Swap32(oCore -> code_size);
+
+	// Offset of static text segment
+	oCore -> syscalls_offset    = Swap32(oCore -> syscalls_offset);
+	// Static text segment size
+	oCore -> syscalls_data_size = Swap32(oCore -> syscalls_data_size);
+
+	// Offset of static text index segment
+	oCore -> syscalls_index_offset = Swap32(oCore -> syscalls_index_offset);
+	// Static text index segment size
+	oCore -> syscalls_index_size   = Swap32(oCore -> syscalls_index_size);
+
+	// Offset of static data segment
+	oCore -> static_data_offset    = Swap32(oCore -> static_data_offset);
+
+	// Static data segment size
+	oCore -> static_data_data_size = Swap32(oCore -> static_data_data_size);
+
+	// Offset of static text segment
+	oCore -> static_text_offset    = Swap32(oCore -> static_text_offset);
+	// Static text segment size
+	oCore -> static_text_data_size = Swap32(oCore -> static_text_data_size);
+
+	// Offset of static text index segment
+	oCore -> static_text_index_offset = Swap32(oCore -> static_text_index_offset);
+	// Static text index segment size
+	oCore -> static_text_index_size   = Swap32(oCore -> static_text_index_size);
+
+	// Version 2.2+
+	// Offset of static data bit index
+	oCore -> static_data_bit_index_offset = Swap32(oCore -> static_data_bit_index_offset);
+	/// Offset of static data bit index
+	oCore -> static_data_bit_index_size = Swap32(oCore -> static_data_bit_index_size);
+
+	// Platform
+	oCore -> platform      = Swap64(oCore -> platform);
+
+	// Ugly-jolly hack!
+	// ... dereferencing type-punned pointer will break strict-aliasing rules ...
+	UINT_64 iTMP;
+	memcpy(&iTMP, &(oCore -> ieee754double), sizeof(UINT_64));
+	iTMP = Swap64(iTMP);
+	memcpy(&(oCore -> ieee754double), &iTMP, sizeof(UINT_64));
+
+	// Cyclic Redundancy Check
+	oCore -> crc = 0;
+
+	// Convert data structures
+
+	// Convert code segment
+	VMInstruction * pInstructions = const_cast<VMInstruction *>(VMExecutable::GetCodeSeg(oCore));
+	UINT_32 iI = 0;
+	UINT_32 iSteps = oCore -> code_size / sizeof(VMInstruction);
+	for(iI = 0; iI < iSteps; ++iI)
+	{
+		pInstructions -> instruction = Swap32(pInstructions -> instruction);
+		pInstructions -> argument    = Swap32(pInstructions -> argument);
+		pInstructions -> reserved    = Swap64(pInstructions -> reserved);
+		++pInstructions;
+	}
+
+	// Convert syscalls index
+	TextDataIndex * pTextIndex = const_cast<TextDataIndex *>(VMExecutable::GetSyscallsIndexSeg(oCore));
+	iSteps = oCore -> syscalls_index_size / sizeof(TextDataIndex);
+	for(iI = 0; iI < iSteps; ++iI)
+	{
+		pTextIndex -> offset = Swap32(pTextIndex -> offset);
+		pTextIndex -> length = Swap32(pTextIndex -> length);
+		++pTextIndex;
+	}
+
+	// Convert static text index
+	pTextIndex = const_cast<TextDataIndex *>(VMExecutable::GetStaticTextIndexSeg(oCore));
+	iSteps = oCore -> static_text_index_size / sizeof(TextDataIndex);
+	for(iI = 0; iI < iSteps; ++iI)
+	{
+		pTextIndex -> offset = Swap32(pTextIndex -> offset);
+		pTextIndex -> length = Swap32(pTextIndex -> length);
+		++pTextIndex;
+	}
+
+	// Convert static data
+	StaticDataVar * pStaticDataVar = const_cast<StaticDataVar *>(VMExecutable::GetStaticDataSeg(oCore));
+	iSteps = oCore -> static_data_data_size / sizeof(StaticDataVar);
+	for(iI = 0; iI < iSteps; ++iI)
+	{
+		(*pStaticDataVar).i_data = Swap64((*pStaticDataVar).i_data);
+		++pStaticDataVar;
+	}
+}
+
+//
+// Constructor
+//
+VMStringLoader::VMStringLoader(CCHAR_P rawContent, size_t rawContentSize)
+{
+    oCore = (VMExecutable *)malloc(rawContentSize + 1);
+    memcpy(oCore, rawContent, rawContentSize);
+
+	if (oCore -> magic[0] == 'C' &&
+	    oCore -> magic[1] == 'T' &&
+	    oCore -> magic[2] == 'P' &&
+	    oCore -> magic[3] == 'P')
+	{
+		// Check version
+		if (oCore -> version[0] >= 1)
+		{
+			// Platform-dependent data (byte order)
+			if (oCore -> platform == 0x4142434445464748ull)
+			{
+#ifdef _DEBUG
+				fprintf(stderr, "Big/Little Endian conversion: Nothing to do\n");
+#endif
+
+				// Nothing to do, only check crc
+				UINT_32 iCRC = oCore -> crc;
+				oCore -> crc = 0;
+
+				// Calculate CRC of file
+                // KELSON: next line used to refer to oStat.st_size
+                // changed it to rawContentSize
+				if (iCRC != crc32((UCCHAR_P)oCore, rawContentSize))
+				{
+					free(oCore);
+					throw CTPPLogicError("CRC checksum invalid");
+				}
+			}
+			// Platform-dependent data (byte order)
+			else if (oCore -> platform == 0x4847464544434241ull)
+			{
+				// Need to reconvert data
+#ifdef _DEBUG
+				fprintf(stderr, "Big/Little Endian conversion: Need to reconvert core\n");
+#endif
+				ConvertExecutable(oCore);
+			}
+			else
+			{
+				free(oCore);
+				throw CTPPLogicError("Conversion of middle-end architecture does not supported.");
+			}
+
+			// Check IEEE 754 format
+			if (oCore -> ieee754double != 15839800103804824402926068484019465486336.0)
+			{
+				free(oCore);
+				throw CTPPLogicError("IEEE 754 format is broken, cannot convert file");
+			}
+		}
+
+		pVMMemoryCore = new VMMemoryCore(oCore);
+	}
+	else
+	{
+		free(oCore);
+		throw CTPPLogicError("Not an CTPP bytecode file.");
+	}
+}
+
+//
+// Get ready-to-run program
+//
+const VMMemoryCore * VMStringLoader::GetCore() const { return pVMMemoryCore; }
+
+//
+// A destructor
+//
+VMStringLoader::~VMStringLoader() throw()
+{
+	delete pVMMemoryCore;
+	free(oCore);
+}
+
+} // namespace CTPP
+// End.
--- a/src/downloader.cpp
+++ b/src/downloader.cpp
@@ -18,8 +18,7 @@
 */

 #include "downloader.h"
-#include "tools/pathTools.h"
-#include "tools/stringTools.h"
+#include "common/pathTools.h"

 #include <algorithm>
 #include <thread>
@@ -29,7 +28,7 @@

 #include "aria2.h"
 #include "xmlrpc.h"
-#include "tools/otherTools.h"
+#include "common/otherTools.h"
 #include <pugixml.hpp>

 namespace kiwix
@@ -37,8 +36,6 @@ namespace kiwix

 void Download::updateStatus(bool follow)
 {
-  if (m_status == Download::K_REMOVED)
-    return;
  static std::vector<std::string> statusKey = {"status", "files", "totalLength",
                                               "completedLength", "followedBy",
                                               "downloadSpeed", "verifiedLength"};
@@ -96,55 +93,17 @@ void Download::updateStatus(bool follow)
  }
 }

-void Download::resumeDownload()
-{
-    if (!m_followedBy.empty())
-        mp_aria->unpause(m_followedBy);
-    else
-        mp_aria->unpause(m_did);
-    updateStatus(true);
-}
-
-void Download::pauseDownload()
-{
-    if (!m_followedBy.empty())
-        mp_aria->pause(m_followedBy);
-    else
-        mp_aria->pause(m_did);
-    updateStatus(true);
-}
-
-void Download::cancelDownload()
-{
-    if (!m_followedBy.empty())
-        mp_aria->remove(m_followedBy);
-    else
-        mp_aria->remove(m_did);
-    m_status = Download::K_REMOVED;
-}
-
 /* Constructor */
 Downloader::Downloader() :
  mp_aria(new Aria2())
 {
-  try {
-    for (auto gid : mp_aria->tellActive()) {
-      m_knownDownloads[gid] = std::unique_ptr<Download>(new Download(mp_aria, gid));
-      m_knownDownloads[gid]->updateStatus();
-    }
-  } catch (std::exception& e) {
-    std::cerr << "aria2 tellActive failed : " << e.what() << std::endl;
-  }
-  try {
-    for (auto gid : mp_aria->tellWaiting()) {
-      m_knownDownloads[gid] = std::unique_ptr<Download>(new Download(mp_aria, gid));
-      m_knownDownloads[gid]->updateStatus();
-    }
-  } catch (std::exception& e) {
-    std::cerr << "aria2 tellWaiting failed : " << e.what() << std::endl;
+  for (auto gid : mp_aria->tellActive()) {
+    m_knownDownloads[gid] = std::unique_ptr<Download>(new Download(mp_aria, gid));
+    m_knownDownloads[gid]->updateStatus();
  }
 }

+
 /* Destructor */
 Downloader::~Downloader()
 {
@@ -163,7 +122,7 @@ std::vector<std::string> Downloader::getDownloadIds() {
  return ret;
 }

-Download* Downloader::startDownload(const std::string& uri, const std::vector<std::pair<std::string, std::string>>& options)
+Download* Downloader::startDownload(const std::string& uri)
 {
  for (auto& p: m_knownDownloads) {
    auto& d = p.second;
@@ -172,7 +131,7 @@ Download* Downloader::startDownload(const std::string& uri, const std::vector<st
      return d.get();
  }
  std::vector<std::string> uris = {uri};
-  auto gid = mp_aria->addUri(uris, options);
+  auto gid = mp_aria->addUri(uris);
  m_knownDownloads[gid] = std::unique_ptr<Download>(new Download(mp_aria, gid));
  return m_knownDownloads[gid].get();
 }
@@ -180,23 +139,14 @@ Download* Downloader::startDownload(const std::string& uri, const std::vector<st
 Download* Downloader::getDownload(const std::string& did)
 {
  try {
-    m_knownDownloads.at(did).get()->updateStatus(true);
    return m_knownDownloads.at(did).get();
-  } catch(std::exception& e) {
+  } catch(exception& e) {
    for (auto gid : mp_aria->tellActive()) {
      if (gid == did) {
        m_knownDownloads[gid] = std::unique_ptr<Download>(new Download(mp_aria, gid));
-        m_knownDownloads.at(gid).get()->updateStatus(true);
        return m_knownDownloads[gid].get();
      }
    }
-    for (auto gid : mp_aria->tellWaiting()) {
-      if (gid == did) {
-        m_knownDownloads[gid] = std::unique_ptr<Download>(new Download(mp_aria, gid));
-        m_knownDownloads.at(gid).get()->updateStatus(true);
-        return m_knownDownloads[gid].get();
-      }
-  }
    throw e;
  }
 }
--- a/src/entry.cpp
+++ b/src/entry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2020 Matthieu Gautier <mgautier@kymeria.fr>
+ * Copyright 2011 Emmanuel Engelhart <kelson@kiwix.org>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU  General Public License as published by
@@ -20,54 +20,119 @@
 #include "reader.h"
 #include <time.h>

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

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

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

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

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

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

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

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

 }
--- a/src/kiwixserve.cpp
+++ b/src/kiwixserve.cpp
@@ -1,81 +0,0 @@
-#include "kiwixserve.h"
-#include "subprocess.h"
-
-#ifdef _WIN32
-    # define KIWIXSERVE_CMD "kiwix-serve.exe"
-    # include <windows.h>
-#else
-    # define KIWIXSERVE_CMD "kiwix-serve"
-    # include <unistd.h>
-#endif
-
-#include "tools/pathTools.h"
-#include "tools/stringTools.h"
-
-namespace kiwix {
-
-KiwixServe::KiwixServe(const std::string& libraryPath, int port)
-  : m_port(port),
-    m_libraryPath(libraryPath)
-{
-}
-
-KiwixServe::~KiwixServe()
-{
-    shutDown();
-}
-
-void KiwixServe::run()
-{
-    #ifdef _WIN32
-        int pid = GetCurrentProcessId();
-    #else
-        pid_t pid = getpid();
-
-    #endif
-
-    std::vector<const char*> callCmd;
-    std::string kiwixServeCmd = appendToDirectory(
-        removeLastPathElement(getExecutablePath(true)),
-        KIWIXSERVE_CMD);
-    if (fileExists(kiwixServeCmd)) {
-        // A local kiwix-serve exe exists (packaged with kiwix-desktop), use it.
-        callCmd.push_back(kiwixServeCmd.c_str());
-    } else {
-        // Try to use a potential installed kiwix-serve.
-        callCmd.push_back(KIWIXSERVE_CMD);
-    }
-    std::string attachProcessOpt = "-a" + to_string(pid);
-    std::string portOpt = "-p" + to_string(m_port);
-    callCmd.push_back(attachProcessOpt.c_str());
-    callCmd.push_back(portOpt.c_str());
-    callCmd.push_back("-l");
-    callCmd.push_back(m_libraryPath.c_str());
-    mp_kiwixServe = Subprocess::run(callCmd);
-}
-
-void KiwixServe::shutDown()
-{
-    if (mp_kiwixServe)
-        mp_kiwixServe->kill();
-}
-
-bool KiwixServe::isRunning()
-{
-    if (mp_kiwixServe) {
-        return (mp_kiwixServe->isRunning());
-    }
-    return false;
-}
-
-int KiwixServe::setPort(int port)
-{
-    if (port >= 1 && port <= 65535) {
-        m_port = port;
-    } else {
-        return -1;
-    }
-    return m_port;
-}
-
-}
--- a/src/library.cpp
+++ b/src/library.cpp
@@ -19,53 +19,20 @@

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

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

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

 namespace kiwix
 {
-
-namespace
-{
-
-std::string iso639_3ToXapian(const std::string& lang) {
-  return icu::Locale(lang.c_str()).getLanguage();
-};
-
-std::string normalizeText(const std::string& text)
-{
-  return removeAccents(text);
-}
-
-} // unnamed namespace
-
-class Library::BookDB : public Xapian::WritableDatabase
-{
-public:
-  BookDB() : Xapian::WritableDatabase("", Xapian::DB_BACKEND_INMEMORY) {}
-};
-
 /* Constructor */
-Library::Library()
-  : m_bookDB(new BookDB)
+Library::Library() : version(KIWIX_LIBRARY_VERSION)
 {
 }
-
-Library::Library(Library&& ) = default;
-
-Library& Library::operator=(Library&& ) = default;
-
 /* Destructor */
 Library::~Library()
 {
@@ -75,90 +42,32 @@ Library::~Library()
 bool Library::addBook(const Book& book)
 {
  /* Try to find it */
-  updateBookDB(book);
  try {
-    auto& oldbook = m_books.at(book.getId());
+    auto& oldbook = books.at(book.getId());
    oldbook.update(book);
    return false;
  } catch (std::out_of_range&) {
-    m_books[book.getId()] = book;
+    books[book.getId()] = book;
    return true;
  }
 }

-void Library::addBookmark(const Bookmark& bookmark)
-{
-  m_bookmarks.push_back(bookmark);
-}
-
-bool Library::removeBookmark(const std::string& zimId, const std::string& url)
-{
-  for(auto it=m_bookmarks.begin(); it!=m_bookmarks.end(); it++) {
-    if (it->getBookId() == zimId && it->getUrl() == url) {
-      m_bookmarks.erase(it);
-      return true;
-    }
-  }
-  return false;
-}
-
-

 bool Library::removeBookById(const std::string& id)
 {
-  m_bookDB->delete_document("Q" + id);
-  m_readers.erase(id);
-  return m_books.erase(id) == 1;
-}
-
-const Book& Library::getBookById(const std::string& id) const
-{
-  return m_books.at(id);
+  return books.erase(id) == 1;
 }

 Book& Library::getBookById(const std::string& id)
 {
-  const Library& const_self = *this;
-  return const_cast<Book&>(const_self.getBookById(id));
-}
-
-const Book& Library::getBookByPath(const std::string& path) const
-{
-  for(auto& it: m_books) {
-    auto& book = it.second;
-    if (book.getPath() == path)
-      return book;
-  }
-  std::ostringstream ss;
-  ss << "No book with path " << path << " in the library." << std::endl;
-  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) {}
-
-  auto book = getBookById(id);
-  if (!book.isPathValid())
-    return nullptr;
-  auto sptr = make_shared<Reader>(book.getPath());
-  m_readers[id] = sptr;
-  return sptr;
+  return books.at(id);
 }

 unsigned int Library::getBookCount(const bool localBooks,
-                                   const bool remoteBooks) const
+                                   const bool remoteBooks)
 {
  unsigned int result = 0;
-  for (auto& pair: m_books) {
+  for (auto& pair: books) {
    auto& book = pair.second;
    if ((!book.getPath().empty() && localBooks)
        || (book.getPath().empty() && remoteBooks)) {
@@ -168,26 +77,100 @@ unsigned int Library::getBookCount(const bool localBooks,
  return result;
 }

-bool Library::writeToFile(const std::string& path) const
-{
-  auto baseDir = removeLastPathElement(path);
-  LibXMLDumper dumper(this);
-  dumper.setBaseDir(baseDir);
-  return writeTextFile(path, dumper.dumpLibXMLContent(getBooksIds()));
+bool Library::writeToFile(const std::string& path) {
+  pugi::xml_document doc;
+  auto baseDir = removeLastPathElement(path, true, false);
+
+  /* Add the library node */
+  pugi::xml_node libraryNode = doc.append_child("library");
+
+  if (!version.empty())
+    libraryNode.append_attribute("version") = version.c_str();
+
+  /* Add each book */
+  for (auto& pair: books) {
+    auto& book = pair.second;
+    if (!book.readOnly()) {
+      pugi::xml_node bookNode = libraryNode.append_child("book");
+      bookNode.append_attribute("id") = book.getId().c_str();
+
+      if (!book.getPath().empty()) {
+        bookNode.append_attribute("path") = computeRelativePath(
+            baseDir, book.getPath()).c_str();
+      }
+
+      if (!book.getIndexPath().empty()) {
+        bookNode.append_attribute("indexPath") = computeRelativePath(
+            baseDir, book.getIndexPath()).c_str();
+        bookNode.append_attribute("indexType") = "xapian";
+      }
+
+      if (book.getOrigId().empty()) {
+        if (!book.getTitle().empty())
+          bookNode.append_attribute("title") = book.getTitle().c_str();
+
+        if (!book.getName().empty())
+          bookNode.append_attribute("name") = book.getName().c_str();
+
+        if (!book.getTags().empty())
+          bookNode.append_attribute("tags") = book.getTags().c_str();
+
+        if (!book.getDescription().empty())
+          bookNode.append_attribute("description") = book.getDescription().c_str();
+
+        if (!book.getLanguage().empty())
+          bookNode.append_attribute("language") = book.getLanguage().c_str();
+
+        if (!book.getCreator().empty())
+          bookNode.append_attribute("creator") = book.getCreator().c_str();
+
+        if (!book.getPublisher().empty())
+          bookNode.append_attribute("publisher") = book.getPublisher().c_str();
+
+        if (!book.getFavicon().empty())
+          bookNode.append_attribute("favicon") = base64_encode(book.getFavicon()).c_str();
+
+        if (!book.getFaviconMimeType().empty())
+          bookNode.append_attribute("faviconMimeType")
+              = book.getFaviconMimeType().c_str();
+      } else {
+        bookNode.append_attribute("origId") = book.getOrigId().c_str();
+      }
+
+      if (!book.getDate().empty()) {
+        bookNode.append_attribute("date") = book.getDate().c_str();
+      }
+
+      if (!book.getUrl().empty()) {
+        bookNode.append_attribute("url") = book.getUrl().c_str();
+      }
+
+      if (book.getArticleCount())
+        bookNode.append_attribute("articleCount") = to_string(book.getArticleCount()).c_str();
+
+      if (book.getMediaCount())
+        bookNode.append_attribute("mediaCount") = to_string(book.getMediaCount()).c_str();
+
+      if (book.getSize()) {
+        bookNode.append_attribute("size") = to_string(book.getSize()>>10).c_str();
+      }
+
+      if (!book.getDownloadId().empty()) {
+        bookNode.append_attribute("downloadId") = book.getDownloadId().c_str();
+      }
+    }
+  }
+
+  /* saving file */
+  return doc.save_file(path.c_str());
 }

-bool Library::writeBookmarksToFile(const std::string& path) const
-{
-  LibXMLDumper dumper(this);
-  return writeTextFile(path, dumper.dumpLibXMLBookmark());
-}
-
-std::vector<std::string> Library::getBooksLanguages() const
+std::vector<std::string> Library::getBooksLanguages()
 {
  std::vector<std::string> booksLanguages;
  std::map<std::string, bool> booksLanguagesMap;

-  for (auto& pair: m_books) {
+  for (auto& pair: books) {
    auto& book = pair.second;
    auto& language = book.getLanguage();
    if (booksLanguagesMap.find(language) == booksLanguagesMap.end()) {
@@ -201,27 +184,12 @@ std::vector<std::string> Library::getBooksLanguages() const
  return booksLanguages;
 }

-std::vector<std::string> Library::getBooksCategories() const
-{
-  std::set<std::string> categories;
-
-  for (const auto& pair: m_books) {
-    const auto& book = pair.second;
-    const auto& c = book.getCategory();
-    if ( !c.empty() ) {
-      categories.insert(c);
-    }
-  }
-
-  return std::vector<std::string>(categories.begin(), categories.end());
-}
-
-std::vector<std::string> Library::getBooksCreators() const
+std::vector<std::string> Library::getBooksCreators()
 {
  std::vector<std::string> booksCreators;
  std::map<std::string, bool> booksCreatorsMap;

-  for (auto& pair: m_books) {
+  for (auto& pair: books) {
    auto& book = pair.second;
    auto& creator = book.getCreator();
    if (booksCreatorsMap.find(creator) == booksCreatorsMap.end()) {
@@ -235,12 +203,12 @@ std::vector<std::string> Library::getBooksCreators() const
  return booksCreators;
 }

-std::vector<std::string> Library::getBooksPublishers() const
+std::vector<std::string> Library::getBooksPublishers()
 {
  std::vector<std::string> booksPublishers;
  std::map<std::string, bool> booksPublishersMap;

-  for (auto& pair:m_books) {
+  for (auto& pair:books) {
    auto& book = pair.second;
    auto& publisher = book.getPublisher();
    if (booksPublishersMap.find(publisher) == booksPublishersMap.end()) {
@@ -254,532 +222,145 @@ std::vector<std::string> Library::getBooksPublishers() const
  return booksPublishers;
 }

-const std::vector<kiwix::Bookmark> Library::getBookmarks(bool onlyValidBookmarks) const
+std::vector<std::string> Library::getBooksIds()
 {
-  if (!onlyValidBookmarks) {
-    return m_bookmarks;
-  }
-  std::vector<kiwix::Bookmark> validBookmarks;
-  auto booksId = getBooksIds();
-  for(auto& bookmark:m_bookmarks) {
-    if (std::find(booksId.begin(), booksId.end(), bookmark.getBookId()) != booksId.end()) {
-      validBookmarks.push_back(bookmark);
-    }
-  }
-  return validBookmarks;
-}
+  std::vector<std::string> bookIds;

-Library::BookIdCollection Library::getBooksIds() const
-{
-  BookIdCollection bookIds;
-
-  for (auto& pair: m_books) {
+  for (auto& pair: books) {
    bookIds.push_back(pair.first);
  }

  return bookIds;
 }

-Library::BookIdCollection Library::filter(const std::string& search) const
+std::vector<std::string> Library::filter(const std::string& search)
 {
  if (search.empty()) {
    return getBooksIds();
  }

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

  return bookIds;
 }

-Library::BookIdCollection Library::filter(const Filter& filter) const
-{
-  BookIdCollection result;
-  for(auto id : filterViaBookDB(filter)) {
-    if(filter.accept(m_books.at(id))) {
-      result.push_back(id);
-    }
-  }
-  return result;
-}
-
-template<supportedListSortBy SORT>
-struct KEY_TYPE {
-  typedef std::string TYPE;
-};
-
-template<>
-struct KEY_TYPE<SIZE> {
-  typedef size_t TYPE;
-};
-
 template<supportedListSortBy sort>
-class Comparator {
-  private:
-    const Library* const lib;
-    const bool     ascending;
+struct Comparator {
+  Library* lib;
+  Comparator(Library* lib) : lib(lib) {}

-    inline typename KEY_TYPE<sort>::TYPE get_key(const std::string& id);
+  bool operator() (const std::string& id1, const std::string& id2) {
+    return get_keys(id1) < get_keys(id2);
+  }

-  public:
-    Comparator(const Library* lib, bool ascending) : lib(lib), ascending(ascending) {}
-    inline bool operator() (const std::string& id1, const std::string& id2) {
-      if (ascending) {
-        return get_key(id1) < get_key(id2);
-      } else {
-        return get_key(id2) < get_key(id1);
-      }
-    }
+  std::string get_keys(const std::string& id);
+  unsigned int get_keyi(const std::string& id);
 };

 template<>
-std::string Comparator<TITLE>::get_key(const std::string& id)
+std::string Comparator<TITLE>::get_keys(const std::string& id)
 {
  return lib->getBookById(id).getTitle();
 }

 template<>
-size_t Comparator<SIZE>::get_key(const std::string& id)
+unsigned int Comparator<SIZE>::get_keyi(const std::string& id)
 {
  return lib->getBookById(id).getSize();
 }

 template<>
-std::string Comparator<DATE>::get_key(const std::string& id)
+bool Comparator<SIZE>::operator() (const std::string& id1, const std::string& id2)
+{
+  return get_keyi(id1) < get_keyi(id2);
+}
+
+template<>
+std::string Comparator<DATE>::get_keys(const std::string& id)
 {
  return lib->getBookById(id).getDate();
 }

 template<>
-std::string Comparator<CREATOR>::get_key(const std::string& id)
+std::string Comparator<CREATOR>::get_keys(const std::string& id)
 {
  return lib->getBookById(id).getCreator();
 }

 template<>
-std::string Comparator<PUBLISHER>::get_key(const std::string& id)
+std::string Comparator<PUBLISHER>::get_keys(const std::string& id)
 {
  return lib->getBookById(id).getPublisher();
 }

-void Library::sort(BookIdCollection& bookIds, supportedListSortBy sort, bool ascending) const
-{
-  switch(sort) {
-    case TITLE:
-      std::sort(bookIds.begin(), bookIds.end(), Comparator<TITLE>(this, ascending));
-      break;
-    case SIZE:
-      std::sort(bookIds.begin(), bookIds.end(), Comparator<SIZE>(this, ascending));
-      break;
-    case DATE:
-      std::sort(bookIds.begin(), bookIds.end(), Comparator<DATE>(this, ascending));
-      break;
-    case CREATOR:
-      std::sort(bookIds.begin(), bookIds.end(), Comparator<CREATOR>(this, ascending));
-      break;
-    case PUBLISHER:
-      std::sort(bookIds.begin(), bookIds.end(), Comparator<PUBLISHER>(this, ascending));
-      break;
-    default:
-      break;
-  }
-}

-
-Library::BookIdCollection Library::listBooksIds(
+std::vector<std::string> Library::listBooksIds(
    int mode,
    supportedListSortBy sortBy,
    const std::string& search,
    const std::string& language,
    const std::string& creator,
    const std::string& publisher,
-    const std::vector<std::string>& tags,
-    size_t maxSize) const {
+    size_t maxSize) {

-  Filter _filter;
-  if (mode & LOCAL)
-    _filter.local(true);
-  if (mode & NOLOCAL)
-    _filter.local(false);
-  if (mode & VALID)
-    _filter.valid(true);
-  if (mode & NOVALID)
-    _filter.valid(false);
-  if (mode & REMOTE)
-    _filter.remote(true);
-  if (mode & NOREMOTE)
-    _filter.remote(false);
-  if (!tags.empty())
-    _filter.acceptTags(tags);
-  if (maxSize != 0)
-    _filter.maxSize(maxSize);
-  if (!language.empty())
-    _filter.lang(language);
-  if (!publisher.empty())
-    _filter.publisher(publisher);
-  if (!creator.empty())
-    _filter.creator(creator);
-  if (!search.empty())
-    _filter.query(search);
+  std::vector<std::string> bookIds;
+  for(auto& pair:books) {
+    auto& book = pair.second;
+    auto local = !book.getPath().empty();
+    if (mode & LOCAL && !local)
+      continue;
+    if (mode & NOLOCAL && local)
+      continue;
+    auto valid = book.isPathValid();
+    if (mode & VALID && !valid)
+      continue;
+    if (mode & NOVALID && valid)
+      continue;
+    auto remote = !book.getUrl().empty();
+    if (mode & REMOTE && !remote)
+      continue;
+    if (mode & NOREMOTE && remote)
+      continue;
+    if (maxSize != 0 && book.getSize() > maxSize)
+      continue;
+    if (!language.empty() && book.getLanguage() != language)
+      continue;
+    if (!publisher.empty() && book.getPublisher() != publisher)
+      continue;
+    if (!creator.empty() && book.getCreator() != creator)
+      continue;
+    if (!search.empty() && !(matchRegex(book.getTitle(), "\\Q" + search + "\\E")
+                          || matchRegex(book.getDescription(), "\\Q" + search + "\\E")))
+      continue;
+    bookIds.push_back(pair.first);
+  }

-  auto bookIds = filter(_filter);
-
-  sort(bookIds, sortBy, true);
+  switch(sortBy) {
+    case TITLE:
+      std::sort(bookIds.begin(), bookIds.end(), Comparator<TITLE>(this));
+      break;
+    case SIZE:
+      std::sort(bookIds.begin(), bookIds.end(), Comparator<SIZE>(this));
+      break;
+    case DATE:
+      std::sort(bookIds.begin(), bookIds.end(), Comparator<DATE>(this));
+      break;
+    case CREATOR:
+      std::sort(bookIds.begin(), bookIds.end(), Comparator<CREATOR>(this));
+      break;
+    case PUBLISHER:
+      std::sort(bookIds.begin(), bookIds.end(), Comparator<PUBLISHER>(this));
+      break;
+    default:
+      break;
+  }
  return bookIds;
 }
-
-Filter::Filter()
-  : activeFilters(0),
-    _maxSize(0)
-{};
-
-#define FLAG(x) (1 << x)
-enum filterTypes {
-  NONE = 0,
-  _LOCAL = FLAG(0),
-  _REMOTE = FLAG(1),
-  _NOLOCAL = FLAG(2),
-  _NOREMOTE = FLAG(3),
-  _VALID = FLAG(4),
-  _NOVALID = FLAG(5),
-  ACCEPTTAGS = FLAG(6),
-  REJECTTAGS = FLAG(7),
-  LANG = FLAG(8),
-  _PUBLISHER = FLAG(9),
-  _CREATOR = FLAG(10),
-  MAXSIZE = FLAG(11),
-  QUERY = FLAG(12),
-  NAME = FLAG(13),
-  CATEGORY = FLAG(14),
-};
-
-Filter& Filter::local(bool accept)
-{
-  if (accept) {
-    activeFilters |= _LOCAL;
-    activeFilters &= ~_NOLOCAL;
-  } else {
-    activeFilters |= _NOLOCAL;
-    activeFilters &= ~_LOCAL;
-  }
-  return *this;
-}
-
-Filter& Filter::remote(bool accept)
-{
-  if (accept) {
-    activeFilters |= _REMOTE;
-    activeFilters &= ~_NOREMOTE;
-  } else {
-    activeFilters |= _NOREMOTE;
-    activeFilters &= ~_REMOTE;
-  }
-  return *this;
-}
-
-Filter& Filter::valid(bool accept)
-{
-  if (accept) {
-    activeFilters |= _VALID;
-    activeFilters &= ~_NOVALID;
-  } else {
-    activeFilters |= _NOVALID;
-    activeFilters &= ~_VALID;
-  }
-  return *this;
-}
-
-Filter& Filter::acceptTags(const Tags& tags)
-{
-  _acceptTags = tags;
-  activeFilters |= ACCEPTTAGS;
-  return *this;
-}
-
-Filter& Filter::rejectTags(const Tags& tags)
-{
-  _rejectTags = tags;
-  activeFilters |= REJECTTAGS;
-  return *this;
-}
-
-Filter& Filter::category(std::string category)
-{
-  _category = category;
-  activeFilters |= CATEGORY;
-  return *this;
-}
-
-Filter& Filter::lang(std::string lang)
-{
-  _lang = lang;
-  activeFilters |= LANG;
-  return *this;
-}
-
-Filter& Filter::publisher(std::string publisher)
-{
-  _publisher = publisher;
-  activeFilters |= _PUBLISHER;
-  return *this;
-}
-
-Filter& Filter::creator(std::string creator)
-{
-  _creator = creator;
-  activeFilters |= _CREATOR;
-  return *this;
-}
-
-Filter& Filter::maxSize(size_t maxSize)
-{
-  _maxSize = maxSize;
-  activeFilters |= MAXSIZE;
-  return *this;
-}
-
-Filter& Filter::query(std::string query, bool partial)
-{
-  _query = query;
-  _queryIsPartial = partial;
-  activeFilters |= QUERY;
-  return *this;
-}
-
-Filter& Filter::name(std::string name)
-{
-  _name = name;
-  activeFilters |= NAME;
-  return *this;
-}
-
-#define ACTIVE(X) (activeFilters & (X))
-#define FILTER(TAG, TEST) if (ACTIVE(TAG) && !(TEST)) { return false; }
-bool Filter::hasQuery() const
-{
-  return ACTIVE(QUERY);
-}
-
-bool Filter::hasName() const
-{
-  return ACTIVE(NAME);
-}
-
-bool Filter::hasCategory() const
-{
-  return ACTIVE(CATEGORY);
-}
-
-bool Filter::hasLang() const
-{
-  return ACTIVE(LANG);
-}
-
-bool Filter::hasPublisher() const
-{
-  return ACTIVE(_PUBLISHER);
-}
-
-bool Filter::hasCreator() const
-{
-  return ACTIVE(_CREATOR);
-}
-
-bool Filter::accept(const Book& book) const
-{
-  auto local = !book.getPath().empty();
-  FILTER(_LOCAL, local)
-  FILTER(_NOLOCAL, !local)
-
-  auto valid = book.isPathValid();
-  FILTER(_VALID, valid)
-  FILTER(_NOVALID, !valid)
-
-  auto remote = !book.getUrl().empty();
-  FILTER(_REMOTE, remote)
-  FILTER(_NOREMOTE, !remote)
-
-  FILTER(MAXSIZE, book.getSize() <= _maxSize)
-
-  return true;
-}
-
 }
--- a/src/libxml_dumper.cpp
+++ b/src/libxml_dumper.cpp
@@ -1,142 +0,0 @@
-/*
- * Copyright 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 "libxml_dumper.h"
-#include "book.h"
-
-#include "tools/base64.h"
-#include "tools/stringTools.h"
-#include "tools/otherTools.h"
-#include "tools/pathTools.h"
-
-namespace kiwix
-{
-/* Constructor */
-LibXMLDumper::LibXMLDumper(const Library* library)
-  : library(library)
-{
-}
-/* Destructor */
-LibXMLDumper::~LibXMLDumper()
-{
-}
-
-#define ADD_ATTRIBUTE(node, name, value) { (node).append_attribute((name)) = (value).c_str(); }
-#define ADD_ATTR_NOT_EMPTY(node, name, value) { if (!(value).empty()) ADD_ATTRIBUTE(node, name, value); }
-
-void LibXMLDumper::handleBook(Book book, pugi::xml_node root_node) {
-  if (book.readOnly())
-    return;
-
-  auto entry_node = root_node.append_child("book");
-  ADD_ATTRIBUTE(entry_node, "id", book.getId());
-
-  if (!book.getPath().empty()) {
-    ADD_ATTRIBUTE(entry_node, "path", computeRelativePath(baseDir, book.getPath()));
-  }
-
-  if (book.getOrigId().empty()) {
-    ADD_ATTR_NOT_EMPTY(entry_node, "title", book.getTitle());
-    ADD_ATTR_NOT_EMPTY(entry_node, "description", book.getDescription());
-    ADD_ATTR_NOT_EMPTY(entry_node, "language", book.getLanguage());
-    ADD_ATTR_NOT_EMPTY(entry_node, "creator", book.getCreator());
-    ADD_ATTR_NOT_EMPTY(entry_node, "publisher", book.getPublisher());
-    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());
-    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());
-  }
-
-  ADD_ATTR_NOT_EMPTY(entry_node, "date", book.getDate());
-  ADD_ATTR_NOT_EMPTY(entry_node, "url", book.getUrl());
-
-  if (book.getArticleCount())
-    ADD_ATTRIBUTE(entry_node, "articleCount", to_string(book.getArticleCount()));
-
-  if (book.getMediaCount())
-    ADD_ATTRIBUTE(entry_node, "mediaCount", to_string(book.getMediaCount()));
-
-  if (book.getSize())
-    ADD_ATTRIBUTE(entry_node, "size", to_string(book.getSize()>>10));
-
-  ADD_ATTR_NOT_EMPTY(entry_node, "downloadId", book.getDownloadId());
-}
-
-#define ADD_TEXT_ENTRY(node, child, value) (node).append_child((child)).append_child(pugi::node_pcdata).set_value((value).c_str())
-
-void LibXMLDumper::handleBookmark(Bookmark bookmark, pugi::xml_node root_node) {
-
-  auto entry_node = root_node.append_child("bookmark");
-  auto book_node = entry_node.append_child("book");
-
-  try {
-    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());
-    ADD_TEXT_ENTRY(book_node, "date", book.getDate());
-  } catch (...) {
-    ADD_TEXT_ENTRY(book_node, "id", bookmark.getBookId());
-    ADD_TEXT_ENTRY(book_node, "title", bookmark.getBookTitle());
-    ADD_TEXT_ENTRY(book_node, "language", bookmark.getLanguage());
-    ADD_TEXT_ENTRY(book_node, "date", bookmark.getDate());
-  }
-  ADD_TEXT_ENTRY(entry_node, "title", bookmark.getTitle());
-  ADD_TEXT_ENTRY(entry_node, "url", bookmark.getUrl());
-}
-
-
-std::string LibXMLDumper::dumpLibXMLContent(const std::vector<std::string>& bookIds)
-{
-  pugi::xml_document doc;
-
-  /* Add the library node */
-  pugi::xml_node libraryNode = doc.append_child("library");
-
-  libraryNode.append_attribute("version") = KIWIX_LIBRARY_VERSION;
-
-  if (library) {
-    for (auto& bookId: bookIds) {
-      handleBook(library->getBookById(bookId), libraryNode);
-    }
-  }
-  return nodeToString(libraryNode);
-}
-
-std::string LibXMLDumper::dumpLibXMLBookmark()
-{
-  pugi::xml_document doc;
-
-  /* Add the library node */
-  pugi::xml_node bookmarksNode = doc.append_child("bookmarks");
-
-  if (library) {
-    for (auto& bookmark: library->getBookmarks()) {
-      handleBookmark(bookmark, bookmarksNode);
-    }
-  }
-  return nodeToString(bookmarksNode);
-}
-
-}
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -19,8 +19,6 @@

 #include "manager.h"

-#include "tools/pathTools.h"
-
 #include <pugixml.hpp>

 namespace kiwix
@@ -48,9 +46,8 @@ Manager::~Manager()
  }
 }
 bool Manager::parseXmlDom(const pugi::xml_document& doc,
-                          bool readOnly,
-                          const std::string& libraryPath,
-                          bool trustLibrary)
+                          const bool readOnly,
+                          const std::string& libraryPath)
 {
  pugi::xml_node libraryNode = doc.child("library");

@@ -62,10 +59,14 @@ bool Manager::parseXmlDom(const pugi::xml_document& doc,

    book.setReadOnly(readOnly);
    book.updateFromXml(bookNode,
-                       removeLastPathElement(libraryPath));
+                       removeLastPathElement(libraryPath, true, false));

-    if (!trustLibrary && !book.getPath().empty()) {
-      this->readBookFromPath(book.getPath(), &book);
+    /* Update the book properties with the new importer */
+    if (libraryVersion.empty()
+        || atoi(libraryVersion.c_str()) <= atoi(KIWIX_LIBRARY_VERSION)) {
+      if (!book.getPath().empty()) {
+        this->readBookFromPath(book.getPath(), &book);
+      }
    }
    manipulator->addBookToLibrary(book);
  }
@@ -74,16 +75,15 @@ bool Manager::parseXmlDom(const pugi::xml_document& doc,
 }

 bool Manager::readXml(const std::string& xml,
-                      bool readOnly,
-                      const std::string& libraryPath,
-                      bool trustLibrary)
+                      const bool readOnly,
+                      const std::string& libraryPath)
 {
  pugi::xml_document doc;
  pugi::xml_parse_result result
-      = doc.load_buffer((void*)xml.data(), xml.size());
+      = doc.load_buffer_inplace((void*)xml.data(), xml.size());

  if (result) {
-    this->parseXmlDom(doc, readOnly, libraryPath, trustLibrary);
+    this->parseXmlDom(doc, readOnly, libraryPath);
  }

  return true;
@@ -124,7 +124,7 @@ bool Manager::readOpds(const std::string& content, const std::string& urlHost)
 {
  pugi::xml_document doc;
  pugi::xml_parse_result result
-      = doc.load_buffer((void*)content.data(), content.size());
+      = doc.load_buffer_inplace((void*)content.data(), content.size());

  if (result) {
    this->parseOpdsDom(doc, urlHost);
@@ -134,22 +134,21 @@ bool Manager::readOpds(const std::string& content, const std::string& urlHost)
  return false;
 }

-bool Manager::readFile(
-  const std::string& path,
-  bool readOnly,
-  bool trustLibrary)
+bool Manager::readFile(const std::string& path, const bool readOnly)
+{
+  return this->readFile(path, path, readOnly);
+}
+
+bool Manager::readFile(const std::string& nativePath,
+                       const std::string& UTF8Path,
+                       const bool readOnly)
 {
  bool retVal = true;
  pugi::xml_document doc;
-
-#ifdef _WIN32
-  pugi::xml_parse_result result = doc.load_file(Utf8ToWide(path).c_str());
-#else
-  pugi::xml_parse_result result = doc.load_file(path.c_str());
-#endif
+  pugi::xml_parse_result result = doc.load_file(nativePath.c_str());

  if (result) {
-    this->parseXmlDom(doc, readOnly, path, trustLibrary);
+    this->parseXmlDom(doc, readOnly, UTF8Path);
  } else {
    retVal = false;
  }
@@ -158,7 +157,7 @@ bool Manager::readFile(
   * able to know where to save the library if new content are
   * available */
  if (!readOnly) {
-    this->writableLibraryPath = path;
+    this->writableLibraryPath = UTF8Path;
  }

  return retVal;
@@ -175,10 +174,10 @@ std::string Manager::addBookFromPathAndGetId(const std::string& pathToOpen,
  kiwix::Book book;

  if (this->readBookFromPath(pathToOpen, &book)) {
-    if (!pathToSave.empty() && pathToSave != pathToOpen) {
+    if (pathToSave != pathToOpen) {
      book.setPath(isRelativePath(pathToSave)
                ? computeAbsolutePath(
-                      removeLastPathElement(writableLibraryPath),
+                      removeLastPathElement(writableLibraryPath, true, false),
                      pathToSave)
                : pathToSave);
    }
@@ -209,15 +208,12 @@ bool Manager::addBookFromPath(const std::string& pathToOpen,

 bool Manager::readBookFromPath(const std::string& path, kiwix::Book* book)
 {
-  std::string tmp_path = path;
-  if (isRelativePath(path)) {
-    tmp_path = computeAbsolutePath(getCurrentDirectory(), path);
-  }
  try {
-    kiwix::Reader reader(tmp_path);
+    kiwix::Reader reader(path);
    book->update(reader);
    book->setPathValid(true);
  } catch (const std::exception& e) {
+    std::cerr << "Invalid " << path << " : " << e.what() << std::endl;
    book->setPathValid(false);
    return false;
  }
@@ -225,27 +221,4 @@ bool Manager::readBookFromPath(const std::string& path, kiwix::Book* book)
  return true;
 }

-bool Manager::readBookmarkFile(const std::string& path)
-{
-  pugi::xml_document doc;
-  pugi::xml_parse_result result = doc.load_file(path.c_str());
-
-  if (!result) {
-    return false;
-  }
-
-  pugi::xml_node libraryNode = doc.child("bookmarks");
-
-  for (pugi::xml_node node = libraryNode.child("bookmark"); node;
-       node = node.next_sibling("bookmark")) {
-    kiwix::Bookmark bookmark;
-
-    bookmark.updateFromXml(node);
-
-    manipulator->addBookmarkToLibrary(bookmark);
-  }
-
-  return true;
-}
-
 }
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,32 +1,22 @@
 kiwix_sources = [
  'book.cpp',
-  'bookmark.cpp',
  'library.cpp',
  'manager.cpp',
-  'libxml_dumper.cpp',
  'opds_dumper.cpp',
  'downloader.cpp',
  'reader.cpp',
  'entry.cpp',
-  'server.cpp',
  'searcher.cpp',
-  'search_renderer.cpp',
  'subprocess.cpp',
  'aria2.cpp',
-  'tools/base64.cpp',
-  'tools/pathTools.cpp',
-  'tools/regexTools.cpp',
-  'tools/stringTools.cpp',
-  'tools/networkTools.cpp',
-  'tools/otherTools.cpp',
-  'kiwixserve.cpp',
-  'name_mapper.cpp',
-  'server/byte_range.cpp',
-  'server/etag.cpp',
-  'server/request_context.cpp',
-  'server/response.cpp',
-  'server/internalServer.cpp',
-  'server/internalServer_catalog_v2.cpp'
+  'common/base64.cpp',
+  'common/pathTools.cpp',
+  'common/regexTools.cpp',
+  'common/stringTools.cpp',
+  'common/networkTools.cpp',
+  'common/otherTools.cpp',
+  'xapian/htmlparse.cc',
+  'xapian/myhtmlparse.cc'
 ]
 kiwix_sources += lib_resources

@@ -36,14 +26,20 @@ else
  kiwix_sources += 'subprocess_unix.cpp'
 endif

-if wrapper.contains('android')
+if xapian_dep.found()
+  kiwix_sources += ['xapianSearcher.cpp']
+endif
+
+if get_option('android')
+  subdir('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')
+
+if has_ctpp2_dep
+  kiwix_sources += ['ctpp2/CTPP2VMStringLoader.cpp']
 endif

 config_h = configure_file(output : 'kiwix_config.h',
@@ -55,7 +51,7 @@ kiwixlib = library('kiwix',
                   kiwix_sources,
                   include_directories : inc,
                   dependencies : all_deps,
-                   link_args: extra_libs,
                   version: meson.project_version(),
                   install: true,
-                   install_dir: install_dir)
+                   install_dir: install_dir,
+                   install_rpath: '$ORIGIN')
--- a/src/name_mapper.cpp
+++ b/src/name_mapper.cpp
@@ -1,62 +0,0 @@
-/*
- * Copyright 2019 Matthieu Gautier <mgautier@kymeria.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU  General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "name_mapper.h"
-#include "library.h"
-#include "tools/regexTools.h"
-#include <iostream>
-
-namespace kiwix {
-
-HumanReadableNameMapper::HumanReadableNameMapper(kiwix::Library& library, bool withAlias) {
-  for (auto& bookId: library.filter(kiwix::Filter().local(true).valid(true))) {
-    auto& currentBook = library.getBookById(bookId);
-    auto bookName = currentBook.getHumanReadableIdFromPath();
-    m_idToName[bookId] = bookName;
-    m_nameToId[bookName] = bookId;
-
-    if (!withAlias)
-      continue;
-
-    auto aliasName = replaceRegex(bookName, "", "_[[:digit:]]{4}-[[:digit:]]{2}$");
-    if (aliasName == bookName) {
-      continue;
-    }
-    if (m_nameToId.find(aliasName) == m_nameToId.end()) {
-      m_nameToId[aliasName] = bookId;
-    } else {
-      auto alreadyPresentPath = library.getBookById(m_nameToId[aliasName]).getPath();
-      std::cerr << "Path collision: " << alreadyPresentPath
-                << " and " << currentBook.getPath()
-                << " can't share the same URL path '" << aliasName << "'."
-                << " Therefore, only " << alreadyPresentPath
-                << " will be served." << std::endl;
-    }
-  }
-}
-
-std::string HumanReadableNameMapper::getNameForId(const std::string& id) {
-  return m_idToName.at(id);
-}
-
-std::string HumanReadableNameMapper::getIdForName(const std::string& name) {
-  return m_nameToId.at(name);
-}
-
-}
--- a/src/opds_dumper.cpp
+++ b/src/opds_dumper.cpp
@@ -20,14 +20,10 @@
 #include "opds_dumper.h"
 #include "book.h"

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

 namespace kiwix
 {
-
 /* Constructor */
 OPDSDumper::OPDSDumper(Library* library)
  : library(library)
@@ -38,111 +34,104 @@ OPDSDumper::~OPDSDumper()
 {
 }

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

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

-typedef kainjow::mustache::data MustacheData;
-typedef kainjow::mustache::list BookData;
+pugi::xml_node OPDSDumper::handleBook(Book book, pugi::xml_node root_node) {
+  auto entry_node = root_node.append_child("entry");
+  ADD_TEXT_ENTRY(entry_node, "title", book.getTitle());
+  ADD_TEXT_ENTRY(entry_node, "id", "urn:uuid:"+book.getId());
+  ADD_TEXT_ENTRY(entry_node, "icon", rootLocation + "/meta?name=favicon&content=" + book.getHumanReadableIdFromPath());
+  ADD_TEXT_ENTRY(entry_node, "updated", date);
+  ADD_TEXT_ENTRY(entry_node, "summary", book.getDescription());

-BookData getBookData(const Library* library, const std::vector<std::string>& bookIds)
-{
-  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",  book.getHumanReadableIdFromPath()},
-      {"updated", book.getDate() + "T00:00:00Z"},
-      {"category", book.getCategory()},
-      {"flavour", book.getFlavour()},
-      {"tags", book.getTags()},
-      {"article_count", to_string(book.getArticleCount())},
-      {"media_count", to_string(book.getMediaCount())},
-      {"author_name", book.getCreator()},
-      {"publisher_name", book.getPublisher()},
-      {"url", bookUrl},
-      {"size", to_string(book.getSize())},
-    });
+  auto content_node = entry_node.append_child("link");
+  content_node.append_attribute("type") = "text/html";
+  content_node.append_attribute("href") = (rootLocation + "/" + book.getHumanReadableIdFromPath()).c_str();
+
+  auto author_node = entry_node.append_child("author");
+  ADD_TEXT_ENTRY(author_node, "name", book.getCreator());
+
+  if (! book.getUrl().empty()) {
+    auto acquisition_link = entry_node.append_child("link");
+    acquisition_link.append_attribute("rel") = "http://opds-spec.org/acquisition/open-access";
+    acquisition_link.append_attribute("type") = "application/x-zim";
+    acquisition_link.append_attribute("href") = book.getUrl().c_str();
+    acquisition_link.append_attribute("length") = to_string(book.getSize()).c_str();
  }

-  return bookData;
+  if (! book.getFaviconMimeType().empty() ) {
+    auto image_link = entry_node.append_child("link");
+    image_link.append_attribute("rel") = "http://opds-spec.org/image/thumbnail";
+    image_link.append_attribute("type") = book.getFaviconMimeType().c_str();
+    image_link.append_attribute("href") = (rootLocation + "/meta?name=favicon&content=" + book.getHumanReadableIdFromPath()).c_str();
+  }
+  return entry_node;
 }

-} // unnamed namespace
-
-string OPDSDumper::dumpOPDSFeed(const std::vector<std::string>& bookIds, const std::string& query) const
+string OPDSDumper::dumpOPDSFeed(const std::vector<std::string>& bookIds)
 {
-  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", query.empty() ? MustacheData(false) : MustacheData(query)},
-     {"totalResults", to_string(m_totalResults)},
-     {"startIndex", to_string(m_startIndex)},
-     {"itemsPerPage", to_string(m_count)},
-     {"books", bookData }
-  };
+  date = gen_date_str();
+  pugi::xml_document doc;

-  return render_template(RESOURCE::templates::catalog_entries_xml, template_data);
-}
+  auto root_node = doc.append_child("feed");
+  root_node.append_attribute("xmlns") = "http://www.w3.org/2005/Atom";
+  root_node.append_attribute("xmlns:opds") = "http://opds-spec.org/2010/catalog";

-string OPDSDumper::dumpOPDSFeedV2(const std::vector<std::string>& bookIds, const std::string& query) const
-{
-  const auto bookData = getBookData(library, bookIds);
+  ADD_TEXT_ENTRY(root_node, "id", id);

-  const kainjow::mustache::object template_data{
-     {"date", gen_date_str()},
-     {"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", bookData }
-  };
+  ADD_TEXT_ENTRY(root_node, "title", title);
+  ADD_TEXT_ENTRY(root_node, "updated", date);

-  return render_template(RESOURCE::templates::catalog_v2_entries_xml, template_data);
-}
-
-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 : categories ) {
-    const auto urlencodedCategoryName = urlEncode(category);
-    categoryData.push_back(kainjow::mustache::object{
-      {"name", category},
-      {"urlencoded_name",  urlencodedCategoryName},
-      {"updated", now},
-      {"id", gen_uuid(libraryId + "/categories/" + urlencodedCategoryName)}
-    });
+  if (m_isSearchResult) {
+    ADD_TEXT_ENTRY(root_node, "totalResults", to_string(m_totalResults));
+    ADD_TEXT_ENTRY(root_node, "startIndex", to_string(m_startIndex));
+    ADD_TEXT_ENTRY(root_node, "itemsPerPage", to_string(m_count));
  }

-  return render_template(
-             RESOURCE::templates::catalog_v2_categories_xml,
-             kainjow::mustache::object{
-               {"date", now},
-               {"endpoint_root", rootLocation + "/catalog/v2"},
-               {"feed_id", gen_uuid(libraryId + "/categories")},
-               {"categories", categoryData }
-             }
-  );
+  auto self_link_node = root_node.append_child("link");
+  self_link_node.append_attribute("rel") = "self";
+  self_link_node.append_attribute("href") = "";
+  self_link_node.append_attribute("type") = "application/atom+xml";
+
+
+  if (!searchDescriptionUrl.empty() ) {
+    auto search_link = root_node.append_child("link");
+    search_link.append_attribute("rel") = "search";
+    search_link.append_attribute("type") = "application/opensearchdescription+xml";
+    search_link.append_attribute("href") = searchDescriptionUrl.c_str();
+  }
+
+  if (library) {
+    for (auto& bookId: bookIds) {
+      handleBook(library->getBookById(bookId), root_node);
+    }
+  }
+
+  return nodeToString(root_node);
 }

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

 #include <zim/search.h>
-#include <zim/item.h>
-#include <zim/error.h>
-
-#include "tools/otherTools.h"

 inline char hi(char v)
 {
@@ -67,9 +63,7 @@ std::string hexUUID(std::string in)
 namespace kiwix
 {
 /* Constructor */
-Reader::Reader(const string zimFilePath)
-  :  zimArchive(nullptr),
-     zimFilePath(zimFilePath)
+Reader::Reader(const string zimFilePath) : zimFileHandler(NULL)
 {
  string tmpZimFilePath = zimFilePath;

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

-  zimArchive.reset(new zim::Archive(tmpZimFilePath));
+  this->zimFileHandler = new zim::File(tmpZimFilePath);

-  /* initialize random seed: */
-  srand(time(nullptr));
-}
-
-#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 {};
+  if (this->zimFileHandler != NULL) {
+    this->firstArticleOffset
+        = this->zimFileHandler->getNamespaceBeginOffset('A');
+    this->lastArticleOffset = this->zimFileHandler->getNamespaceEndOffset('A');
+    this->nsACount = this->zimFileHandler->getNamespaceCount('A');
+    this->nsICount = this->zimFileHandler->getNamespaceCount('I');
+    this->zimFilePath = zimFilePath;
  }
+
+  /* initialize random seed: */
+  srand(time(NULL));
+}
+
+/* Destructor */
+Reader::~Reader()
+{
+  if (this->zimFileHandler != NULL) {
+    delete this->zimFileHandler;
+  }
+}
+
+zim::File* Reader::getZimFileHandler() const
+{
+  return this->zimFileHandler;
+}
+std::map<const std::string, unsigned int> Reader::parseCounterMetadata() const
+{
+  std::map<const std::string, unsigned int> counters;
+  string mimeType, item, counterString;
+  unsigned int counter;
+
+  zim::Article article = this->zimFileHandler->getArticle('M', "Counter");
+
+  if (article.good()) {
+    stringstream ssContent(article.getData());
+
+    while (getline(ssContent, item, ';')) {
+      stringstream ssItem(item);
+      getline(ssItem, mimeType, '=');
+      getline(ssItem, counterString, '=');
+      if (!counterString.empty() && !mimeType.empty()) {
+        sscanf(counterString.c_str(), "%u", &counter);
+        counters.insert(pair<string, int>(mimeType, counter));
+      }
+    }
+  }
+
+  return counters;
 }

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

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

@@ -142,84 +152,151 @@ unsigned int Reader::getMediaCount() const
      = 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;
+  if (counterMap.empty()) {
+    counter = this->nsICount;
+  } else {
+    auto it = counterMap.find("image/jpeg");
+    if (it != counterMap.end()) {
+      counter += it->second;
+    }
+
+    it = counterMap.find("image/gif");
+    if (it != counterMap.end()) {
+      counter += it->second;
+    }
+
+    it = counterMap.find("image/png");
+    if (it != counterMap.end()) {
+      counter += it->second;
    }
  }
-
  return counter;
 }

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

 /* Return the UID of the ZIM file */
 string Reader::getId() const
 {
  std::ostringstream s;
-  s << zimArchive->getUuid();
+  s << this->zimFileHandler->getFileheader().getUuid();
  return s.str();
 }

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

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

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

  return false;
 }

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

-#define METADATA(NAME) std::string v; getMetadata(NAME, v); return v;
-
-string Reader::getName() const
-{
-  METADATA("Name")
-}
-
 string Reader::getTitle() const
 {
-  string value = zimArchive->getMetadata("Title");
+  string value;
+  this->getMetatag("Title", value);
  if (value.empty()) {
-    value = getLastPathElement(zimFilePath);
+    value = getLastPathElement(zimFileHandler->getFilename());
    std::replace(value.begin(), value.end(), '_', ' ');
    size_t pos = value.find(".zim");
    value = value.substr(0, pos);
@@ -227,98 +304,65 @@ string Reader::getTitle() const
  return value;
 }

-string Reader::getCreator() const
+string Reader::getName() const
 {
-  METADATA("Creator")
+  string value;
+  this->getMetatag("Name", value);
+  return value;
 }

-string Reader::getPublisher() const
+string Reader::getTags() const
 {
-  METADATA("Publisher")
-}
-
-string Reader::getDate() const
-{
-  METADATA("Date")
+  string value;
+  this->getMetatag("Tags", value);
+  return value;
 }

 string Reader::getDescription() const
 {
  string value;
-  this->getMetadata("Description", value);
+  this->getMetatag("Description", value);

  /* Mediawiki Collection tends to use the "Subtitle" name */
  if (value.empty()) {
-    this->getMetadata("Subtitle", value);
+    this->getMetatag("Subtitle", value);
  }

  return value;
 }

-string Reader::getLongDescription() const
-{
-  METADATA("LongDescription")
-}
-
 string Reader::getLanguage() const
 {
-  METADATA("Language")
+  string value;
+  this->getMetatag("Language", value);
+  return value;
 }

-string Reader::getLicense() const
+string Reader::getDate() const
 {
-  METADATA("License")
+  string value;
+  this->getMetatag("Date", value);
+  return value;
 }

-string Reader::getTags(bool original) const
+string Reader::getCreator() const
 {
-  string tags_str;
-  getMetadata("Tags", tags_str);
-  if (original) {
-    return tags_str;
-  }
-  auto tags = convertTags(tags_str);
-  return join(tags, ";");
+  string value;
+  this->getMetatag("Creator", value);
+  return value;
 }

-
-string Reader::getTagStr(const std::string& tagName) const
+string Reader::getPublisher() const
 {
-  string tags_str;
-  getMetadata("Tags", tags_str);
-  return getTagValueFromTagList(convertTags(tags_str), tagName);
+  string value;
+  this->getMetatag("Publisher", value);
+  return value;
 }

-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);
+  this->getMetatag("startfileuid", value);
  if (value.empty()) {
    return "";
  }
@@ -340,17 +384,83 @@ string Reader::getOrigId() const
  return origID;
 }

+/* Return the first page URL */
+string Reader::getFirstPageUrl() const
+{
+  return getFirstPage().getPath();
+}
+
+Entry Reader::getFirstPage() const
+{
+  if (!this->zimFileHandler) {
+    throw NoEntry();
+  }
+
+  auto firstPageOffset = zimFileHandler->getNamespaceBeginOffset('A');
+  auto article = zimFileHandler->getArticle(firstPageOffset);
+
+  if (! article.good()) {
+    throw NoEntry();
+  }
+
+  return article;
+}
+
+bool _parseUrl(const string& url, char* ns, string& title)
+{
+  /* Offset to visit the url */
+  unsigned int urlLength = url.size();
+  unsigned int offset = 0;
+
+  /* Ignore the first '/' */
+  if (url[offset] == '/')
+    offset++;
+
+  if (url[offset] == '/' || offset >= urlLength)
+    return false;
+
+  /* Get namespace */
+  *ns = url[offset++];
+
+  if (url[offset] != '/' || offset >= urlLength)
+    return false;
+
+  offset++;
+
+  if ( offset >= urlLength)
+    return false;
+
+  /* Get content title */
+  title = url.substr(offset, urlLength - offset);
+
+  return true;
+}
+
+bool Reader::parseUrl(const string& url, char* ns, string& title) const
+{
+  return _parseUrl(url, ns, title);
+}
+
 Entry Reader::getEntryFromPath(const std::string& path) const
 {
-  if (path.empty() || path == "/") {
+  char ns = 0;
+  std::string short_url;
+
+  if (!this->zimFileHandler) {
+    throw NoEntry();
+  }
+  _parseUrl(path, &ns, short_url);
+
+  if (short_url.empty() && ns == 0) {
    return getMainPage();
  }

-  try {
-    return zimArchive->getEntryByPath(path);
-  } catch (zim::EntryNotFound& e) {
+  auto article = zimFileHandler->getArticle(ns, short_url);
+  if (!article.good()) {
    throw NoEntry();
  }
+
+  return article;
 }

 Entry Reader::getEntryFromEncodedPath(const std::string& path) const
@@ -360,30 +470,212 @@ Entry Reader::getEntryFromEncodedPath(const std::string& path) const

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

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

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

 /* Search titles by prefix */
-
 bool Reader::searchSuggestions(const string& prefix,
                               unsigned int suggestionsCount,
                               const bool reset)
 {
+  bool retVal = false;
+  zim::File::const_iterator articleItr;
+
  /* Reset the suggestions otherwise check if the suggestions number is less
   * than the suggestionsCount */
  if (reset) {
@@ -395,48 +687,39 @@ bool Reader::searchSuggestions(const string& prefix,
    }
  }

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

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

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

    /* Suggestions where found */
    retVal = true;
  }

+  /* Set the cursor to the begining */
+  this->suggestionsOffset = this->suggestions.begin();
+
  return retVal;
 }

@@ -468,50 +757,36 @@ std::vector<std::string> Reader::getTitleVariants(
  return variants;
 }

-
+/* Try also a few variations of the prefix to have better results */
 bool Reader::searchSuggestionsSmart(const string& prefix,
                                    unsigned int suggestionsCount)
 {
+  std::vector<std::string> variants = this->getTitleVariants(prefix);
+  bool retVal;
+
  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 */
+  const zim::Search* suggestionSearch
+      = this->getZimFileHandler()->suggestions(prefix, 0, suggestionsCount);

-  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();
+  if (suggestionSearch->get_matches_estimated()) {
+    for (auto current = suggestionSearch->begin();
+         current != suggestionSearch->end();
         current++) {
-      SuggestionItem suggestion(current.getTitle(), kiwix::normalize(current.getTitle()),
-                                current.getPath(), current.getSnippet());
-      results.push_back(suggestion);
+      std::vector<std::string> suggestion;
+      suggestion.push_back(current->getTitle());
+      suggestion.push_back("/A/" + current->getUrl());
+      suggestion.push_back(kiwix::normalize(current->getTitle()));
+      this->suggestions.push_back(suggestion);
    }
+    this->suggestionsOffset = this->suggestions.begin();
    retVal = true;
  } else {
    for (std::vector<std::string>::iterator variantsItr = variants.begin();
         variantsItr != variants.end();
         variantsItr++) {
-      retVal = this->searchSuggestions(*variantsItr, suggestionsCount, results)
+      retVal = this->searchSuggestions(*variantsItr, suggestionsCount, false)
               || retVal;
    }
  }
@@ -524,7 +799,7 @@ bool Reader::getNextSuggestion(string& title)
 {
  if (this->suggestionsOffset != this->suggestions.end()) {
    /* title */
-    title = (*(this->suggestionsOffset)).getTitle();
+    title = (*(this->suggestionsOffset))[0];

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

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

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

+  if (file != NULL) {
+    size = file->getFilesize();
+  }
+
+  return (size / 1024);
+}
 }
--- a/src/search_renderer.cpp
+++ b/src/search_renderer.cpp
@@ -1,149 +0,0 @@
-/*
- * 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 <cmath>
-
-#include "search_renderer.h"
-#include "searcher.h"
-#include "reader.h"
-#include "library.h"
-#include "name_mapper.h"
-
-#include <zim/search.h>
-
-#include <mustache.hpp>
-#include "kiwixlib-resources.h"
-
-
-namespace kiwix
-{
-
-/* Constructor */
-SearchRenderer::SearchRenderer(Searcher* searcher, NameMapper* mapper)
-    : mp_searcher(searcher),
-      mp_nameMapper(mapper),
-      protocolPrefix("zim://"),
-      searchProtocolPrefix("search://?")
-{}
-
-/* Destructor */
-SearchRenderer::~SearchRenderer() = default;
-
-void SearchRenderer::setSearchPattern(const std::string& pattern)
-{
-  this->searchPattern = pattern;
-}
-
-void SearchRenderer::setSearchContent(const std::string& name)
-{
-  this->searchContent = name;
-}
-
-void SearchRenderer::setProtocolPrefix(const std::string& prefix)
-{
-  this->protocolPrefix = prefix;
-}
-
-void SearchRenderer::setSearchProtocolPrefix(const std::string& prefix)
-{
-  this->searchProtocolPrefix = prefix;
-}
-
-std::string SearchRenderer::getHtml()
-{
-  kainjow::mustache::data results{kainjow::mustache::data::type::list};
-
-  mp_searcher->restart_search();
-  Result* p_result = NULL;
-  while ((p_result = mp_searcher->getNextResult())) {
-    kainjow::mustache::data result;
-    result.set("title", p_result->get_title());
-    result.set("url", p_result->get_url());
-    result.set("snippet", p_result->get_snippet());
-    result.set("resultContentId", mp_nameMapper->getNameForId(p_result->get_zimId()));
-
-    if (p_result->get_wordCount() >= 0) {
-      result.set("wordCount", kiwix::beautifyInteger(p_result->get_wordCount()));
-    }
-
-    results.push_back(result);
-    delete p_result;
-  }
-
-  // pages
-  kainjow::mustache::data pages{kainjow::mustache::data::type::list};
-
-  auto resultStart = mp_searcher->getResultStart();
-  auto resultEnd = 0U;
-  auto estimatedResultCount = mp_searcher->getEstimatedResultCount();
-  auto currentPage = 0U;
-  auto pageStart = 0U;
-  auto pageEnd = 0U;
-  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("results", results);
-  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; });
-  return ss.str();
-}
-
-}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`usr/share/man/man1/kiwix-compile-resources.1*`