Merge pull request #208 from kiwix/new_version

Version 4.1.0
2026-01-04 20:38:05 -05:00 · 2019-03-19 16:35:57 +01:00 · 2019-03-19 16:26:14 +01:00 · 2019-03-19 15:27:03 +01:00 · 2019-03-07 17:19:31 +01:00 · 2019-03-07 17:08:39 +01:00
10 changed files with 192 additions and 282 deletions
--- a/14
+++ b/14
@@ -1,3 +1,17 @@
+kiwix-lib 4.1.0
+===============
+
+ * Allow the library to be filtered by tags.
+ * Fix language mapping.
+ * Update README about mustache dependency.
+
+kiwix-lib 4.0.1
+===============
+
+ * Fix "maybe uninitialize variable" issue.
+ * Ensure path are stored correctly (absolute path) in the library.
+ * [CI] Use the new deps archive xz
+
 kiwix-lib 4.0.0
 ===============

--- a/README.md
+++ b/README.md
@@ -35,6 +35,9 @@ libraries need to be available:
 (package libpugixml-dev on Ubuntu)
 * libaria2 .................................. https://aria2.github.io/
 (no package on Ubuntu)
+* Mustache ....................... https://github.com/kainjow/Mustache
+(Just copy the header mustache.hpp somewhere it can be found by the
+compiler and/or set CPPFLAGS with correct '-I' option)

 These dependencies may or may not be packaged by your operating
 system. They may also be packaged but only in an older version. The
--- a/include/library.h
+++ b/include/library.h
@@ -194,6 +194,7 @@ class Library
    const std::string& language = "",
    const std::string& creator = "",
    const std::string& publisher = "",
+    const std::vector<std::string>& tags = {},
    size_t maxSize = 0);

  friend class OPDSDumper;
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('kiwix-lib', 'cpp',
-  version : '4.0.0',
+  version : '4.1.0',
  license : 'GPL',
  default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])

--- a/src/android/kiwixreader.cpp
+++ b/src/android/kiwixreader.cpp
@@ -91,7 +91,7 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getId(JNIEnv* env, jobject obj)
 JNIEXPORT jint JNICALL
 Java_org_kiwix_kiwixlib_JNIKiwixReader_getFileSize(JNIEnv* env, jobject obj)
 {
-  jint size;
+  jint size = 0;

  try {
    int cSize = READER->getFileSize();
--- a/src/library.cpp
+++ b/src/library.cpp
@@ -27,6 +27,7 @@

 #include <pugixml.hpp>
 #include <algorithm>
+#include <set>

 namespace kiwix
 {
@@ -250,6 +251,7 @@ std::vector<std::string> Library::listBooksIds(
    const std::string& language,
    const std::string& creator,
    const std::string& publisher,
+    const std::vector<std::string>& tags,
    size_t maxSize) {

  std::vector<std::string> bookIds;
@@ -270,6 +272,23 @@ std::vector<std::string> Library::listBooksIds(
      continue;
    if (mode & NOREMOTE && remote)
      continue;
+    if (!tags.empty()) {
+      auto vBookTags = split(book.getTags(), ";");
+      std::set<std::string> sBookTags(vBookTags.begin(), vBookTags.end());
+      bool ok = true;
+      for (auto& t: tags) {
+        if (sBookTags.find(t) == sBookTags.end()) {
+          // A "filter" tag is not in the book tag.
+          // No need to loop for all "filter" tags.
+          ok = false;
+          break;
+        }
+      }
+      if (! ok ) {
+        // Skip the book
+        continue;
+      }
+    }
    if (maxSize != 0 && book.getSize() > maxSize)
      continue;
    if (!language.empty() && book.getLanguage() != language)
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -208,12 +208,16 @@ bool Manager::addBookFromPath(const std::string& pathToOpen,

 bool Manager::readBookFromPath(const std::string& path, kiwix::Book* book)
 {
+  std::string tmp_path = path;
+  if (isRelativePath(path)) {
+    tmp_path = computeAbsolutePath(getCurrentDirectory(), path);
+  }
  try {
-    kiwix::Reader reader(path);
+    kiwix::Reader reader(tmp_path);
    book->update(reader);
    book->setPathValid(true);
  } catch (const std::exception& e) {
-    std::cerr << "Invalid " << path << " : " << e.what() << std::endl;
+    std::cerr << "Invalid " << tmp_path << " : " << e.what() << std::endl;
    book->setPathValid(false);
    return false;
  }
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -241,8 +241,6 @@ Entry Reader::getMainPage() const
    throw NoEntry();
  }

-  string url = "";
-
  zim::Article article;
  if (this->zimFileHandler->getFileheader().hasMainPage())
  {
--- a/src/tools/otherTools.cpp
+++ b/src/tools/otherTools.cpp
@@ -21,279 +21,150 @@
 #include <map>

 static std::map<std::string, std::string> codeisomapping {
-//a
-  { "ad", "and" },
-  { "ae", "are" },
-  { "af", "afg" },
-  { "ag", "atg" },
-  { "ai", "aia" },
-  { "al", "alb" },
-  { "am", "arm" },
-  { "an", "ant" },
-  { "ao", "ago" },
-  { "aq", "ata" },
-  { "ar", "arg" },
-  { "as", "asm" },
-  { "at", "aut" },
-  { "au", "aus" },
-  { "aw", "abw" },
-  { "ax", "ala" },
-  { "az", "aze" },
-//b
-  { "ba", "bih" },
-  { "bb", "brb" },
-  { "bd", "bgd" },
-  { "be", "bel" },
-  { "bf", "bfa" },
-  { "bg", "bgr" },
-  { "bh", "bhr" },
-  { "bi", "bdi" },
-  { "bj", "ben" },
-  { "bl", "blm" },
-  { "bn", "brn" },
-  { "bm", "bmu" },
-  { "bo", "bol" },
-  { "br", "bra" },
-  { "bs", "bhs" },
-  { "bt", "btn" },
-  { "bv", "bvt" },
-  { "bw", "bwa" },
-  { "by", "blr" },
-  { "bz", "blz" },
-//c
-  { "ca", "can" },
-  { "cc", "cck" },
-  { "cd", "cod" },
-  { "cf", "caf" },
-  { "cg", "cog" },
-  { "ch", "che" },
-  { "ci", "civ" },
-  { "ck", "cok" },
-  { "cl", "chl" },
-  { "cm", "cmr" },
-  { "cn", "chn" },
-  { "co", "col" },
-  { "cr", "cri" },
-  { "cu", "cub" },
-  { "cv", "cpv" },
-  { "cx", "cxr" },
-  { "cy", "cyp" },
-  { "cz", "cze" },
-//d
-  { "de", "deu" },
-  { "dj", "dji" },
-  { "dk", "dnk" },
-  { "dm", "dma" },
-  { "do", "dom" },
-  { "dz", "dza" },
-//e
-  { "ec", "ecu" },
-  { "ee", "est" },
-  { "eg", "egy" },
-  { "eh", "esh" },
-  { "en", "eng" },
-  { "er", "eri" },
-  { "es", "esp" },
-  { "et", "eth" },
-//f
-  { "fi", "fin" },
-  { "fj", "fji" },
-  { "fk", "flk" },
-  { "fm", "fsm" },
-  { "fo", "fro" },
-  { "fr", "fra" },
-//g
-  { "ga", "gab" },
-  { "gb", "gbr" },
-  { "gd", "grd" },
-  { "ge", "geo" },
-  { "gf", "guf" },
-  { "gg", "ggy" },
-  { "gh", "gha" },
-  { "gi", "gib" },
-  { "gl", "grl" },
-  { "gm", "gmb" },
-  { "gn", "gin" },
-  { "gp", "glp" },
-  { "gq", "gnq" },
-  { "gr", "grc" },
-  { "gs", "sgs" },
-  { "gt", "gtm" },
-  { "gu", "gum" },
-  { "gw", "gnb" },
-  { "gy", "guy" },
-//h
-  { "hk", "hkg" },
-  { "hm", "hmd" },
-  { "hn", "hnd" },
-  { "hr", "hrv" },
-  { "ht", "hti" },
-  { "hu", "hun" },
-//i
-  { "id", "idn" },
-  { "ie", "irl" },
-  { "il", "isr" },
-  { "im", "imn" },
-  { "in", "ind" },
-  { "io", "iot" },
-  { "iq", "irq" },
-  { "ir", "irn" },
-  { "is", "isl" },
-  { "it", "ita" },
-//j
-  { "je", "jey" },
-  { "jm", "jam" },
-  { "jo", "jor" },
-  { "jp", "jpn" },
-//k
-  { "ke", "ken" },
-  { "kg", "kgz" },
-  { "kh", "khm" },
-  { "ki", "kir" },
-  { "km", "com" },
-  { "kn", "kna" },
-  { "kp", "prk" },
-  { "kr", "kor" },
-  { "kw", "kwt" },
-  { "ky", "cym" },
-  { "kz", "kaz" },
-//l
-  { "la", "lao" },
-  { "lb", "lbn" },
-  { "lc", "lca" },
-  { "li", "lie" },
-  { "lk", "lka" },
-  { "lr", "lbr" },
-  { "ls", "lso" },
-  { "lt", "ltu" },
-  { "lu", "lux" },
-  { "lv", "lva" },
-  { "ly", "lby" },
-//m
-  { "ma", "mar" },
-  { "mc", "mco" },
-  { "md", "mda" },
-  { "me", "mne" },
-  { "mf", "maf" },
-  { "mg", "mdg" },
-  { "mh", "mhl" },
-  { "mk", "mkd" },
-  { "ml", "mli" },
-  { "mm", "mmr" },
-  { "mn", "mng" },
-  { "mo", "mac" },
-  { "mp", "mnp" },
-  { "mq", "mtq" },
-  { "mr", "mrt" },
-  { "ms", "msr" },
-  { "mt", "mlt" },
-  { "mu", "mus" },
-  { "mv", "mdv" },
-  { "mw", "mwi" },
-  { "mx", "mex" },
-  { "my", "mys" },
-  { "mz", "moz" },
-//n
-  { "na", "nam" },
-  { "nc", "ncl" },
-  { "ne", "ner" },
-  { "nf", "nfk" },
-  { "ng", "nga" },
-  { "ni", "nic" },
-  { "nl", "nld" },
-  { "no", "nor" },
-  { "np", "npl" },
-  { "nr", "nru" },
-  { "nu", "niu" },
-  { "nz", "nzl" },
-//o
-  { "om", "omn" },
-//p
-  { "pa", "pan" },
-  { "pe", "per" },
-  { "pf", "pyf" },
-  { "pg", "png" },
-  { "ph", "phl" },
-  { "pk", "pak" },
-  { "pl", "pol" },
-  { "pm", "spm" },
-  { "pn", "pcn" },
-  { "pr", "pri" },
-  { "ps", "pse" },
-  { "pt", "prt" },
-  { "pw", "plw" },
-  { "py", "pry" },
-//q
-  { "qa", "qat" },
-//r
-  { "re", "reu" },
-  { "ro", "rou" },
-  { "rs", "srb" },
-  { "ru", "rus" },
-  { "rw", "rwa" },
-//s
-  { "sa", "sau" },
-  { "sb", "slb" },
-  { "sc", "syc" },
-  { "sd", "sdn" },
-  { "se", "swe" },
-  { "sg", "sgp" },
-  { "sh", "shn" },
-  { "si", "svn" },
-  { "sj", "sjm" },
-  { "sk", "svk" },
-  { "sl", "sle" },
-  { "sm", "smr" },
-  { "sn", "sen" },
-  { "so", "som" },
-  { "sr", "sur" },
-  { "ss", "ssd" },
-  { "st", "stp" },
-  { "sv", "slv" },
-  { "sy", "syr" },
-  { "sz", "swz" },
-//t
-  { "tc", "tca" },
-  { "td", "tcd" },
-  { "tf", "atf" },
-  { "tg", "tgo" },
-  { "th", "tha" },
-  { "tj", "tjk" },
-  { "tk", "tkl" },
-  { "tl", "tls" },
-  { "tm", "tkm" },
-  { "tn", "tun" },
-  { "to", "ton" },
-  { "tr", "tur" },
-  { "tt", "tto" },
-  { "tv", "tuv" },
-  { "tw", "twn" },
-  { "tz", "tza" },
-//u
-  { "ua", "ukr" },
-  { "ug", "uga" },
-  { "um", "umi" },
-  { "us", "usa" },
-  { "uy", "ury" },
-  { "uz", "uzb" },
-//v
-  { "va", "vat" },
-  { "vc", "vct" },
-  { "ve", "ven" },
-  { "vg", "vgb" },
-  { "vi", "vir" },
-  { "vn", "vnm" },
-  { "vu", "vut" },
-//w
-  { "wf", "wlf" },
-  { "ws", "wsm" },
-//y
-  { "ye", "yem" },
-  { "yt", "myt" },
-// z
-  { "za", "zaf" },
-  { "zm", "zmb" },
-  { "zw", "zwe" }
+{ "aa", "aar" },
+{ "af", "afr" },
+{ "ak", "aka" },
+{ "am", "amh" },
+{ "ar", "ara" },
+{ "as", "asm" },
+{ "az", "aze" },
+{ "ba", "bak" },
+{ "be", "bel" },
+{ "bg", "bul" },
+{ "bm", "bam" },
+{ "bn", "ben" },
+{ "bo", "bod" },
+{ "br", "bre" },
+{ "bs", "bos" },
+{ "ca", "cat" },
+{ "ce", "che" },
+{ "co", "cos" },
+{ "cs", "ces" },
+{ "cu", "chu" },
+{ "cv", "chv" },
+{ "cy", "cym" },
+{ "da", "dan" },
+{ "de", "deu" },
+{ "dv", "div" },
+{ "dz", "dzo" },
+{ "ee", "ewe" },
+{ "el", "ell" },
+{ "en", "eng" },
+{ "es", "spa" },
+{ "et", "est" },
+{ "eu", "eus" },
+{ "fa", "fas" },
+{ "ff", "ful" },
+{ "fi", "fin" },
+{ "fo", "fao" },
+{ "fr", "fra" },
+{ "fy", "fry" },
+{ "ga", "gle" },
+{ "gd", "gla" },
+{ "gl", "glg" },
+{ "gn", "grn" },
+{ "gu", "guj" },
+{ "gv", "glv" },
+{ "ha", "hau" },
+{ "he", "heb" },
+{ "hi", "hin" },
+{ "hr", "hrv" },
+{ "hu", "hun" },
+{ "hy", "hye" },
+{ "ia", "ina" },
+{ "id", "ind" },
+{ "ig", "ibo" },
+{ "is", "isl" },
+{ "it", "ita" },
+{ "iu", "iku" },
+{ "ja", "jpn" },
+{ "jv", "jav" },
+{ "ka", "kat" },
+{ "ki", "kik" },
+{ "kk", "kaz" },
+{ "kl", "kal" },
+{ "km", "khm" },
+{ "kn", "kan" },
+{ "ko", "kor" },
+{ "ks", "kas" },
+{ "ku", "kur" },
+{ "kw", "cor" },
+{ "ky", "kir" },
+{ "lb", "ltz" },
+{ "lg", "lug" },
+{ "ln", "lin" },
+{ "lo", "lao" },
+{ "lt", "lit" },
+{ "lv", "lav" },
+{ "mg", "mlg" },
+{ "mi", "mri" },
+{ "mi", "mri" },
+{ "mk", "mkd" },
+{ "ml", "mal" },
+{ "mn", "mon" },
+{ "mr", "mar" },
+{ "ms", "msa" },
+{ "mt", "mlt" },
+{ "my", "mya" },
+{ "nb", "nob" },
+{ "ne", "nep" },
+{ "nl", "nld" },
+{ "nn", "nno" },
+{ "no", "nor" },
+{ "ny", "nya" },
+{ "oc", "oci" },
+{ "om", "orm" },
+{ "or", "ori" },
+{ "os", "oss" },
+{ "pa", "pan" },
+{ "pl", "pol" },
+{ "ps", "pus" },
+{ "pt", "por" },
+{ "qu", "que" },
+{ "rm", "roh" },
+{ "rn", "run" },
+{ "ro", "ron" },
+{ "ru", "rus" },
+{ "rw", "kin" },
+{ "sa", "san" },
+{ "sd", "snd" },
+{ "se", "sme" },
+{ "sg", "sag" },
+{ "si", "sin" },
+{ "sk", "slk" },
+{ "sl", "slv" },
+{ "sn", "sna" },
+{ "so", "som" },
+{ "sq", "sqi" },
+{ "sr", "srp" },
+{ "ss", "ssw" },
+{ "st", "sot" },
+{ "sv", "swe" },
+{ "sw", "swa" },
+{ "ta", "tam" },
+{ "te", "tel" },
+{ "tg", "tgk" },
+{ "th", "tha" },
+{ "ti", "tir" },
+{ "tk", "tuk" },
+{ "tl", "tgl" },
+{ "tn", "tsn" },
+{ "to", "ton" },
+{ "tr", "tur" },
+{ "ts", "tso" },
+{ "tt", "tat" },
+{ "ug", "uig" },
+{ "uk", "ukr" },
+{ "ur", "urd" },
+{ "uz", "uzb" },
+{ "ve", "ven" },
+{ "vi", "vie" },
+{ "wa", "wln" },
+{ "wo", "wol" },
+{ "xh", "xho" },
+{ "yo", "yor" },
+{ "zh", "zho" },
+{ "zu", "zul" }
 };

 void kiwix::sleep(unsigned int milliseconds)
--- a/travis/install_deps.sh
+++ b/travis/install_deps.sh
@@ -3,13 +3,13 @@
 set -e

 REPO_NAME=${TRAVIS_REPO_SLUG#*/}
-ARCHIVE_NAME=deps_${TRAVIS_OS_NAME}_${PLATFORM}_${REPO_NAME}.tar.gz
+ARCHIVE_NAME=deps_${TRAVIS_OS_NAME}_${PLATFORM}_${REPO_NAME}.tar.xz

 # Ninja
 cd $HOME
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]
 then
-  pip3 install meson
+  pip3 install meson==0.49.2

  wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip
  unzip ninja-mac.zip ninja
@@ -18,7 +18,7 @@ else
  python3.5 get-pip.py --user

  python3.5 -m pip install --user --upgrade pip
-  python3.5 -m pip install --user meson
+  python3.5 -m pip install --user meson==0.49.2

  wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip
  unzip ninja-linux.zip ninja
Author	SHA1	Message	Date
Matthieu Gautier	42b7692f9b	Merge pull request #208 from kiwix/new_version Version 4.1.0	2019-03-19 16:35:57 +01:00
Matthieu Gautier	cd654b9cae	Version 4.1.0	2019-03-19 16:26:14 +01:00
Matthieu Gautier	15dafcaa80	Force use of meson 0.49.2	2019-03-19 15:27:03 +01:00
Matthieu Gautier	f71f2935e0	Merge pull request #204 from kiwix/library_filter_tag Allow the library to be filtered by tags.	2019-03-07 17:19:31 +01:00
Matthieu Gautier	c6254d9504	Allow the library to be filtered by tags. This add an argument to `listBooksIds` to filter by tags. So, this is an API break.	2019-03-07 17:08:39 +01:00
Matthieu Gautier	f1a046757e	Merge pull request #203 from kiwix/fix_lang_mapping Fix the language mapping.	2019-03-05 18:43:00 +01:00
Matthieu Gautier	93af3aa2d1	Fix the language mapping. The previous mapping was taken from an unknown (:/) source. The new mapping is generated with a script taking https://www.loc.gov/standards/iso639-2/php/code_list.php as source. The source list is sanitized to keep only language for which we (http://library.kiwix.org/) have content.	2019-03-05 17:53:37 +01:00
Matthieu Gautier	336a987bb2	Merge pull request #202 from kiwix/update_readme_mustache Add information about mustache dependency in the README.	2019-03-04 17:03:56 +01:00
Matthieu Gautier	72b4af4d65	Add information about mustache dependency in the README.	2019-03-04 14:26:40 +01:00
Matthieu Gautier	9aa1c65d7a	Merge pull request #200 from kiwix/new_version New version 4.0.1	2019-02-22 11:18:55 +01:00
Matthieu Gautier	ad6b20a530	New version 4.0.1	2019-02-22 10:29:16 +01:00
Matthieu Gautier	c1d04cc5b5	Merge pull request #199 from kiwix/fix_warning_android Correctly initialize variable.	2019-02-19 14:15:20 +01:00
Matthieu Gautier	af9734c87f	Correctly initialize variable.	2019-02-19 14:05:37 +01:00
Matthieu Gautier	a7a0798f99	Merge pull request #198 from kiwix/use_correct_dep_archive Use new xz archive.	2019-02-19 14:05:08 +01:00
Matthieu Gautier	0154fdd190	Use new xz archive.	2019-02-19 13:31:26 +01:00
Matthieu Gautier	788d16ec01	Merge pull request #197 from kiwix/ensure_path_abs Ensure path abs	2019-02-07 15:55:51 +01:00
Matthieu Gautier	35d812a5f7	Ensure the book's `path` is absolute. We must use absolute path whenever possible. Relative path has sense only related to the "interaction" with the user (current directory, library location, ...).	2019-02-07 15:22:33 +01:00
Matthieu Gautier	432f9c30a3	Remove unused variable url.	2019-02-07 15:20:18 +01:00