Merge pull request #559 from kiwix/version_3.3.0

Add a option to limit the number of zim in a fulltext multizim search.

.clang-format

@@ -0,0 +1,12 @@
+BasedOnStyle:  Google
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBinaryOperators: All
+BreakBeforeBraces: Linux
+DerivePointerAlignment: false
+SpacesInContainerLiterals: false
+Standard: Cpp11
+
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: kiwix # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+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/

.github/move.yml

@@ -0,0 +1,27 @@
+# Configuration for Move Issues - https://github.com/dessant/move-issues
+
+# Delete the command comment when it contains no other content
+deleteCommand: true
+
+# Close the source issue after moving
+closeSourceIssue: true
+
+# Lock the source issue after moving
+lockSourceIssue: false
+
+# Mention issue and comment authors
+mentionAuthors: true
+
+# Preserve mentions in the issue content
+keepContentMentions: true
+
+# Move labels that also exist on the target repository
+moveLabels: true
+
+# Set custom aliases for targets
+# aliases:
+#   r: repo
+#   or: owner/repo
+
+# Repository to extend settings from
+# _extends: repo

.github/workflows/ci.yml

@@ -0,0 +1,72 @@
+name: CI
+
+on: [push]
+
+jobs:
+  Linux:
+    strategy:
+      fail-fast: false
+      matrix:
+        target:
+          - native_static
+          - native_dyn
+          - win32_static
+          - win32_dyn
+        include:
+          - target: native_static
+            image_variant: bionic
+            lib_postfix: '/x86_64-linux-gnu'
+          - target: native_dyn
+            image_variant: bionic
+            lib_postfix: '/x86_64-linux-gnu'
+          - target: win32_static
+            image_variant: f35
+            lib_postfix: '64'
+          - target: win32_dyn
+            image_variant: f35
+            lib_postfix: '64'
+    env:
+      HOME: /home/runner
+    runs-on: ubuntu-latest
+    container:
+      image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-31"
+    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-tools.tar.xz
+        wget -O- http://tmp.kiwix.org/ci/${ARCHIVE_NAME} | tar -xJ -C /home/runner
+    - name: Compile
+      shell: bash
+      run: |
+        if [[ "${{matrix.target}}" =~ .*_static ]]; then
+          MESON_OPTION="-Dstatic-linkage=true"
+        else
+          MESON_OPTION=""
+        fi
+        if [[ ! "${{matrix.target}}" =~ native_.* ]]; then
+          MESON_OPTION="$MESON_OPTION --cross-file $HOME/BUILD_${{matrix.target}}/meson_cross_file.txt"
+        fi
+        cd $HOME/kiwix-tools
+        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"

.github/workflows/docker.yml

@@ -0,0 +1,61 @@
+name: Docker
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: Specific version to build (overrides on-master and tag-pattern)
+        required: false
+        default: ''
+
+jobs:
+  build-and-push-kiwix-tools:
+    name: Deploy kiwix-tools Docker Image
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: build and publish kiwix-tools
+        uses: openzim/docker-publish-action@v5
+        with:
+          image-name: kiwix/kiwix-tools
+          credentials: |
+            DOCKERIO_USERNAME=${{ secrets.DOCKERHUB_USERNAME }}
+            DOCKERIO_TOKEN=${{ secrets.DOCKERHUB_PASSWORD }}
+            GHCRIO_USERNAME=${{ secrets.GHCR_USERNAME }}
+            GHCRIO_TOKEN=${{ secrets.GHCR_TOKEN }}
+          context: docker
+          latest-on-tag: true
+          build-args:
+            VERSION={tag}
+          platforms: |
+            linux/amd64
+            linux/arm/v7
+            linux/arm64
+          restrict-to: kiwix/kiwix-tools
+          manual-tag: ${{ github.event.inputs.version }}
+
+  build-and-push-kiwix-serve:
+    name: Deploy kiwix-serve Docker Image
+    runs-on: ubuntu-20.04
+    needs: build-and-push-kiwix-tools
+    steps:
+      - uses: actions/checkout@v2
+      - name: build and publish kiwix-serve
+        uses: openzim/docker-publish-action@v5
+        with:
+          image-name: kiwix/kiwix-serve
+          credentials: |
+            DOCKERIO_USERNAME=${{ secrets.DOCKERHUB_USERNAME }}
+            DOCKERIO_TOKEN=${{ secrets.DOCKERHUB_PASSWORD }}
+            GHCRIO_USERNAME=${{ secrets.GHCR_USERNAME }}
+            GHCRIO_TOKEN=${{ secrets.GHCR_TOKEN }}
+          context: docker/server
+          latest-on-tag: true
+          build-args:
+            VERSION={tag}
+          platforms: |
+            linux/amd64
+            linux/arm/v7
+            linux/arm64
+          restrict-to: kiwix/kiwix-tools
+          manual-tag: ${{ github.event.inputs.version }}

.github/workflows/package.yml

@@ -0,0 +1,82 @@
+name: Packages
+on: [push, pull_request]
+
+jobs:
+  build-deb:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        distro:
+          - ubuntu-jammy
+          - ubuntu-impish
+          - ubuntu-focal
+    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-jammy
+        if: matrix.distro == 'ubuntu-jammy'
+        name: Build package for ubuntu-jammy
+        id: build-ubuntu-jammy
+        with:
+          args: --no-sign
+          ppa: ${{ steps.ppa.outputs.ppa }}
+
+      - uses: legoktm/gh-action-build-deb@ubuntu-impish
+        if: matrix.distro == 'ubuntu-impish'
+        name: Build package for ubuntu-impish
+        id: build-ubuntu-impish
+        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: 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
+

Changelog

@@ -0,0 +1,318 @@
+kiwix-tools 3.3.0
+=================
+
+ * Remove kiwix-read tool (@veloman-yunkan #535)
+
+kiwix-serve
+-----------
+
+ * Add an option to limit the number of connections for a same IP (@nikhil #534)
+ * Add an option to limit the number of zim in a multizim fulltext search (@mgautierfr #558)
+
+kiwix-search
+------------
+
+ * Remove usage of libkiwix's deprecated api (@veloman-yunkan #535)
+
+kiwix-manage
+------------
+
+ * Correctly return a value !0 if something went wrong (@mgautierfr #553)
+
+
+kiwix-tools 3.2.0
+=================
+
+ * Print the version of all dependencies (@kelson42 #516)
+ * Better Docker images (@kelson42 @rgaudin)
+ * Update Readme (@kelson42)
+ * Build debian packages on CI (@legoktm #394)
+ * Add man pages for kiwix-read and kiwix-search (@legoktm #392)
+ * Various fixes (@legoktm @hashworks @mgautierfr)
+
+
+kiwix-serve
+-----------
+
+ * Print the url on which a user can connect to on startup (@nikhil #499 #522)
+ * Reload library on SIGHUP signal (@veloman-yunkan #497)
+ * Add a option `--monitorLibrary` to monitor and automically reload the library
+   (@veloman-yunkan #503)
+ * Correct handling of SIGTERM and SIGINT (@veloman-yunkan #488)
+ * Add `--customIndexTemplate` option (@manan #477)
+ * Add `--help` option (@kelson42 #511)
+
+
+kiwix-tools 3.1.2
+=================
+
+ * Use new threadsafe API of kiwix-lib to do suggestions search.
+
+kiwix-tools 3.1.1
+=================
+
+ * Fix compilation on Windows' CI
+
+kiwix-tools 3.1.0
+=================
+
+ * [SERVER] Add option to block external links
+
+kiwix-tools 3.0.3
+=================
+
+ * [MANAGER] Fix broken --version argument parsing
+
+kiwix-tools 3.0.2
+=================
+
+ * New option --version for all tools
+ * Remove benchmark.sh file.
+ * [DOCKER] Add ability to download a file at container start.
+ * [CI] Move to github actions instead of travis.
+ * [SERVER] Trust the given library by default.
+ * [SERVER] Add shortcut alias for option `--address` and `--nodatealias`
+
+kiwix-tools 3.0.1
+=================
+
+ * Fix --nodatealiases inverted logic regression
+
+kiwix-tools 3.0.0
+=================
+
+ * Move kiwix-serve implementation in kiwix-lib.
+
+kiwix-tools 2.1.0
+=================
+
+ * Fix few compilation errors.
+
+kiwix-serve
+-----------
+
+ * Use new api to filter the library.
+ * Mobile friendly top bar.
+ * Add notag parameter to be able to exclude tags from the zim search.
+
+
+kiwix-tools 2.0.0
+=================
+
+kiwix-manage
+-----------
+
+ * Better usage()
+ * Adding multiple files bug fix
+ * Remove download command.
+
+kiwix-serve
+-----------
+
+ * Better usage()
+ * Display properly welcome page on 3 columns
+ * New welcome page footer "Powered by Kiwix"
+
+kiwix-tools 1.2.1
+=================
+
+kiwix-serve
+-----------
+
+ * Always use POLL when avaible.
+
+kiwix-tools 1.2.0
+=================
+
+ * Remove rpath for installed binaries.
+
+kiwix-serve
+-----------
+
+ * New Dockerfile of kiwix-serve
+ * New --nodatealiases option
+ * Do not use POLL on windows
+
+kiwix-manage
+------------
+
+ * Do not show all books if book ids has been provided.
+ * Be able to add several zim files in the same time in a library.
+
+kiwix-tools 1.1.0
+=================
+
+kiwix-serve
+-----------
+
+ * Fix bug about handling of absolute url in old zim file.
+ * All the catalog to be searched by tags.
+
+kiwix-tools 1.0.0
+=================
+
+ * [CI] Use the new deps archive xz
+ * Move version 1.0.0. There is no need to stay in pre 1.0 version.
+
+kiwix-serve
+-----------
+
+ * Correctly implement redirection.
+   kiwix-serve now return a 302 http status code instead of resolving the
+   redirection internally and return the content.
+
+
+kiwix-tools 0.9.0
+=================
+
+ * Update README
+ * Update man pages
+ * Remove support of external indexes (manage, search, serve)
+ * Update build system as we don't use ctpp2 anymore
+ * Update to last kiwix-lib API.
+
+kiwix-manage
+------------
+
+ * Update usage.
+
+
+kiwix-tools 0.8.0
+=================
+
+kiwix-manage
+------------
+
+ * Be able to remove several books from the library in one command.
+
+kiwix-tools 0.7.0
+=================
+
+ * Adapt to kiwix-lib new API
+
+kiwix-serve
+-----------
+
+ * Dumps only valid books in the opdsfeed.
+ * Allow the opds feed to be filtered by lang and paginated.
+
+kiwix-manage
+------------
+
+ * Add a download command to download a remote book locally
+ * Book are referenced by bookId not index.
+ * No more indexType option as it is always XAPIAN.
+
+kiwix-tools 0.6.1
+=================
+
+kiwix-serve
+-----------
+
+ * Update README.
+ * Fix crash when `--library` flag is provided without value.
+ * Correctly handle mimetype of file without extension on 64bits.
+ * Minor fixes
+
+kiwix-tools 0.6.0
+=================
+
+ * remove kiwix-install tool.
+
+kiwix-serve
+-----------
+
+ * Improved taskbar #160
+ * Fix global page when using the option `--nosearchbar`
+ * Return 404 for missing resources
+ * Fix compilation for gcc 4.8.
+
+kiwix-manage
+------------
+
+ * Returns proper exit code (not always 0)
+
+
+kiwix-tools 0.5.0
+=================
+
+ * Build kiwix-tools setting the RPATH
+ * Compile without warning.
+
+
+kiwix-serve
+------------
+
+ * Serve metadata information using the "/meta" url.
+ * Serve an OPDS stream of all zim handled by kiwix-serve
+   All informations cannot be infer from the zim file itself,
+   you should use a library.xml to provide needed information (url, ...)
+ * Update kiwix-serve to use the new API of kiwix-lib
+
+kiwix-tools 0.4.0
+=================
+
+ * Use gcc-5 on travis.
+
+kiwix-serve
+-----------
+
+ * Accept zim file with `&` in the name
+ * Do not cache (on client side) global search (as it can depends on the zim
+   files handled)
+ * Fix HTTP byte range handling. (#91)
+ * Fix opening of relative path (#70)
+ * Add a small (and hidden) API to do geo search.
+ * Better request parsing. (#91)
+ * Better handling of invalid request (#116)
+ * Various bug fixes (#146, #150, #153, #165, #168, #165)
+
+kiwix-search
+------------
+
+ * Add an option `--suggestion` to do suggestion search with
+   kiwix-search.(#132)
+
+kiwix-tools 0.3.0
+=================
+
+ * Move to C++11
+
+kiwix-serve
+-----------
+
+ * Add a global taskbar in the welcome page to search in all zims (#49)
+ * Serve the taskbar as css file instead of including it in the html (#68):
+   * Better client caching
+   * The html encoding is now in the first 1024 bytes and firefox correctly
+     detect the encoding
+ * Make kiwix-server multi-threaded (#82)
+ * Correctly return 404 instead of crashing when request inexistant skin file
+   (#83)
+ * Correctly respond to bytes-range requests.(#84)
+ * Directly respond to first request for a url instead of refusing the first
+   connexion
+ * Add support to relative url location. (#86)
+ * Remove caching (on client side) for the welcome page. (#86)
+
+
+kiwix-tools 0.2.0
+=================
+
+ * Remove indexer tools
+
+kiwix-serve
+-----------
+
+ * Correctly fix the deflate data we send over http. (#15)
+ * Update in the taskbar (or topbar):
+    * Taskbar is responsive (github.com/kiwix/kiwix/issues/336)
+    * Force css rules for the taskbar (and not be impacted by content's css)
+ * Add `--nolibrarybutton` to hide the library button from the taskbar.
+ * Rewrite of the welcome page.
+
+
+kiwix-installer
+---------------
+
+ * Remove indexing functionnality

README.md

@@ -1,14 +1,28 @@
 Kiwix tools
 ===========
 
-The Kiwix tools gathers kiwix command line tools.
+The Kiwix tools is a collection of [Kiwix](https://kiwix.org) related
+command line tools:
+* kiwix-manage: Manage XML based library of ZIM files
+* kiwix-read: Read ZIM file content
+* kiwix-search: Fulltext search in ZIM files
+* kiwix-serve: HTTP daemon serving ZIM files
+
+[![latest release](https://img.shields.io/github/v/tag/kiwix/kiwix-tools?label=latest%20release&sort=semver)](https://download.kiwix.org/release/kiwix-tools/)
+[![Repositories](https://img.shields.io/repology/repositories/kiwix-tools?label=repositories)](https://github.com/kiwix/kiwix-tools/wiki/Repology)
+[![Docker](https://img.shields.io/docker/v/kiwix/kiwix-tools?arch=amd64&label=Docker&sort=date)](https://hub.docker.com/r/kiwix/kiwix-tools)
+[![Docker (kiwix-serve)](https://img.shields.io/docker/v/kiwix/kiwix-serve?arch=amd64&label=Docker%20(kiwix-serve)&sort=date)](https://hub.docker.com/r/kiwix/kiwix-serve)
+[![Sandstorm](https://img.shields.io/badge/Sandstorm-kiwix-blue)](https://apps.sandstorm.io/app/5uh349d0kky2zp5whrh2znahn27gwha876xze3864n0fu9e5220h)
+[![Build Status](https://github.com/kiwix/kiwix-tools/workflows/CI/badge.svg?query=branch%3Amaster)](https://github.com/kiwix/kiwix-tools/actions?query=branch%3Amaster)
+[![CodeFactor](https://www.codefactor.io/repository/github/kiwix/kiwix-tools/badge)](https://www.codefactor.io/repository/github/kiwix/kiwix-tools)
+[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 
 Disclaimer
 ----------
 
 This document assumes you have a little knowledge about software
 compilation. If you experience difficulties with the dependencies or
-with the Kiwix libary compilation itself, we recommend to have a look
+with the Kiwix tools compilation itself, we recommend to have a look
 to [kiwix-build](https://github.com/kiwix/kiwix-build).
 
 Preamble
@@ -16,23 +30,19 @@ Preamble
 
 Although the Kiwix tools can be compiled/cross-compiled on/for many
 sytems, the following documentation explains how to do it on POSIX
-ones. It is primarly though for GNU/Linux systems and has been tested
-on recent releases of Ubuntu and Fedora.
+ones. It is primarly thought for GNU/Linux systems and has been tested
+on recent releases of
+[Debian](https://debian.org)/[Ubuntu](https://ubuntu.com) and
+[Fedora](https://getfedora.org).
 
 Dependencies
 ------------
 
-The Kiwix tools rely on a few third parts software libraries. They
-are prerequisites to the Kiwix library compilation. Following
+The Kiwix tools rely on a few third party software libraries. They are
+prerequisites to the Kiwix tools compilation. Therefore, following
 libraries need to be available:
-
-* Kiwix lib ....................... https://github.com/kiwix/kiwix-lib
-(no package for now)
-* Libmicrohttpd .......... https://www.gnu.org/software/libmicrohttpd/
-(package libmicrohttpd-dev on Ubuntu)
-(package libctpp2-dev on Ubuntu)
-* Zlib .......................................... http://www.zlib.net/
-(package zlib1g-dev on Ubuntu)
+* [libkiwix](https://github.com/kiwix/libkiwix) (package `libkiwix` on Debian/Ubuntu)
+* [libzim](https://github.com/openzim/libzim) (package `libzim` on Debian/Ubuntu)
 
 These dependencies may or may not be packaged by your operating
 system. They may also be packaged but only in an older version. They
@@ -45,54 +55,30 @@ If you want to install these dependencies locally, then use the
 kiwix-tools directory as install prefix.
 
 If you want to compile Kiwix tools statically, the dependencies should
-be compile statically (provide a lib...a library), for example by
-using "--enable-static" with "./configure".
+be compiled statically (provide a `lib...a` library), for example by
+using `--enable-static` with `./configure`.
 
-If you compile manually Libmicrohttpd, you might need to compile it
-without GNU TLS, a bug here will empeach further compilation of Kiwix
-tools otherwise.
-
-Environnement
+Environment
 -------------
 
-The Kiwix library builds using [Meson](http://mesonbuild.com/) version
-0.34 or higher. Meson relies itself on Ninja, pkg-config and few other
-compilation tools.
+The Kiwix tools build using [Meson](http://mesonbuild.com/) version
+0.43 or higher. Meson relies itself on Ninja, pkg-config and few other
+compilation tools. Install them first:
+* [Meson](http://mesonbuild.com/)
+* [Ninja](https://ninja-build.org/)
+* [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/)
 
-Install first the few common compilation tools:
-* Automake
-* Libtool
-* Virtualenv
-* Pkg-config
-
-Then install Meson itself:
-```
-virtualenv -p python3 ./ # Create virtualenv
-source bin/activate      # Activate the virtualenv
-pip install meson        # Install Meson
-hash -r                  # Refresh bash paths
-```
-
-Finally download and build Ninja locally:
-```
-git clone git://github.com/ninja-build/ninja.git
-cd ninja
-git checkout release
-./configure.py --bootstrap
-mkdir ../bin                      
-cp ninja ../bin
-cd ..
-```
+These tools should be packaged if you use a cutting edge operating
+system. If not, have a look to the [Troubleshooting](#Troubleshooting)
+section.
 
 Compilation
 -----------
 
-Once all dependencies are installed, you can compile kiwix-lib with:
-```
-mkdir build
+Once all dependencies are installed, you can compile Kiwix tools with:
+```bash
 meson . build
-cd build
-ninja
+ninja -C build
 ```
 
 By default, it will compile dynamic linked libraries. If you want
@@ -104,18 +90,64 @@ Depending of you system, `ninja` may be called `ninja-build`.
 Installation
 ------------
 
-If you want to install the Kiwix tools you just have compiled on your
-system, here we go:
-
+If you want to install the Kiwix tools, here we go:
+```bash
+ninja -C build install
 ```
-ninja install
+
+You might need to run the command as `root` (or using `sudo`),
+depending where you want to install the Kiwix tools. After the
+installation succeeded, you may need to run ldconfig (as `root`).
+
+Uninstallation
+------------
+
+If you want to uninstall the Kiwix tools:
+```bash
+ninja -C build uninstall
+```
+
+Like for the installation, you might need to run the command as `root`
+(or using `sudo`).
+
+Docker
+------
+
+An official Docker image of the Kiwix tools can be found in the
+[Docker Hub](https://hub.docker.com/r/kiwix/kiwix-tools). A
+`kiwix-serve` dedicated Docker image [exists
+too](https://hub.docker.com/r/kiwix/kiwix-serve).
+
+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
+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
+./configure.py --bootstrap
+mkdir ../bin
+cp ninja ../bin
 cd ..
 ```
 
-You might need to run the command as root, depending where you want to
-install the libraries.
+If the compilation still fails, you might need to get a more recent
+version of a dependency than the one packaged by your Linux
+distribution. Try then with a source tarball distributed by the
+problematic upstream project or even directly from the source code
+repository.
 
 License
 -------
 
-GPLv3 or later, see COPYING for more details.
+[GPLv3](https://www.gnu.org/licenses/gpl-3.0) or later, see
+[COPYING](COPYING) for more details.

debian/changelog

@@ -0,0 +1,5 @@
+kiwix-tools (0.0.0) unstable; urgency=medium
+
+  * Initial release
+
+ -- Kunal Mehta <legoktm@debian.org>  Mon, 13 Jul 2020 17:21:11 -0700

debian/control

@@ -0,0 +1,26 @@
+Source: kiwix-tools
+Section: utils
+Priority: optional
+Maintainer: Kiwix team <kiwix@kiwix.org>
+Build-Depends: debhelper-compat (= 13),
+               libkiwix-dev (>= 10.0.0~),
+               libzim-dev (>= 7.2.0~),
+               meson,
+               pkg-config,
+Standards-Version: 4.5.0
+Homepage: https://github.com/kiwix/kiwix-tools
+Rules-Requires-Root: no
+
+Package: kiwix-tools
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: collection of Kiwix tools
+ kiwix-tools is a collection of various command-line tools used to help
+ users interact with and manage ZIM files. It includes:
+  * kiwix-serve is a standalone HTTP server for serving ZIM files
+    over the network.
+  * kiwix-manage allows one to manage the content of the Kiwix library (an
+    XML file listing available ZIM files).
+  * kiwix-read allows for reading ZIM files from the command-line.
+  * kiwix-search allows one to find articles in a ZIM file using fulltext
+    search patterns.

debian/copyright

@@ -0,0 +1 @@
+See COPYING in the repository root.

debian/rules

@@ -0,0 +1,5 @@
+#!/usr/bin/make -f
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

docker/Dockerfile

@@ -0,0 +1,49 @@
+# dumb-init to use as entrypoint so it can forward signals to our CMD
+FROM debian:bullseye-slim as builder
+RUN apt-get update -y \
+    && apt-get install -y --no-install-recommends \
+    build-essential ca-certificates musl-tools wget unzip make \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+# compile dumb-init
+RUN wget -nv https://github.com/Yelp/dumb-init/archive/refs/tags/v1.2.5.zip && \
+    unzip v1.2.5.zip && cd dumb-init-1.2.5 && CC=musl-gcc make
+
+# declare build option ARCH if not using buildx
+ARG ARCH=
+# declare version to build image for
+ARG VERSION=
+
+# alpine is a multi-arch image
+FROM alpine:3
+LABEL org.opencontainers.image.source https://github.com/openzim/kiwix-tools
+
+# TARGETARCH is injected by buildx
+ARG TARGETARCH
+ARG VERSION
+ARG ARCH
+
+# copy built dumb-init
+COPY --from=builder /dumb-init-1.2.5/dumb-init /usr/bin/dumb-init
+
+# find and store arch in image, using (in this order):
+# $TARGETARCH || --build-arg ARCH (not using buildx) || amd64
+RUN echo "amd64" > /etc/docker_arch && \
+    if [ ! -z "$ARCH" ] ; then echo "$ARCH" > /etc/docker_arch ; fi && \
+    if [ ! -z "$TARGETARCH" ] ; then echo "$TARGETARCH" > /etc/docker_arch ; fi
+
+# decide which kiwix arch to download later (`armhf` for all arm* and x86_64 otherwise)
+RUN if [ $(cut -c 1-3 /etc/docker_arch) = "arm" ] ; then echo "armhf" > /etc/kiwix_arch ; else echo "x86_64" > /etc/kiwix_arch ; fi
+
+# Install kiwix-tools
+RUN url="http://mirror.download.kiwix.org/release/kiwix-tools/kiwix-tools_linux-$(cat /etc/kiwix_arch)-$VERSION.tar.gz" && \
+    echo "URL: $url" && \
+    wget -q -O - $url | tar -xz && \
+    mv kiwix-tools*/kiwix-* /usr/local/bin && \
+    rm -r kiwix-tools*
+
+# expose kiwix-serve default port
+EXPOSE 80
+
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+CMD ["/bin/sh", "-c", "echo 'Welcome to kiwix-tools! The following binaries are available:' && ls /usr/local/bin/"]

docker/README.md

@@ -0,0 +1,32 @@
+Kiwix-tools Docker image
+===
+
+- Available on [docker.io](https://hub.docker.com/r/kiwix/kiwix-tools) and [ghcr.io](https://ghcr.io/kiwix/kiwix-tools).
+- multi-arch (`linux/amd64`, `linux/arm64`, `linux/arm/v7`)
+- based on official `kiwix-tools` binaries.
+
+## Usage
+
+``` sh
+$ docker run -it kiwix/kiwix-tools:3.1.2
+
+Welcome to kiwix-tools! The following binaries are available:
+kiwix-manage  kiwix-read    kiwix-search  kiwix-serve
+```
+
+`kiwix-tools` operates on zim files. You shall mount a volume to access the files.
+
+```sh
+docker run -v $(pwd):/data -it kiwix/kiwix-tools kiwix-read --suggest="Mali" /data/wikipedia_fr_test.zim
+```
+
+## Building and reusing
+
+- `kiwix/kiwix-tools` is multi-arch and is ideally built using `buildx`.
+- requires a `--build-arg VERSION=` with the kiwix-tools release.
+- can be built using `docker build` in which case it expects an additionnal `--build-arg ARCH=arm` for arm. Otherwise defaults to `amd64`.
+
+**Notes:**
+
+- `wget` in `alpine:3` on `arm/v7` (__inside github action only__) crashes when downloading from HTTPs locations. Keep http-only in Dockerfile.
+- Was also unhappy when using the mirrors so it's using `mirror.download` on purpose.

docker/server/Dockerfile

@@ -0,0 +1,14 @@
+ARG VERSION=latest
+
+# kiwix-tools is multi-arch
+FROM kiwix/kiwix-tools:$VERSION
+LABEL org.opencontainers.image.source https://github.com/openzim/kiwix-tools
+
+# expose kiwix-serve default port and workdir
+EXPOSE 80
+VOLUME /data
+WORKDIR /data
+
+COPY ./start.sh /usr/local/bin/
+
+ENTRYPOINT ["/usr/bin/dumb-init", "--", "/usr/local/bin/start.sh"]

docker/server/README.md

@@ -0,0 +1,36 @@
+Kiwix serve Docker image
+========================
+
+With local ZIM file(s)
+----------------------
+
+* Download a ZIM file from <https://wiki.kiwix.org/wiki/Content>
+
+* Given `wikipedia.zim` and `wiktionary.zim` reside in `/tmp/zim/`, execute the following:
+
+```bash
+docker run -v /tmp/zim:/data -p 8080:80 kiwix/kiwix-serve wikipedia.zim wiktionary.zim
+```
+
+With remote ZIM file
+--------------------
+
+```bash
+docker run -e "DOWNLOAD=https://download.kiwix.org/zim/wikipedia_bm_all.zim" -p 8080:80 kiwix/kiwix-serve
+```
+
+ARM
+---
+
+Build an image for an ARM based GNU/Linux:
+```bash
+docker build . -t kiwix/kiwix-serve:latest --build-arg ARCH="arm32v7/"
+```
+
+You can also deploy kiwix with [`docker-compose`](https://docs.docker.com/compose/). Check out a sample at [docker-compose.yml.example](docker-compose.yml.example)
+
+Screenshots
+-----------
+
+![screenshot_1.png](https://github.com/kiwix/kiwix-tools/raw/master/docker/server/pictures/screenshot_1.png)
+![screenshot_2.png](https://github.com/kiwix/kiwix-tools/raw/master/docker/server/pictures/screenshot_2.png)

docker/server/docker-compose.yml.example

@@ -0,0 +1,14 @@
+version: '3.3'
+services:
+  kiwix-serve:
+      ports:
+        - 8080:80
+      image: kiwix/kiwix-serve
+      # uncomment next 4 lines to use it with local zim file in /tmp/zim
+      # volumes:
+      #   - /tmp/zim:/data
+      # command:
+      #   - *.zim
+      # uncomment next 2 lines to use it with remote zim file
+      # environment:
+      #   - 'DOWNLOAD=https://download.kiwix.org/zim/wikipedia_bm_all.zim'

docker/server/start.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# Download if necessary a file
+if [ ! -z "$DOWNLOAD" ]
+then
+    ZIM=`basename $DOWNLOAD`
+    wget $DOWNLOAD -O "$ZIM"
+
+    # Set arguments
+    if [ "$#" -eq "0" ]
+    then
+        set -- "$@" $ZIM
+    fi
+fi
+
+CMD="/usr/local/bin/kiwix-serve --port=80 $@"
+echo $CMD
+$CMD
+
+# If error, print the content of /data
+if [ $? -ne 0 ]
+then
+    echo "Here is the content of /data:"
+    find /data -type f
+fi

format_code.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/bash
+
+files=(
+"src/installer/kiwix-install.cpp"
+"src/searcher/kiwix-search.cpp"
+"src/reader/kiwix-read.cpp"
+"src/manager/kiwix-manage.cpp"
+"src/server/kiwix-serve.cpp"
+)
+
+for i in "${files[@]}"
+do
+  echo $i
+  clang-format -i -style=file $i
+done

meson.build

@@ -1,72 +1,28 @@
-project('kiwix-tools', 'cpp')
+project('kiwix-tools', 'cpp',
+  version : '3.3.0',
+  license : 'GPL',
+  default_options: ['c_std=c11', 'cpp_std=c++11', 'werror=true'])
 
 compiler = meson.get_compiler('cpp')
 
+add_global_arguments('-DKIWIX_TOOLS_VERSION="@0@"'.format(meson.project_version()), language : 'cpp')
+
 static_linkage = get_option('static-linkage')
 if static_linkage
   add_global_link_arguments('-static-libstdc++', '--static', language:'cpp')
 endif
 
 thread_dep = dependency('threads')
-kiwixlib_dep = dependency('kiwix', static:static_linkage)
-microhttpd_dep = dependency('libmicrohttpd', static:static_linkage)
-z_dep = dependency('zlib', static:static_linkage)
+kiwixlib_dep = dependency('kiwix', version:'>=11.0.0', static:static_linkage)
+libzim_dep = dependency('libzim', version:'>=7.2.0', static:static_linkage)
 
-# Idealy we should not have more dependency, however :
-# We should declare we use ctpp2 in kiwixlib in the pkg-config file.
-# But there is no pkg-config file for ctpp2. Once one exists, no need to
-# declare the dependency here
-ctpp2_prefix_install = get_option('ctpp2-install-prefix')
-find_library_in_compiler = meson.version().version_compare('>=0.31.0')
-if ctpp2_prefix_install == ''
-  if not compiler.has_header('ctpp2/CTPP2Logger.hpp')
-    error('ctpp2/CTPP2Logger.hppnot found')
+all_deps = [thread_dep, kiwixlib_dep, libzim_dep]
+
+if static_linkage
+  librt = compiler.find_library('rt', required:false)
+  if librt.found()
+    all_deps += librt
   endif
-  if find_library_in_compiler
-    ctpp2_lib = compiler.find_library('ctpp2')
-  else
-    ctpp2_lib = find_library('ctpp2')
-  endif
-  link_args = ['-lctpp2']
-  if meson.is_cross_build()
-    if host_machine.system() == 'windows'
-      link_args += ['-liconv']
-    endif
-  endif
-  ctpp2_dep = declare_dependency(link_args:link_args)
-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 not compiler.has_header('ctpp2/CTPP2Logger.hpp', args:ctpp2_include_args)
-    error('ctpp2/CTPP2Logger.hpp not found')
-  endif
-  ctpp2_include_path = include_directories(ctpp2_include_path, is_system:true)
-  ctpp2_lib_path = ctpp2_prefix_install+'/lib'
-  ctpp2_lib = compiler.find_library('ctpp2', dirs:ctpp2_lib_path)
-  link_args = ['-L'+ctpp2_lib_path, '-lctpp2']
-  if meson.is_cross_build()
-    if host_machine.system() == 'windows'
-      link_args += ['-liconv']
-    endif
-  endif
-  ctpp2_dep = declare_dependency(include_directories:ctpp2_include_path, link_args:link_args)
 endif
 
-# This is a temporary workaround until xapian fix it's xapian-core.pc
-# For a correct dependency checking we should test if uuid is really installed
-# but for a workaround, we assume that in xapian is installed, uuid also.
-if meson.is_cross_build() and host_machine.system() == 'windows'
-    # xapian doesn't use uuid on windows.
-    uuid_dep = declare_dependency()
-else
-    uuid_dep = declare_dependency(link_args:['-luuid', '-lrt'])
-endif
-
-all_deps = [thread_dep, kiwixlib_dep, microhttpd_dep, ctpp2_dep, z_dep, uuid_dep]
-
-#subdir('include')
-subdir('static')
 subdir('src')

meson_options.txt

@@ -1,4 +1,2 @@
 option('static-linkage', type : 'boolean', value : false,
   description : 'Create statically linked binaries.')
-option('ctpp2-install-prefix', type : 'string', value : '',
-  description : 'Prefix where ctpp libs has been installed')

src/indexer/kiwix-index.cpp

@@ -1,107 +0,0 @@
-/*
- * Copyright 2009-2013 Emmanuel Engelhart <kelson@kiwix.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU  General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include <kiwix/xapianIndexer.h>
-#include <getopt.h>
-
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <unistd.h>
-#endif
-
-void usage() {
-    cout << "Usage: kiwix-index [--verbose] ZIM_PATH INDEX_PATH" << endl;
-    exit(1);
-}
-
-int main(int argc, char **argv) {
-
-  /* Init the variables */
-  char *zimFilePath = NULL;
-  char *indexPath = NULL;
-  bool verboseFlag = false;
-  int option_index = 0;
-  int c = 0;
-
-  kiwix::XapianIndexer *indexer = NULL;
-
-  /* Argument parsing */
-  while (42) {
-
-    static struct option long_options[] = {
-      {"verbose", no_argument, 0, 'v'},
-      {0, 0, 0, 0}
-    };
-
-    if (c != -1) {
-      c = getopt_long(argc, argv, "v", long_options, &option_index);
-
-      switch (c) {
-	case 'v':
-	  verboseFlag = true;
-	  break;
-      }
-    } else {
-      if (optind < argc) {
-	if (zimFilePath == NULL) {
-	  zimFilePath = argv[optind++];
-	} else if (indexPath == NULL) {
-	  indexPath = argv[optind++];
-	} else {
-	  usage();
-	}
-      } else {
-	break;
-      }
-    }
-  }
-
-  /* Check if we have enough arguments */
-  if (zimFilePath == NULL || indexPath == NULL) {
-    usage();
-  }
-
-  /* Try to prepare the indexing */
-  try {
-    indexer = new kiwix::XapianIndexer();
-  } catch (...) {
-    cerr << "Unable to index '" << zimFilePath << "'." << endl;
-    exit(1);
-  }
-
-  /* Start the indexing */
-  if (indexer != NULL) {
-    indexer->setVerboseFlag(verboseFlag);
-    indexer->start(zimFilePath, indexPath);
-    while (indexer->isRunning()) {
-      if (verboseFlag)
-	cout << indexer->getProgression() << "% of all the articles indexed..." << endl;
-      kiwix::sleep(1000);
-    }
-    if (verboseFlag)
-      cout << "100% of the articles were successfuly indexed..." << endl;
-    delete indexer;
-  } else {
-    cerr << "Unable instanciate the Kiwix indexer." << endl;
-    exit(1);
-  }
-
-  exit(0);
-}

src/indexer/meson.build

@@ -1,3 +0,0 @@
-executable('kiwix-index', ['kiwix-index.cpp'],
-  dependencies:all_deps,
-  install:true)

src/installer/kiwix-install.cpp

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

src/installer/meson.build

@@ -1,3 +0,0 @@
-executable('kiwix-install', ['kiwix-install.cpp'],
-  dependencies:all_deps,
-  install:true)

src/man/fr/kiwix-compact.1

@@ -1,23 +0,0 @@
-.TH KIWIX 1 "21 May 2012"
-.SH NAME
-kiwix-compact \- Compacteur d'index pour fichier ZIM
-.SH SYNOPSIS
-.IX Header SYNOPSIS
-kiwix-compact INDEX_PATH
-.SH DESCRIPTION
-.PP
-Compacte les fichiers d'index des ZIM à l'aide de xapian-compact.
-
-.TP
-\fBINDEX_PATH\fR
-Chemin de l'index plein texte à compacter.
-
-.SH SEE ALSO
-kiwix(1) kiwix-index(1) kiwix-manage(1) xapian-compact(1)
-.br
-kiwix-install(1) kiwix-serve(1)
-
-.SH AUTHOR
-Emmanuel Engelhart <kelson@kiwix.org>
-.br
-Vasudev Kamath <kamathvasudev@gmail.com> (Manual)

src/man/fr/kiwix-index.1

@@ -1,31 +0,0 @@
-.TH KIWIX 1 "21 May 2012"
-.SH NAME
-kiwix\-index \- Indexeur de fichiers ZIM
-.SH SYNOPSIS
-.IX Header SYNOPSIS
-kiwix\-index [\-\-backend|\-b=xapian|clucene] ZIM_PATH INDEX_PATH
-.SH DESCRIPTION
-.PP
-Génère un index plein texte xapian ou cLucene pour un fichier ZIM.
-
-.TP
-\fB\-\-backend=xapian|clucene\fR
-Séléctionne un moteur d'indexation.
-
-.TP
-\fBZIM_PATH\fR
-Chemin du fichier ZIM à indexer.
-
-.TP
-\fBINDEX_PATH\fR
-Chemin où enregistrer l'index plein texte.
-
-.SH SEE ALSO
-kiwix\-compact(1) kiwix\-manage(1) kiwix\-serve(1)
-.br
-kiwix(1) kiwix\-install(1)
-
-.SH AUTHOR
-Emmanuel Engelhart <kelson@kiwix.org>
-.br
-Vasudev Kamath <kamathvasudev@gmail.com> (Manual)

src/man/fr/kiwix-install.1

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

src/man/fr/kiwix-manage.1

@@ -57,8 +57,8 @@ Chemin vers l'index plein texte correspondant au fichier ZIM.
 Définit l'adresse URL corresponsant au fichier ZIM pour pouvoir être téléchargé depuis Kiwix.
 
 .SH SEE ALSO
-kiwix(1) kiwix\-index(1) kiwix\-install(1) kiwix\-serve(1) kiwix\-compact(1)
+kiwix(1) kiwix\-install(1) kiwix\-serve(1)
 .SH AUTHOR
 Emmanuel Engelhart <kelson@kiwix.org>
 .br
-Vasudev Kamath <kamathvasudev@gmail.com> (Manual)
+Vasudev Kamath <kamathvasudev@gmail.com> (Manual)

src/man/fr/kiwix-serve.1

@@ -52,10 +52,10 @@ Chemin vers le fichier bibliothèque de Kiwix.
 Le fichier bibliothèque est un fichier XML créé avec \fBkiwix-manage\fB.
 
 .SH SEE ALSO
-kiwix(1) kiwix\-index(1) kiwix\-manage(1)
+kiwix(1) kiwix\-manage(1)
 .br
-kiwix\-install(1) kiwix\-compact(1)
+kiwix\-install(1)
 .SH AUTHOR
 Emmanuel Engelhart <kelson@kiwix.org>
 .br
-Vasudev Kamath <kamathvasudev@gmail.com> (Manual)
+Vasudev Kamath <kamathvasudev@gmail.com> (Manual)

src/man/fr/kiwix.1

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

src/man/fr/meson.build

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

src/man/kiwix-compact.1

@@ -1,23 +0,0 @@
-.TH KIWIX 1 "21 May 2012"
-.SH NAME
-kiwix-compact \- ZIM index compacter
-.SH SYNOPSIS
-.IX Header SYNOPSIS
-kiwix-compact INDEX_PATH
-.SH DESCRIPTION
-.PP
-Compacts ZIM index files used by Kiwix using xapian-compact
-
-.TP
-\fBINDEX_PATH\fR
-Full-text index path to compact.
-
-.SH SEE ALSO
-kiwix(1) kiwix-index(1) kiwix-manage(1) xapian-compact(1)
-.br
-kiwix-install(1) kiwix-serve(1)
-
-.SH AUTHOR
-Emmanuel Engelhart <kelson@kiwix.org>
-.br
-Vasudev Kamath <kamathvasudev@gmail.com> (Manual)

src/man/kiwix-index.1

@@ -1,31 +0,0 @@
-.TH KIWIX 1 "21 May 2012"
-.SH NAME
-kiwix\-index \- Kiwix ZIM Indexer
-.SH SYNOPSIS
-.IX Header SYNOPSIS
-kiwix\-index [\-\-backend|\-b=xapian|clucene] ZIM_PATH INDEX_PATH
-.SH DESCRIPTION
-.PP
-Generates a xapian or clucene full-text index for a ZIM file.
-
-.TP
-\fB\-\-backend=xapian|clucene\fR
-Select an indexing backend.
-
-.TP
-\fBZIM_PATH\fR
-ZIM file path to index.
-
-.TP
-\fBINDEX_PATH\fR
-Path to save the full\-text index to.
-
-.SH SEE ALSO
-kiwix\-compact(1) kiwix\-manage(1) kiwix\-serve(1)
-.br
-kiwix(1) kiwix\-install(1)
-
-.SH AUTHOR
-Emmanuel Engelhart <kelson@kiwix.org>
-.br
-Vasudev Kamath <kamathvasudev@gmail.com> (Manual)

src/man/kiwix-install.1

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

src/man/kiwix-manage.1

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

src/man/kiwix-read.1

@@ -0,0 +1,18 @@
+.TH KIWIX-READ "1" "July 2020" "kiwix-tools" "User Commands"
+.SH NAME
+kiwix-read \- Read ZIM file content
+.SH SYNOPSIS
+\fBkiwix-read\fR [\-\-verbose] [\-\-version] \-\-suggest=PATTERN ZIM\fR
+.SH DESCRIPTION
+.TP
+ZIM
+ZIM file to search
+.TP
+\fB\-\-verbose\fR
+Enable extra output
+.TP
+\fB\-\-version\fR
+print software version
+.TP
+\fB\-\-suggest=PATTERN\fR
+Get search suggestions for the provided pattern

src/man/kiwix-search.1

@@ -0,0 +1,21 @@
+.TH KIWIX-SEARCH "1" "July 2020" "kiwix-tools" "User Commands"
+.SH NAME
+kiwix-search \- find articles using a fulltext search pattern
+.SH SYNOPSIS
+\fBkiwix-search\fR [OPTIONS] ZIM PATTERN\fR
+.SH DESCRIPTION
+.TP
+ZIM
+ZIM file to search
+.TP
+PATTERN
+Words or parts of words to search for in the ZIM file
+.TP
+\fB\-s\fR, \fB\-\-suggestion\fR
+Suggest article titles based on the PATTERN instead of a fulltext search
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+print software version
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Give details about the search process

src/man/kiwix-serve.1

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

src/man/meson.build

@@ -1,5 +1,5 @@
-install_man('kiwix-index.1',
-            'kiwix-install.1',
-            'kiwix-manage.1',
+install_man('kiwix-manage.1',
+            'kiwix-read.1',
+            'kiwix-search.1',
             'kiwix-serve.1')
 subdir('fr')

src/manager/kiwix-manage.cpp

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

src/meson.build

@@ -1,9 +1,4 @@
-
-
-subdir('indexer')
-subdir('installer')
 subdir('manager')
-subdir('reader')
 subdir('searcher')
 subdir('server')
 subdir('man')

src/reader/kiwix-read.cpp

@@ -1,119 +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 <getopt.h>
-#include <unistd.h>
-#include <string>
-#include <map>
-#include <kiwix/common/tree.h>
-#include <kiwix/reader.h>
-
-void usage() {
-    cout << "Usage: kiwix-read --suggest=<PATTERN> ZIM_FILE_PATH" << endl;
-    exit(1);
-}
-
-void updateSuggestionTree(tree< pair<string, unsigned> > &suggestionTree, string suggestion) {
-  return;
-}
-
-int main(int argc, char **argv) {
-
-  /* Init the variables */
-  const char *filePath = NULL;
-  const char *pattern = NULL;
-  int option_index = 0;
-  int c = 0;
-
-  kiwix::Reader *reader = NULL;
-
-  /* Argument parsing */
-  while (42) {
-
-    static struct option long_options[] = {
-      {"verbose", no_argument, 0, 'v'},
-      {"suggest", required_argument, 0, 's'},
-      {0, 0, 0, 0}
-    };
-    
-    if (c != -1) {
-      c = getopt_long(argc, argv, "vs:", long_options, &option_index);
-
-      switch (c) {
-	case 'v':
-	  break;
-      case 's':
-	pattern = optarg;
-	break;
-      }
-    } else {
-      if (optind < argc) {
-	if (filePath == NULL) {
-	  filePath = argv[optind++];
-	} else {
-	  usage();
-	}
-      } else {
-	break;
-      }
-    }
-  }
-
-  /* Check if we have enough arguments */
-  if (filePath == NULL) {
-    usage();
-  }
-
-  /* Instanciate the reader */
-  reader = new kiwix::Reader(filePath);
-
-  /* Start to read an article */
-  if (reader != NULL) {
-    string mainPageUrl = reader->getMainPageUrl();
-    string content;
-    string contentType;
-    unsigned int contentLength = 0;
-    string suggestion;
-    
-    if (pattern != NULL) {
-      std::cout << "Searching suggestions for: " << pattern << std::endl;
-
-      reader->searchSuggestionsSmart(pattern, 10);
-      while (reader->getNextSuggestion(suggestion)) {
-	std::cout << suggestion << std::endl;
-      }
-    }
-
-    /*
-    if (reader->getContentByUrl(mainPageUrl, content, contentLength, contentType)) {
-      cout << content << endl;
-    }
-    */
-
-    //    tree< pair<string, unsigned> > tree;
-    //updateSuggestionTree(tree, string(suggestion));
-
-    delete reader;
-  } else {
-    cerr << "Unable instanciate the Kiwix reader." << endl;
-    exit(1);
-  }
-
-  exit(0);
-}

src/reader/meson.build

@@ -1,3 +0,0 @@
-executable('kiwix-read', ['kiwix-read.cpp'],
-  dependencies:all_deps,
-  install:true)

src/searcher/kiwix-search.cpp

@@ -18,99 +18,104 @@
  */
 
 #include <getopt.h>
-#include <unistd.h>
-#include <kiwix/xapianSearcher.h>
 
-enum supportedBackend { XAPIAN };
+#include <zim/search.h>
+#include <zim/suggestion.h>
 
-void usage() {
-    cout << "Usage: kiwix-search [--verbose|-v] [--backend|-b=xapian] INDEX_PATH SEARCH" << endl;
-    exit(1);
+#include <iostream>
+
+#include "../version.h"
+
+using namespace std;
+
+void usage()
+{
+  cout << "Usage: kiwix-search [OPTIONS] ZIM PATTERN" << endl << endl
+       << "  kiwix-search allows one to find articles based on the a fulltext search pattern." << endl << endl
+       << "  ZIM is the full path of the ZIM file." << endl
+       << "  PATTERN is/are word(s) - or part of - to search in the ZIM." << endl << endl
+       << "  -s, --suggestion\tSuggest article titles based on the few letters of the PATTERN instead of making a fulltext search. Work a bit like a completion solution." << endl
+       << "  -v, --verbose\t\tGive details about the search process" << endl
+       << "  -V, --version\t\tPrint software version" << endl;
+  exit(1);
 }
 
-int main(int argc, char **argv) {
-
+int main(int argc, char** argv)
+{
   /* Init the variables */
-  //const char *indexPath = "/home/itamar/.www.kiwix.org/kiwix/43k0i1j4.default/6d2e587b-d586-dc6a-dc6a-e4ef035a1495d15c.index";
-  //const char *indexPath = "/home/itamar/testindex";
-  const char *indexPath = NULL;
-  const char *search = NULL;
+  // const char *indexPath =
+  // "/home/itamar/.www.kiwix.org/kiwix/43k0i1j4.default/6d2e587b-d586-dc6a-dc6a-e4ef035a1495d15c.index";
+  // const char *indexPath = "/home/itamar/testindex";
+  const char* zimPath = NULL;
+  const char* search = NULL;
   bool verboseFlag = false;
+  bool suggestionFlag = false;
   int option_index = 0;
   int c = 0;
-  supportedBackend backend = XAPIAN;
-
-  kiwix::Searcher *searcher = NULL;
 
   /* Argument parsing */
   while (42) {
-
-    static struct option long_options[] = {
-      {"verbose", no_argument, 0, 'v'},
-      {"backend", required_argument, 0, 'b'},
-      {0, 0, 0, 0}
-    };
+    static struct option long_options[]
+        = {{"verbose", no_argument, 0, 'v'},
+           {"suggestion", no_argument, 0, 's'},
+           {"version", no_argument, 0, 'V'},
+           {0, 0, 0, 0}};
 
     if (c != -1) {
-      c = getopt_long(argc, argv, "vb:", long_options, &option_index);
+      c = getopt_long(argc, argv, "Vvsb:", long_options, &option_index);
 
       switch (c) {
-	case 'v':
-	  verboseFlag = true;
-	  break;
-	case 'b':
-	  if (!strcmp(optarg, "xapian")) {
-	    backend = XAPIAN;
-	  } else {
-	    usage();
-	  }
-	  break;
+        case 'v':
+          verboseFlag = true;
+          break;
+        case 'V':
+          version();
+          return 0;
+        case 's':
+          suggestionFlag = true;
+          break;
       }
     } else {
       if (optind < argc) {
-	if (indexPath == NULL) {
-	  indexPath = argv[optind++];
-	} else if (search == NULL) {
-	  search = argv[optind++];
-	} else {
-	  cout << indexPath << endl;
-	  usage();
-	}
+        if (zimPath == NULL) {
+          zimPath = argv[optind++];
+        } else if (search == NULL) {
+          search = argv[optind++];
+        } else {
+          cout << zimPath << endl;
+          usage();
+        }
       } else {
-	break;
+        break;
       }
     }
   }
 
   /* Check if we have enough arguments */
-  if (indexPath == NULL || search == NULL) {
+  if (zimPath == NULL || search == NULL) {
     usage();
   }
 
   /* Try to prepare the indexing */
   try {
-      searcher = new kiwix::XapianSearcher(indexPath);
-  } catch (...) {
-    cerr << "Unable to search through index '" << indexPath << "'." << endl;
-    exit(1);
-  }
+    zim::Archive archive(zimPath);
 
-  /* Start the indexing */
-  if (searcher != NULL) {
-    string searchString(search);
-    searcher->search(searchString, 0, 10);
-    string url;
-    string title;
-    unsigned int score;
-    while (searcher->getNextResult(url, title, score)) {
-      cout << title << endl;
+    if (suggestionFlag) {
+      zim::SuggestionSearcher searcher(archive);
+      searcher.setVerbose(verboseFlag);
+      for (const auto& r : searcher.suggest(search).getResults(0, 10) ) {
+        cout << r.getTitle() << endl;
+      }
+    } else {
+      zim::Searcher searcher(archive);
+      searcher.setVerbose(verboseFlag);
+      const zim::Query query(search);
+      for (const auto& r : searcher.search(query).getResults(0, 10) ) {
+        cout << r.getTitle() << endl;
+      }
     }
-
-    delete searcher;
-
-    //      kiwix::XapianSearcher::terminate();
-  } else {
-    cerr << "Unable instanciate the Kiwix searcher." << endl;
+  } catch ( const std::runtime_error& err)  {
+    cerr << err.what() << endl;
     exit(1);
   }
 

src/server/benchmark.sh

@@ -1,72 +0,0 @@
-#!/bin/bash
-
-# Parse command line
-zim=$1
-serve=$2
-if (( $# != 2 ))
-then
-    echo "Usage: ./benchmark ZIM_PATH KIWIX-SERVE_PATH"
-    exit 1
-fi
-
-# Constants
-delay=0.01
-top_log=/tmp/top.log
-top_calc=/tmp/top.calc
-
-# Available memory
-memory_kb=`cat /proc/meminfo | grep "MemTotal" | tr -d " " | cut -f2 -d: | sed -e 's/[^0123456789]//g'`
-memory_mb=`echo "scale=2;$memory_kb/1024" | bc -l`
-
-# Start Kiwix-serve
-echo "Starting kiwix-serve to be tested..."
-$serve --port=8080 "$zim" &
-serve_pid=$!
-
-# Start top to monitor resource usage
-top -d $delay -b -p $serve_pid | grep $serve_pid > "$top_log" &
-top_pid=$!
-
-# Print environnement informations
-echo "Process to monitor: $serve_pid"
-echo "Monitoring process: $top_pid"
-echo "Monitoring delay:   $delay s"
-echo "ZIM file path:      $zim"
-echo "Kiwix-serve path:   $serve"
-echo "Total memory:       $memory_mb MB"
-echo
-
-# Compute artice list
-echo "Computing article list snippet..."
-articles=`zimdump -l $zim | grep ".html" | shuf | head -n 1000`
-
-# Run wget against kiwix-serve
-start_date=`date +%s`
-for LINE in $articles
-do
-    echo "Scrapping $LINE..."
-    wget --quiet p -P /dev/shm/tmp "http://localhost:8080/wikipedia_en_medicine_2016-09/A/$LINE"
-    rm -rf /dev/shm/tmp
-done
-end_date=`date +%s`
-
-# Kill top instance
-kill -s STOP $top_pid 2>&1 > /dev/null
-sed -i '$ d' "$top_log"
-times=`cat "$top_log" | wc -l`
-
-# Compute KPI
-duration=`echo "$end_date-$start_date" | bc -l`
-cpu_percent=`cat "$top_log" | sed -r -e "s;\s\s*; ;g" -e "s;^ *;;" | cut -d' ' -f9 | tr '\n' '+0' | sed -r -e "s;(.*)[+]$;\1;" -e "s/.*/scale=2\n(&)\/$times\nquit\n/" > "$top_calc" ; bc -q "$top_calc"`
-memory_percent=`cat "$top_log" | sed -r -e "s;\s\s*; ;g" -e "s;^ *;;" | cut -d' ' -f10 | tr '\n' '+' | sed -r -e "s;(.*)[+]$;\1;" -e "s/.*/scale=2\n(&)\/$times\nquit\n/" > "$top_calc" ; bc -q "$top_calc"`
-memory_absolut=`echo "scale=2;$memory_mb/100*$memory_percent" | bc -l`
- 
-echo 
-echo "Measure count:      $times"
-echo "Duration:           $duration s"
-echo "CPU (average):      $cpu_percent %"
-echo "Memory (average):   $memory_absolut MB"
-
-# Kill kiwix-serve & top instances
-kill -s STOP $serve_pid 2>&1 > /dev/null
-#rm "$top_log" "$top_calc"

src/server/meson.build

@@ -1,6 +1,5 @@
 
 sources = ['kiwix-serve.cpp']
-sources += server_resources
 
 executable('kiwix-serve', sources,
   dependencies:all_deps,

src/version.h

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2009-2016 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_TOOLS_VERSION_H_
+#define _KIWIX_TOOLS_VERSION_H_
+
+#ifndef KIWIX_TOOLS_VERSION
+  #define KIWIX_TOOLS_VERSION "undefined"
+#endif
+
+#include <kiwix/version.h>
+#include <zim/version.h>
+
+void version()
+{
+  std::cout << "kiwix-tools " << KIWIX_TOOLS_VERSION << std::endl << std::endl;
+  kiwix::printVersions();
+  std::cout << std::endl;
+  zim::printVersions();
+}
+
+#endif //_KIWIX_TOOLs_VERSION_H_

static/meson.build

@@ -1,4 +0,0 @@
-
-res_compiler = find_program('compile_resources.py')
-
-subdir('server')

static/server/home.html.tmpl

@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta charset="UTF-8" />
-  <title>Welcome to Kiwix Server</title>
-  <script type="text/javascript" src="/skin/jquery-ui/external/jquery/jquery.js"></script>
-  <script type="text/javascript" src="/skin/jquery-ui/jquery-ui.min.js"></script>
-  <link type="text/css" href="/skin/jquery-ui/jquery-ui.min.css" rel="Stylesheet" />
-  <link type="text/css" href="/skin/jquery-ui/jquery-ui.theme.min.css" rel="Stylesheet" />
-<script>
-$(function() {
-$( "#accordion" ).accordion();
-});
-</script>
-</head>
-<body class="kiwix">
-
-<div id="accordion" class="kiwix">
-  __BOOKS__
-</div>
-</body>
-</html>

static/server/include.html.part

@@ -1,24 +0,0 @@
-<script type="text/javascript" src="/skin/jquery-ui/external/jquery/jquery.js"></script>
-<script type="text/javascript" src="/skin/jquery-ui/jquery-ui.min.js"></script>
-<script>
-  var jk = jQuery.noConflict();
-  jk(function() {
-  jk( "#kiwixsearchbox" ).autocomplete({
-
-  source: "/suggest?content=__CONTENT__",
-  dataType: "json",
-  cache: false,
-
-  select: function(event, ui) {
-  jk( "#kiwixsearchbox" ).val(ui.item.value);
-  jk( "#kiwixsearchform" ).submit();
-  },
-
-  });
-  });
-
-  /* cybook hack */
-  if (navigator.userAgent.indexOf("bookeen/cybook") != -1) {
-  	jk("html").addClass("cybook");
-  }
-</script>

static/server/meson.build

@@ -1,8 +0,0 @@
-
-server_resources = custom_target('resources',
-  input: 'resources_list.txt',
-  output: ['server-resources.cpp', 'server-resources.h'],
-  command:[res_compiler, '--cxxfile', '@OUTPUT0@', '--hfile', '@OUTPUT1@', '@INPUT@'],
-  build_always: true
-)
-  

static/server/resources_list.txt

@@ -1,23 +0,0 @@
-jquery-ui/jquery-ui.structure.min.css
-jquery-ui/jquery-ui.min.js
-jquery-ui/external/jquery/jquery.js
-jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png
-jquery-ui/images/ui-bg_flat_75_ffffff_40x100.png
-jquery-ui/images/ui-icons_222222_256x240.png
-jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png
-jquery-ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png
-jquery-ui/images/ui-icons_2e83ff_256x240.png
-jquery-ui/images/ui-icons_cd0a0a_256x240.png
-jquery-ui/images/ui-icons_888888_256x240.png
-jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png
-jquery-ui/images/animated-overlay.gif
-jquery-ui/images/ui-bg_glass_75_dadada_1x400.png
-jquery-ui/images/ui-icons_454545_256x240.png
-jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png
-jquery-ui/jquery-ui.theme.min.css
-jquery-ui/jquery-ui.min.css
-home.html.tmpl
-include.html.part
-taskbar.css
-taskbar.html.part

static/server/taskbar.css

@@ -1,50 +0,0 @@
-#kiwixtoolbar {
-    position: fixed;
-    padding: .5em;
-    left:0;
-    right:0;
-    top: 0;
-    z-index:100;
-    max-height: 2.8em;
-}
-
-#kiwixsearchbox {
-    width: 20em;
-}
-
-.kiwixsearch {
-	float: right;
-}s
-
-/* Try to fix buggy stuff in jquery-ui autocomplete */
-#ui-id-1, .ui-autocomplete {
-    background: white !important;
-    border: solid 1px grey !important;
-}
-
-li.ui-state-focus {
-    font-weight: bold;
-}
-
-/* Specific CSS for Bookeen Cybook device (800x600 B&W ereader) */
-.cybook #kiwixtoolbar button, .cybook #kiwixtoolbar input {
-	font-size: 1.5em;
-}
-.cybook #kiwixsearchbox {
-	width: 7em;
-}
-.cybook a {
-	text-decoration: underline;
-}
-
-@media only screen and (min--moz-device-pixel-ratio: 1.5),
-only screen and (-o-min-device-pixel-ratio: 1.5/1),
-only screen and (-webkit-min-device-pixel-ratio: 1.5),
-only screen and (min-device-pixel-ratio: 1.5) {
-    #kiwixtoolbar button, #kiwixtoolbar input {
-    	font-size: 2em;
-    }
-    #kiwixsearchbox {
-		width: 7em;
-	}
-}

static/server/taskbar.html.part

@@ -1,15 +0,0 @@
-<link type="text/css" href="/skin/jquery-ui/jquery-ui.min.css" rel="Stylesheet" />
-<link type="text/css" href="/skin/jquery-ui/jquery-ui.theme.min.css" rel="Stylesheet" />
-<span class="kiwix">
-  <span id="kiwixtoolbar" class="ui-widget-header">
-  	<a href="/"><button>Library</button></a>
-  	<a href="/__CONTENT__/"><button>Home</button></a>
-  	<a href="/random?content=__CONTENT__"><button>Random</button></a>
-  	<form class="kiwixsearch" method="GET" action="/search" id="kiwixsearchform">
-  	<input type="hidden" name="content" value="__CONTENT__" />
-  	<input autocomplete="off" class="ui-autocomplete-input" id="kiwixsearchbox" name="pattern" type="text">
-  	<input type="submit" value="Search">
-  	</form>
-  </span>
-</span>
-<div style="display: block; height: 3em;"></div>