Enter uriEncode()

.github/workflows/ci.yml

@@ -7,38 +7,42 @@ on:
   pull_request:
 
 jobs:
-  macOS:
-    runs-on: macos-12
-    env:
-      HOME: /Users/runner
+  Macos:
+    runs-on: macos-latest
     steps:
-      - name: Retrieve source code
-        uses: actions/checkout@v3
-
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Setup python 3.9
+        uses: actions/setup-python@v1
+        with:
+          python-version: '3.9'
       - name: Install packages
         run: |
           brew update
-          brew install pkg-config ninja meson
-
-      - name: Install dependencies
-        env:
-          ARCHIVE_NAME: deps2_osx_native_dyn_libkiwix.tar.xz
+          brew install gcovr pkg-config ninja || brew link --overwrite python
+      - name: Install python modules
+        run: pip3 install meson==0.49.2 pytest
+      - name: Install deps
+        shell: bash
         run: |
-          wget -O- https://tmp.kiwix.org/ci/${{env.ARCHIVE_NAME}} | tar -xJ -C ${{env.HOME}}
-
-      - name: Compile source code
-        env:
-          PKG_CONFIG_PATH: ${{env.HOME}}/BUILD_native_dyn/INSTALL/lib/pkgconfig
-          CPPFLAGS: -I${{env.HOME}}/BUILD_native_dyn/INSTALL/include
+          ARCHIVE_NAME=deps2_osx_native_dyn_libkiwix.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
-          ninja -C build
-
-      - name: Test libkiwix
+          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
         env:
           SKIP_BIG_MEMORY_TEST: 1
-          LD_LIBRARY_PATH: ${{env.HOME}}/BUILD_native_dyn/INSTALL/lib:${{env.HOME}}/BUILD_native_dyn/INSTALL/lib64
-        run: meson test -C build --verbose
 
   Linux:
     strategy:
@@ -80,7 +84,7 @@ jobs:
       HOME: /home/runner
     runs-on: ubuntu-latest
     container:
-      image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:36"
+      image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-31"
     steps:
     - name: Checkout code
       shell: python
@@ -133,9 +137,13 @@ jobs:
       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_')
-      uses: codecov/codecov-action@v3
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/package.yml

@@ -1,10 +1,5 @@
 name: Packages
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
+on: [push, pull_request]
 
 jobs:
   build-deb:
@@ -18,7 +13,7 @@ jobs:
           - ubuntu-focal
           - ubuntu-bionic
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       # Determine which PPA we should upload to
       - name: PPA
@@ -71,7 +66,7 @@ jobs:
           args: --no-sign
           ppa: ${{ steps.ppa.outputs.ppa }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v2
         with:
           name: Packages for ${{ matrix.distro }}
           path: output

README.md

@@ -190,7 +190,7 @@ To use JS provided by kiwix-serve you can use the following template to start wi
 - To get books listed using `index.js` add - `<div class="book__list"></div>` under body tag.
 - To get number of books listed add - `<h3 class="kiwixHomeBody__results"></h3>` under body tag.
 - To add language select box add - `<select id="languageFilter"></select>` under body tag.
-- To add category select box add - `<select id="categoryFilter"></select>` under body tag.
+- To add language select box add - `<select id="categoryFilter"></select>` under body tag.
 - To add search box for books use following form -
     ```
         <form id='kiwixSearchForm'>

android-kiwix-lib-publisher/.gitignore

@@ -0,0 +1,13 @@
+*.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

android-kiwix-lib-publisher/build.gradle

@@ -0,0 +1,25 @@
+// 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
+}

android-kiwix-lib-publisher/gradle.properties

@@ -0,0 +1,15 @@
+# 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

android-kiwix-lib-publisher/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#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

android-kiwix-lib-publisher/gradlew

@@ -0,0 +1,172 @@
+#!/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" "$@"

android-kiwix-lib-publisher/gradlew.bat

@@ -0,0 +1,84 @@
+@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

android-kiwix-lib-publisher/kiwixLibAndroid/.gitignore

@@ -0,0 +1 @@
+/build

android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle

@@ -0,0 +1,64 @@
+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.1.1' + (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")
+}
+

android-kiwix-lib-publisher/kiwixLibAndroid/proguard-rules.pro

@@ -0,0 +1,21 @@
+# 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

android-kiwix-lib-publisher/kiwixLibAndroid/src/main/AndroidManifest.xml

@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.kiwix.kiwixlib">
+
+    <application
+        android:allowBackup="true"
+        android:supportsRtl="true">
+
+    </application>
+
+</manifest>

android-kiwix-lib-publisher/settings.gradle

@@ -0,0 +1 @@
+include ':kiwixLibAndroid'

include/book.h

@@ -79,9 +79,7 @@ class Book
   bool isPathValid() const { return m_pathValid; }
   const std::string& getTitle() const { return m_title; }
   const std::string& getDescription() const { return m_description; }
-  DEPRECATED const std::string& getLanguage() const { return m_language; }
-  const std::string& getCommaSeparatedLanguages() const { return m_language; }
-  const std::vector<std::string> getLanguages() const;
+  const std::string& getLanguage() const { return m_language; }
   const std::string& getCreator() const { return m_creator; }
   const std::string& getPublisher() const { return m_publisher; }
   const std::string& getDate() const { return m_date; }

include/downloader.h

@@ -25,7 +25,6 @@
 #include <map>
 #include <memory>
 #include <stdexcept>
-#include <mutex>
 
 namespace kiwix
 {
@@ -44,14 +43,6 @@ class AriaError : public std::runtime_error {
 };
 
 
-/**
- * A representation of a current download.
- *
- * `Download` is not thread safe. User must care to not call method on a
- * same download from different threads.
- * However, it is safe to use different `Download`s from different threads.
- */
-
 class Download {
  public:
   typedef enum { K_ACTIVE, K_WAITING, K_PAUSED, K_ERROR, K_COMPLETE, K_REMOVED, K_UNKNOWN } StatusResult;
@@ -62,89 +53,19 @@ class Download {
     : mp_aria(p_aria),
       m_status(K_UNKNOWN),
       m_did(did) {};
-
-  /**
-   * Update the status of the download.
-   *
-   * This call make an aria rpc call and is blocking.
-   * Some download (started with a metalink) are in fact several downloads.
-   * - A first one to download the metadlink.
-   * - A second one to download the real file.
-   *
-   * If `follow` is true, updateStatus tries to detect that and tracks
-   * the second download when the first one is finished.
-   * By passing false to `follow`, `Download` will only track the first download.
-   *
-   * `getFoo` methods are based on the last statusUpdate.
-   *
-   * @param follow: Do we have to follow following downloads.
-   */
-  void updateStatus(bool follow);
-
-  /**
-   * Pause the download (and call updateStatus)
-   */
+  void updateStatus(bool follow=false);
   void pauseDownload();
-
-  /**
-   * Resume the download (and call updateStatus)
-   */
   void resumeDownload();
-
-  /**
-   * Cancel the download.
-   *
-   * A canceled downlod cannot be resume and updateStatus does nothing.
-   * However, you can still get information based on the last known information.
-   */
   void cancelDownload();
-
-  /*
-   * Get the status of the download.
-   */
-  StatusResult getStatus() const             { return m_status; }
-
-  /*
-   * Get the id of the download.
-   */
-  const std::string&  getDid() const         { return m_did; }
-
-  /*
-   * Get the id of the "second" download.
-   *
-   * Set only if the "first" download is a metalink and is complete.
-   */
-  const std::string&  getFollowedBy() const  { return m_followedBy; }
-
-  /*
-   * Get the total length of the download.
-   */
-  uint64_t     getTotalLength() const        { return m_totalLength; }
-
-  /*
-   * Get the completed length of the download.
-   */
-  uint64_t     getCompletedLength() const    { return m_completedLength; }
-
-  /*
-   * Get the download speed of the download.
-   */
-  uint64_t     getDownloadSpeed() const      { return m_downloadSpeed; }
-
-  /*
-   * Get the verified length of the download.
-   */
-  uint64_t     getVerifiedLength() const     { return m_verifiedLength; }
-
-  /*
-   * Get the path (local file) of the download.
-   */
-  const std::string&  getPath() const        { return m_path; }
-
-  /*
-   * Get the download uris of the download.
-   */
-  const std::vector<std::string>&  getUris() const { return m_uris; }
+  StatusResult getStatus()          { return m_status; }
+  std::string  getDid()             { return m_did; }
+  std::string  getFollowedBy()      { return m_followedBy; }
+  uint64_t     getTotalLength()     { return m_totalLength; }
+  uint64_t     getCompletedLength() { return m_completedLength; }
+  uint64_t     getDownloadSpeed()   { return m_downloadSpeed; }
+  uint64_t     getVerifiedLength()  { return m_verifiedLength; }
+  std::string  getPath()            { return m_path; }
+  std::vector<std::string>&  getUris()             { return m_uris; }
 
  protected:
   std::shared_ptr<Aria2> mp_aria;
@@ -162,9 +83,6 @@ class Download {
 /**
  * A tool to download things.
  *
- * A Downloader manages `Download` using aria2 in the background.
- * `Downloader` is threadsafe.
- * However, the returned `Download`s are NOT threadsafe.
  */
 class Downloader
 {
@@ -174,41 +92,14 @@ class Downloader
 
   void close();
 
-  /**
-   * Start a new download.
-   *
-   * This method is thread safe and return a pointer to a newly created `Download`.
-   * User should call `update` on the returned `Download` to have an accurate status.
-   *
-   * @param uri: The uri of the thing to download.
-   * @param options: A series of pair <option_name, option_value> to pass to aria.
-   * @return: The newly created Download.
-   */
-  std::shared_ptr<Download> startDownload(const std::string& uri, const std::vector<std::pair<std::string, std::string>>& options = {});
+  Download* startDownload(const std::string& uri, const std::vector<std::pair<std::string, std::string>>& options = {});
+  Download* getDownload(const std::string& did);
 
-  /**
-   * Get a download corrsponding to a download id (did)
-   * User should call `update` on the returned `Download` to have an accurate status.
-   *
-   * @param did: The download id to search for.
-   * @return: The Download corresponding to did.
-   * @throw: Throw std::out_of_range if did is not found.
-   */
-  std::shared_ptr<Download> getDownload(const std::string& did);
-
-  /**
-   * Get the number of downloads currently managed.
-   */
-  size_t getNbDownload() const;
-
-  /**
-   * Get the ids of the managed downloads.
-   */
-  std::vector<std::string> getDownloadIds() const;
+  size_t getNbDownload() { return m_knownDownloads.size(); }
+  std::vector<std::string> getDownloadIds();
 
  private:
-  mutable std::mutex m_lock;
-  std::map<std::string, std::shared_ptr<Download>> m_knownDownloads;
+  std::map<std::string, std::unique_ptr<Download>> m_knownDownloads;
   std::shared_ptr<Aria2> mp_aria;
 };
 }

include/html_dumper.h

@@ -1,50 +0,0 @@
-/*
- * Copyright 2023 Nikhil Tanwar <2002nikhiltanwar@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU  General Public License as published by
- * 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_HTML_DUMPER_H
-#define KIWIX_HTML_DUMPER_H
-
-#include <string>
-
-#include "library_dumper.h"
-
-namespace kiwix
-{
-
-/**
- * A class to dump Library in HTML format.
- */
-class HTMLDumper : public LibraryDumper
-{
- public:
-  HTMLDumper(const Library* library, const NameMapper* NameMapper);
-  ~HTMLDumper();
-
-
-  /**
-   * Dump library in HTML
-   *
-   * @return HTML content
-   */
-  std::string dumpPlainHTML(kiwix::Filter filter) const;
-};
-
-}
-
-#endif // KIWIX_HTML_DUMPER_H

include/library.h

@@ -120,8 +120,6 @@ class Filter {
     Filter& maxSize(size_t size);
     Filter& query(std::string query, bool partial=true);
     Filter& name(std::string name);
-    Filter& clearLang();
-    Filter& clearCategory();
 
     bool hasQuery() const;
     const std::string& getQuery() const { return _query; }

include/library_dumper.h

@@ -1,91 +0,0 @@
-/*
- * Copyright 2023 Nikhil Tanwar <2002nikhiltanwar@gmail.com>
- * 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.
- */
-
-#ifndef KIWIX_LIBRARY_DUMPER_H
-#define KIWIX_LIBRARY_DUMPER_H
-
-#include <string>
-
-
-#include "library.h"
-#include "name_mapper.h"
-#include <mustache.hpp>
-
-namespace kiwix
-{
-
-/**
- * A base class to dump Library in various formats.
- *
- */
-class LibraryDumper
-{
- public:
-  LibraryDumper(const Library* library, const NameMapper* NameMapper);
-  ~LibraryDumper();
-
-  void setLibraryId(const std::string& id) { this->libraryId = id;}
-
-  /**
-   * Set the root location used when generating url.
-   *
-   * @param rootLocation the root location to use.
-   */
-  void setRootLocation(const std::string& rootLocation) { this->rootLocation = rootLocation; }
-
-  /**
-   * Set some informations about the search results.
-   *
-   * @param totalResult the total number of results of the search.
-   * @param startIndex the start index of the result.
-   * @param count the number of result of the current set (or page).
-   */
-  void setOpenSearchInfo(int totalResult, int startIndex, int count);
-  
-  /**
-   * Sets user default language
-   * 
-   * @param userLang the user language to be set
-   */
-  void setUserLanguage(std::string userLang) { this->m_userLang = userLang; }
-
-  /**
-   * Get the data of categories
-   */
-  kainjow::mustache::list getCategoryData() const;
-
-  /**
-   * Get the data of languages
-   */
-  kainjow::mustache::list getLanguageData() const;
-
- protected:
-  const kiwix::Library* const library;
-  const kiwix::NameMapper* const nameMapper;
-  std::string libraryId;
-  std::string rootLocation;
-  std::string m_userLang;
-  int m_totalResults;
-  int m_startIndex;
-  int m_count;
-};
-}
-
-#endif // KIWIX_LIBRARY_DUMPER_H

include/opds_dumper.h

@@ -28,7 +28,6 @@
 
 #include "library.h"
 #include "name_mapper.h"
-#include "library_dumper.h"
 
 using namespace std;
 
@@ -39,10 +38,11 @@ namespace kiwix
  * A tool to dump a `Library` into a opds stream.
  *
  */
-class OPDSDumper : public LibraryDumper
+class OPDSDumper
 {
  public:
-  OPDSDumper(const Library* library, const NameMapper* NameMapper);
+  OPDSDumper() = default;
+  OPDSDumper(Library* library, NameMapper* NameMapper);
   ~OPDSDumper();
 
   /**
@@ -85,6 +85,38 @@ class OPDSDumper : public LibraryDumper
    * @return The OPDS feed.
    */
   std::string languagesOPDSFeed() const;
+
+  /**
+   * Set the id of the library.
+   *
+   * @param id the id to use.
+   */
+  void setLibraryId(const std::string& id) { this->libraryId = id;}
+
+  /**
+   * Set the root location used when generating url.
+   *
+   * @param rootLocation the root location to use.
+   */
+  void setRootLocation(const std::string& rootLocation) { this->rootLocation = rootLocation; }
+
+  /**
+   * Set some informations about the search results.
+   *
+   * @param totalResult the total number of results of the search.
+   * @param startIndex the start index of the result.
+   * @param count the number of result of the current set (or page).
+   */
+  void setOpenSearchInfo(int totalResult, int startIndex, int count);
+
+ protected:
+  kiwix::Library* library;
+  kiwix::NameMapper* nameMapper;
+  std::string libraryId;
+  std::string rootLocation;
+  int m_totalResults;
+  int m_startIndex;
+  int m_count;
 };
 }
 

scripts/kiwix-compile-resources

@@ -202,17 +202,15 @@ if __name__ == "__main__":
     parser.add_argument('--source_dir',
                         help="Additional directory where to look for resources.",
                         action='append')
-    parser.add_argument('resource_files', nargs='+',
+    parser.add_argument('resource_file',
                         help='The list of resources to compile.')
     args = parser.parse_args()
 
+    base_dir = os.path.dirname(os.path.realpath(args.resource_file))
     source_dir = args.source_dir or []
-    resources = []
-    for resfile in args.resource_files:
-        base_dir = os.path.dirname(os.path.realpath(resfile))
-        with open(resfile, 'r') as f:
-            resources += [Resource([base_dir]+source_dir, *line.strip().split())
-                            for line in f.readlines()]
+    with open(args.resource_file, 'r') as f:
+        resources = [Resource([base_dir]+source_dir, *line.strip().split())
+                        for line in f.readlines()]
 
     h_identifier = to_identifier(os.path.basename(args.hfile))
     with open(args.hfile, 'w') as f:

scripts/kiwix-compile-resources.1

@@ -2,7 +2,7 @@
 .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
+\fBkiwix\-compile\-resources\fR [\-h] [\-\-cxxfile CXXFILE] [\-\-hfile HFILE] resource_file\fR
 .SH DESCRIPTION
 .TP
 resource_file

src/aria2.cpp

@@ -24,7 +24,7 @@
 #define LOG_ARIA_ERROR() \
   { \
     std::cerr << "ERROR: aria2 RPC request failed. (" << res << ")." << std::endl; \
-    std::cerr << (curlErrorBuffer[0] ? curlErrorBuffer : curl_easy_strerror(res)) << std::endl; \
+    std::cerr << (m_curlErrorBuffer[0] ? m_curlErrorBuffer.get() : curl_easy_strerror(res)) << std::endl; \
   }
 
 namespace kiwix {
@@ -32,7 +32,9 @@ namespace kiwix {
 Aria2::Aria2():
   mp_aria(nullptr),
   m_port(42042),
-  m_secret(getNewRpcSecret())
+  m_secret(getNewRpcSecret()),
+  m_curlErrorBuffer(new char[CURL_ERROR_SIZE]),
+  mp_curl(nullptr)
 {
   m_downloadDir = getDataDirectory();
   makeDirectory(m_downloadDir);
@@ -89,32 +91,36 @@ Aria2::Aria2():
       launchCmd.append(cmd).append(" ");
   }
   mp_aria = Subprocess::run(callCmd);
+  mp_curl = curl_easy_init();
 
-  CURL* p_curl = curl_easy_init();
-  char curlErrorBuffer[CURL_ERROR_SIZE];
-
-  curl_easy_setopt(p_curl, CURLOPT_URL, "http://localhost/rpc");
-  curl_easy_setopt(p_curl, CURLOPT_PORT, m_port);
-  curl_easy_setopt(p_curl, CURLOPT_POST, 1L);
-  curl_easy_setopt(p_curl, CURLOPT_ERRORBUFFER, curlErrorBuffer);
+  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);
-    curlErrorBuffer[0] = 0;
-    auto res = curl_easy_perform(p_curl);
+    m_curlErrorBuffer[0] = 0;
+    auto res = curl_easy_perform(mp_curl);
     if (res == CURLE_OK) {
       break;
     } else if (watchdog == 1) {
       LOG_ARIA_ERROR();
     }
   }
-  curl_easy_cleanup(p_curl);
   if (!watchdog) {
+    curl_easy_cleanup(mp_curl);
     throw std::runtime_error("Cannot connect to aria2c rpc. Aria2c launch cmd : " + launchCmd);
   }
 }
 
+Aria2::~Aria2()
+{
+  std::unique_lock<std::mutex> lock(m_lock);
+  curl_easy_cleanup(mp_curl);
+}
+
 void Aria2::close()
 {
   saveSession();
@@ -134,25 +140,20 @@ std::string Aria2::doRequest(const MethodCall& methodCall)
   std::stringstream outStream;
   CURLcode res;
   long response_code;
-  char curlErrorBuffer[CURL_ERROR_SIZE];
-  CURL* p_curl = curl_easy_init();
-  curl_easy_setopt(p_curl, CURLOPT_URL, "http://localhost/rpc");
-  curl_easy_setopt(p_curl, CURLOPT_PORT, m_port);
-  curl_easy_setopt(p_curl, CURLOPT_POST, 1L);
-  curl_easy_setopt(p_curl, CURLOPT_ERRORBUFFER, curlErrorBuffer);
-  curl_easy_setopt(p_curl, CURLOPT_POSTFIELDSIZE, requestContent.size());
-  curl_easy_setopt(p_curl, CURLOPT_POSTFIELDS, requestContent.c_str());
-  curl_easy_setopt(p_curl, CURLOPT_WRITEFUNCTION, &write_callback_to_iss);
-  curl_easy_setopt(p_curl, CURLOPT_WRITEDATA, &outStream);
-  curlErrorBuffer[0] = 0;
-  res = curl_easy_perform(p_curl);
-  if (res != CURLE_OK) {
-    LOG_ARIA_ERROR();
-    curl_easy_cleanup(p_curl);
-    throw std::runtime_error("Cannot perform request");
+  {
+    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_getinfo(mp_curl, CURLINFO_RESPONSE_CODE, &response_code);
   }
-  curl_easy_getinfo(p_curl, CURLINFO_RESPONSE_CODE, &response_code);
-  curl_easy_cleanup(p_curl);
 
   auto responseContent = outStream.str();
   if (response_code != 200) {

src/aria2.h

@@ -12,6 +12,7 @@
 #include "xmlrpc.h"
 
 #include <memory>
+#include <mutex>
 #include <curl/curl.h>
 
 namespace kiwix {
@@ -23,11 +24,15 @@ 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;
+
     std::string doRequest(const MethodCall& methodCall);
 
   public:
     Aria2();
-    virtual ~Aria2() = default;
+    virtual ~Aria2();
     void close();
 
     std::string addUri(const std::vector<std::string>& uri, const std::vector<std::pair<std::string, std::string>>& options = {});

src/book.cpp

@@ -286,9 +286,4 @@ std::string Book::getCategoryFromTags() const
   }
 }
 
-const std::vector<std::string> Book::getLanguages() const
-{
-  return kiwix::split(m_language, ",");
-}
-
 }

src/downloader.cpp

@@ -127,24 +127,22 @@ void Download::cancelDownload()
 Downloader::Downloader() :
   mp_aria(new Aria2())
 {
-  try {
-    for (auto gid : mp_aria->tellWaiting()) {
-      m_knownDownloads[gid] = std::unique_ptr<Download>(new Download(mp_aria, gid));
-      m_knownDownloads[gid]->updateStatus(false);
-    }
-  } catch (std::exception& e) {
-    std::cerr << "aria2 tellWaiting failed : " << e.what() << std::endl;
-  }
   try {
     for (auto gid : mp_aria->tellActive()) {
-      if( m_knownDownloads.find(gid) == m_knownDownloads.end()) {
-        m_knownDownloads[gid] = std::unique_ptr<Download>(new Download(mp_aria, gid));
-        m_knownDownloads[gid]->updateStatus(false);
-      }
+      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;
+  }
 }
 
 /* Destructor */
@@ -157,8 +155,7 @@ void Downloader::close()
   mp_aria->close();
 }
 
-std::vector<std::string> Downloader::getDownloadIds() const {
-  std::unique_lock<std::mutex> lock(m_lock);
+std::vector<std::string> Downloader::getDownloadIds() {
   std::vector<std::string> ret;
   for(auto& p:m_knownDownloads) {
     ret.push_back(p.first);
@@ -166,46 +163,42 @@ std::vector<std::string> Downloader::getDownloadIds() const {
   return ret;
 }
 
-std::shared_ptr<Download> Downloader::startDownload(const std::string& uri, const std::vector<std::pair<std::string, std::string>>& options)
+Download* Downloader::startDownload(const std::string& uri, const std::vector<std::pair<std::string, std::string>>& options)
 {
-  std::unique_lock<std::mutex> lock(m_lock);
   for (auto& p: m_knownDownloads) {
     auto& d = p.second;
     auto& uris = d->getUris();
     if (std::find(uris.begin(), uris.end(), uri) != uris.end())
-      return d;
+      return d.get();
   }
   std::vector<std::string> uris = {uri};
   auto gid = mp_aria->addUri(uris, options);
-  m_knownDownloads[gid] = std::make_shared<Download>(mp_aria, gid);
-  return m_knownDownloads[gid];
+  m_knownDownloads[gid] = std::unique_ptr<Download>(new Download(mp_aria, gid));
+  return m_knownDownloads[gid].get();
 }
 
-std::shared_ptr<Download> Downloader::getDownload(const std::string& did)
+Download* Downloader::getDownload(const std::string& did)
 {
-  std::unique_lock<std::mutex> lock(m_lock);
   try {
-    return m_knownDownloads.at(did);
+    m_knownDownloads.at(did).get()->updateStatus(true);
+    return m_knownDownloads.at(did).get();
   } catch(std::exception& e) {
-    for (auto gid : mp_aria->tellWaiting()) {
-      if (gid == did) {
-        m_knownDownloads[gid] = std::make_shared<Download>(mp_aria, gid);
-        return m_knownDownloads[gid];
-      }
-    }
     for (auto gid : mp_aria->tellActive()) {
       if (gid == did) {
-        m_knownDownloads[gid] = std::make_shared<Download>(mp_aria, gid);
-        return m_knownDownloads[gid];
+        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;
   }
 }
 
-size_t Downloader::getNbDownload() const {
-  std::unique_lock<std::mutex> lock(m_lock);
-  return m_knownDownloads.size();
-}
-
 }

src/html_dumper.cpp

@@ -1,120 +0,0 @@
-#include "html_dumper.h"
-#include "libkiwix-resources.h"
-#include "tools/otherTools.h"
-#include "tools.h"
-#include "tools/regexTools.h"
-#include "server/i18n.h"
-
-namespace kiwix
-{
-
-/* Constructor */
-HTMLDumper::HTMLDumper(const Library* library, const NameMapper* nameMapper)
-  : LibraryDumper(library, nameMapper)
-{
-}
-/* Destructor */
-HTMLDumper::~HTMLDumper()
-{
-}
-
-namespace {
-
-std::string humanFriendlyTitle(std::string title)
-{
-  std::string humanFriendlyString = replaceRegex(title, "_", " ");
-  humanFriendlyString[0] = toupper(humanFriendlyString[0]);
-  return humanFriendlyString;
-}
-
-kainjow::mustache::list getTagList(std::string tags)
-{
-  const auto tagsList = kiwix::split(tags, ";", true, false);
-  kainjow::mustache::list finalTagList;
-  for (auto tag : tagsList) {
-  if (tag[0] != '_')
-    finalTagList.push_back(kainjow::mustache::object{
-      {"tag", tag}
-    });
-  }
-  return finalTagList;
-}
-
-} // unnamed namespace
-
-std::string HTMLDumper::dumpPlainHTML(kiwix::Filter filter) const
-{
-  kainjow::mustache::list booksData;
-  const auto filteredBooks = library->filter(filter);
-  const auto searchQuery = filter.getQuery();
-  auto languages = getLanguageData();
-  auto categories = getCategoryData();
-
-  for (auto &category : categories) {
-    const auto categoryName = category.get("name")->string_value();
-    if (categoryName == filter.getCategory()) {
-      category["selected"] = true;
-    }
-    category["hf_name"] = humanFriendlyTitle(categoryName);
-  }
-
-  for (auto &language : languages) {
-    if (language.get("lang_code")->string_value() == filter.getLang()) {
-      language["selected"] = true;
-    }
-  }
-
-  for ( const auto& bookId : filteredBooks ) {
-    const auto bookObj = library->getBookById(bookId);
-    const auto bookTitle = bookObj.getTitle();
-    std::string contentId = "";
-    try {
-      contentId = urlEncode(nameMapper->getNameForId(bookId));
-    } catch (...) {}
-    const auto bookDescription = bookObj.getDescription();
-    const auto langCode = bookObj.getCommaSeparatedLanguages();
-    const auto bookIconUrl = rootLocation + "/catalog/v2/illustration/" + bookId +  "/?size=48";
-    const auto tags = bookObj.getTags();
-    const auto downloadAvailable = (bookObj.getUrl() != "");
-    std::string faviconAttr = "style=background-image:url(" + bookIconUrl + ")";
-    
-    booksData.push_back(kainjow::mustache::object{
-      {"id", contentId},
-      {"title", bookTitle},
-      {"description", bookDescription},
-      {"langCode", langCode},
-      {"faviconAttr", faviconAttr},
-      {"tagList", getTagList(tags)},
-      {"downloadAvailable", downloadAvailable}
-    });
-  }
-
-  auto getTranslation = i18n::GetTranslatedStringWithMsgId(m_userLang);
-
-  const auto translations = kainjow::mustache::object{
-                    getTranslation("search"),
-                    getTranslation("download"),
-                    getTranslation("count-of-matching-books", {{"COUNT", to_string(filteredBooks.size())}}),
-                    getTranslation("book-filtering-all-categories"),
-                    getTranslation("book-filtering-all-languages"),
-                    getTranslation("powered-by-kiwix-html"),
-                    getTranslation("welcome-to-kiwix-server"),
-                    getTranslation("preview-book"),
-                    getTranslation("welcome-page-overzealous-filter", {{"URL", "?lang="}})
-  };
-
-  return render_template(
-             RESOURCE::templates::no_js_library_page_html,
-             kainjow::mustache::object{
-               {"root", rootLocation},
-               {"books", booksData },
-               {"searchQuery", searchQuery},
-               {"languages", languages},
-               {"categories", categories},
-               {"noResults", filteredBooks.size() == 0},
-               {"translations", translations}
-             }
-  );
-}
-
-} // namespace kiwix

src/library.cpp

@@ -373,27 +373,12 @@ std::vector<std::string> Library::getBookPropValueSet(BookStrPropMemFn p) const
 
 std::vector<std::string> Library::getBooksLanguages() const
 {
-  std::vector<std::string> langs;
-  for ( const auto& langAndCount : getBooksLanguagesWithCounts() ) {
-    langs.push_back(langAndCount.first);
-  }
-  return langs;
+  return getBookPropValueSet(&Book::getLanguage);
 }
 
 Library::AttributeCounts Library::getBooksLanguagesWithCounts() const
 {
-  std::lock_guard<std::mutex> lock(m_mutex);
-  AttributeCounts langsWithCounts;
-
-  for (const auto& pair: mp_impl->m_books) {
-    const auto& book = pair.second;
-    if (book.getOrigId().empty()) {
-      for ( const auto& lang : book.getLanguages() ) {
-        ++langsWithCounts[lang];
-      }
-    }
-  }
-  return langsWithCounts;
+  return getBookAttributeCounts(&Book::getLanguage);
 }
 
 std::vector<std::string> Library::getBooksCategories() const
@@ -455,14 +440,12 @@ void Library::updateBookDB(const Book& book)
 {
   Xapian::Stem stemmer;
   Xapian::TermGenerator indexer;
-  const auto langs = book.getLanguages();
-  if ( langs.size() == 1 ) {
-    try {
-      stemmer = Xapian::Stem(iso639_3ToXapian(langs[0]));
-      indexer.set_stemmer(stemmer);
-      indexer.set_stemming_strategy(Xapian::TermGenerator::STEM_SOME);
-    } catch (...) {}
-  }
+  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);
 
@@ -477,9 +460,7 @@ void Library::updateBookDB(const Book& book)
   // Index all fields for field-based search
   indexer.index_text(title, 1, "S");
   indexer.index_text(desc,  1, "XD");
-  for ( const auto& lang : langs ) {
-    indexer.index_text(lang,  1, "L");
-  }
+  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");
@@ -878,18 +859,6 @@ Filter& Filter::name(std::string name)
   return *this;
 }
 
-Filter& Filter::clearLang()
-{
-  activeFilters &= ~LANG;
-  return *this;
-}
-
-Filter& Filter::clearCategory()
-{
-  activeFilters &= ~CATEGORY;
-  return *this;
-}
-
 #define ACTIVE(X) (activeFilters & (X))
 #define FILTER(TAG, TEST) if (ACTIVE(TAG) && !(TEST)) { return false; }
 bool Filter::hasQuery() const

src/library_dumper.cpp

@@ -1,120 +0,0 @@
-#include "library_dumper.h"
-#include "tools/stringTools.h"
-#include "tools/otherTools.h"
-#include "tools.h"
-
-namespace kiwix
-{
-/* Constructor */
-LibraryDumper::LibraryDumper(const Library* library, const NameMapper* nameMapper)
-  : library(library),
-    nameMapper(nameMapper)
-{
-}
-/* Destructor */
-LibraryDumper::~LibraryDumper()
-{
-}
-
-void LibraryDumper::setOpenSearchInfo(int totalResults, int startIndex, int count)
-{
-  m_totalResults = totalResults;
-  m_startIndex = startIndex,
-  m_count = count;
-}
-
-namespace {
-
-std::map<std::string, std::string> iso639_3 = {
-  {"atj", "atikamekw"},
-  {"azb", "آذربایجان دیلی"},
-  {"bcl", "central bikol"},
-  {"bgs", "tagabawa"},
-  {"bxr", "буряад хэлэн"},
-  {"cbk", "chavacano"},
-  {"cdo", "閩東語"},
-  {"dag", "Dagbani"},
-  {"diq", "dimli"},
-  {"dty", "डोटेली"},
-  {"eml", "emiliân-rumagnōl"},
-  {"fbs", "српскохрватски"},
-  {"hbs", "srpskohrvatski"},
-  {"ido", "ido"},
-  {"kbp", "kabɩyɛ"},
-  {"kld", "Gamilaraay"},
-  {"lbe", "лакку маз"},
-  {"lbj", "ལ་དྭགས་སྐད་"},
-  {"map", "Austronesian"},
-  {"mhr", "марий йылме"},
-  {"mnw", "ဘာသာမန်"},
-  {"myn", "mayan"},
-  {"nah", "nahuatl"},
-  {"nai", "north American Indian"},
-  {"nds", "plattdütsch"},
-  {"nrm", "bhasa narom"},
-  {"olo", "livvi"},
-  {"pih", "Pitcairn-Norfolk"},
-  {"pnb", "Western Panjabi"},
-  {"rmr", "Caló"},
-  {"rmy", "romani shib"},
-  {"roa", "romance languages"},
-  {"twi", "twi"},
-};
-
-std::once_flag fillLanguagesFlag;
-
-void fillLanguagesMap()
-{
-  for (auto icuLangPtr = icu::Locale::getISOLanguages(); *icuLangPtr != NULL; ++icuLangPtr) {
-    const ICULanguageInfo lang(*icuLangPtr);
-    iso639_3.insert({lang.iso3Code(), lang.selfName()});
-  }
-}
-
-std::string getLanguageSelfName(const std::string& lang) {
-  const auto itr = iso639_3.find(lang);
-  if (itr != iso639_3.end()) {
-    return itr->second;
-  }
-  return lang;
-};
-
-} // unnamed namespace
-
-kainjow::mustache::list LibraryDumper::getCategoryData() const
-{
-  const auto now = gen_date_str();
-  kainjow::mustache::list categoryData;
-  for ( const auto& category : library->getBooksCategories() ) {
-    const auto urlencodedCategoryName = urlEncode(category);
-    categoryData.push_back(kainjow::mustache::object{
-      {"name", category},
-      {"urlencoded_name",  urlencodedCategoryName},
-      {"updated", now},
-      {"id", gen_uuid(libraryId + "/categories/" + urlencodedCategoryName)}
-    });
-  }
-  return categoryData;
-}
-
-kainjow::mustache::list LibraryDumper::getLanguageData() const
-{
-  const auto now = gen_date_str();
-  kainjow::mustache::list languageData;
-  std::call_once(fillLanguagesFlag, fillLanguagesMap);
-  for ( const auto& langAndBookCount : library->getBooksLanguagesWithCounts() ) {
-    const std::string languageCode = langAndBookCount.first;
-    const int bookCount = langAndBookCount.second;
-    const auto languageSelfName = getLanguageSelfName(languageCode);
-    languageData.push_back(kainjow::mustache::object{
-      {"lang_code",  languageCode},
-      {"lang_self_name", languageSelfName},
-      {"book_count", to_string(bookCount)},
-      {"updated", now},
-      {"id", gen_uuid(libraryId + "/languages/" + languageCode)}
-    });
-  }
-  return languageData;
-}
-
-} // namespace kiwix

src/libxml_dumper.cpp

@@ -54,7 +54,7 @@ void LibXMLDumper::handleBook(Book book, pugi::xml_node root_node) {
   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.getCommaSeparatedLanguages());
+    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());
@@ -97,7 +97,7 @@ void LibXMLDumper::handleBookmark(Bookmark bookmark, pugi::xml_node root_node) {
     auto book = library->getBookByIdThreadSafe(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.getCommaSeparatedLanguages());
+    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());

src/manager.cpp

@@ -238,7 +238,7 @@ std::string Manager::addBookFromPathAndGetId(const std::string& pathToOpen,
     }
 
     if (!checkMetaData
-        || (!book.getTitle().empty() && !book.getLanguages().empty()
+        || (checkMetaData && !book.getTitle().empty() && !book.getLanguage().empty()
             && !book.getDate().empty())) {
       book.setUrl(url);
       manipulator->addBookToLibrary(book);

src/meson.build

@@ -5,8 +5,6 @@ kiwix_sources = [
   'manager.cpp',
   'libxml_dumper.cpp',
   'opds_dumper.cpp',
-  'html_dumper.cpp',
-  'library_dumper.cpp',
   'downloader.cpp',
   'server.cpp',
   'search_renderer.cpp',
@@ -26,7 +24,7 @@ kiwix_sources = [
   'server/request_context.cpp',
   'server/response.cpp',
   'server/internalServer.cpp',
-  'server/internalServer_catalog.cpp',
+  'server/internalServer_catalog_v2.cpp',
   'server/i18n.cpp',
   'opds_catalog.cpp',
   'version.cpp'

src/opds_dumper.cpp

@@ -30,8 +30,9 @@ namespace kiwix
 {
 
 /* Constructor */
-OPDSDumper::OPDSDumper(const Library* library, const NameMapper* nameMapper)
-  : LibraryDumper(library, nameMapper)
+OPDSDumper::OPDSDumper(Library* library, NameMapper* nameMapper)
+  : library(library),
+    nameMapper(nameMapper)
 {
 }
 /* Destructor */
@@ -39,6 +40,13 @@ OPDSDumper::~OPDSDumper()
 {
 }
 
+void OPDSDumper::setOpenSearchInfo(int totalResults, int startIndex, int count)
+{
+  m_totalResults = totalResults;
+  m_startIndex = startIndex,
+  m_count = count;
+}
+
 namespace
 {
 
@@ -73,7 +81,7 @@ std::string fullEntryXML(const Book& book, const std::string& rootLocation, cons
       {"name", book.getName()},
       {"title", book.getTitle()},
       {"description", book.getDescription()},
-      {"language", book.getCommaSeparatedLanguages()},
+      {"language", book.getLanguage()},
       {"content_id",  urlEncode(contentId)},
       {"updated", bookDate}, // XXX: this should be the entry update datetime
       {"book_date", bookDate},
@@ -125,6 +133,59 @@ BooksData getBooksData(const Library* library, const NameMapper* nameMapper, con
   return booksData;
 }
 
+std::map<std::string, std::string> iso639_3 = {
+  {"atj", "atikamekw"},
+  {"azb", "آذربایجان دیلی"},
+  {"bcl", "central bikol"},
+  {"bgs", "tagabawa"},
+  {"bxr", "буряад хэлэн"},
+  {"cbk", "chavacano"},
+  {"cdo", "閩東語"},
+  {"dag", "Dagbani"},
+  {"diq", "dimli"},
+  {"dty", "डोटेली"},
+  {"eml", "emiliân-rumagnōl"},
+  {"fbs", "српскохрватски"},
+  {"ido", "ido"},
+  {"kbp", "kabɩyɛ"},
+  {"kld", "Gamilaraay"},
+  {"lbe", "лакку маз"},
+  {"lbj", "ལ་དྭགས་སྐད་"},
+  {"map", "Austronesian"},
+  {"mhr", "марий йылме"},
+  {"mnw", "ဘာသာမန်"},
+  {"myn", "mayan"},
+  {"nah", "nahuatl"},
+  {"nai", "north American Indian"},
+  {"nds", "plattdütsch"},
+  {"nrm", "bhasa narom"},
+  {"olo", "livvi"},
+  {"pih", "Pitcairn-Norfolk"},
+  {"pnb", "Western Panjabi"},
+  {"rmr", "Caló"},
+  {"rmy", "romani shib"},
+  {"roa", "romance languages"},
+  {"twi", "twi"}
+};
+
+std::once_flag fillLanguagesFlag;
+
+void fillLanguagesMap()
+{
+  for (auto icuLangPtr = icu::Locale::getISOLanguages(); *icuLangPtr != NULL; ++icuLangPtr) {
+    const ICULanguageInfo lang(*icuLangPtr);
+    iso639_3.insert({lang.iso3Code(), lang.selfName()});
+  }
+}
+
+std::string getLanguageSelfName(const std::string& lang) {
+  const auto itr = iso639_3.find(lang);
+  if (itr != iso639_3.end()) {
+    return itr->second;
+  }
+  return lang;
+};
+
 } // unnamed namespace
 
 string OPDSDumper::dumpOPDSFeed(const std::vector<std::string>& bookIds, const std::string& query) const
@@ -150,17 +211,17 @@ string OPDSDumper::dumpOPDSFeedV2(const std::vector<std::string>& bookIds, const
   const auto booksData = getBooksData(library, nameMapper, bookIds, rootLocation, partial);
 
   const char* const endpoint = partial ? "/partial_entries" : "/entries";
-  const std::string url = endpoint + (query.empty() ? "" : "?" + query);
   const kainjow::mustache::object template_data{
      {"date", gen_date_str()},
      {"endpoint_root", endpointRoot},
      {"feed_id", gen_uuid(libraryId + endpoint + "?" + query)},
      {"filter", onlyAsNonEmptyMustacheValue(query)},
-     {"self_url", url},
+     {"query", query.empty() ? "" : "?" + query},
      {"totalResults", to_string(m_totalResults)},
      {"startIndex", to_string(m_startIndex)},
      {"itemsPerPage", to_string(m_count)},
-     {"books", booksData }
+     {"books", booksData },
+     {"dump_partial_entries", MustacheData(partial)}
   };
 
   return render_template(RESOURCE::templates::catalog_v2_entries_xml, template_data);
@@ -178,7 +239,17 @@ std::string OPDSDumper::dumpOPDSCompleteEntry(const std::string& bookId) const
 std::string OPDSDumper::categoriesOPDSFeed() const
 {
   const auto now = gen_date_str();
-  kainjow::mustache::list categoryData = getCategoryData();
+  kainjow::mustache::list categoryData;
+  for ( const auto& category : library->getBooksCategories() ) {
+    const auto urlencodedCategoryName = urlEncode(category);
+    categoryData.push_back(kainjow::mustache::object{
+      {"name", category},
+      {"urlencoded_name",  urlencodedCategoryName},
+      {"updated", now},
+      {"id", gen_uuid(libraryId + "/categories/" + urlencodedCategoryName)}
+    });
+  }
+
   return render_template(
              RESOURCE::templates::catalog_v2_categories_xml,
              kainjow::mustache::object{
@@ -193,7 +264,21 @@ std::string OPDSDumper::categoriesOPDSFeed() const
 std::string OPDSDumper::languagesOPDSFeed() const
 {
   const auto now = gen_date_str();
-  kainjow::mustache::list languageData = getLanguageData();
+  kainjow::mustache::list languageData;
+  std::call_once(fillLanguagesFlag, fillLanguagesMap);
+  for ( const auto& langAndBookCount : library->getBooksLanguagesWithCounts() ) {
+    const std::string languageCode = langAndBookCount.first;
+    const int bookCount = langAndBookCount.second;
+    const auto languageSelfName = getLanguageSelfName(languageCode);
+    languageData.push_back(kainjow::mustache::object{
+      {"lang_code",  languageCode},
+      {"lang_self_name", languageSelfName},
+      {"book_count", to_string(bookCount)},
+      {"updated", now},
+      {"id", gen_uuid(libraryId + "/languages/" + languageCode)}
+    });
+  }
+
   return render_template(
              RESOURCE::templates::catalog_v2_languages_xml,
              kainjow::mustache::object{

src/server/i18n.h

@@ -69,28 +69,6 @@ private:
   const std::string m_lang;
 };
 
-class GetTranslatedStringWithMsgId
-{
-  typedef kainjow::mustache::basic_data<std::string> MustacheString;
-  typedef std::pair<std::string, MustacheString> MsgIdAndTranslation;
-
-public:
-  explicit GetTranslatedStringWithMsgId(const std::string& lang) : m_lang(lang) {}
-
-  MsgIdAndTranslation operator()(const std::string& key) const
-  {
-    return {key, getTranslatedString(m_lang, key)};
-  }
-
-  MsgIdAndTranslation operator()(const std::string& key, const Parameters& params) const
-  {
-    return {key, expandParameterizedString(m_lang, key, params)};
-  }
-
-private:
-  const std::string m_lang;
-};
-
 } // namespace i18n
 
 struct ParameterizedMessage

src/server/internalServer.cpp

@@ -53,7 +53,6 @@ extern "C" {
 #include "name_mapper.h"
 #include "search_renderer.h"
 #include "opds_dumper.h"
-#include "html_dumper.h"
 #include "i18n.h"
 
 #include <zim/uuid.h>
@@ -95,22 +94,6 @@ inline std::string normalizeRootUrl(std::string rootUrl)
   return rootUrl.empty() ? rootUrl : "/" + rootUrl;
 }
 
-std::string
-fullURL2LocalURL(const std::string& fullUrl, const std::string& rootLocation)
-{
-  if ( kiwix::startsWith(fullUrl, rootLocation) ) {
-    return fullUrl.substr(rootLocation.size());
-  } else {
-    return "INVALID URL";
-  }
-}
-
-std::string getSearchComponent(const RequestContext& request)
-{
-    const std::string query = request.get_query();
-    return query.empty() ? query : "?" + query;
-}
-
 Filter get_search_filter(const RequestContext& request, const std::string& prefix="")
 {
     auto filter = kiwix::Filter().valid(true).local(true);
@@ -224,8 +207,7 @@ typedef std::set<std::string> Languages;
 Languages getLanguages(const Library& lib, const Library::BookIdSet& bookIds) {
   Languages langs;
   for ( const auto& b : bookIds ) {
-    const auto bookLangs = lib.getBookById(b).getLanguages();
-    langs.insert(bookLangs.begin(), bookLangs.end());
+    langs.insert(lib.getBookById(b).getLanguage());
   }
   return langs;
 }
@@ -263,7 +245,7 @@ std::pair<std::string, Library::BookIdSet> InternalServer::selectBooks(const Req
     auto bookName = request.get_argument("content");
     try {
       const auto bookIds = Library::BookIdSet{mp_nameMapper->getIdForName(bookName)};
-      const auto queryString = request.get_query([&](const std::string& key){return key == "content";}, true);
+      const auto queryString = request.get_query([&](const std::string& key){return key == "content";});
       return {queryString, bookIds};
     } catch (const std::out_of_range&) {
       throw Error(noSuchBookErrorMsg(bookName));
@@ -288,7 +270,7 @@ std::pair<std::string, Library::BookIdSet> InternalServer::selectBooks(const Req
       }
     }
     const auto bookIds = Library::BookIdSet(id_vec.begin(), id_vec.end());
-    const auto queryString = request.get_query([&](const std::string& key){return key == "books.id";}, true);
+    const auto queryString = request.get_query([&](const std::string& key){return key == "books.id";});
     return {queryString, bookIds};
   } catch(const std::out_of_range&) {}
 
@@ -306,7 +288,7 @@ std::pair<std::string, Library::BookIdSet> InternalServer::selectBooks(const Req
         throw Error(noSuchBookErrorMsg(bookName));
       }
     }
-    const auto queryString = request.get_query([&](const std::string& key){return key == "books.name";}, true);
+    const auto queryString = request.get_query([&](const std::string& key){return key == "books.name";});
     return {queryString, bookIds};
   } catch(const std::out_of_range&) {}
 
@@ -317,7 +299,7 @@ std::pair<std::string, Library::BookIdSet> InternalServer::selectBooks(const Req
     throw Error(nonParameterizedMessage("no-book-found"));
   }
   const auto bookIds = Library::BookIdSet(id_vec.begin(), id_vec.end());
-  const auto queryString = request.get_query([&](const std::string& key){return startsWith(key, "books.filter.");}, true);
+  const auto queryString = request.get_query([&](const std::string& key){return startsWith(key, "books.filter.");});
   return {queryString, bookIds};
 }
 
@@ -422,7 +404,6 @@ InternalServer::InternalServer(Library* library,
   m_addr(addr),
   m_port(port),
   m_root(normalizeRootUrl(root)),
-  m_rootPrefixOfDecodedURL(m_root),
   m_nbThreads(nbThreads),
   m_multizimSearchLimit(multizimSearchLimit),
   m_verbose(verbose),
@@ -437,9 +418,7 @@ InternalServer::InternalServer(Library* library,
   searchCache(getEnvVar<int>("KIWIX_SEARCH_CACHE_SIZE", DEFAULT_CACHE_SIZE)),
   suggestionSearcherCache(getEnvVar<int>("KIWIX_SUGGESTION_SEARCHER_CACHE_SIZE", std::max((unsigned int) (mp_library->getBookCount(true, true)*0.1), 1U))),
   m_customizedResources(new CustomizedResources)
-{
-  m_root = urlEncode(m_root);
-}
+{}
 
 InternalServer::~InternalServer() = default;
 
@@ -515,7 +494,7 @@ static MHD_Result staticHandlerCallback(void* cls,
 }
 
 MHD_Result InternalServer::handlerCallback(struct MHD_Connection* connection,
-                                           const char* fullUrl,
+                                           const char* url,
                                            const char* method,
                                            const char* version,
                                            const char* upload_data,
@@ -526,10 +505,8 @@ MHD_Result InternalServer::handlerCallback(struct MHD_Connection* connection,
   if (m_verbose.load() ) {
     printf("======================\n");
     printf("Requesting : \n");
-    printf("full_url  : %s\n", fullUrl);
+    printf("full_url  : %s\n", url);
   }
-
-  const auto url = fullURL2LocalURL(fullUrl, m_rootPrefixOfDecodedURL);
   RequestContext request(connection, m_root, url, method, version);
 
   if (m_verbose.load() ) {
@@ -550,7 +527,7 @@ MHD_Result InternalServer::handlerCallback(struct MHD_Connection* connection,
     printf("========== INTERNAL ERROR !! ============\n");
     if (!m_verbose.load()) {
       printf("Requesting : \n");
-      printf("full_url : %s\n", fullUrl);
+      printf("full_url : %s\n", url);
       request.print_debug_info();
     }
   }
@@ -592,13 +569,6 @@ std::unique_ptr<Response> InternalServer::handle_request(const RequestContext& r
              + urlNotFoundMsg;
     }
 
-    if ( request.get_url() == "" ) {
-      // Redirect /ROOT_LOCATION to /ROOT_LOCATION/ (note the added slash)
-      // so that relative URLs are resolved correctly
-      const std::string query = getSearchComponent(request);
-      return Response::build_redirect(*this, m_root + "/" + query);
-    }
-
     const ETag etag = get_matching_if_none_match_etag(request, getLibraryId());
     if ( etag )
       return Response::build_304(*this, etag);
@@ -628,9 +598,6 @@ std::unique_ptr<Response> InternalServer::handle_request(const RequestContext& r
     if (isEndpointUrl(url, "search"))
       return handle_search(request);
 
-    if (isEndpointUrl(url, "nojs"))
-      return handle_no_js(request);
-
     if (isEndpointUrl(url, "suggest"))
      return handle_suggest(request);
 
@@ -640,9 +607,11 @@ std::unique_ptr<Response> InternalServer::handle_request(const RequestContext& r
     if (isEndpointUrl(url, "catch"))
       return handle_catch(request);
 
-    const std::string contentUrl = m_root + "/content" + urlEncode(url);
-    const std::string query = getSearchComponent(request);
-    return Response::build_redirect(*this, contentUrl + query);
+    std::string contentUrl = m_root + "/content" + url;
+    const std::string query = request.get_query();
+    if ( ! query.empty() )
+      contentUrl += "?" + query;
+    return Response::build_redirect(*this, contentUrl);
   } catch (std::exception& e) {
     fprintf(stderr, "===== Unhandled error : %s\n", e.what());
     return HTTP500Response(*this, request)
@@ -759,73 +728,6 @@ std::unique_ptr<Response> InternalServer::handle_viewer_settings(const RequestCo
   return ContentResponse::build(*this, RESOURCE::templates::viewer_settings_js, data, "application/javascript; charset=utf-8");
 }
 
-std::string InternalServer::getNoJSDownloadPageHTML(const std::string& bookId, const std::string& userLang) const
-{
-  const auto book = mp_library->getBookById(bookId);
-  auto bookUrl = kiwix::stripSuffix(book.getUrl(), ".meta4");
-  auto getTranslation = i18n::GetTranslatedStringWithMsgId(userLang);
-  const auto translations = kainjow::mustache::object{
-                            getTranslation("download-links-heading", {{"BOOK_TITLE", book.getTitle()}}),
-                            getTranslation("download-links-title"),
-                            getTranslation("direct-download-link-text"),
-                            getTranslation("hash-download-link-text"),
-                            getTranslation("magnet-link-text"),
-                            getTranslation("torrent-download-link-text")
-  };
-
-  return render_template(
-             RESOURCE::templates::no_js_download_html,
-             kainjow::mustache::object{
-               {"url", bookUrl},
-               {"translations", translations}
-             }
-  );
-}
-
-std::unique_ptr<Response> InternalServer::handle_no_js(const RequestContext& request)
-{
-  const auto url = request.get_url();
-  const auto urlParts = kiwix::split(url, "/", true, false);
-  HTMLDumper htmlDumper(mp_library, mp_nameMapper);
-  htmlDumper.setRootLocation(m_root);
-  htmlDumper.setLibraryId(getLibraryId());
-  auto userLang = request.get_user_language();
-  htmlDumper.setUserLanguage(userLang);
-  std::string content;
-
-  if (urlParts.size() == 1) {
-    auto filter = get_search_filter(request);
-    try {
-      if (request.get_argument("category") == "") {
-        filter.clearCategory();
-      }
-    } catch (...) {}
-    try {
-      if (request.get_argument("lang") == "") {
-        filter.clearLang();
-      }
-    } catch (...) {}
-    content = htmlDumper.dumpPlainHTML(filter);
-  } else if ((urlParts.size() == 3) && (urlParts[1] == "download")) {
-    try {
-      const auto bookId = mp_nameMapper->getIdForName(urlParts[2]);
-      content = getNoJSDownloadPageHTML(bookId, userLang);
-    } catch (const std::out_of_range&) {
-      return HTTP404Response(*this, request)
-           + urlNotFoundMsg;
-    }
-  } else {
-    return HTTP404Response(*this, request)
-           + urlNotFoundMsg;
-  }
-
-  return ContentResponse::build(
-             *this,
-             content,
-             "text/html; charset=utf-8"
-  );
-}
-
 namespace
 {
 
@@ -1046,6 +948,56 @@ std::unique_ptr<Response> InternalServer::handle_catch(const RequestContext& req
          + urlNotFoundMsg;
 }
 
+std::unique_ptr<Response> InternalServer::handle_catalog(const RequestContext& request)
+{
+  if (m_verbose.load()) {
+    printf("** running handle_catalog");
+  }
+
+  std::string host;
+  std::string url;
+  try {
+    host = request.get_header("Host");
+    url  = request.get_url_part(1);
+  } catch (const std::out_of_range&) {
+    return HTTP404Response(*this, request)
+           + urlNotFoundMsg;
+  }
+
+  if (url == "v2") {
+    return handle_catalog_v2(request);
+  }
+
+  if (url != "searchdescription.xml" && url != "root.xml" && url != "search") {
+    return HTTP404Response(*this, request)
+           + urlNotFoundMsg;
+  }
+
+  if (url == "searchdescription.xml") {
+    auto response = ContentResponse::build(*this, RESOURCE::opensearchdescription_xml, get_default_data(), "application/opensearchdescription+xml");
+    return std::move(response);
+  }
+
+  zim::Uuid uuid;
+  kiwix::OPDSDumper opdsDumper(mp_library, mp_nameMapper);
+  opdsDumper.setRootLocation(m_root);
+  opdsDumper.setLibraryId(getLibraryId());
+  std::vector<std::string> bookIdsToDump;
+  if (url == "root.xml") {
+    uuid = zim::Uuid::generate(host);
+    bookIdsToDump = mp_library->filter(kiwix::Filter().valid(true).local(true).remote(true));
+  } else if (url == "search") {
+    bookIdsToDump = search_catalog(request, opdsDumper);
+    uuid = zim::Uuid::generate();
+  }
+
+  auto response = ContentResponse::build(
+      *this,
+      opdsDumper.dumpOPDSFeed(bookIdsToDump, request.get_query()),
+      "application/atom+xml; profile=opds-catalog; kind=acquisition; charset=utf-8");
+  return std::move(response);
+}
+
 std::vector<std::string>
 InternalServer::search_catalog(const RequestContext& request,
                                kiwix::OPDSDumper& opdsDumper)
@@ -1053,9 +1005,9 @@ InternalServer::search_catalog(const RequestContext& request,
     const auto filter = get_search_filter(request);
     std::vector<std::string> bookIdsToDump = mp_library->filter(filter);
     const auto totalResults = bookIdsToDump.size();
-    const long count = request.get_optional_param("count", 10L);
+    const size_t count = request.get_optional_param("count", 10UL);
     const size_t startIndex = request.get_optional_param("start", 0UL);
-    const size_t intendedCount = count >= 0 ? count : bookIdsToDump.size();
+    const size_t intendedCount = count > 0 ? count : bookIdsToDump.size();
     bookIdsToDump = subrange(bookIdsToDump, startIndex, intendedCount);
     opdsDumper.setOpenSearchInfo(totalResults, startIndex, bookIdsToDump.size());
     return bookIdsToDump;
@@ -1073,37 +1025,14 @@ ParameterizedMessage suggestSearchMsg(const std::string& searchURL, const std::s
                               });
 }
 
-///////////////////////////////////////////////////////////////////////////////
-// The content security policy below is set on responses to the /content
-// endpoint in order to prevent the ZIM content from interfering with the
-// viewer (e.g. breaking out of the viewer iframe by performing top-level
-// navigation).
-const std::string CONTENT_CSP_HEADER =
-    "default-src 'self' "
-                "data: "
-                "blob: "
-                "about: "
-                "'unsafe-inline' "
-                "'unsafe-eval'; "
-
-    "sandbox allow-scripts "
-            "allow-same-origin "
-            "allow-modals "
-            "allow-popups "
-            "allow-forms "
-            "allow-downloads;";
-
-// End of content security policy
-///////////////////////////////////////////////////////////////////////////////
-
 } // unnamed namespace
 
 std::unique_ptr<Response>
 InternalServer::build_redirect(const std::string& bookName, const zim::Item& item) const
 {
-  const auto contentPath = "/content/" + bookName + "/" + item.getPath();
-  const auto url = m_root + kiwix::urlEncode(contentPath);
-  return Response::build_redirect(*this, url);
+  const auto path = kiwix::urlEncode(item.getPath());
+  const auto redirectUrl = m_root + "/content/" + bookName + "/" + path;
+  return Response::build_redirect(*this, redirectUrl);
 }
 
 std::unique_ptr<Response> InternalServer::handle_content(const RequestContext& request)
@@ -1157,13 +1086,6 @@ std::unique_ptr<Response> InternalServer::handle_content(const RequestContext& r
     auto response = ItemResponse::build(*this, request, entry.getItem());
     response->set_etag_body(archiveUuid);
 
-    if ( !startsWith(entry.getItem().getMimetype(), "application/pdf") ) {
-      // NOTE: Content security policy is not applied to PDF content so that
-      // NOTE: it can be displayed in the viewer in Chromium-based browsers.
-      response->add_header("Content-Security-Policy", CONTENT_CSP_HEADER);
-      response->add_header("Referrer-Policy", "no-referrer");
-    }
-
     if (m_verbose.load()) {
       printf("Found %s\n", entry.getPath().c_str());
       printf("mimeType: %s\n", entry.getItem(true).getMimetype().c_str());

src/server/internalServer.h

@@ -131,7 +131,6 @@ class InternalServer {
     std::unique_ptr<Response> handle_catalog_v2_entries(const RequestContext& request, bool partial);
     std::unique_ptr<Response> handle_catalog_v2_complete_entry(const RequestContext& request, const std::string& entryId);
     std::unique_ptr<Response> handle_catalog_v2_categories(const RequestContext& request);
-    std::unique_ptr<Response> handle_no_js(const RequestContext& request);
     std::unique_ptr<Response> handle_catalog_v2_languages(const RequestContext& request);
     std::unique_ptr<Response> handle_catalog_v2_illustration(const RequestContext& request);
     std::unique_ptr<Response> handle_search(const RequestContext& request);
@@ -156,8 +155,6 @@ class InternalServer {
 
     std::string getLibraryId() const;
 
-    std::string getNoJSDownloadPageHTML(const std::string& bookId, const std::string& userLang) const;
-
   private: // types
     class LockableSuggestionSearcher;
     typedef ConcurrentCache<SearchInfo, std::shared_ptr<zim::Search>> SearchCache;
@@ -166,8 +163,7 @@ class InternalServer {
   private: // data
     std::string m_addr;
     int m_port;
-    std::string m_root;                   // URI-encoded
-    std::string m_rootPrefixOfDecodedURL; // URI-decoded
+    std::string m_root;
     int m_nbThreads;
     unsigned int m_multizimSearchLimit;
     std::atomic_bool m_verbose;

src/server/internalServer_catalog_v2.cpp

@@ -33,74 +33,6 @@
 
 namespace kiwix {
 
-namespace
-{
-
-enum OPDSResponseKind
-{
-  OPDS_ENTRY,
-  OPDS_NAVIGATION_FEED,
-  OPDS_ACQUISITION_FEED
-};
-
-const std::string opdsMimeType[] = {
-  "application/atom+xml;type=entry;profile=opds-catalog;charset=utf-8",
-  "application/atom+xml;profile=opds-catalog;kind=navigation;charset=utf-8",
-  "application/atom+xml;profile=opds-catalog;kind=acquisition;charset=utf-8"
-};
-
-} // unnamed namespace
-
-std::unique_ptr<Response> InternalServer::handle_catalog(const RequestContext& request)
-{
-  if (m_verbose.load()) {
-    printf("** running handle_catalog");
-  }
-
-  std::string host;
-  std::string url;
-  try {
-    host = request.get_header("Host");
-    url  = request.get_url_part(1);
-  } catch (const std::out_of_range&) {
-    return HTTP404Response(*this, request)
-           + urlNotFoundMsg;
-  }
-
-  if (url == "v2") {
-    return handle_catalog_v2(request);
-  }
-
-  if (url != "searchdescription.xml" && url != "root.xml" && url != "search") {
-    return HTTP404Response(*this, request)
-           + urlNotFoundMsg;
-  }
-
-  if (url == "searchdescription.xml") {
-    auto response = ContentResponse::build(*this, RESOURCE::opensearchdescription_xml, get_default_data(), "application/opensearchdescription+xml");
-    return std::move(response);
-  }
-
-  zim::Uuid uuid;
-  kiwix::OPDSDumper opdsDumper(mp_library, mp_nameMapper);
-  opdsDumper.setRootLocation(m_root);
-  opdsDumper.setLibraryId(getLibraryId());
-  std::vector<std::string> bookIdsToDump;
-  if (url == "root.xml") {
-    uuid = zim::Uuid::generate(host);
-    bookIdsToDump = mp_library->filter(kiwix::Filter().valid(true).local(true).remote(true));
-  } else if (url == "search") {
-    bookIdsToDump = search_catalog(request, opdsDumper);
-    uuid = zim::Uuid::generate();
-  }
-
-  auto response = ContentResponse::build(
-      *this,
-      opdsDumper.dumpOPDSFeed(bookIdsToDump, request.get_query()),
-      opdsMimeType[OPDS_ACQUISITION_FEED]);
-  return std::move(response);
-}
-
 std::unique_ptr<Response> InternalServer::handle_catalog_v2(const RequestContext& request)
 {
   if (m_verbose.load()) {
@@ -158,7 +90,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2_root(const RequestCo
                {"category_list_feed_id", gen_uuid(libraryId + "/categories")},
                {"language_list_feed_id", gen_uuid(libraryId + "/languages")}
              },
-             opdsMimeType[OPDS_NAVIGATION_FEED]
+             "application/atom+xml;profile=opds-catalog;kind=navigation"
   );
 }
 
@@ -172,7 +104,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2_entries(const Reques
   return ContentResponse::build(
              *this,
              opdsFeed,
-             opdsMimeType[OPDS_ACQUISITION_FEED]
+             "application/atom+xml;profile=opds-catalog;kind=acquisition"
   );
 }
 
@@ -192,7 +124,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2_complete_entry(const
   return ContentResponse::build(
              *this,
              opdsFeed,
-             opdsMimeType[OPDS_ENTRY]
+             "application/atom+xml;type=entry;profile=opds-catalog"
   );
 }
 
@@ -204,7 +136,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2_categories(const Req
   return ContentResponse::build(
              *this,
              opdsDumper.categoriesOPDSFeed(),
-             opdsMimeType[OPDS_NAVIGATION_FEED]
+             "application/atom+xml;profile=opds-catalog;kind=navigation"
   );
 }
 
@@ -216,7 +148,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2_languages(const Requ
   return ContentResponse::build(
              *this,
              opdsDumper.languagesOPDSFeed(),
-             opdsMimeType[OPDS_NAVIGATION_FEED]
+             "application/atom+xml;profile=opds-catalog;kind=navigation"
   );
 }
 

src/server/request_context.cpp

@@ -49,15 +49,32 @@ RequestMethod str2RequestMethod(const std::string& method) {
   else                          return RequestMethod::OTHER;
 }
 
+std::string
+fullURL2LocalURL(const std::string& full_url, const std::string& rootLocation)
+{
+  if (rootLocation.empty()) {
+    // nothing special to handle.
+    return full_url;
+  } else if (full_url == rootLocation) {
+    return "/";
+  } else if (full_url.size() > rootLocation.size() &&
+             full_url.substr(0, rootLocation.size()+1) == rootLocation + "/") {
+    return full_url.substr(rootLocation.size());
+  } else {
+    return "";
+  }
+}
+
 } // unnamed namespace
 
 RequestContext::RequestContext(struct MHD_Connection* connection,
-                               const std::string& _rootLocation, // URI-encoded
-                               const std::string& unrootedUrl,   // URI-decoded
+                               std::string _rootLocation,
+                               const std::string& _url,
                                const std::string& _method,
                                const std::string& version) :
   rootLocation(_rootLocation),
-  url(unrootedUrl),
+  full_url(_url),
+  url(fullURL2LocalURL(_url, _rootLocation)),
   method(str2RequestMethod(_method)),
   version(version),
   requestIndex(s_requestIndex++),
@@ -136,6 +153,7 @@ void RequestContext::print_debug_info() const {
     printf("\n");
   }
   printf("Parsed : \n");
+  printf("full_url: %s\n", full_url.c_str());
   printf("url   : %s\n", url.c_str());
   printf("acceptEncodingGzip : %d\n", acceptEncodingGzip);
   printf("has_range : %d\n", byteRange_.kind() != ByteRange::NONE);
@@ -173,7 +191,7 @@ std::string RequestContext::get_url_part(int number) const {
 }
 
 std::string RequestContext::get_full_url() const {
-  return rootLocation + urlEncode(url);
+  return full_url;
 }
 
 std::string RequestContext::get_root_path() const {
@@ -181,7 +199,7 @@ std::string RequestContext::get_root_path() const {
 }
 
 bool RequestContext::is_valid_url() const {
-  return url.empty() || url[0] == '/';
+  return !url.empty();
 }
 
 ByteRange RequestContext::get_range() const {

src/server/request_context.h

@@ -57,8 +57,8 @@ class IndexError: public std::runtime_error {};
 class RequestContext {
   public: // functions
     RequestContext(struct MHD_Connection* connection,
-                   const std::string& rootLocation, // URI-encoded
-                   const std::string& unrootedUrl,  // URI-decoded
+                   std::string rootLocation,
+                   const std::string& url,
                    const std::string& method,
                    const std::string& version);
     ~RequestContext();
@@ -96,16 +96,15 @@ class RequestContext {
     std::string get_query() const { return queryString; }
 
     template<class F>
-    std::string get_query(F filter, bool mustEncode) const {
+    std::string get_query(F filter) const {
       std::string q;
       const char* sep = "";
-      auto encode = [=](const std::string& value) { return mustEncode?urlEncode(value):value; };
       for ( const auto& a : arguments ) {
         if (!filter(a.first)) {
           continue;
         }
         for (const auto& v: a.second) {
-          q += sep + encode(a.first) + '=' + encode(v);
+          q += sep + urlEncode(a.first) + '=' + urlEncode(v);
           sep = "&";
         }
       }
@@ -138,6 +137,7 @@ class RequestContext {
 
   private: // data
     std::string rootLocation;
+    std::string full_url;
     std::string url;
     RequestMethod method;
     std::string version;

src/server/response.cpp

@@ -200,7 +200,7 @@ HTTP404Response::HTTP404Response(const InternalServer& server,
 
 HTTPErrorResponse& HTTP404Response::operator+(UrlNotFoundMsg /*unused*/)
 {
-  const std::string requestUrl = urlDecode(m_request.get_full_url(), false);
+  const std::string requestUrl = m_request.get_full_url();
   return *this + ParameterizedMessage("url-not-found", {{"url", requestUrl}});
 }
 
@@ -234,7 +234,7 @@ HTTP400Response::HTTP400Response(const InternalServer& server,
 
 HTTPErrorResponse& HTTP400Response::operator+(InvalidUrlMsg /*unused*/)
 {
-  std::string requestUrl = urlDecode(m_request.get_full_url(), false);
+  std::string requestUrl = m_request.get_full_url();
   const auto query = m_request.get_query();
   if (!query.empty()) {
     requestUrl += "?" + encodeDiples(query);

src/tools/pathTools.cpp

@@ -493,14 +493,12 @@ static std::map<std::string, std::string> extMimeTypes = {
  { "jpeg", "image/jpeg"},
  { "jpg", "image/jpeg"},
  { "gif", "image/gif"},
- { "ico", "image/x-icon"},
  { "svg", "image/svg+xml"},
  { "txt", "text/plain"},
  { "xml", "text/xml"},
  { "pdf", "application/pdf"},
  { "ogg", "application/ogg"},
  { "js", "application/javascript"},
- { "json", "application/json"},
  { "css", "text/css"},
  { "otf", "application/vnd.ms-opentype"},
  { "ttf", "application/font-ttf"},

src/tools/stringTools.cpp

@@ -208,6 +208,43 @@ bool isHarmlessUriChar(char c)
   return false;
 }
 
+bool mustBeUriEncodedFor(kiwix::URIComponentKind target, char c)
+{
+  if (isHarmlessUriChar(c))
+    return false;
+
+  switch (c) {
+  case '/': // There is no reason to encode the path separator in the general
+            // case. It must be encoded only in a path component when its
+            // semantics of a path separator has to be suppressed.
+            return false;
+
+  case '@': // In a relative URL of the form abc@def/xyz (with no / in abc)
+            // a non-encoded @ will make "abc" and "def" to be interpreted as
+            // username and host components, respectively
+            return target == kiwix::URIComponentKind::PATH;
+
+  case ':': // In a relative URL of the form abc:def/xyz (with no / in abc)
+            // a non-encoded : will make "abc" and "def" to be interpreted as
+            // host and port components, respectively
+            return target == kiwix::URIComponentKind::PATH;
+
+  case '?': // A non-encoded '?' acts as a separator between the path
+            // and query components
+            return target == kiwix::URIComponentKind::PATH;
+
+  case '&': return target == kiwix::URIComponentKind::QUERY;
+  case '=': return target == kiwix::URIComponentKind::QUERY;
+  case '+': return target == kiwix::URIComponentKind::QUERY;
+
+  case '#': // A non-encoded '#' in either path or query-component
+            // would mark the beginning of the fragment component
+            return true;
+  }
+
+  return true;
+}
+
 int hexToInt(char c) {
   switch (c) {
   case '0': return 0;
@@ -247,6 +284,26 @@ std::string kiwix::urlEncode(const std::string& value)
   return os.str();
 }
 
+namespace kiwix
+{
+
+std::string uriEncode(URIComponentKind target, const std::string& value)
+{
+  std::ostringstream os;
+  os << std::hex << std::uppercase;
+  for (const char c : value) {
+    if ( mustBeUriEncodedFor(target, c)  ) {
+      const unsigned int charVal = static_cast<unsigned char>(c);
+      os << '%' << std::setw(2) << std::setfill('0') << charVal;
+    } else {
+      os << c;
+    }
+  }
+  return os.str();
+}
+
+} // namespace kiwix
+
 std::string kiwix::urlDecode(const std::string& value, bool component)
 {
   std::ostringstream os;
@@ -415,17 +472,6 @@ bool kiwix::startsWith(const std::string& base, const std::string& start)
         && std::equal(start.begin(), start.end(), base.begin());
 }
 
-std::string kiwix::stripSuffix(const std::string& str, const std::string& suffix)
-{
-  if (str.size() > suffix.size()) {
-    const auto subStr = str.substr(str.size() - suffix.size(), str.size());
-    if (subStr == suffix) {
-      return str.substr(0, str.size() - suffix.size());
-    }
-  }
-  return str;
-}
-
 std::vector<std::string> kiwix::getTitleVariants(const std::string& title) {
   std::vector<std::string> variants;
   variants.push_back(title);

src/tools/stringTools.h

@@ -60,6 +60,17 @@ private:
 std::string urlEncode(const std::string& value);
 std::string urlDecode(const std::string& value, bool component = false);
 
+// Only URI components that are of interest to libkiwix
+// are included in the below enumeration type
+enum class URIComponentKind
+{
+  PATH,
+  QUERY
+};
+
+// Encode 'value' for usage in a URI componenet specified by 'target'
+std::string uriEncode(URIComponentKind target, const std::string& value);
+
 std::string join(const std::vector<std::string>& list, const std::string& sep);
 
 std::string ucAll(const std::string& word);
@@ -93,8 +104,6 @@ std::string extractFromString(const std::string& str);
 
 bool startsWith(const std::string& base, const std::string& start);
 
-std::string stripSuffix(const std::string& str, const std::string& suffix);
-
 std::vector<std::string> getTitleVariants(const std::string& title);
 } //namespace kiwix
 #endif

static/generate_i18n_resources_list.py

@@ -17,41 +17,15 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from pathlib import Path
-import json
 
 script_path = Path(__file__)
 
 resource_file = script_path.parent / "i18n_resources_list.txt"
-translation_dir = script_path.parent / "skin/i18n"
-language_list_relpath = "skin/languages.js"
+translation_dir = script_path.parent / "i18n"
 
-def get_translation_info(filepath):
-    lang_code = Path(filepath).stem
-    with open(filepath, 'r', encoding="utf-8") as f:
-        content = json.load(f)
-        lang_name = content.get("name")
-        return lang_code, lang_name
-
-language_list = []
 json_files = translation_dir.glob("*.json")
 with open(resource_file, 'w', encoding="utf-8") as f:
-    for i18n_file in sorted(translation_dir.glob("*.json")):
-        if i18n_file.name == "qqq.json":
+    for json in sorted(translation_dir.glob("*.json")):
+        if json.name == "qqq.json":
             continue
-        print("Processing", i18n_file.name)
-        if i18n_file.name != "test.json":
-            lang_code, lang_name = get_translation_info(i18n_file)
-            if lang_name:
-                language_list.append((lang_code, lang_name))
-            else:
-                print(f"Warning: missing 'name' in {i18n_file.name}")
-        f.write(str(i18n_file.relative_to(script_path.parent)) + '\n')
-
-language_list = [{name: code} for code, name in sorted(language_list)]
-language_list_jsobj_str = json.dumps(language_list,
-                                     indent=2,
-                                     ensure_ascii=False)
-print("Saving", language_list_relpath)
-fullpath = script_path.parent / language_list_relpath
-with open(fullpath, 'w', encoding="utf-8") as f:
-    f.write("const uiLanguages = " + language_list_jsobj_str)
+        f.write(str(json.relative_to(script_path.parent)) + '\n')

static/i18n/bn.json

@@ -10,6 +10,5 @@
 	"500-page-heading": "অভ্যন্তরীণ সার্ভার ত্রুটি",
 	"library-button-text": "স্বাগত পাতায় চলুন",
 	"home-button-text": "'{{BOOK_TITLE}}'-এর প্রধান পাতায় চলুন",
-	"searchbox-tooltip": "'{{BOOK_TITLE}}' অনুসন্ধান করুন",
-	"search": "অনুসন্ধান"
+	"searchbox-tooltip": "'{{BOOK_TITLE}}' অনুসন্ধান করুন"
 }

static/i18n/en.json

@@ -28,27 +28,4 @@
 	, "random-page-button-text": "Go to a randomly selected page"
 	, "searchbox-tooltip": "Search '{{BOOK_TITLE}}'"
 	, "confusion-of-tongues": "Two or more books in different languages would participate in search, which may lead to confusing results."
-	, "welcome-page-overzealous-filter": "No result. Would you like to <a href=\"{{URL}}\">reset filter</a>?"
-	, "powered-by-kiwix-html": "Powered by&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>"
-	, "search": "Search"
-	, "book-filtering-all-categories": "All categories"
-	, "book-filtering-all-languages": "All languages"
-	, "count-of-matching-books": "{{COUNT}} book(s)"
-	, "download": "Download"
-	, "direct-download-link-text": "Direct"
-	, "direct-download-alt-text": "direct download"
-	, "hash-download-link-text": "Sha256 hash"
-	, "hash-download-alt-text": "download hash"
-	, "magnet-link-text": "Magnet link"
-	, "magnet-alt-text": "download magnet"
-	, "torrent-download-link-text": "Torrent file"
-	, "torrent-download-alt-text": "download torrent"
-	, "library-opds-feed-all-entries": "Library OPDS Feed - All entries"
-	, "filter-by-tag": "Filter by tag \"{{TAG}}\""
-	, "stop-filtering-by-tag": "Stop filtering by tag \"{{TAG}}\""
-	, "library-opds-feed-parameterised": "Library OPDS Feed - entries matching {{#LANG}}\nLanguage: {{LANG}} {{/LANG}}{{#CATEGORY}}\nCategory: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nTag: {{TAG}} {{/TAG}}{{#Q}}\nQuery: {{Q}} {{/Q}}"
-	, "welcome-to-kiwix-server": "Welcome to Kiwix Server"
-	, "download-links-heading": "Download links for <b><i>{{BOOK_TITLE}}</i></b>"
-	, "download-links-title": "Download book"
-	, "preview-book": "Preview"
 }

static/i18n/fr.json

@@ -30,23 +30,5 @@
 	"home-button-text": "Aller à la page principale de « {{BOOK_TITLE}} »",
 	"random-page-button-text": "Aller à une page sélectionnée aléatoirement",
 	"searchbox-tooltip": "Rechercher « {{BOOK_TITLE}} »",
-	"confusion-of-tongues": "Deux livres ou plus dans des langues différentes participeraient à la recherche, ce qui pourrait conduire à des résultats confus.",
-	"welcome-page-overzealous-filter": "Aucun résultat. Souhaitez-vous <a href=\"?lang=\">réinitialiser le filtre</a> ?",
-	"powered-by-kiwix-html": "Propulsé par <a href=\"https://kiwix.org/\">Kiwix</a>",
-	"search": "Rechercher",
-	"book-filtering-all-categories": "Toutes les catégories",
-	"book-filtering-all-languages": "Toutes les langues",
-	"count-of-matching-books": "{{COUNT}} livre(s)",
-	"download": "Télécharger",
-	"direct-download-link-text": "Direct",
-	"direct-download-alt-text": "téléchargement direct",
-	"hash-download-link-text": "Hachage sha256",
-	"hash-download-alt-text": "télécharger le hachage",
-	"magnet-link-text": "Lien Magnet",
-	"magnet-alt-text": "télécharger le lien Magnet",
-	"torrent-download-link-text": "Fichier torrent",
-	"torrent-download-alt-text": "télécharger le torrent",
-	"library-opds-feed": "Flux OPDS de la bibliothèque",
-	"filter-by-tag": "Filtrer par la balise « {{TAG}} »",
-	"stop-filtering-by-tag": "Arrêter le filtrage par la balise « {{TAG}} »"
+	"confusion-of-tongues": "Deux livres ou plus dans des langues différentes participeraient à la recherche, ce qui pourrait conduire à des résultats confus."
 }

static/i18n/he.json

@@ -29,23 +29,5 @@
 	"home-button-text": "מעבר לדף הראשי של \"{{BOOK_TITLE}}\"",
 	"random-page-button-text": "מעבר לדף שנבחר אקראית",
 	"searchbox-tooltip": "חיפוש \"{{BOOK_TITLE}}\"",
-	"confusion-of-tongues": "שני ספרים או יותר בשפות שונות ישתתפו בחיפוש, מה שעלול להוביל לתוצאות מבלבלות.",
-	"welcome-page-overzealous-filter": "אין תוצאות. האם <a href=\"?lang=\">לאפס את המסנן</a>?",
-	"powered-by-kiwix-html": "מופעל על־ידי&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
-	"search": "חיפוש",
-	"book-filtering-all-categories": "כל הקטגוריות",
-	"book-filtering-all-languages": "כל השפות",
-	"count-of-matching-books": "{{COUNT}} ספרים",
-	"download": "הורדה",
-	"direct-download-link-text": "ישירה",
-	"direct-download-alt-text": "הורדה ישירה",
-	"hash-download-link-text": "גיבוב Sha256",
-	"hash-download-alt-text": "הורדת גיבוב",
-	"magnet-link-text": "קישור Magnet",
-	"magnet-alt-text": "הורדת magnet",
-	"torrent-download-link-text": "קובץ טורנט",
-	"torrent-download-alt-text": "הורדת טורנט",
-	"library-opds-feed": "הזנת OPDS של ספרייה",
-	"filter-by-tag": "סינון לפי התג \"{{TAG}}\"",
-	"stop-filtering-by-tag": "להפסיק סינון לפי התג \"{{TAG}}\""
+	"confusion-of-tongues": "שני ספרים או יותר בשפות שונות ישתתפו בחיפוש, מה שעלול להוביל לתוצאות מבלבלות."
 }

static/i18n/hy.json

@@ -16,6 +16,5 @@
 	"library-button-text": "Գրադարանի էջ",
 	"home-button-text": "Դեպի '{{BOOK_TITLE}}'֊ի գլխավոր էջը",
 	"random-page-button-text": "Բացել պատահական էջ",
-	"searchbox-tooltip": "Որոնել '{{BOOK_TITLE}}'֊ում",
-	"book-filtering-all-categories": "Բոլոր կատեգորիաներ"
+	"searchbox-tooltip": "Որոնել '{{BOOK_TITLE}}'֊ում"
 }

static/i18n/it.json

@@ -23,9 +23,5 @@
 	"library-button-text": "Vai alla pagina di benvenuto",
 	"home-button-text": "Vai alla pagina principale di '{{BOOK_TITLE}}'",
 	"random-page-button-text": "Vai a una pagina selezionata casualmente",
-	"searchbox-tooltip": "Cerca '{{BOOK_TITLE}}'",
-	"book-filtering-all-categories": "Tutte le categorie",
-	"book-filtering-all-languages": "Tutte le lingue",
-	"count-of-matching-books": "{{COUNT}} libro/i",
-	"download": "Scarica"
+	"searchbox-tooltip": "Cerca '{{BOOK_TITLE}}'"
 }

static/i18n/ja.json

@@ -1,11 +1,9 @@
 {
 	"@metadata": {
 		"authors": [
-			"MathXplore",
-			"もなー(偽物)"
+			"MathXplore"
 		]
 	},
-	"name": "日本語",
 	"no-query": "クエリを指定していません。",
 	"400-page-title": "無効なリクエストです",
 	"400-page-heading": "無効なリクエストです",
@@ -16,17 +14,5 @@
 	"fulltext-search-unavailable": "全文検索は利用できません",
 	"no-search-results": "このコンテンツでは全文検索エンジンが利用できません",
 	"library-button-text": "ウェルカムページに移動",
-	"random-page-button-text": "無作為に選ばれたページに移動する",
-	"search": "検索",
-	"book-filtering-all-categories": "すべてのカテゴリー",
-	"book-filtering-all-languages": "すべての言語",
-	"download": "ダウンロード",
-	"direct-download-link-text": "直ダウンロードリンク",
-	"direct-download-alt-text": "直ダウンロード",
-	"hash-download-link-text": "Sha256 ハッシュ",
-	"hash-download-alt-text": "ハッシュをダウンロード",
-	"magnet-link-text": "マグネットリンク",
-	"magnet-alt-text": "マグネットをダウンロード",
-	"torrent-download-link-text": "Torrentファイル",
-	"torrent-download-alt-text": "Torrentをダウンロード"
+	"random-page-button-text": "無作為に選ばれたページに移動する"
 }

static/i18n/mk.json

@@ -28,23 +28,5 @@
 	"home-button-text": "Оди на главната страница на „{{BOOK_TITLE}}“",
 	"random-page-button-text": "Оди на случајно избрана страница",
 	"searchbox-tooltip": "Пребарај го „{{BOOK_TITLE}}“",
-	"confusion-of-tongues": "Во пребарувањето ќе учествуваат две или повеќе книги на различни јазици, што може да довете до збунувачки исход.",
-	"welcome-page-overzealous-filter": "Нема исход. Дали би сакале да го <a href=\"?lang=\">поништите филтерот</a>?",
-	"powered-by-kiwix-html": "Овозможено од&nbsp;<a href=\"https://kiwix.org\">Кивикс</a>",
-	"search": "Пребарај",
-	"book-filtering-all-categories": "Сите категории",
-	"book-filtering-all-languages": "Сите јазици",
-	"count-of-matching-books": "{{COUNT}} книги",
-	"download": "Преземи",
-	"direct-download-link-text": "Непосредно",
-	"direct-download-alt-text": "непосредно преземање",
-	"hash-download-link-text": "Sha256-тараба",
-	"hash-download-alt-text": "преземи тараба",
-	"magnet-link-text": "Магнетна врска",
-	"magnet-alt-text": "преземи магнет",
-	"torrent-download-link-text": "Торентна податотека",
-	"torrent-download-alt-text": "преземи торент",
-	"library-opds-feed": "Библиотечен OPDS-тековник",
-	"filter-by-tag": "Филтрирај по ознаката „{{TAG}}“",
-	"stop-filtering-by-tag": "Запри филтрирање по ознаката „{{TAG}}“"
+	"confusion-of-tongues": "Во пребарувањето ќе учествуваат две или повеќе книги на различни јазици, што може да довете до збунувачки исход."
 }

static/i18n/nqo.json

@@ -27,7 +27,5 @@
 	"library-button-text": "ߕߊ߯ ߟߊ߬ߛߣߍ߬ߟߌ߫ ߞߐߜߍ ߞߊ߲߬",
 	"home-button-text": "ߕߊ߯ {{BOOK_TITLE}} ߓߏ߬ߟߏ߲߬ߘߊ ߞߐߜߍ ߞߊ߲߬",
 	"random-page-button-text": "ߕߊ߯ ߓߍ߲߬ߛߋ߲߬ߡߊ߬ ߞߐߜߍ߫ ߛߎߥߊ߲ߘߌߣߍ߲ ߠߎ߬ ߞߊ߲߬",
-	"searchbox-tooltip": "ߕߌߙߌ߲ߠߌ߲ {{BOOK_TITLE}}",
-	"confusion-of-tongues": "ߞߊ߬ߝߊ߫ ߝߌ߬ߟߊ߬ ߥߟߊ߫ ߦߙߌߞߊ ߞߊ߲߫ ߜߘߍ ߟߎ߬ ߘߐ߫߸ ߏ߬ ߟߎ߫ ߘߌߣߊ߬ ߕߘߍ߬ ߢߌߣߌ߲ߠߌ߲ ߘߐ߫߸ ߡߍ߲ ߠߎ߬ ߛߌ߫ ߞߣߐ߬ߝߟߌ ߟߊߘߏ߲߬ ߠߊ߫ ߞߐߝߟߌ ߘߐ߫.",
-	"welcome-page-overzealous-filter": "ߞߐߝߟߌ߫ ߕߴߦߋ߲߬. ߊ߬ ߝߐ߫ ߌ ߦߴߊ߬ ߝߍ߬ ߞߊ߬ <a href=\"?lang=\">ߛߍ߲ߛߍ߲ߟߊ߲ ߘߐߛߌ߰ ߕߎ߲߯</a>؟"
+	"searchbox-tooltip": "ߕߌߙߌ߲ߠߌ߲ {{BOOK_TITLE}}"
 }

static/i18n/qqq.json

@@ -29,28 +29,5 @@
 	"library-button-text": "Tooltip of the button leading to the welcome page",
 	"home-button-text": "Tooltip of the button leading to the main page of a book",
 	"random-page-button-text": "Tooltip of the button opening a randomly selected page",
-	"searchbox-tooltip": "Tooltip displayed for the search box",
-	"welcome-page-overzealous-filter": "Text shown when book filtering on the welcome page produces zero results",
-	"powered-by-kiwix-html": "Link to Kiwix website",
-	"search": "A general search action (text displayed on search buttons or as aplaceholder in searchboxes)",
-	"book-filtering-all-categories": "Choosing this filter will disable filtering of books by category",
-	"book-filtering-all-languages": "Choosing this filter will disable filtering of books by language",
-	"count-of-matching-books": "Reporting the count of books matching the filter",
-	"download": "A general download action",
-	"direct-download-link-text": "Link text for a direct download",
-	"direct-download-alt-text": "Hint for a direct download icon",
-	"hash-download-link-text": "Link text for downloading the hash",
-	"hash-download-alt-text": "Hint for the icon of hash download",
-	"magnet-link-text": "Link text for a magnet link",
-	"magnet-alt-text": "Hint for the icon of a magnet link",
-	"torrent-download-link-text": "Link text for downloading the torrent file",
-	"torrent-download-alt-text": "Hint for the icon of torrent download",
-	"filter-by-tag": "Hint for a link that would load results filtered by a single tag",
-	"stop-filtering-by-tag": "Tooltip for the button that cancels filtering by tag",
-	"library-opds-feed-all-entries": "Hint for the library OPDS feed for all entries",
-	"library-opds-feed-parameterised": "Hint for the library OPDS feed for filtered entries",
-	"welcome-to-kiwix-server": "Title shown in browser's title bar/page tab",
-	"download-links-heading": "Heading for no-js download page",
-	"download-links-title": "Title for no-js download page",
-	"preview-book": "Tooltip of book-tile leading to the book"
+	"searchbox-tooltip": "Tooltip displayed for the search box"
 }

static/i18n/ru.json

@@ -31,8 +31,5 @@
 	"home-button-text": "Перейти на главную страницу '{{BOOK_TITLE}}'",
 	"random-page-button-text": "Перейти на случайно выбранную страницу",
 	"searchbox-tooltip": "Искать '{{BOOK_TITLE}}'",
-	"confusion-of-tongues": "В поиске будут участвовать две или более книг на разных языках, что может привести к запутанным результатам.",
-	"book-filtering-all-categories": "Все категории",
-	"book-filtering-all-languages": "Все языки",
-	"download": "Скачать"
+	"confusion-of-tongues": "В поиске будут участвовать две или более книг на разных языках, что может привести к запутанным результатам."
 }

static/i18n/sl.json

@@ -15,7 +15,7 @@
 	"invalid-raw-data-type": "{{DATATYPE}} ni veljaven zahtevek za neobdelano vsebino.",
 	"no-value-for-arg": "Argument {{ARGUMENT}} nima določene nobene vrednosti",
 	"no-query": "Poizvedba ni podana.",
-	"raw-entry-not-found": "Ni mogoče najti vnosa {{ENTRY}} tipa {{DATATYPE}}",
+	"raw-entry-not-found": "Ni mogoče najti vnosa {{ENTRY}} vrste {{DATATYPE}}",
 	"400-page-title": "Neveljaven zahtevek",
 	"400-page-heading": "Neveljaven zahtevek",
 	"404-page-title": "Vsebine ni mogoče najti",
@@ -28,23 +28,5 @@
 	"home-button-text": "Pojdite na glavno stran »{{BOOK_TITLE}}«",
 	"random-page-button-text": "Pojdite na naključno izbrano stran",
 	"searchbox-tooltip": "Poiščite »{{BOOK_TITLE}}«",
-	"confusion-of-tongues": "V iskanju bi bili uporabljeni dve ali več knjig v različnih jezikih, kar lahko pripelje do nejasnih zadetkov.",
-	"welcome-page-overzealous-filter": "Ni zadetkov. Želite <a href=\"?lang=\">ponastaviti filter</a>?",
-	"powered-by-kiwix-html": "Omogoča <a href=\"https://kiwix.org\">Kiwix</a>",
-	"search": "Išči",
-	"book-filtering-all-categories": "Vse kategorije",
-	"book-filtering-all-languages": "Vsi jeziki",
-	"count-of-matching-books": "{{COUNT}} knjiga(i/e)",
-	"download": "Prenesi",
-	"direct-download-link-text": "Neposredno",
-	"direct-download-alt-text": "neposredni prenos",
-	"hash-download-link-text": "Zgoščena vrednost SHA256",
-	"hash-download-alt-text": "prenesi zgoščeno vrednost",
-	"magnet-link-text": "Magnetna povezava",
-	"magnet-alt-text": "prenesi magnet",
-	"torrent-download-link-text": "Torrent datoteka",
-	"torrent-download-alt-text": "prenesi torrent",
-	"library-opds-feed": "Vir OPDS knjižnice",
-	"filter-by-tag": "Filtriraj po oznaki »{{TAG}}«",
-	"stop-filtering-by-tag": "Ustavi filtriranje po oznaki »{{TAG}}«"
+	"confusion-of-tongues": "V iskanju bi bili uporabljeni dve ali več knjig v različnih jezikih, kar lahko pripelje do nejasnih zadetkov."
 }

static/i18n/test.json

@@ -0,0 +1,20 @@
+{
+	"@metadata": {
+		"authors": [
+			"Kareyac"
+		]
+	},
+	"name": "Fake language for i18n testing"
+	, "suggest-full-text-search": "[I18N TESTING] cOnTaInInG '{{{SEARCH_TERMS}}}'..."
+	, "no-such-book": "[I18N TESTING] No such book: {{BOOK_NAME}}. Sorry."
+	, "url-not-found": "[I18N TESTING] URL not found: {{url}}"
+	, "suggest-search": "[I18N TESTING] Make a full text search for <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>"
+	, "400-page-title": "[I18N TESTING] Invalid request ($400 fine must be paid)"
+	, "400-page-heading": "[I18N TESTING] -400 karma for an invalid request"
+	, "404-page-title": "[I18N TESTING] Not Found - Try Again"
+	, "404-page-heading": "[I18N TESTING] Content not found, but at least the server is alive"
+	, "library-button-text": "[I18N TESTING] Navigate to the welcome page"
+	, "home-button-text": "[I18N TESTING] Jump to the main page of '{{BOOK_TITLE}}'"
+	, "random-page-button-text": "[I18N TESTING] I am tired of determinism"
+	, "searchbox-tooltip": "[I18N TESTING] Let's search in '{{BOOK_TITLE}}'"
+}

static/i18n/zh-hant.json

@@ -29,23 +29,5 @@
 	"home-button-text": "前往「{{BOOK_TITLE}}」的首頁",
 	"random-page-button-text": "前往隨機選取頁面",
 	"searchbox-tooltip": "在{{BOOK_TITLE}}搜尋",
-	"confusion-of-tongues": "搜索裡有加入兩本或更多不同語言的書籍，這可能會導致混淆結果。",
-	"welcome-page-overzealous-filter": "沒有結果。您想要<a href=\"?lang=\">重新設定篩選</a>嗎？",
-	"powered-by-kiwix-html": "由 <a href=\"https://kiwix.org\">Kiwix</a> 提供技術支援",
-	"search": "搜尋",
-	"book-filtering-all-categories": "所有分類",
-	"book-filtering-all-languages": "所有語言",
-	"count-of-matching-books": "{{COUNT}} 本書籍",
-	"download": "下載",
-	"direct-download-link-text": "直接",
-	"direct-download-alt-text": "直接下載",
-	"hash-download-link-text": "Sha256 雜湊",
-	"hash-download-alt-text": "下載雜湊",
-	"magnet-link-text": "Magnet 連結",
-	"magnet-alt-text": "下載 magnet",
-	"torrent-download-link-text": "Torrent 檔案",
-	"torrent-download-alt-text": "下載 torrent",
-	"library-opds-feed": "圖書館 OPDS 訊息來源",
-	"filter-by-tag": "依標籤「{{TAG}}」篩選",
-	"stop-filtering-by-tag": "停止依標籤「{{TAG}}」篩選"
+	"confusion-of-tongues": "搜索裡有加入兩本或更多不同語言的書籍，這可能會導致混淆結果。"
 }

static/i18n_resources_list.txt

@@ -1,29 +1,24 @@
-skin/i18n/ar.json
-skin/i18n/bn.json
-skin/i18n/cs.json
-skin/i18n/de.json
-skin/i18n/dga.json
-skin/i18n/el.json
-skin/i18n/en.json
-skin/i18n/fr.json
-skin/i18n/he.json
-skin/i18n/hy.json
-skin/i18n/ia.json
-skin/i18n/it.json
-skin/i18n/ja.json
-skin/i18n/ko.json
-skin/i18n/ku-latn.json
-skin/i18n/lb.json
-skin/i18n/mk.json
-skin/i18n/nl.json
-skin/i18n/nqo.json
-skin/i18n/pl.json
-skin/i18n/ru.json
-skin/i18n/sc.json
-skin/i18n/sk.json
-skin/i18n/sl.json
-skin/i18n/sv.json
-skin/i18n/test.json
-skin/i18n/tr.json
-skin/i18n/zh-hans.json
-skin/i18n/zh-hant.json
+i18n/ar.json
+i18n/bn.json
+i18n/cs.json
+i18n/de.json
+i18n/en.json
+i18n/fr.json
+i18n/he.json
+i18n/hy.json
+i18n/it.json
+i18n/ja.json
+i18n/ko.json
+i18n/ku-latn.json
+i18n/mk.json
+i18n/nqo.json
+i18n/pl.json
+i18n/ru.json
+i18n/sc.json
+i18n/sk.json
+i18n/sl.json
+i18n/sv.json
+i18n/test.json
+i18n/tr.json
+i18n/zh-hans.json
+i18n/zh-hant.json

static/meson.build

@@ -1,18 +1,8 @@
-if meson.version().version_compare('>=0.47.0')
-    resource_files = run_command(
-        res_manager,
-        '--list-all',
-        files('resources_list.txt'),
-        check: true
-    ).stdout().strip().split('\n')
-else
-    resource_files = run_command(
-        res_manager,
-        '--list-all',
-        files('resources_list.txt')
-    ).stdout().strip().split('\n')
-endif
-
+resource_files = run_command(res_manager,
+                    '--list-all',
+                    files('resources_list.txt'),
+                    check: true
+                 ).stdout().strip().split('\n')
 
 preprocessed_resources = custom_target('preprocessed_resource_files',
     input: 'resources_list.txt',
@@ -25,7 +15,7 @@ preprocessed_resources = custom_target('preprocessed_resource_files',
 )
 
 lib_resources = custom_target('resources',
-    input: [preprocessed_resources, 'i18n_resources_list.txt'],
+    input: preprocessed_resources,
     output: ['libkiwix-resources.cpp', 'libkiwix-resources.h'],
     command:[res_compiler,
              '--cxxfile', '@OUTPUT0@',
@@ -41,24 +31,12 @@ lib_resources = custom_target('resources',
 # i18n_resource_files = fs.read('i18n_resources_list.txt').strip().split('\n')
 # ```
 # once we move to meson >= 0.57.0
-
-if meson.version().version_compare('>=0.47.0')
-    i18n_resource_files = run_command(
-        find_program('python3'),
-        '-c',
-        'import sys; f=open(sys.argv[1]); print(f.read())',
-        files('i18n_resources_list.txt'),
-        check: true
-    ).stdout().strip().split('\n')
-else
-    i18n_resource_files = run_command(
-        find_program('python3'),
-        '-c',
-        'import sys; f=open(sys.argv[1]); print(f.read())',
-        files('i18n_resources_list.txt'),
-    ).stdout().strip().split('\n')
-endif
-
+i18n_resource_files = run_command(find_program('python3'),
+                                    '-c',
+                                    'import sys; f=open(sys.argv[1]); print(f.read())',
+                                    files('i18n_resources_list.txt'),
+                                    check: true
+                                 ).stdout().strip().split('\n')
 
 i18n_resources = custom_target('i18n_resources',
     input: i18n_resource_files,

static/resources_list.txt

@@ -1,8 +1,6 @@
 skin/caret.png
 skin/bittorrent.png
 skin/magnet.png
-skin/feed.svg
-skin/langSelector.svg
 skin/download.png
 skin/hash.png
 skin/search-icon.svg
@@ -17,9 +15,6 @@ skin/fonts/Roboto.ttf
 skin/search_results.css
 skin/blank.html
 skin/viewer.js
-skin/i18n.js
-skin/languages.js
-skin/mustache.min.js
 viewer.html
 templates/search_result.html
 templates/search_result.xml
@@ -37,8 +32,6 @@ templates/catalog_v2_categories.xml
 templates/catalog_v2_languages.xml
 templates/url_of_search_results_css
 templates/viewer_settings.js
-templates/no_js_library_page.html
-templates/no_js_download.html
 opensearchdescription.xml
 ft_opensearchdescription.xml
 catalog_v2_searchdescription.xml

static/skin/feed.svg

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="uiLanguageSelectorButton" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#CCCCCC;}
-	.st2{fill:#F78422;}
-</style>
-<g>
-	<path class="st0" d="M2.9,29.6c-1.4,0-2.6-1.1-2.6-2.6V2.9c0-1.4,1.1-2.6,2.6-2.6h24.1c1.4,0,2.6,1.1,2.6,2.6v24.1
-		c0,1.4-1.1,2.6-2.6,2.6H2.9z"/>
-	<path class="st1" d="M27.1,0.6c1.3,0,2.3,1,2.3,2.3v24.1c0,1.3-1,2.3-2.3,2.3H2.9c-1.3,0-2.3-1-2.3-2.3V2.9c0-1.3,1-2.3,2.3-2.3
-		H27.1 M27.1,0.1H2.9c-1.6,0-2.8,1.3-2.8,2.8v24.1c0,1.6,1.3,2.8,2.8,2.8h24.1c1.6,0,2.8-1.3,2.8-2.8V2.9
-		C29.9,1.4,28.6,0.1,27.1,0.1L27.1,0.1z"/>
-</g>
-<g>
-	<path class="st2" d="M18,24h-3c0-5.2-4.2-9.4-9.4-9.4v-3C12.4,11.6,18,17.2,18,24z"/>
-	<path class="st2" d="M24.5,24h-3c-0.1-8.7-7.2-15.9-16-15.9v-3C16,5.1,24.5,13.6,24.5,24z"/>
-	<circle class="st2" cx="8.1" cy="21.6" r="2.6"/>
-</g>
-</svg>

static/skin/i18n.js

@@ -1,158 +0,0 @@
-import mustache from '../skin/mustache.min.js?KIWIXCACHEID'
-
-const Translations = {
-  defaultLanguage: null,
-  currentLanguage: null,
-  promises: {},
-  data: {},
-
-  load: function(lang, asDefault=false) {
-    if ( asDefault ) {
-      this.defaultLanguage = lang;
-      this.loadTranslationsJSON(lang);
-    } else {
-      this.currentLanguage = lang;
-      if ( lang != this.defaultLanguage ) {
-        this.loadTranslationsJSON(lang);
-      }
-    }
-  },
-
-  loadTranslationsJSON: function(lang) {
-    if ( this.promises[lang] )
-      return;
-
-    const errorMsg = `Error loading translations for language '${lang}': `;
-    this.promises[lang] = fetch(`./skin/i18n/${lang}.json`).then(async (resp) => {
-      if ( resp.ok ) {
-        this.data[lang] = JSON.parse(await resp.text());
-      } else {
-        console.log(errorMsg + resp.statusText);
-      }
-    }).catch((err) => {
-      console.log(errorMsg + err);
-    });
-  },
-
-  whenReady: function(callback) {
-    const defaultLangPromise = this.promises[this.defaultLanguage];
-    const currentLangPromise = this.promises[this.currentLanguage];
-    Promise.all([defaultLangPromise, currentLangPromise]).then(callback);
-  },
-
-  get: function(msgId) {
-    const activeTranslation = this.data[this.currentLanguage];
-
-    const r = activeTranslation && activeTranslation[msgId];
-    if ( r )
-      return r;
-
-    const defaultMsgs = this.data[this.defaultLanguage];
-    if ( defaultMsgs )
-      return defaultMsgs[msgId];
-
-    throw "Translations are not loaded";
-  }
-}
-
-
-function $t(msgId, params={}) {
-  try {
-    const msgTemplate = Translations.get(msgId);
-    if ( ! msgTemplate ) {
-      return "Invalid message id: " + msgId;
-    }
-
-    return mustache.render(msgTemplate, params);
-  } catch (err) {
-    return "ERROR: " + err;
-  }
-}
-
-function getCookie(cookieName) {
-    const name = cookieName + "=";
-    let result;
-    decodeURIComponent(document.cookie).split('; ').forEach(val => {
-        if (val.indexOf(name) === 0) {
-            result = val.substring(name.length);
-        }
-    });
-    return result;
-}
-
-
-const DEFAULT_UI_LANGUAGE = 'en';
-
-Translations.load(DEFAULT_UI_LANGUAGE, /*asDefault=*/true);
-
-function getUserLanguage() {
-  return new URLSearchParams(window.location.search).get('userlang')
-      || getCookie('userlang')
-      || DEFAULT_UI_LANGUAGE;
-}
-
-function setUserLanguage(lang, callback) {
-  setPermanentGlobalCookie('userlang', lang);
-  Translations.load(lang);
-  Translations.whenReady(callback);
-}
-
-function createModalUILanguageSelector() {
-  document.body.insertAdjacentHTML('beforeend',
-    `<div id="uiLanguageSelector" class="modal-wrapper">
-      <div class="modal">
-        <div class="modal-heading">
-          <div class="modal-title">
-            <div>
-                Select UI language
-            </div>
-          </div>
-          <div onclick="window.modalUILanguageSelector.close()" class="modal-close-button">
-            <div>
-              <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14" fill="none">
-                  <path fill-rule="evenodd" clip-rule="evenodd" d="M13.7071 1.70711C14.0976 1.31658 14.0976
-                  0.683417 13.7071 0.292893C13.3166 -0.0976311 12.6834 -0.0976311 12.2929 0.292893L7 5.58579L1.70711
-                  0.292893C1.31658 -0.0976311 0.683417 -0.0976311 0.292893 0.292893C-0.0976311 0.683417
-                  -0.0976311 1.31658 0.292893 1.70711L5.58579 7L0.292893 12.2929C-0.0976311 12.6834
-                  -0.0976311 13.3166 0.292893 13.7071C0.683417 14.0976 1.31658 14.0976 1.70711 13.7071L7
-                  8.41421L12.2929 13.7071C12.6834 14.0976 13.3166 14.0976 13.7071 13.7071C14.0976 13.3166
-                  14.0976 12.6834 13.7071 12.2929L8.41421 7L13.7071 1.70711Z" fill="black" />
-              </svg>
-            </div>
-          </div>
-        </div>
-        <div class="modal-content">
-          <select id="ui_language"></select>
-        </div>
-      </div>
-    </div>`);
-
-  window.modalUILanguageSelector = {
-    show: () => {
-      document.getElementById('uiLanguageSelector').style.display = 'flex';
-    },
-
-    close: () => {
-      document.getElementById('uiLanguageSelector').style.display = 'none';
-    }
-  };
-}
-
-function initUILanguageSelector(activeLanguage, languageChangeCallback) {
-  if ( document.getElementById("ui_language") == null ) {
-    createModalUILanguageSelector();
-  }
-  const languageSelector = document.getElementById("ui_language");
-  for (const lang of uiLanguages ) {
-    const lang_name = Object.getOwnPropertyNames(lang)[0];
-    const lang_code = lang[lang_name];
-    const is_selected = lang_code == activeLanguage;
-    languageSelector.appendChild(new Option(lang_name, lang_code, is_selected, is_selected));
-  }
-  languageSelector.onchange = languageChangeCallback;
-}
-
-window.$t = $t;
-window.getUserLanguage = getUserLanguage;
-window.setUserLanguage = setUserLanguage;
-window.initUILanguageSelector = initUILanguageSelector;

static/skin/i18n/dga.json

@@ -1,21 +0,0 @@
-{
-	"@metadata": {
-		"authors": [
-			"Alhaji Yakubu"
-		]
-	},
-	"welcome-page-overzealous-filter": "Duoro kyebe. E na boɔra ka fo <a href=\"?lang=\"></a>",
-	"search": "Bo",
-	"book-filtering-all-categories": "Zagre zaa",
-	"book-filtering-all-languages": "Kɔkɔrɛɛ zaa",
-	"count-of-matching-books": "{{COUNT}}  gama",
-	"download": "Tagebo",
-	"direct-download-link-text": "Toribu",
-	"direct-download-alt-text": "Toribu tagebo",
-	"hash-download-alt-text": "Tage bonmannaa",
-	"magnet-link-text": "Kurimaraa sobie",
-	"magnet-alt-text": "Tage kurimaraa",
-	"library-opds-feed": "Gamadie OPDS diibu",
-	"filter-by-tag": "Guy yi kpuli {{TAG}}",
-	"stop-filtering-by-tag": "Bare gyɛɛbo kpuli {{TAG}}"
-}

static/skin/i18n/el.json

@@ -1,21 +0,0 @@
-{
-	"@metadata": {
-		"authors": [
-			"Norhorn"
-		]
-	},
-	"welcome-page-overzealous-filter": "Κανένα αποτέλεσμα. Θέλετε να <a href=\"?lang=\">επαναφέρετε το φίλτρο</a>;",
-	"powered-by-kiwix-html": "Με την υποστήριξη by&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
-	"search": "Αναζήτηση",
-	"book-filtering-all-categories": "Όλες οι κατηγορίες",
-	"book-filtering-all-languages": "Όλες οι γλώσσες",
-	"count-of-matching-books": "{{COUNT}} βιβλίο(α)",
-	"download": "Λήψη",
-	"direct-download-link-text": "Απευθείας",
-	"direct-download-alt-text": "άμεση λήψη",
-	"hash-download-alt-text": "λήψη αναγνωριστικού",
-	"torrent-download-link-text": "Αρχείο torrent",
-	"torrent-download-alt-text": "λήψη torrent",
-	"filter-by-tag": "Φίλτρο ανά ετικέτα \"{{TAG}}\"",
-	"stop-filtering-by-tag": "Διακοπή φίλτρου ανά ετικέτα \"{{TAG}}\""
-}

static/skin/i18n/ia.json

@@ -1,25 +0,0 @@
-{
-	"@metadata": {
-		"authors": [
-			"McDutchie"
-		]
-	},
-	"welcome-page-overzealous-filter": "Nulle resultato. Vole tu <a href=\"?lang=\">reinitialisar le filtro</a>?",
-	"powered-by-kiwix-html": "Actionate per&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
-	"search": "Cercar",
-	"book-filtering-all-categories": "Tote le categorias",
-	"book-filtering-all-languages": "Tote le linguas",
-	"count-of-matching-books": "{{COUNT}} libro(s)",
-	"download": "Discargar",
-	"direct-download-link-text": "Directe",
-	"direct-download-alt-text": "discargamento directe",
-	"hash-download-link-text": "Hash SHA256",
-	"hash-download-alt-text": "hash del discargamento",
-	"magnet-link-text": "Ligamine Magnet",
-	"magnet-alt-text": "ligamine \"magnet\" de discargamento",
-	"torrent-download-link-text": "File Torrent",
-	"torrent-download-alt-text": "discargar Torrent",
-	"library-opds-feed": "Fluxo OPDS del bibliotheca",
-	"filter-by-tag": "Filtrar per etiquetta \"{{TAG}}\"",
-	"stop-filtering-by-tag": "Non plus filtrar per etiquetta \"{{TAG}}\""
-}

static/skin/i18n/lb.json

@@ -1,26 +0,0 @@
-{
-	"@metadata": {
-		"authors": [
-			"Robby",
-			"Volvox"
-		]
-	},
-	"name": "Lëtzebuergesch",
-	"suggest-search": "Maacht eng Volltext-Sich fir <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>",
-	"random-article-failure": "Ups! Et konnt keen zoufällegen Artikel ausgewielt ginn :(",
-	"404-page-title": "Inhalt net fonnt",
-	"404-page-heading": "Net fonnt",
-	"500-page-title": "Interne Feeler um Server",
-	"500-page-heading": "Interne Feeler um Server",
-	"fulltext-search-unavailable": "Volltext-Sich net verfügbar",
-	"home-button-text": "Gitt op d'Haaptsäit vun '{{BOOK_TITLE}}'",
-	"random-page-button-text": "Gitt op eng zoufälleg gewielte Säit",
-	"searchbox-tooltip": "No '{{BOOK_TITLE}}' sichen",
-	"welcome-page-overzealous-filter": "Kee Resultat. Wëllt Dir <a href=\"?lang=\">de Filter zrécksetzen</a>?",
-	"search": "Sichen",
-	"book-filtering-all-categories": "All Kategorien",
-	"book-filtering-all-languages": "All Sproochen",
-	"count-of-matching-books": "{{COUNT}} Buch/Bicher",
-	"download": "Eroflueden",
-	"direct-download-link-text": "Direkt"
-}

static/skin/i18n/nl.json

@@ -1,30 +0,0 @@
-{
-	"@metadata": {
-		"authors": [
-			"McDutchie",
-			"Vistaus"
-		]
-	},
-	"too-many-books": "Er zijn teveel boeken opgevraagd ({{NB_BOOKS}}). Het limiet is {{LIMIT}}.",
-	"no-book-found": "Er zijn geen boeken die overeenkomen met de zoekcriteria",
-	"no-value-for-arg": "Er is geen waarde opgegeven bij {{ARGUMENT}}",
-	"no-query": "Er is geen zoekterm opgegeven.",
-	"welcome-page-overzealous-filter": "Geen resultaat. Wilt u <a href=\"?lang=\">het filter resetten</a>?",
-	"powered-by-kiwix-html": "Mogelijk gemaakt door <a href=\"https://kiwix.org\">Kiwix</a>",
-	"search": "Zoeken",
-	"book-filtering-all-categories": "Alle categorieën",
-	"book-filtering-all-languages": "Alle talen",
-	"count-of-matching-books": "{{COUNT}} boek(en)",
-	"download": "Downloaden",
-	"direct-download-link-text": "Direct",
-	"direct-download-alt-text": "directe download",
-	"hash-download-link-text": "SHA256-hash",
-	"hash-download-alt-text": "controlesom (hash) van de download",
-	"magnet-link-text": "Magnet-link",
-	"magnet-alt-text": "magnet-link van de download",
-	"torrent-download-link-text": "Torrent-bestand",
-	"torrent-download-alt-text": "torrent downloaden",
-	"library-opds-feed": "OPDS-feed van de bibliotheek",
-	"filter-by-tag": "Filteren op tag \"{{TAG}}\"",
-	"stop-filtering-by-tag": "Stoppen met filteren op tag \"{{TAG}}\""
-}

static/skin/i18n/test.json

@@ -1,43 +0,0 @@
-{
-	"@metadata": {
-		"authors": [
-			"Kareyac"
-		]
-	},
-	"name": "Fake language for i18n testing"
-	, "suggest-full-text-search": "[I18N TESTING] cOnTaInInG '{{{SEARCH_TERMS}}}'..."
-	, "no-such-book": "[I18N TESTING] No such book: {{BOOK_NAME}}. Sorry."
-	, "url-not-found": "[I18N TESTING] URL not found: {{url}}"
-	, "suggest-search": "[I18N TESTING] Make a full text search for <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>"
-	, "400-page-title": "[I18N TESTING] Invalid request ($400 fine must be paid)"
-	, "400-page-heading": "[I18N TESTING] -400 karma for an invalid request"
-	, "404-page-title": "[I18N TESTING] Not Found - Try Again"
-	, "404-page-heading": "[I18N TESTING] Content not found, but at least the server is alive"
-	, "library-button-text": "[I18N TESTING] Navigate to the welcome page"
-	, "home-button-text": "[I18N TESTING] Jump to the main page of '{{BOOK_TITLE}}'"
-	, "random-page-button-text": "[I18N TESTING] I am tired of determinism"
-	, "searchbox-tooltip": "[I18N TESTING] Let's search in '{{BOOK_TITLE}}'"
-	, "welcome-page-overzealous-filter": "[I18N TESTING] Nothing found. <a href=\"{{URL}}\">Reset filter</a>"
-	, "powered-by-kiwix-html": "[I18N TESTING] Powered by&nbsp;<a href=\"https://kiwix.org\">Kiwix</a> (nominal power: 1.23 kW)"
-	, "search": "[I18N Search TESTING]"
-	, "book-filtering-all-categories": "All [I18N TESTING] categories"
-	, "book-filtering-all-languages": "All [I18N TESTING] languages"
-	, "count-of-matching-books": "[I18N TESTING] Number of matching books: {{COUNT}}"
-	, "download": "[I18N Download TESTING]"
-	, "direct-download-link-text": "[I18N TESTING] HTTP(S)"
-	, "direct-download-alt-text": "[I18N TESTING] download directly"
-	, "hash-download-link-text": "Sha256 [I18N TESTING] hash"
-	, "hash-download-alt-text": "download [I18N TESTING] hash"
-	, "magnet-link-text": "Magnet [I18N TESTING] link"
-	, "magnet-alt-text": "download [I18N TESTING] magnet"
-	, "torrent-download-link-text": "Torrent [I18N TESTING] file"
-	, "torrent-download-alt-text": "download [I18N TESTING] torrent"
-	, "library-opds-feed-all-entries": "[I18N] Library [TESTING] OPDS Feed - All entries [I18N TESTING]"
-	, "filter-by-tag": "Filter [I18N] by [TESTING] tag \"{{TAG}}\""
-	, "stop-filtering-by-tag": "[I18N] Stop filtering [TESTING] by tag \"{{TAG}}\""
-	, "library-opds-feed-parameterised": "[I18N] Library OPDS Feed - [TESTING] entries matching {{#LANG}}\nLanguage: {{LANG}} {{/LANG}}{{#CATEGORY}}\nCategory: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nTag: {{TAG}} {{/TAG}}{{#Q}}\nQuery: {{Q}} {{/Q}}"
-	, "welcome-to-kiwix-server": "[I18N] Welcome to Kiwix Server [TESTING]"
-	, "download-links-heading": "[I18N] Download links for <b><i>{{BOOK_TITLE}}</i></b> [TESTING]"
-	, "download-links-title": "[I18N TESTING]Download book"
-	, "preview-book": "[I18N] Preview [TESTING]"
-}

static/skin/index.css

@@ -24,10 +24,6 @@ body {
     background-color: #f4f6f8;
     width: 100%;
     padding: 20px;
-    position: sticky;
-    top: 0;
-    z-index: 3;
-    transition: all 0.5s ease;
 }
 
 .kiwixHomeBody__results {
@@ -138,7 +134,6 @@ body {
     display: flex;
     flex-direction: column;
     align-items: center;
-    width: 100%;
 }
 
 .tagFilterLabel {
@@ -162,29 +157,6 @@ body {
     font-weight: bolder;
 }
 
-#uiLanguageSelector {
-  display: none;
-}
-
-#uiLanguageSelector .modal {
-  height: 140px;
-}
-
-#uiLanguageSelector .modal-heading {
-  height: 40%;
-}
-
-#uiLanguageSelector .modal-content #ui_language {
-  font-size: 1.6rem;
-  width: 100%;
-}
-
-#uiLanguageSelectorButton {
-  margin: 0 12px 0 0;
-  float: right;
-  cursor: pointer;
-}
-
 .book__list {
     position: relative;
     margin: 0 auto;
@@ -469,11 +441,6 @@ body {
     width: auto;
 }
 
-.feedLogo, #uiLanguageSelectorButton {
-    height: 30px;
-    float: right;
-}
-
 @media screen and (max-width: 1100px) {
 
     .kiwixHomeBody {
@@ -491,19 +458,18 @@ body {
 
 @media screen and (max-width: 590px) {
 
-    .kiwixNav__SearchForm {
-        display: flex;
-        flex-direction: column;
+    .kiwixNav {
+        height: 285px;
     }
 
     .kiwixHomeBody {
         min-height: calc(100vh - 287px);
     }
-
+    
     .kiwixSearch {
         margin-top: 11px;
     }
-
+    
     .kiwixButton {
         margin: 15px 0;
         width: 229px;

static/skin/index.js

@@ -1,12 +1,4 @@
 (function() {
-    class FragmentParams extends URLSearchParams {
-        constructor(fragment = '') {
-            if (fragment[0] == '#')
-                fragment = fragment.substring(1);
-            super(fragment);
-        }
-    }
-
     const root = document.querySelector(`link[type='root']`).getAttribute('href');
     const incrementalLoadingParams = {
         start: 0,
@@ -22,49 +14,21 @@
     let isFetching = false;
     let noResultInjected = false;
     let filters = getCookie(filterCookieName);
-    let params = new FragmentParams(window.location.hash || filters || '');
-    params.delete('userlang');
+    let params = new URLSearchParams(window.location.search || filters || '');
     let timer;
     let languages = {};
-    let previousScrollTop = Infinity;
-
-    function updateFeedLink() {
-        const inputParams = new FragmentParams(window.location.hash);
-        const filteredParams = new FragmentParams();
-        for (const [key, value] of inputParams) {
-            if ( value != '' ) {
-                filteredParams.set(key, value);
-            }
-        }
-        const feedLink = `${root}/catalog/v2/entries?${filteredParams.toString()}`;
-        document.querySelector('#headFeedLink').href = feedLink;
-        document.querySelector('#feedLink').href = feedLink;
-        setFeedToolTip();
-    }
-
-    function changeUILanguage() {
-      window.modalUILanguageSelector.close();
-      const s = document.getElementById("ui_language");
-      const lang = s.options[s.selectedIndex].value;
-      setPermanentGlobalCookie('userlang', lang);
-      window.location.reload();
-    }
 
     function queryUrlBuilder() {
-        let url = `${root}/catalog/v2/entries?`;
+        let url = `${root}/catalog/search?`;
         url += Object.keys(incrementalLoadingParams).map(key => `${key}=${incrementalLoadingParams[key]}`).join("&");
         params.forEach((value, key) => {url+= value ? `&${key}=${value}` : ''});
         return (url);
     }
 
-    function setCookie(cookieName, cookieValue, ttl) {
-        let exp = "";
-        if ( ttl ) {
-          const date = new Date();
-          date.setTime(date.getTime() + ttl);
-          exp = `expires=${date.toUTCString()};`;
-        }
-        document.cookie = `${cookieName}=${cookieValue};${exp}sameSite=Strict`;
+    function setCookie(cookieName, cookieValue) {
+        const date = new Date();
+        date.setTime(date.getTime() + oneDayDelta);
+        document.cookie = `${cookieName}=${cookieValue};expires=${date.toUTCString()};sameSite=Strict`;
     }
 
     function getCookie(cookieName) {
@@ -116,7 +80,7 @@
     function generateTagLink(tagValue) {
         tagValue = tagValue.toLowerCase();
         const humanFriendlyTagValue = humanFriendlyTitle(tagValue);
-        const tagMessage = $t("filter-by-tag", {TAG: humanFriendlyTagValue});
+        const tagMessage = `Filter by tag "${humanFriendlyTagValue}"`;
         return `<span class='tag__link' aria-label='${tagMessage}' title='${tagMessage}' data-tag=${tagValue}>${humanFriendlyTagValue}</span>`
     }
 
@@ -131,13 +95,8 @@
         const title =  getInnerHtml(book, 'title');
         const description = getInnerHtml(book, 'summary');
         const id = getInnerHtml(book, 'id');
-        const langCodesList = getInnerHtml(book, 'language').split(',');
-        const langCode = langCodesList.length == 1 ? langCodesList[0] : 'mul';
-        let language = languages[langCode];
-        if (langCode == 'mul') {
-            const mulLangList = langCodesList.filter(x => languages.hasOwnProperty(x)).map(x => languages[x]);
-            language = mulLangList.join(', ');
-        }
+        const langCode = getInnerHtml(book, 'language');
+        const language = languages[langCode];
         const tags = getInnerHtml(book, 'tags');
         const tagList = tags.split(';').filter(tag => {return !(tag.startsWith('_'))});
         const tagFilterLinks = tagList.map((tagValue) => generateTagLink(tagValue));
@@ -171,7 +130,7 @@
             <div class="book__icon" ${faviconAttr}></div>
             <div class="book__header">
                 <div id="book__title">${title}</div>
-                ${downloadLink ? `<div class="book__download"><span data-link="${downloadLink}">${$t("download")} ${humanFriendlyZimSize ? ` - ${humanFriendlyZimSize}</span></div>`: ''}` : ''}
+                ${downloadLink ? `<div class="book__download"><span data-link="${downloadLink}">Download ${humanFriendlyZimSize ? ` - ${humanFriendlyZimSize}</span></div>`: ''}` : ''}
             </div>
             <div class="book__description" title="${description}">${description}</div>
             </div>
@@ -237,27 +196,27 @@
                     <div class="modal-content">
                         <div class="modal-regular-download">
                             <a href="${downloadLink}" download>
-                                <img src="${root}/skin/download.png?KIWIXCACHEID" alt="${$t("direct-download-alt-text")}" />
-                                <div>${$t("direct-download-link-text")}</div>
+                                <img src="../skin/download.png?KIWIXCACHEID" alt="direct download" />
+                                <div>Direct</div>
                             </a>
                         </div>
                         <div class="modal-regular-download">
                             <a href="${downloadLink}.sha256" download>
-                                <img src="${root}/skin/hash.png?KIWIXCACHEID" alt="${$t("hash-download-alt-text")}" />
-                                <div>${$t("hash-download-link-text")}</div>
+                                <img src="../skin/hash.png?KIWIXCACHEID" alt="download hash" />
+                                <div>Sha256 hash</div>
                             </a>
                         </div>
                         ${magnetLink ?
                         `<div class="modal-regular-download">
                             <a href="${magnetLink}" target="_blank">
-                                <img src="${root}/skin/magnet.png?KIWIXCACHEID" alt="${$t("magnet-alt-text")}" />
-                                <div>${$t("magnet-link-text")}</div>
+                                <img src="../skin/magnet.png?KIWIXCACHEID" alt="download magnet" />
+                                <div>Magnet link</div>
                             </a>
                         </div>` : ``}
                         <div class="modal-regular-download">
                             <a href="${downloadLink}.torrent" download>
-                                <img src="${root}/skin/bittorrent.png?KIWIXCACHEID" alt="${$t("torrent-download-alt-text")}" />
-                                <div>${$t("torrent-download-link-text")}</div>
+                                <img src="../skin/bittorrent.png?KIWIXCACHEID" alt="download torrent" />
+                                <div>Torrent file</div>
                             </a>
                         </div>
                     </div>
@@ -267,7 +226,7 @@
     }
 
     async function getBookCount(query) {
-        const url = `${root}/catalog/v2/entries?${query}&count=0`;
+        const url = `${root}/catalog/search?${query}`;
         return await fetch(url).then(async (resp) => {
             const data = new window.DOMParser().parseFromString(await resp.text(), 'application/xml');
             return parseInt(data.querySelector('totalResults').innerHTML);
@@ -290,10 +249,16 @@
             } else {
                 toggleFooter();
             }
-            const text = results
-                       ? $t("count-of-matching-books", {COUNT: results})
-                       : '';
-            document.querySelector('.kiwixHomeBody__results').innerHTML = text;
+            const kiwixResultText = document.querySelector('.kiwixHomeBody__results')
+            if (results) {
+                let resultText = `${results} books`;
+                if (results === 1) {
+                    resultText = `${results} book`;
+                }
+                kiwixResultText.innerHTML = resultText;
+            } else {
+                kiwixResultText.innerHTML = ``;
+            }
             loader.style.display = 'none';
             return books;
         });
@@ -320,7 +285,7 @@
         const kiwixHomeBody = document.querySelector('.kiwixHomeBody');
         const divTag = document.createElement('div');
         divTag.setAttribute('class', 'noResults');
-        divTag.innerHTML = $t("welcome-page-overzealous-filter", {URL: '#lang='});
+        divTag.innerHTML = `No result. Would you like to <a href="?lang=">reset filter</a>?`;
         kiwixHomeBody.append(divTag);
         kiwixHomeBody.setAttribute('style', 'display: flex; justify-content: center; align-items: center');
         loader.setAttribute('style', 'position: absolute; top: 50%');
@@ -391,14 +356,13 @@
         incrementalLoadingParams.count = viewPortToCount();
         fadeOutDiv.style.display = 'none';
         bookOrderMap.clear();
-        params = new FragmentParams(window.location.hash);
+        params = new URLSearchParams(window.location.search);
         if (filterType) {
             params.set(filterType, filterValue);
-            window.history.pushState({}, null, `#${params.toString()}`);
-            setCookie(filterCookieName, params.toString(), oneDayDelta);
+            window.history.pushState({}, null, `?${params.toString()}`);
+            setCookie(filterCookieName, params.toString());
         }
         updateFilterColors();
-        updateFeedLink();
         await loadAndDisplayBooks(true);
     }
 
@@ -433,7 +397,7 @@
         tagElement.style.display = 'inline-block';
         const humanFriendlyTagValue = humanFriendlyTitle(tagValue);
         tagElement.innerHTML = `${humanFriendlyTagValue}`;
-        const tagMessage = $t("stop-filtering-by-tag", {TAG: humanFriendlyTagValue});
+        const tagMessage = `Stop filtering by tag "${humanFriendlyTagValue}"`;
         tagElement.setAttribute('aria-label', tagMessage);
         tagElement.setAttribute('title', tagMessage);
         if (resetFilter)
@@ -468,22 +432,6 @@
         }
     }
 
-    function updateNavVisibilityState() {
-        const st = window.scrollY;
-        const enableAutoHiding = document.body.clientWidth < 590;
-        if ((Math.abs(previousScrollTop - st) <= 5) || !enableAutoHiding)
-            return;
-        const kiwixNav = document.querySelector('.kiwixNav');
-        if (st > previousScrollTop) {
-            kiwixNav.style.position = 'fixed';
-            kiwixNav.style.top = '-100%';
-        } else {
-            kiwixNav.style.position = 'sticky';
-            kiwixNav.style.top = '0';
-        }
-        previousScrollTop = st;
-    }
-
     window.addEventListener('resize', (event) => {
         if (timer) {clearTimeout(timer)}
         timer = setTimeout(() => {
@@ -500,42 +448,7 @@
         }
     });
 
-    window.addEventListener('hashchange', () => resetAndFilter());
-
-    function setFeedToolTip() {
-        const feedLogoElem = document.getElementById('feedLogo');
-        const libraryOpdsFeedHint = opdsFeedHintByParams();
-        for (const attr of ["alt", "aria-label", "title"] ) {
-            feedLogoElem.setAttribute(attr, libraryOpdsFeedHint);
-        }
-    }
-
-    function opdsFeedHintByParams() {
-        const paramObj = {};
-        const inputParams = new FragmentParams(window.location.hash);
-        for (const [key, value] of inputParams) {
-            if ( value != '' ) {
-                paramObj[key.toUpperCase()] = value;
-            }
-        }
-        if (!paramObj.LANG && !paramObj.CATEGORY && !paramObj.TAG && !paramObj.Q) {
-            return $t('library-opds-feed-all-entries');
-        }
-        return $t('library-opds-feed-parameterised', paramObj);
-    }
-
-    function updateUIText() {
-        footer.innerHTML = $t("powered-by-kiwix-html");
-        const searchText = $t("search");
-        document.getElementById('searchFilter').placeholder = searchText;
-        document.getElementById('searchButton').value = searchText;
-        document.getElementById('categoryFilter').children[0].innerHTML = $t("book-filtering-all-categories");
-        document.getElementById('languageFilter').children[0].innerHTML = $t("book-filtering-all-languages");
-        setFeedToolTip();
-    }
-
-    async function onload() {
-        initUILanguageSelector(getUserLanguage(), changeUILanguage);
+    window.onload = async () => {
         iso = new Isotope( '.book__list', {
             itemSelector: '.book',
             getSortData:{
@@ -551,7 +464,6 @@
             }
         });
         footer = document.getElementById('kiwixfooter');
-        updateUIText();
         fadeOutDiv = document.getElementById('fadeOut');
         loader = document.querySelector('.loader');
         await loadAndDisplayOptions('#languageFilter', `${root}/catalog/v2/languages`, 'language');
@@ -563,15 +475,15 @@
         const tagElement = document.getElementsByClassName('tagFilterLabel')[0];
         tagElement.addEventListener('click', () => removeTagElement(true));
         if (filters) {
-            const currentLink = window.location.hash;
-            const newLink = `#${params.toString()}`;
+            const currentLink = window.location.search;
+            const newLink = `?${params.toString()}`;
             if (currentLink != newLink) {
                 window.history.pushState({}, null, newLink);
             }
         }
         updateVisibleParams();
         document.getElementById('kiwixSearchForm').onsubmit = (event) => {event.preventDefault()};
-        if (!window.location.hash) {
+        if (!window.location.search) {
             const browserLang = navigator.language.split('-')[0];
             const langFilter = document.getElementById('languageFilter');
             const lang = browserLang.length === 3 ? browserLang : iso6391To3[browserLang];
@@ -580,16 +492,7 @@
                 langFilter.dispatchEvent(new Event('change'));
             }
         }
-        updateFeedLink();
-        setCookie(filterCookieName, params.toString(), oneDayDelta);
-        setInterval(updateNavVisibilityState, 250);
-    };
-
-    // required by i18n.js:setUserLanguage()
-    window.setPermanentGlobalCookie = function(name, value) {
-        document.cookie = `${name}=${value};path=${root};max-age=31536000`;
+        setCookie(filterCookieName, params.toString());
     }
-
-    window.onload = () => { setUserLanguage(getUserLanguage(), onload); }
 })();
 

static/skin/langSelector.svg

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="uiLanguageSelectorButton" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#CCCCCC;}
-	.st2{fill:#3366CC;}
-</style>
-<g>
-	<path class="st0" d="M2.9,29.6c-1.4,0-2.6-1.1-2.6-2.6V2.9c0-1.4,1.1-2.6,2.6-2.6h24.1c1.4,0,2.6,1.1,2.6,2.6v24.1
-		c0,1.4-1.1,2.6-2.6,2.6H2.9z"/>
-	<path class="st1" d="M27.1,0.6c1.3,0,2.3,1,2.3,2.3v24.1c0,1.3-1,2.3-2.3,2.3H2.9c-1.3,0-2.3-1-2.3-2.3V2.9c0-1.3,1-2.3,2.3-2.3
-		H27.1 M27.1,0.1H2.9c-1.6,0-2.8,1.3-2.8,2.8v24.1c0,1.6,1.3,2.8,2.8,2.8h24.1c1.6,0,2.8-1.3,2.8-2.8V2.9
-		C29.9,1.4,28.6,0.1,27.1,0.1L27.1,0.1z"/>
-</g>
-<g>
-	<path class="st2" d="M26.4,24.1h-1.7c-0.2,0-0.3-0.1-0.5-0.2S24,23.7,24,23.6l-1.1-3h-5.7l-1.1,2.9c-0.1,0.2-0.2,0.2-0.2,0.3
-		c-0.2,0.2-0.3,0.3-0.5,0.3h-1.6L19,11.1h2.1L26.4,24.1z M22.4,19.2l-1.8-4.8c-0.2-0.5-0.3-0.9-0.5-1.4c-0.1,0.3-0.2,0.5-0.2,0.8
-		l-0.2,0.6l-1.8,4.8L22.4,19.2z M15.2,17.4c-1.1-0.4-2.3-0.9-3.3-1.6c1.6-1.7,2.7-3.8,3.2-6.2h2.2V8.2H12c-0.1-0.2-0.2-0.5-0.2-0.6
-		c-0.3-0.8-0.6-1.7-0.6-1.7L9.5,6.5c0,0,0.5,1,0.7,1.7H3.6v1.5H6c0.5,2.3,1.6,4.4,3.3,6.2c-1.7,1.1-3.6,1.9-5.7,2.4
-		c0.5,0.6,0.8,1.1,1,1.6c2.1-0.7,4.1-1.7,5.9-2.9c1.3,0.8,2.7,1.5,4,2.1L15.2,17.4z M7.7,9.7h5.6c-0.4,2-1.4,3.7-2.8,5.1
-		C9.2,13.3,8.2,11.6,7.7,9.7z"/>
-</g>
-</svg>

static/skin/languages.js

@@ -1,74 +0,0 @@
-const uiLanguages = [
-  {
-    "الإنجليزية": "ar"
-  },
-  {
-    "বাংলা": "bn"
-  },
-  {
-    "Čeština": "cs"
-  },
-  {
-    "Deutsch": "de"
-  },
-  {
-    "English": "en"
-  },
-  {
-    "français": "fr"
-  },
-  {
-    "עברית": "he"
-  },
-  {
-    "Հայերեն": "hy"
-  },
-  {
-    "italiano": "it"
-  },
-  {
-    "日本語": "ja"
-  },
-  {
-    "한국어": "ko"
-  },
-  {
-    "kurdî": "ku-latn"
-  },
-  {
-    "Lëtzebuergesch": "lb"
-  },
-  {
-    "македонски": "mk"
-  },
-  {
-    "ߒߞߏ": "nqo"
-  },
-  {
-    "Polski": "pl"
-  },
-  {
-    "русский": "ru"
-  },
-  {
-    "Sardu": "sc"
-  },
-  {
-    "slovenčina": "sk"
-  },
-  {
-    "slovenščina": "sl"
-  },
-  {
-    "Svenska": "sv"
-  },
-  {
-    "Türkçe": "tr"
-  },
-  {
-    "英语": "zh-hans"
-  },
-  {
-    "繁體中文": "zh-hant"
-  }
-]

static/skin/mustache.js

@@ -1,764 +0,0 @@
-/*!
- * mustache.js - Logic-less {{mustache}} templates with JavaScript
- * http://github.com/janl/mustache.js
- */
-
-var objectToString = Object.prototype.toString;
-var isArray = Array.isArray || function isArrayPolyfill (object) {
-  return objectToString.call(object) === '[object Array]';
-};
-
-function isFunction (object) {
-  return typeof object === 'function';
-}
-
-/**
- * More correct typeof string handling array
- * which normally returns typeof 'object'
- */
-function typeStr (obj) {
-  return isArray(obj) ? 'array' : typeof obj;
-}
-
-function escapeRegExp (string) {
-  return string.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&');
-}
-
-/**
- * Null safe way of checking whether or not an object,
- * including its prototype, has a given property
- */
-function hasProperty (obj, propName) {
-  return obj != null && typeof obj === 'object' && (propName in obj);
-}
-
-/**
- * Safe way of detecting whether or not the given thing is a primitive and
- * whether it has the given property
- */
-function primitiveHasOwnProperty (primitive, propName) {
-  return (
-    primitive != null
-    && typeof primitive !== 'object'
-    && primitive.hasOwnProperty
-    && primitive.hasOwnProperty(propName)
-  );
-}
-
-// Workaround for https://issues.apache.org/jira/browse/COUCHDB-577
-// See https://github.com/janl/mustache.js/issues/189
-var regExpTest = RegExp.prototype.test;
-function testRegExp (re, string) {
-  return regExpTest.call(re, string);
-}
-
-var nonSpaceRe = /\S/;
-function isWhitespace (string) {
-  return !testRegExp(nonSpaceRe, string);
-}
-
-var entityMap = {
-  '&': '&',
-  '<': '&lt;',
-  '>': '&gt;',
-  '"': '&quot;',
-  "'": '&#39;',
-  '/': '&#x2F;',
-  '`': '&#x60;',
-  '=': '&#x3D;'
-};
-
-function escapeHtml (string) {
-  return String(string).replace(/[&<>"'`=\/]/g, function fromEntityMap (s) {
-    return entityMap[s];
-  });
-}
-
-var whiteRe = /\s*/;
-var spaceRe = /\s+/;
-var equalsRe = /\s*=/;
-var curlyRe = /\s*\}/;
-var tagRe = /#|\^|\/|>|\{|&|=|!/;
-
-/**
- * Breaks up the given `template` string into a tree of tokens. If the `tags`
- * argument is given here it must be an array with two string values: the
- * opening and closing tags used in the template (e.g. [ "<%", "%>" ]). Of
- * course, the default is to use mustaches (i.e. mustache.tags).
- *
- * A token is an array with at least 4 elements. The first element is the
- * mustache symbol that was used inside the tag, e.g. "#" or "&". If the tag
- * did not contain a symbol (i.e. {{myValue}}) this element is "name". For
- * all text that appears outside a symbol this element is "text".
- *
- * The second element of a token is its "value". For mustache tags this is
- * whatever else was inside the tag besides the opening symbol. For text tokens
- * this is the text itself.
- *
- * The third and fourth elements of the token are the start and end indices,
- * respectively, of the token in the original template.
- *
- * Tokens that are the root node of a subtree contain two more elements: 1) an
- * array of tokens in the subtree and 2) the index in the original template at
- * which the closing tag for that section begins.
- *
- * Tokens for partials also contain two more elements: 1) a string value of
- * indendation prior to that tag and 2) the index of that tag on that line -
- * eg a value of 2 indicates the partial is the third tag on this line.
- */
-function parseTemplate (template, tags) {
-  if (!template)
-    return [];
-  var lineHasNonSpace = false;
-  var sections = [];     // Stack to hold section tokens
-  var tokens = [];       // Buffer to hold the tokens
-  var spaces = [];       // Indices of whitespace tokens on the current line
-  var hasTag = false;    // Is there a {{tag}} on the current line?
-  var nonSpace = false;  // Is there a non-space char on the current line?
-  var indentation = '';  // Tracks indentation for tags that use it
-  var tagIndex = 0;      // Stores a count of number of tags encountered on a line
-
-  // Strips all whitespace tokens array for the current line
-  // if there was a {{#tag}} on it and otherwise only space.
-  function stripSpace () {
-    if (hasTag && !nonSpace) {
-      while (spaces.length)
-        delete tokens[spaces.pop()];
-    } else {
-      spaces = [];
-    }
-
-    hasTag = false;
-    nonSpace = false;
-  }
-
-  var openingTagRe, closingTagRe, closingCurlyRe;
-  function compileTags (tagsToCompile) {
-    if (typeof tagsToCompile === 'string')
-      tagsToCompile = tagsToCompile.split(spaceRe, 2);
-
-    if (!isArray(tagsToCompile) || tagsToCompile.length !== 2)
-      throw new Error('Invalid tags: ' + tagsToCompile);
-
-    openingTagRe = new RegExp(escapeRegExp(tagsToCompile[0]) + '\\s*');
-    closingTagRe = new RegExp('\\s*' + escapeRegExp(tagsToCompile[1]));
-    closingCurlyRe = new RegExp('\\s*' + escapeRegExp('}' + tagsToCompile[1]));
-  }
-
-  compileTags(tags || mustache.tags);
-
-  var scanner = new Scanner(template);
-
-  var start, type, value, chr, token, openSection;
-  while (!scanner.eos()) {
-    start = scanner.pos;
-
-    // Match any text between tags.
-    value = scanner.scanUntil(openingTagRe);
-
-    if (value) {
-      for (var i = 0, valueLength = value.length; i < valueLength; ++i) {
-        chr = value.charAt(i);
-
-        if (isWhitespace(chr)) {
-          spaces.push(tokens.length);
-          indentation += chr;
-        } else {
-          nonSpace = true;
-          lineHasNonSpace = true;
-          indentation += ' ';
-        }
-
-        tokens.push([ 'text', chr, start, start + 1 ]);
-        start += 1;
-
-        // Check for whitespace on the current line.
-        if (chr === '\n') {
-          stripSpace();
-          indentation = '';
-          tagIndex = 0;
-          lineHasNonSpace = false;
-        }
-      }
-    }
-
-    // Match the opening tag.
-    if (!scanner.scan(openingTagRe))
-      break;
-
-    hasTag = true;
-
-    // Get the tag type.
-    type = scanner.scan(tagRe) || 'name';
-    scanner.scan(whiteRe);
-
-    // Get the tag value.
-    if (type === '=') {
-      value = scanner.scanUntil(equalsRe);
-      scanner.scan(equalsRe);
-      scanner.scanUntil(closingTagRe);
-    } else if (type === '{') {
-      value = scanner.scanUntil(closingCurlyRe);
-      scanner.scan(curlyRe);
-      scanner.scanUntil(closingTagRe);
-      type = '&';
-    } else {
-      value = scanner.scanUntil(closingTagRe);
-    }
-
-    // Match the closing tag.
-    if (!scanner.scan(closingTagRe))
-      throw new Error('Unclosed tag at ' + scanner.pos);
-
-    if (type == '>') {
-      token = [ type, value, start, scanner.pos, indentation, tagIndex, lineHasNonSpace ];
-    } else {
-      token = [ type, value, start, scanner.pos ];
-    }
-    tagIndex++;
-    tokens.push(token);
-
-    if (type === '#' || type === '^') {
-      sections.push(token);
-    } else if (type === '/') {
-      // Check section nesting.
-      openSection = sections.pop();
-
-      if (!openSection)
-        throw new Error('Unopened section "' + value + '" at ' + start);
-
-      if (openSection[1] !== value)
-        throw new Error('Unclosed section "' + openSection[1] + '" at ' + start);
-    } else if (type === 'name' || type === '{' || type === '&') {
-      nonSpace = true;
-    } else if (type === '=') {
-      // Set the tags for the next time around.
-      compileTags(value);
-    }
-  }
-
-  stripSpace();
-
-  // Make sure there are no open sections when we're done.
-  openSection = sections.pop();
-
-  if (openSection)
-    throw new Error('Unclosed section "' + openSection[1] + '" at ' + scanner.pos);
-
-  return nestTokens(squashTokens(tokens));
-}
-
-/**
- * Combines the values of consecutive text tokens in the given `tokens` array
- * to a single token.
- */
-function squashTokens (tokens) {
-  var squashedTokens = [];
-
-  var token, lastToken;
-  for (var i = 0, numTokens = tokens.length; i < numTokens; ++i) {
-    token = tokens[i];
-
-    if (token) {
-      if (token[0] === 'text' && lastToken && lastToken[0] === 'text') {
-        lastToken[1] += token[1];
-        lastToken[3] = token[3];
-      } else {
-        squashedTokens.push(token);
-        lastToken = token;
-      }
-    }
-  }
-
-  return squashedTokens;
-}
-
-/**
- * Forms the given array of `tokens` into a nested tree structure where
- * tokens that represent a section have two additional items: 1) an array of
- * all tokens that appear in that section and 2) the index in the original
- * template that represents the end of that section.
- */
-function nestTokens (tokens) {
-  var nestedTokens = [];
-  var collector = nestedTokens;
-  var sections = [];
-
-  var token, section;
-  for (var i = 0, numTokens = tokens.length; i < numTokens; ++i) {
-    token = tokens[i];
-
-    switch (token[0]) {
-      case '#':
-      case '^':
-        collector.push(token);
-        sections.push(token);
-        collector = token[4] = [];
-        break;
-      case '/':
-        section = sections.pop();
-        section[5] = token[2];
-        collector = sections.length > 0 ? sections[sections.length - 1][4] : nestedTokens;
-        break;
-      default:
-        collector.push(token);
-    }
-  }
-
-  return nestedTokens;
-}
-
-/**
- * A simple string scanner that is used by the template parser to find
- * tokens in template strings.
- */
-function Scanner (string) {
-  this.string = string;
-  this.tail = string;
-  this.pos = 0;
-}
-
-/**
- * Returns `true` if the tail is empty (end of string).
- */
-Scanner.prototype.eos = function eos () {
-  return this.tail === '';
-};
-
-/**
- * Tries to match the given regular expression at the current position.
- * Returns the matched text if it can match, the empty string otherwise.
- */
-Scanner.prototype.scan = function scan (re) {
-  var match = this.tail.match(re);
-
-  if (!match || match.index !== 0)
-    return '';
-
-  var string = match[0];
-
-  this.tail = this.tail.substring(string.length);
-  this.pos += string.length;
-
-  return string;
-};
-
-/**
- * Skips all text until the given regular expression can be matched. Returns
- * the skipped string, which is the entire tail if no match can be made.
- */
-Scanner.prototype.scanUntil = function scanUntil (re) {
-  var index = this.tail.search(re), match;
-
-  switch (index) {
-    case -1:
-      match = this.tail;
-      this.tail = '';
-      break;
-    case 0:
-      match = '';
-      break;
-    default:
-      match = this.tail.substring(0, index);
-      this.tail = this.tail.substring(index);
-  }
-
-  this.pos += match.length;
-
-  return match;
-};
-
-/**
- * Represents a rendering context by wrapping a view object and
- * maintaining a reference to the parent context.
- */
-function Context (view, parentContext) {
-  this.view = view;
-  this.cache = { '.': this.view };
-  this.parent = parentContext;
-}
-
-/**
- * Creates a new context using the given view with this context
- * as the parent.
- */
-Context.prototype.push = function push (view) {
-  return new Context(view, this);
-};
-
-/**
- * Returns the value of the given name in this context, traversing
- * up the context hierarchy if the value is absent in this context's view.
- */
-Context.prototype.lookup = function lookup (name) {
-  var cache = this.cache;
-
-  var value;
-  if (cache.hasOwnProperty(name)) {
-    value = cache[name];
-  } else {
-    var context = this, intermediateValue, names, index, lookupHit = false;
-
-    while (context) {
-      if (name.indexOf('.') > 0) {
-        intermediateValue = context.view;
-        names = name.split('.');
-        index = 0;
-
-        /**
-         * Using the dot notion path in `name`, we descend through the
-         * nested objects.
-         *
-         * To be certain that the lookup has been successful, we have to
-         * check if the last object in the path actually has the property
-         * we are looking for. We store the result in `lookupHit`.
-         *
-         * This is specially necessary for when the value has been set to
-         * `undefined` and we want to avoid looking up parent contexts.
-         *
-         * In the case where dot notation is used, we consider the lookup
-         * to be successful even if the last "object" in the path is
-         * not actually an object but a primitive (e.g., a string, or an
-         * integer), because it is sometimes useful to access a property
-         * of an autoboxed primitive, such as the length of a string.
-         **/
-        while (intermediateValue != null && index < names.length) {
-          if (index === names.length - 1)
-            lookupHit = (
-              hasProperty(intermediateValue, names[index])
-              || primitiveHasOwnProperty(intermediateValue, names[index])
-            );
-
-          intermediateValue = intermediateValue[names[index++]];
-        }
-      } else {
-        intermediateValue = context.view[name];
-
-        /**
-         * Only checking against `hasProperty`, which always returns `false` if
-         * `context.view` is not an object. Deliberately omitting the check
-         * against `primitiveHasOwnProperty` if dot notation is not used.
-         *
-         * Consider this example:
-         * ```
-         * Mustache.render("The length of a football field is {{#length}}{{length}}{{/length}}.", {length: "100 yards"})
-         * ```
-         *
-         * If we were to check also against `primitiveHasOwnProperty`, as we do
-         * in the dot notation case, then render call would return:
-         *
-         * "The length of a football field is 9."
-         *
-         * rather than the expected:
-         *
-         * "The length of a football field is 100 yards."
-         **/
-        lookupHit = hasProperty(context.view, name);
-      }
-
-      if (lookupHit) {
-        value = intermediateValue;
-        break;
-      }
-
-      context = context.parent;
-    }
-
-    cache[name] = value;
-  }
-
-  if (isFunction(value))
-    value = value.call(this.view);
-
-  return value;
-};
-
-/**
- * A Writer knows how to take a stream of tokens and render them to a
- * string, given a context. It also maintains a cache of templates to
- * avoid the need to parse the same template twice.
- */
-function Writer () {
-  this.templateCache = {
-    _cache: {},
-    set: function set (key, value) {
-      this._cache[key] = value;
-    },
-    get: function get (key) {
-      return this._cache[key];
-    },
-    clear: function clear () {
-      this._cache = {};
-    }
-  };
-}
-
-/**
- * Clears all cached templates in this writer.
- */
-Writer.prototype.clearCache = function clearCache () {
-  if (typeof this.templateCache !== 'undefined') {
-    this.templateCache.clear();
-  }
-};
-
-/**
- * Parses and caches the given `template` according to the given `tags` or
- * `mustache.tags` if `tags` is omitted,  and returns the array of tokens
- * that is generated from the parse.
- */
-Writer.prototype.parse = function parse (template, tags) {
-  var cache = this.templateCache;
-  var cacheKey = template + ':' + (tags || mustache.tags).join(':');
-  var isCacheEnabled = typeof cache !== 'undefined';
-  var tokens = isCacheEnabled ? cache.get(cacheKey) : undefined;
-
-  if (tokens == undefined) {
-    tokens = parseTemplate(template, tags);
-    isCacheEnabled && cache.set(cacheKey, tokens);
-  }
-  return tokens;
-};
-
-/**
- * High-level method that is used to render the given `template` with
- * the given `view`.
- *
- * The optional `partials` argument may be an object that contains the
- * names and templates of partials that are used in the template. It may
- * also be a function that is used to load partial templates on the fly
- * that takes a single argument: the name of the partial.
- *
- * If the optional `config` argument is given here, then it should be an
- * object with a `tags` attribute or an `escape` attribute or both.
- * If an array is passed, then it will be interpreted the same way as
- * a `tags` attribute on a `config` object.
- *
- * The `tags` attribute of a `config` object must be an array with two
- * string values: the opening and closing tags used in the template (e.g.
- * [ "<%", "%>" ]). The default is to mustache.tags.
- *
- * The `escape` attribute of a `config` object must be a function which
- * accepts a string as input and outputs a safely escaped string.
- * If an `escape` function is not provided, then an HTML-safe string
- * escaping function is used as the default.
- */
-Writer.prototype.render = function render (template, view, partials, config) {
-  var tags = this.getConfigTags(config);
-  var tokens = this.parse(template, tags);
-  var context = (view instanceof Context) ? view : new Context(view, undefined);
-  return this.renderTokens(tokens, context, partials, template, config);
-};
-
-/**
- * Low-level method that renders the given array of `tokens` using
- * the given `context` and `partials`.
- *
- * Note: The `originalTemplate` is only ever used to extract the portion
- * of the original template that was contained in a higher-order section.
- * If the template doesn't use higher-order sections, this argument may
- * be omitted.
- */
-Writer.prototype.renderTokens = function renderTokens (tokens, context, partials, originalTemplate, config) {
-  var buffer = '';
-
-  var token, symbol, value;
-  for (var i = 0, numTokens = tokens.length; i < numTokens; ++i) {
-    value = undefined;
-    token = tokens[i];
-    symbol = token[0];
-
-    if (symbol === '#') value = this.renderSection(token, context, partials, originalTemplate, config);
-    else if (symbol === '^') value = this.renderInverted(token, context, partials, originalTemplate, config);
-    else if (symbol === '>') value = this.renderPartial(token, context, partials, config);
-    else if (symbol === '&') value = this.unescapedValue(token, context);
-    else if (symbol === 'name') value = this.escapedValue(token, context, config);
-    else if (symbol === 'text') value = this.rawValue(token);
-
-    if (value !== undefined)
-      buffer += value;
-  }
-
-  return buffer;
-};
-
-Writer.prototype.renderSection = function renderSection (token, context, partials, originalTemplate, config) {
-  var self = this;
-  var buffer = '';
-  var value = context.lookup(token[1]);
-
-  // This function is used to render an arbitrary template
-  // in the current context by higher-order sections.
-  function subRender (template) {
-    return self.render(template, context, partials, config);
-  }
-
-  if (!value) return;
-
-  if (isArray(value)) {
-    for (var j = 0, valueLength = value.length; j < valueLength; ++j) {
-      buffer += this.renderTokens(token[4], context.push(value[j]), partials, originalTemplate, config);
-    }
-  } else if (typeof value === 'object' || typeof value === 'string' || typeof value === 'number') {
-    buffer += this.renderTokens(token[4], context.push(value), partials, originalTemplate, config);
-  } else if (isFunction(value)) {
-    if (typeof originalTemplate !== 'string')
-      throw new Error('Cannot use higher-order sections without the original template');
-
-    // Extract the portion of the original template that the section contains.
-    value = value.call(context.view, originalTemplate.slice(token[3], token[5]), subRender);
-
-    if (value != null)
-      buffer += value;
-  } else {
-    buffer += this.renderTokens(token[4], context, partials, originalTemplate, config);
-  }
-  return buffer;
-};
-
-Writer.prototype.renderInverted = function renderInverted (token, context, partials, originalTemplate, config) {
-  var value = context.lookup(token[1]);
-
-  // Use JavaScript's definition of falsy. Include empty arrays.
-  // See https://github.com/janl/mustache.js/issues/186
-  if (!value || (isArray(value) && value.length === 0))
-    return this.renderTokens(token[4], context, partials, originalTemplate, config);
-};
-
-Writer.prototype.indentPartial = function indentPartial (partial, indentation, lineHasNonSpace) {
-  var filteredIndentation = indentation.replace(/[^ \t]/g, '');
-  var partialByNl = partial.split('\n');
-  for (var i = 0; i < partialByNl.length; i++) {
-    if (partialByNl[i].length && (i > 0 || !lineHasNonSpace)) {
-      partialByNl[i] = filteredIndentation + partialByNl[i];
-    }
-  }
-  return partialByNl.join('\n');
-};
-
-Writer.prototype.renderPartial = function renderPartial (token, context, partials, config) {
-  if (!partials) return;
-  var tags = this.getConfigTags(config);
-
-  var value = isFunction(partials) ? partials(token[1]) : partials[token[1]];
-  if (value != null) {
-    var lineHasNonSpace = token[6];
-    var tagIndex = token[5];
-    var indentation = token[4];
-    var indentedValue = value;
-    if (tagIndex == 0 && indentation) {
-      indentedValue = this.indentPartial(value, indentation, lineHasNonSpace);
-    }
-    var tokens = this.parse(indentedValue, tags);
-    return this.renderTokens(tokens, context, partials, indentedValue, config);
-  }
-};
-
-Writer.prototype.unescapedValue = function unescapedValue (token, context) {
-  var value = context.lookup(token[1]);
-  if (value != null)
-    return value;
-};
-
-Writer.prototype.escapedValue = function escapedValue (token, context, config) {
-  var escape = this.getConfigEscape(config) || mustache.escape;
-  var value = context.lookup(token[1]);
-  if (value != null)
-    return (typeof value === 'number' && escape === mustache.escape) ? String(value) : escape(value);
-};
-
-Writer.prototype.rawValue = function rawValue (token) {
-  return token[1];
-};
-
-Writer.prototype.getConfigTags = function getConfigTags (config) {
-  if (isArray(config)) {
-    return config;
-  }
-  else if (config && typeof config === 'object') {
-    return config.tags;
-  }
-  else {
-    return undefined;
-  }
-};
-
-Writer.prototype.getConfigEscape = function getConfigEscape (config) {
-  if (config && typeof config === 'object' && !isArray(config)) {
-    return config.escape;
-  }
-  else {
-    return undefined;
-  }
-};
-
-var mustache = {
-  name: 'mustache.js',
-  version: '4.2.0',
-  tags: [ '{{', '}}' ],
-  clearCache: undefined,
-  escape: undefined,
-  parse: undefined,
-  render: undefined,
-  Scanner: undefined,
-  Context: undefined,
-  Writer: undefined,
-  /**
-   * Allows a user to override the default caching strategy, by providing an
-   * object with set, get and clear methods. This can also be used to disable
-   * the cache by setting it to the literal `undefined`.
-   */
-  set templateCache (cache) {
-    defaultWriter.templateCache = cache;
-  },
-  /**
-   * Gets the default or overridden caching object from the default writer.
-   */
-  get templateCache () {
-    return defaultWriter.templateCache;
-  }
-};
-
-// All high-level mustache.* functions use this writer.
-var defaultWriter = new Writer();
-
-/**
- * Clears all cached templates in the default writer.
- */
-mustache.clearCache = function clearCache () {
-  return defaultWriter.clearCache();
-};
-
-/**
- * Parses and caches the given template in the default writer and returns the
- * array of tokens it contains. Doing this ahead of time avoids the need to
- * parse templates on the fly as they are rendered.
- */
-mustache.parse = function parse (template, tags) {
-  return defaultWriter.parse(template, tags);
-};
-
-/**
- * Renders the `template` with the given `view`, `partials`, and `config`
- * using the default writer.
- */
-mustache.render = function render (template, view, partials, config) {
-  if (typeof template !== 'string') {
-    throw new TypeError('Invalid template! Template should be a "string" ' +
-                        'but "' + typeStr(template) + '" was given as the first ' +
-                        'argument for mustache#render(template, view, partials)');
-  }
-
-  return defaultWriter.render(template, view, partials, config);
-};
-
-// Export the escaping function so that the user may override it.
-// See https://github.com/janl/mustache.js/issues/244
-mustache.escape = escapeHtml;
-
-// Export these mainly for testing, but also for advanced usage.
-mustache.Scanner = Scanner;
-mustache.Context = Context;
-mustache.Writer = Writer;
-
-export default mustache;

static/skin/taskbar.css

@@ -129,81 +129,6 @@ a.suggest, a.suggest:visited, a.suggest:hover, a.suggest:active {
     column-count: 1 !important;
 }
 
-.modal-wrapper {
-    position: fixed;
-    z-index: 100;
-    top: 0;
-    left: 0;
-    width: 100vw;
-    height: 100vh;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    align-content: center;
-    background-color: rgba(0, 0, 0, 30%);
-}
-
-.modal {
-    color: #444343;
-    height: 280px;
-    width: 250px;
-    margin: 15px;
-    background-color: #f7f7f7;
-    border: 1px solid #ececec;
-    border-radius: 3px;
-}
-
-.modal-heading {
-    background-color: #f0f0f0;
-    height: 20%;
-    width: 100%;
-    border-bottom: 1px solid #ececec;
-    display: grid;
-    grid-template-columns: 3fr 1fr;
-}
-
-.modal-title {
-    display: flex;
-    font-size: 15px;
-    align-items: center;
-    padding-left: 20px;
-    font-family: poppins;
-}
-
-.modal-close-button {
-    cursor: pointer;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
-.modal-content {
-    padding: 20px;
-}
-
-#uiLanguageSelector {
-  display: none;
-}
-
-#uiLanguageSelector .modal {
-  height: 140px;
-}
-
-#uiLanguageSelector .modal-heading {
-  height: 40%;
-}
-
-#uiLanguageSelector .modal-content #ui_language {
-  width: 100%;
-}
-
-#uiLanguageSelectorButton {
-  margin: 0px 12px 6px 12px;
-  float: right;
-  cursor: pointer;
-  height: 30px;
-}
-
 @media(min-width:420px) {
     .kiwix_button_cont {
         display: inline-block !important;

static/skin/viewer.js

@@ -2,14 +2,10 @@
 //
 // user url: identifier of the page that has to be displayed in the viewer
 //           and that is used as the hash component of the viewer URL. For
-//           book resources the user url is {book}/{resource} .
+//           book resources the address url is {book}/{resource} .
 //
 // iframe url: the URL to be loaded in the viewer iframe.
 
-let viewerState = {
-  uiLanguage: 'en',
-};
-
 function userUrl2IframeUrl(url) {
   if ( url == '' ) {
     return blankPageUrl;
@@ -23,7 +19,7 @@ function userUrl2IframeUrl(url) {
 }
 
 function getBookFromUserUrl(url) {
-  if ( url == '' || url.startsWith('catch/external?') ) {
+  if ( url == '' ) {
     return null;
   }
 
@@ -34,7 +30,7 @@ function getBookFromUserUrl(url) {
   return url.split('/')[0];
 }
 
-let currentBook = null;
+let currentBook = getBookFromUserUrl(location.hash.slice(1));
 let currentBookTitle = null;
 
 const bookUIGroup = document.getElementById('kiwix_serve_taskbar_book_ui_group');
@@ -72,24 +68,14 @@ function makeJSLink(jsCodeString, linkText, linkAttr="") {
 
 function suggestionsApiURL()
 {
-  const uriEncodedBookName = encodeURIComponent(currentBook);
-  const userLang = viewerState.uiLanguage;
-  return `${root}/suggest?userlang=${userLang}&content=${uriEncodedBookName}`;
-}
-
-function setTitle(element, text) {
-  if ( element ) {
-    element.title = text;
-    if ( element.hasAttribute("aria-label") ) {
-      element.setAttribute("aria-label", text);
-    }
-  }
+  return `${root}/suggest?content=${encodeURIComponent(currentBook)}`;
 }
 
 function setCurrentBook(book, title) {
   currentBook = book;
   currentBookTitle = title;
-  setTitle(homeButton, $t("home-button-text", {BOOK_TITLE: title}));
+  homeButton.title = `Go to the main page of '${title}'`;
+  homeButton.setAttribute("aria-label", homeButton.title);
   homeButton.innerHTML = `<button>${title}</button>`;
   bookUIGroup.style.display = 'inline';
   updateSearchBoxForBookChange();
@@ -131,10 +117,6 @@ function iframeUrl2UserUrl(url, query) {
     return '';
   }
 
-  if ( url == `${root}/catch/external` ) {
-    return `catch/external${query}`;
-  }
-
   if ( url == `${root}/search` ) {
     return `search${query}`;
   }
@@ -171,7 +153,7 @@ function updateSearchBoxForBookChange() {
   const searchbox = document.getElementById('kiwixsearchbox');
   const kiwixSearchFormWrapper = document.querySelector('.kiwix_searchform');
   if ( currentBookTitle ) {
-    searchbox.title = $t("searchbox-tooltip", {BOOK_TITLE : currentBookTitle});
+    searchbox.title = `Search '${currentBookTitle}'`;
     searchbox.placeholder = searchbox.title;
     searchbox.setAttribute("aria-label", searchbox.title);
     kiwixSearchFormWrapper.style.display = 'inline';
@@ -202,10 +184,7 @@ function updateToolbarVisibilityState() {
 }
 
 function handle_visual_viewport_change() {
-  const wh = window.visualViewport
-           ? window.visualViewport.height
-           : window.innerHeight;
-  contentIframe.height = wh - contentIframe.offsetTop - 4;
+  contentIframe.height = window.visualViewport.height - contentIframe.offsetTop - 4;
 }
 
 function handle_location_hash_change() {
@@ -218,22 +197,18 @@ function handle_location_hash_change() {
   }
   updateSearchBoxForLocationChange();
   previousScrollTop = Infinity;
-  history.replaceState(viewerState, null);
 }
 
 function handle_content_url_change() {
   const iframeLocation = contentIframe.contentWindow.location;
   console.log('handle_content_url_change: ' + iframeLocation.href);
+  document.title = contentIframe.contentDocument.title;
   const iframeContentUrl = iframeLocation.pathname;
   const iframeContentQuery = iframeLocation.search;
   const newHash = iframeUrl2UserUrl(iframeContentUrl, iframeContentQuery);
-  if ( newHash.startsWith('catch/external?') ) {
-    handleInterceptedExternalLink(newHash);
-  } else {
-    document.title = contentIframe.contentDocument.title;
-    history.replaceState(viewerState, null, makeURL(location.search, newHash));
-    updateCurrentBookIfNeeded(newHash);
-  }
+  const viewerURL = location.origin + location.pathname + location.search;
+  window.location.replace(viewerURL + '#' + newHash);
+  updateCurrentBookIfNeeded(newHash);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -270,7 +245,10 @@ function onClickEvent(e) {
   const target = matchingAncestorElement(e.target, iframeDocument, "a");
   if (target !== null && "href" in target) {
     if ( isExternalUrl(target.href) ) {
-      return blockLink(target);
+      target.setAttribute("target", "_top");
+      if ( viewerSettings.linkBlockingEnabled ) {
+        return blockLink(target);
+      }
     }
   }
 }
@@ -309,37 +287,21 @@ function setup_external_link_blocker() {
   setupEventHandler(contentIframe.contentDocument, 'a', 'click', onClickEvent);
 }
 
-function getBlockedUrl(catchExternalUrl) {
-  const p = new URLSearchParams(catchExternalUrl.split('?')[1]);
-  return p.get('source');
-}
-
-function handleInterceptedExternalLink(catchExternalUrl) {
-  // The external link blocking page was loaded in the viewer iframe.
-  // We need to get rid of the viewer taskbar and load in the top frame either
-  // the external resource or, if running in --blockexternal mode, the
-  // confirmation page
-  const url = viewerSettings.linkBlockingEnabled
-            ? `${root}/` + catchExternalUrl
-            : getBlockedUrl(catchExternalUrl);
-  history.back(); // drop from the browsing history the state where the
-                  // external link catcher page is loaded in the iframe ...
-  window.location = url; // ... and load the target in the top frame instead
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // End of external link blocking
 ////////////////////////////////////////////////////////////////////////////////
 
-let viewerSetupComplete = false;
-
 function on_content_load() {
-  if ( viewerSetupComplete ) {
-    handle_content_url_change();
-  }
+  handle_content_url_change();
   setup_external_link_blocker();
 }
 
+window.onresize = handle_visual_viewport_change;
+window.onhashchange = handle_location_hash_change;
+
+updateCurrentBook(currentBook);
+handle_location_hash_change();
+
 function htmlDecode(input) {
     var doc = new DOMParser().parseFromString(input, "text/html");
     return doc.documentElement.textContent;
@@ -429,73 +391,22 @@ function setupSuggestions() {
   });
 }
 
-function makeURL(search, hash) {
-  let url = location.origin + location.pathname;
-  if (search != "") {
-    url += (search[0] == '?' ? search : '?' + search);
-  }
-
-  url += (hash[0] == '#' ? hash : '#' + hash);
-  return url;
-}
-
-function updateUILanguageSelector(userLang) {
-  console.log(`updateUILanguageSelector(${userLang})`);
-  const languageSelector = document.getElementById("ui_language");
-  for (const opt of languageSelector.children ) {
-    if ( opt.value == userLang ) {
-      opt.selected = true;
-    }
-  }
-}
-
-function handle_history_state_change(event) {
-  console.log(`handle_history_state_change`);
-  if ( event.state ) {
-    viewerState = event.state;
-    updateUILanguageSelector(viewerState.uiLanguage);
-    setUserLanguage(viewerState.uiLanguage, updateUIText);
-  }
-}
-
-function changeUILanguage() {
-  window.modalUILanguageSelector.close();
-  const s = document.getElementById("ui_language");
-  const lang = s.options[s.selectedIndex].value;
-  viewerState.uiLanguage = lang;
-  setUserLanguage(lang, () => {
-    updateUIText();
-    history.pushState(viewerState, null);
-  });
-}
-
 function setupViewer() {
   // Defer the call of handle_visual_viewport_change() until after the
   // presence or absence of the taskbar as determined by this function
   // has been settled.
   setTimeout(handle_visual_viewport_change, 0);
 
-  window.onresize = handle_visual_viewport_change;
-
   const kiwixToolBarWrapper = document.getElementById('kiwixtoolbarwrapper');
   if ( ! viewerSettings.toolbarEnabled ) {
     return;
   }
 
-  const lang = getUserLanguage();
-  setUserLanguage(lang, finishViewerSetupOnceTranslationsAreLoaded);
-  viewerState.uiLanguage = lang;
-  const q = new URLSearchParams(window.location.search);
-  q.delete('userlang');
-  const rewrittenURL = makeURL(q.toString(), location.hash);
-  history.replaceState(viewerState, null, rewrittenURL);
-
   kiwixToolBarWrapper.style.display = 'block';
   if ( ! viewerSettings.libraryButtonEnabled ) {
     document.getElementById("kiwix_serve_taskbar_library_button").remove();
   }
 
-  initUILanguageSelector(viewerState.uiLanguage, changeUILanguage);
   setupSuggestions();
 
   // cybook hack
@@ -507,29 +418,3 @@ function setupViewer() {
     setupAutoHidingOfTheToolbar();
   }
 }
-
-function updateUIText() {
-  currentBook = getBookFromUserUrl(location.hash.slice(1));
-  updateCurrentBook(currentBook);
-
-  setTitle(document.getElementById("kiwix_serve_taskbar_library_button"),
-           $t("library-button-text"));
-
-  setTitle(document.getElementById("kiwix_serve_taskbar_random_button"),
-           $t("random-page-button-text"));
-}
-
-function finishViewerSetupOnceTranslationsAreLoaded()
-{
-  updateUIText();
-  handle_location_hash_change();
-
-  window.onhashchange = handle_location_hash_change;
-  window.onpopstate = handle_history_state_change;
-
-  viewerSetupComplete = true;
-}
-
-function setPermanentGlobalCookie(name, value) {
-  document.cookie = `${name}=${value};path=${root};max-age=31536000`;
-}

static/templates/catalog_v2_entries.xml

@@ -6,7 +6,7 @@
   <id>{{feed_id}}</id>
 
   <link rel="self"
-        href="{{endpoint_root}}{{self_url}}"
+        href="{{endpoint_root}}/{{#dump_partial_entries}}partial_{{/dump_partial_entries}}entries{{{query}}}"
         type="application/atom+xml;profile=opds-catalog;kind=acquisition"/>
   <link rel="start"
         href="{{endpoint_root}}/root.xml"

static/templates/index.html

@@ -10,13 +10,6 @@
       href="{{root}}/skin/index.css?KIWIXCACHEID"
       rel="Stylesheet"
     />
-    <link
-      rel="alternate"
-      type="application/atom+xml"
-      title="Library OPDS Feed"
-      id="headFeedLink"
-      href="{{root}}/catalog/v2/entries"
-    />
     <link rel="apple-touch-icon" sizes="180x180" href="{{root}}/skin/favicon/apple-touch-icon.png?KIWIXCACHEID">
     <link rel="icon" type="image/png" sizes="32x32" href="{{root}}/skin/favicon/favicon-32x32.png?KIWIXCACHEID">
     <link rel="icon" type="image/png" sizes="16x16" href="{{root}}/skin/favicon/favicon-16x16.png?KIWIXCACHEID">
@@ -37,52 +30,12 @@
           src: url("{{root}}/skin/fonts/Roboto.ttf?KIWIXCACHEID") format("truetype");
       }
     </style>
-    <script type="module" src="{{root}}/skin/i18n.js?KIWIXCACHEID" defer></script>
-    <script type="text/javascript" src="{{root}}/skin/languages.js?KIWIXCACHEID" defer></script>
     <script src="{{root}}/skin/isotope.pkgd.min.js?KIWIXCACHEID" defer></script>
     <script src="{{root}}/skin/iso6391To3.js?KIWIXCACHEID"></script>
     <script type="text/javascript" src="{{root}}/skin/index.js?KIWIXCACHEID" defer></script>
   </head>
   <body>
-    <noscript>
-      <style>
-        .kiwixNav, .kiwixHomeBody, #feedLink, .kiwixfooter {
-          display: none;
-        }
-        html, body {
-          height: 100%;
-        }
-        .noScriptLinkContainer {
-          position: absolute;
-          top: 50%;
-          left: 50%;
-          -moz-transform: translateX(-50%) translateY(-50%);
-          -webkit-transform: translateX(-50%) translateY(-50%);
-          transform: translateX(-50%) translateY(-50%);
-          font-size: 16px;
-          font-family: roboto;
-        }
-      </style>
-      <div class="noScriptLinkContainer">
-        <span id="noScriptLinkText">This page cannot be accessed if JavaScript is not enabled. Please head over to <a href="{{root}}/nojs">nojs endpoint.</a></span>
-      </div>
-    </noscript>
     <div class='kiwixNav'>
-      <a href="{{root}}/catalog/v2/entries" id="feedLink">
-        <img src="{{root}}/skin/feed.svg?KIWIXCACHEID"
-             class="feedLogo"
-             id="feedLogo"
-             alt="Library OPDS Feed"
-             aria-label="Library OPDS Feed"
-             title="Library OPDS Feed">
-      </a>
-      <a onclick="window.modalUILanguageSelector.show()"
-         alt="Select UI language"
-         aria-label="Select UI language"
-         title="Select UI language">
-        <img src="{{root}}/skin/langSelector.svg?KIWIXCACHEID"
-             id="uiLanguageSelectorButton">
-      </a>
       <div class="kiwixNav__filters">
         <div class="kiwixNav__select">
           <select name="lang" id="languageFilter" class='kiwixNav__kiwixFilter filter'>
@@ -98,7 +51,7 @@
       <form id='kiwixSearchForm' class='kiwixNav__SearchForm'>
         <input type="text" name="q" placeholder="Search" id="searchFilter" class='kiwixSearch filter'>
         <span class="kiwixButton tagFilterLabel"></span>
-        <input type="submit" class="kiwixButton kiwixButtonHover" id="searchButton" value="Search"/>
+        <input type="submit" class="kiwixButton kiwixButtonHover" value="Search"/>
       </form>
     </div>
     <div class="kiwixHomeBody">
@@ -113,11 +66,7 @@
   <script>
     function closeModal() {
       for(modal of document.getElementsByClassName('modal-wrapper')) {
-        if ( modal.id == "uiLanguageSelector" ) {
-          window.modalUILanguageSelector.close();
-        } else {
-          modal.remove();
-        }
+        modal.remove();
       }
     }
   </script>

static/templates/no_js_download.html

@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{{translations.download-links-title}}</title>
-</head>
-<style>
-    .downloadLinksTitle {
-        text-align: center;
-        font-size: 32px;
-        margin-bottom: 8px;
-    }
-</style>
-<body>
-    <div class="downloadLinksTitle">
-        {{{translations.download-links-heading}}}
-    </div>
-    <a href="{{url}}" download>
-        <div>{{translations.direct-download-link-text}}</div>
-    </a>
-    <a href="{{url}}.sha256" download>
-        <div>{{translations.hash-download-link-text}}</div>
-    </a>
-    <a href="{{url}}.magnet" target="_blank">
-        <div>{{translations.magnet-link-text}}</div>
-    </a>
-    <a href="{{url}}.torrent" download>
-        <div>{{translations.torrent-download-link-text}}</div>
-    </a>
-</body>
-</html>

static/templates/no_js_library_page.html

@@ -1,140 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width,initial-scale=1" />
-    <link type="root" href="{{root}}">
-    <title>{{translations.welcome-to-kiwix-server}}</title>
-    <link
-      type="text/css"
-      href="{{root}}/skin/index.css?KIWIXCACHEID"
-      rel="Stylesheet"
-    />
-    <link rel="apple-touch-icon" sizes="180x180" href="{{root}}/skin/favicon/apple-touch-icon.png?KIWIXCACHEID">
-    <link rel="icon" type="image/png" sizes="32x32" href="{{root}}/skin/favicon/favicon-32x32.png?KIWIXCACHEID">
-    <link rel="icon" type="image/png" sizes="16x16" href="{{root}}/skin/favicon/favicon-16x16.png?KIWIXCACHEID">
-    <link rel="manifest" href="{{root}}/skin/favicon/site.webmanifest?KIWIXCACHEID">
-    <link rel="mask-icon" href="{{root}}/skin/favicon/safari-pinned-tab.svg?KIWIXCACHEID" color="#5bbad5">
-    <link rel="shortcut icon" href="{{root}}/skin/favicon/favicon.ico?KIWIXCACHEID">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-config" content="{{root}}/skin/favicon/browserconfig.xml?KIWIXCACHEID">
-    <meta name="theme-color" content="#ffffff">
-    <style>
-      @font-face {
-        font-family: "poppins";
-        src: url("{{root}}/skin/fonts/Poppins.ttf?KIWIXCACHEID") format("truetype");
-      }
-
-      @font-face {
-          font-family: "roboto";
-          src: url("{{root}}/skin/fonts/Roboto.ttf?KIWIXCACHEID") format("truetype");
-      }
-
-      .book__list {
-        display: flex;
-        flex-direction: row;
-        flex-wrap: wrap;
-        align-items: center;
-      }
-
-      .book__wrapper:hover {
-        transform: scale(1.0);
-      }
-
-      .tag__link {
-        pointer-events: none;
-      }
-
-      .book__link__wrapper {
-        grid-column: 1 / 3;
-        grid-row: 1 / 3;
-      }
-
-      .book__link {
-        grid-row: 2 / 3;
-      }
-
-      .kiwixHomeBody__results {
-        flex-basis: 100%;
-      }
-
-      #book__title>a, .book__download a {
-        text-decoration: none;
-        all: unset;
-      }
-    </style>
-  </head>
-  <body>
-    <div class='kiwixNav'>
-      <div class="kiwixNav__filters">
-        <div class="kiwixNav__select">
-          <select name="lang" id="languageFilter" class='kiwixNav__kiwixFilter filter' form="kiwixSearchForm">
-            <option value="" selected>{{translations.book-filtering-all-languages}}</option>
-            {{#languages}}
-            <option value="{{lang_code}}"{{#selected}} selected {{/selected}}>{{lang_self_name}}</option>
-            {{/languages}}
-          </select>
-        </div>
-        <div class="kiwixNav__select">
-          <select name="category" id="categoryFilter" class='kiwixNav__kiwixFilter filter' form="kiwixSearchForm">
-            <option value="">{{translations.book-filtering-all-categories}}</option>
-            {{#categories}}
-            <option value="{{name}}"{{#selected}} selected {{/selected}}>{{hf_name}}</option>
-            {{/categories}}
-          </select>
-        </div>
-      </div>
-      <form id='kiwixSearchForm' class='kiwixNav__SearchForm' action="{{root}}/nojs">
-        <input type="text" name="q" placeholder="{{translations.search}}" id="searchFilter" class='kiwixSearch filter' value="{{searchQuery}}">
-        <input type="submit" class="kiwixButton kiwixButtonHover" value="{{translations.search}}"/>
-      </form>
-    </div>
-    <div class="kiwixHomeBody">
-        {{#noResults}}
-        <style>
-          .book__list {
-            display: none;
-          }
-          .kiwixHomeBody {
-            justify-content: center;
-          }
-          .noResults {
-            font-size: 16px;
-            font-family: roboto;
-          }
-        </style>
-        <div class="noResults">
-          {{{translations.welcome-page-overzealous-filter}}}
-        </div>
-        </style>
-        {{/noResults}}
-        <div class="book__list">
-        <h3 class="kiwixHomeBody__results">{{translations.count-of-matching-books}}</h3>
-        {{#books}}
-        <div class="book__wrapper">
-                <div class="book__link__wrapper">
-                    <div class="book__icon" {{faviconAttr}}></div>
-                    <div class="book__header">
-                        <div id="book__title"><a href="{{root}}/content/{{id}}">{{title}}</a></div>
-                        {{#downloadAvailable}}
-                        <div class="book__download"><span><a href="{{root}}/nojs/download/{{id}}">{{translations.download}}</a></span></div>
-                        {{/downloadAvailable}}
-                    </div>
-                    <a class="book__link" href="{{root}}/content/{{id}}" title="{{translations.preview-book}}" aria-label="{{translations.preview-book}}">
-                      <div class="book__description" title="{{description}}">{{description}}</div>
-                    </a>
-              </div>
-            <div class="book__languageTag" {{languageAttr}}>{{langCode}}</div>
-            <div class="book__tags"><div class="book__tags--wrapper">
-                {{#tagList}}
-                <span class="tag__link" aria-label='{{tag}}' title='{{tag}}'>{{tag}}</span>
-                {{/tagList}}
-            </div>
-        </div>
-        </div>
-        {{/books}}
-        </div>
-    </div>
-    <div id="kiwixfooter" class="kiwixfooter">{{{translations.powered-by-kiwix-html}}}</div>
-    </body>
-</html>

static/viewer.html

@@ -2,17 +2,11 @@
 <html>
   <head>
     <meta charset="UTF-8">
-    <meta http-equiv="Content-Security-Policy"
-          content="default-src 'self' data: 'unsafe-inline' 'unsafe-eval';
-                   frame-src 'self';
-                   object-src 'none';">
     <title>ZIM Viewer</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link type="text/css" href="./skin/taskbar.css?KIWIXCACHEID" rel="Stylesheet" />
     <link type="text/css" href="./skin/css/autoComplete.css?KIWIXCACHEID" rel="Stylesheet" />
     <script type="text/javascript" src="./viewer_settings.js"></script>
-    <script type="module" src="./skin/i18n.js?KIWIXCACHEID" defer></script>
-    <script type="text/javascript" src="./skin/languages.js?KIWIXCACHEID" defer></script>
     <script type="text/javascript" src="./skin/viewer.js?KIWIXCACHEID" defer></script>
     <script type="text/javascript" src="./skin/autoComplete.min.js?KIWIXCACHEID"></script>
     <script>
@@ -34,42 +28,35 @@
     <div class="kiwix" style="display:none" id="kiwixtoolbarwrapper">
       <div id="kiwixtoolbar" class="ui-widget-header">
         <div class="kiwix_centered">
-          <a id="uiLanguageSelectorButton"
-             onclick="window.modalUILanguageSelector.show()"
-             alt="Select UI language"
-             aria-label="Select UI language"
-             title="Select UI language">
-            <img src="./skin/langSelector.svg?KIWIXCACHEID">
-          </a>
           <div class="kiwix_searchform">
             <form class="kiwixsearch" method="GET" action="javascript:performSearch()" id="kiwixsearchform">
               <label for="kiwixsearchbox">&#x1f50d;</label>
               <input autocomplete="off" class="ui-autocomplete-input" id="kiwixsearchbox" name="pattern" type="text" title="Search '{{title}}'" aria-label="Search '{{title}}'">
             </form>
           </div>
-          <input type="checkbox" id="kiwix_button_show_toggle">
-          <label for="kiwix_button_show_toggle"><img src="./skin/caret.png?KIWIXCACHEID" alt=""></label>
-          <div class="kiwix_button_cont">
-            <a id="kiwix_serve_taskbar_library_button" title="Go to welcome page" aria-label="Go to welcome page" href="./"><button>&#x1f3e0;</button></a>
-            <span id="kiwix_serve_taskbar_book_ui_group">
-              <a id="kiwix_serve_taskbar_home_button"
-                 title="Go to the main page of the current book"
-                 aria-label="Go to the main page of the current book"
-                 onclick="gotoMainPageOfCurrentBook()"></a>
-              <a id="kiwix_serve_taskbar_random_button"
-                 title="Go to a randomly selected page"
-                 aria-label="Go to a randomly selected page"
-                 onclick="gotoRandomPage()">
-                <button>&#x1F3B2;</button>
-              </a>
-            </span>
-          </div>
+            <input type="checkbox" id="kiwix_button_show_toggle">
+            <label for="kiwix_button_show_toggle"><img src="./skin/caret.png?KIWIXCACHEID" alt=""></label>
+            <div class="kiwix_button_cont">
+                <a id="kiwix_serve_taskbar_library_button" title="Go to welcome page" aria-label="Go to welcome page" href="./"><button>&#x1f3e0;</button></a>
+              <span id="kiwix_serve_taskbar_book_ui_group">
+                <a id="kiwix_serve_taskbar_home_button"
+                   title="Go to the main page of the current book"
+                   aria-label="Go to the main page of the current book"
+                   onclick="gotoMainPageOfCurrentBook()"></a>
+                <a id="kiwix_serve_taskbar_random_button"
+                   title="Go to a randomly selected page"
+                   aria-label="Go to a randomly selected page"
+                   onclick="gotoRandomPage()">
+                  <button>&#x1F3B2;</button>
+                </a>
+              </span>
+            </div>
         </div>
       </div>
     </div>
 
     <iframe id="content_iframe"
-            referrerpolicy="no-referrer"
+            referrerpolicy="same-origin"
             onload="on_content_load()"
             src="./skin/blank.html?KIWIXCACHEID" title="ZIM content" width="100%"
             style="border:0px">

test/book.cpp

@@ -58,53 +58,60 @@ TEST(BookTest, updateFromXMLTest)
     EXPECT_EQ(defaultIllustration->url, "http://who.org/zara.fav");
 }
 
-namespace
-{
-
-kiwix::Book makeBook(const std::string& attr, const std::string& baseDir="")
-{
-    const XMLDoc xml("<book " + attr + "></book>");
-    kiwix::Book book;
-    book.updateFromXml(xml.child("book"), baseDir);
-    return book;
-}
-
-} // unnamed namespace
-
 TEST(BookTest, updateFromXMLCategoryHandlingTest)
 {
   {
-    const kiwix::Book book = makeBook(R"(
-        id="abcd"
-        tags="_category:category_defined_via_tags_only"
+    const XMLDoc xml(R"(
+      <book id="abcd"
+            tags="_category:category_defined_via_tags_only"
+          >
+      </book>
     )");
 
+    kiwix::Book book;
+    book.updateFromXml(xml.child("book"), "");
+
     EXPECT_EQ(book.getCategory(), "category_defined_via_tags_only");
   }
   {
-    const kiwix::Book book = makeBook(R"(
-        id="abcd"
-        category="category_defined_via_attribute_only"
+    const XMLDoc xml(R"(
+      <book id="abcd"
+            category="category_defined_via_attribute_only"
+          >
+      </book>
     )");
 
+    kiwix::Book book;
+    book.updateFromXml(xml.child("book"), "");
+
     EXPECT_EQ(book.getCategory(), "category_defined_via_attribute_only");
   }
   {
-    const kiwix::Book book = makeBook(R"(
-        id="abcd"
-        category="category_attribute_overrides_tags"
-        tags="_category:tags_override_category_attribute"
+    const XMLDoc xml(R"(
+      <book id="abcd"
+            category="category_attribute_overrides_tags"
+            tags="_category:tags_override_category_attribute"
+          >
+      </book>
     )");
 
+    kiwix::Book book;
+    book.updateFromXml(xml.child("book"), "");
+
     EXPECT_EQ(book.getCategory(), "category_attribute_overrides_tags");
   }
   {
-    const kiwix::Book book = makeBook(R"(
-        id="abcd"
-        tags="_category:tags_override_category_attribute"
-        category="category_attribute_overrides_tags"
+    const XMLDoc xml(R"(
+      <book id="abcd"
+            tags="_category:tags_override_category_attribute"
+            category="category_attribute_overrides_tags"
+          >
+      </book>
     )");
 
+    kiwix::Book book;
+    book.updateFromXml(xml.child("book"), "");
+
     EXPECT_EQ(book.getCategory(), "category_attribute_overrides_tags");
   }
 }
@@ -119,7 +126,10 @@ TEST(BookTest, setTagsDoesntAffectCategory)
 
 TEST(BookTest, updateCopiesCategory)
 {
-    const kiwix::Book book = makeBook(R"(id="abcd" category="ted")");
+    const XMLDoc xml(R"(<book id="abcd" category="ted"></book>)");
+
+    kiwix::Book book;
+    book.updateFromXml(xml.child("book"), "");
 
     kiwix::Book newBook;
     newBook.setId("abcd");
@@ -130,15 +140,20 @@ TEST(BookTest, updateCopiesCategory)
 
 TEST(BookTest, updateTest)
 {
-    kiwix::Book book = makeBook(R"(
-        id="xyz"
-        path="/home/user/Downloads/skin-of-color-society_en_all_2019-11.zim"
-        url="book-url"
-        name="skin-of-color-society_en_all"
-        tags="youtube;_videos:yes;_ftindex:yes;_ftindex:yes;_pictures:yes;_details:yes"
-        favicon="Ym9vay1mYXZpY29u"
-        faviconMimeType="book-favicon-mimetype"
-    )", "/data/zim");
+    const XMLDoc xml(R"(
+      <book id="xyz"
+            path="/home/user/Downloads/skin-of-color-society_en_all_2019-11.zim"
+            url="book-url"
+            name="skin-of-color-society_en_all"
+            tags="youtube;_videos:yes;_ftindex:yes;_ftindex:yes;_pictures:yes;_details:yes"
+            favicon="Ym9vay1mYXZpY29u"
+            faviconMimeType="book-favicon-mimetype"
+          >
+      </book>
+    )");
+
+    kiwix::Book book;
+    book.updateFromXml(xml.child("book"), "/data/zim");
 
     book.setReadOnly(false);
     book.setPathValid(true);
@@ -195,22 +210,3 @@ TEST(BookTest, getHumanReadableIdFromPath)
 #endif
   EXPECT_EQ("3plus2",  path2HumanReadableId("3+2.zim"));
 }
-
-TEST(BookTest, getLanguages)
-{
-  typedef std::vector<std::string> Langs;
-
-  {
-    const kiwix::Book book = makeBook(R"(id="abcd" language="fra")");
-
-    EXPECT_EQ(book.getCommaSeparatedLanguages(), "fra");
-    EXPECT_EQ(book.getLanguages(), Langs{ "fra" });
-  }
-
-  {
-    const kiwix::Book book = makeBook(R"(id="abcd" language="eng,ong,ing")");
-
-    EXPECT_EQ(book.getCommaSeparatedLanguages(), "eng,ong,ing");
-    EXPECT_EQ(book.getLanguages(), Langs({ "eng", "ong", "ing" }));
-  }
-}

test/data/create_corner_cases_zim_file

@@ -1,24 +1,7 @@
 #!/usr/bin/env bash
 
 cd "$(dirname "$0")"
-
-# The following symbols (that would be nice to include in testing) are not
-# allowed under NTFS and/or FAT32 filesystems, and would result in the
-# impossibility to git clone (or rather checkout) the libkiwix repository under
-# Windows:
-#
-#  ?
-#  =
-#  + (that's a pity, since the + symbol in a ZIM filename is replaced with the
-#     text 'plus' when the ZIM file is added to kiwix-serve's library and it
-#     would be nice to test that functionality)
-#
-# Assuming that tests are NOT run under Windows, above symbols can be included
-# in testing if the file is renamed while copying to the build directory (see
-# test/meson.build), though that would make maintenance slightly more confusing.
-zimfilename='corner_cases#&.zim'
-
-rm -f "$zimfilename"
+rm -f corner_cases.zim
 zimwriterfs --withoutFTIndex --dont-check-arguments \
             -w empty.html \
             -I empty.png \
@@ -28,6 +11,6 @@ zimwriterfs --withoutFTIndex --dont-check-arguments \
             -c "" \
             -p "" \
             corner_cases \
-            "$zimfilename" \
-&& echo "$zimfilename was successfully created" \
-|| echo '!!! Failed to create' "$zimfilename" '!!!' >&2
+            corner_cases.zim \
+&& echo 'corner_cases.zim was successfully created' \
+|| echo '!!! Failed to create corner_cases.zim !!!' >&2

test/data/library.xml

@@ -23,7 +23,7 @@
         url="https://github.com/kiwix/libkiwix/raw/master/test/data/zimfile.zim"
         title="Ray (uncategorized) Charles"
         description="No category is assigned to this library entry."
-        language="rus,eng"
+        language="rus"
         creator="Wikipedia"
         publisher="Kiwix"
         date="2020-03-31"