wip

Get book by path

ChangeLog

@@ -1,3 +1,9 @@
+kiwix-lib 9.0.1
+===============
+
+ * [JAVA] Use a long to store the offset of an article in the zim file instead
+    of an int.
+
 kiwix-lib 9.0.0
 ===============
 

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

@@ -26,7 +26,7 @@ task writePom {
     project {
         groupId 'org.kiwix.kiwixlib'
         artifactId 'kiwixlib'
-        version '9.0.0' + (System.env.KIWIXLIB_BUILDVERSION == null ? '' : '-'+System.env.KIWIXLIB_BUILDVERSION)
+        version '9.0.1' + (System.env.KIWIXLIB_BUILDVERSION == null ? '' : '-'+System.env.KIWIXLIB_BUILDVERSION)
         packaging 'aar'
         name 'kiwixlib'
         url 'https://github.com/kiwix/kiwix-lib'

include/downloader.h

@@ -88,7 +88,7 @@ class Download {
 class Downloader
 {
  public:
-  Downloader();
+  Downloader(std::string sessionFileDir = "");
   virtual ~Downloader();
 
   void close();

include/kiwixserve.h

@@ -18,6 +18,7 @@ class KiwixServe
     bool isRunning();
     int getPort() { return m_port; }
     int setPort(int port);
+    void setLibraryPath(std::string path) { m_libraryPath = path; }
 
   private:
   std::unique_ptr<Subprocess> mp_kiwixServe;

include/library.h

@@ -149,6 +149,7 @@ class Library
   bool removeBookmark(const std::string& zimId, const std::string& url);
 
   Book& getBookById(const std::string& id);
+  Book& getBookByPath(const std::string& path);
   std::shared_ptr<Reader> getReaderById(const std::string& id);
 
   /**

include/searcher.h

@@ -89,7 +89,7 @@ class Searcher
    * @param resultEnd the end offset of the search results (used for pagination).
    * @param verbose print some info on stdout if true.
    */
-  void search(std::string& search,
+  void search(const std::string& search,
               unsigned int resultStart,
               unsigned int resultEnd,
               const bool verbose = false);

meson.build

@@ -1,5 +1,5 @@
 project('kiwix-lib', 'cpp',
-  version : '9.0.0', # Also change this in android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
+  version : '9.0.1', # Also change this in android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
   license : 'GPL',
   default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])
 

src/aria2.cpp

@@ -22,7 +22,7 @@
 
 namespace kiwix {
 
-Aria2::Aria2():
+Aria2::Aria2(std::string sessionFileDir):
   mp_aria(nullptr),
   m_port(42042),
   m_secret("kiwixariarpc"),
@@ -35,7 +35,12 @@ Aria2::Aria2():
 
   std::string rpc_port = "--rpc-listen-port=" + to_string(m_port);
   std::string download_dir = "--dir=" + getDataDirectory();
-  std::string session_file = appendToDirectory(getDataDirectory(), "kiwix.session");
+  std::string session_file;
+  if (sessionFileDir.empty()) {
+    session_file = appendToDirectory(getDataDirectory(), "kiwix.session");
+  } else {
+    session_file = appendToDirectory(sessionFileDir, "kiwix.session");
+  }
   std::string session = "--save-session=" + session_file;
   std::string inputFile = "--input-file=" + session_file;
 //  std::string log_dir = "--log=\"" + logDir + "\"";

src/aria2.h

@@ -30,7 +30,7 @@ class Aria2
     std::string doRequest(const MethodCall& methodCall);
 
   public:
-    Aria2();
+    Aria2(std::string sessionFileDir = "");
     virtual ~Aria2();
     void close();
 

src/downloader.cpp

@@ -124,8 +124,8 @@ void Download::cancelDownload()
 }
 
 /* Constructor */
-Downloader::Downloader() :
-  mp_aria(new Aria2())
+Downloader::Downloader(std::string sessionFileDir) :
+  mp_aria(new Aria2(sessionFileDir))
 {
   try {
     for (auto gid : mp_aria->tellActive()) {

src/library.cpp

@@ -85,6 +85,18 @@ Book& Library::getBookById(const std::string& id)
   return m_books.at(id);
 }
 
+Book& Library::getBookByPath(const std::string& path)
+{
+  for(auto& it: m_books) {
+    auto& book = it.second;
+    if (book.getPath() == path)
+      return book;
+  }
+  std::ostringstream ss;
+  ss << "No book with path " << path << " in the library." << std::endl;
+  throw std::out_of_range(ss.str());
+}
+
 std::shared_ptr<Reader> Library::getReaderById(const std::string& id)
 {
   try {

src/searcher.cpp

@@ -97,7 +97,7 @@ Reader* Searcher::get_reader(int readerIndex)
 }
 
 /* Search strings in the database */
-void Searcher::search(std::string& search,
+void Searcher::search(const std::string& search,
                       unsigned int resultStart,
                       unsigned int resultEnd,
                       const bool verbose)

src/wrapper/java/kiwixreader.cpp

@@ -21,6 +21,7 @@
 
 #include <jni.h>
 #include <zim/file.h>
+#include <exception>
 #include "org_kiwix_kiwixlib_JNIKiwixReader.h"
 
 #include "tools/base64.h"
@@ -305,6 +306,22 @@ JNIEXPORT jbyteArray JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getContentPa
   return data;
 }
 
+JNIEXPORT jlong JNICALL
+Java_org_kiwix_kiwixlib_JNIKiwixReader_getArticleSize(
+    JNIEnv* env, jobject obj, jstring url)
+{
+  std::string cUrl = jni2c(url, env);
+  try {
+    auto entry = READER->getEntryFromEncodedPath(cUrl);
+    entry = entry.getFinalEntry();
+    return c2jni(entry.getSize(), env);
+  } catch(std::exception& e) {
+    LOG("Unable to get size for url : %s", cUrl.c_str());
+    LOG(e.what());
+  }
+  return c2jni(0, env);
+}
+
 JNIEXPORT jobject JNICALL
 Java_org_kiwix_kiwixlib_JNIKiwixReader_getDirectAccessInformation(
     JNIEnv* env, jobject obj, jstring url)

src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixReader.java

@@ -82,6 +82,16 @@ public class JNIKiwixReader
                                       int len,
                                       JNIKiwixInt size);
 
+  /**
+   *
+   * Get the size of an article.
+   *
+   * @param   url The url of the article.
+   * @return  The size of the final (redirections are resolved) article (in byte).
+   *          Return 0 if the article is not found.
+   */
+  public native long getArticleSize(String url);
+
   /**
    * getDirectAccessInformation.
    *

src/wrapper/java/org/kiwix/kiwixlib/Pair.java

@@ -22,5 +22,5 @@ package org.kiwix.kiwixlib;
 public class Pair
 {
   public String filename;
-  public int offset;
+  public long offset;
 }

src/wrapper/java/utils.h

@@ -258,14 +258,14 @@ inline void setBoolObjValue(const bool value, const jobject obj, JNIEnv* env)
   env->SetIntField(obj, objFid, c2jni(value, env));
 }
 
-inline void setPairObjValue(const std::string& filename, const int offset,
+inline void setPairObjValue(const std::string& filename, const long offset,
                             const jobject obj, JNIEnv* env)
 {
   jclass objClass = env->GetObjectClass(obj);
   jfieldID filenameFid = env->GetFieldID(objClass, "filename", "Ljava/lang/String;");
   env->SetObjectField(obj, filenameFid, c2jni(filename, env));
-  jfieldID offsetFid = env->GetFieldID(objClass, "offset", "I");
-  env->SetIntField(obj, offsetFid, offset);
+  jfieldID offsetFid = env->GetFieldID(objClass, "offset", "J");
+  env->SetLongField(obj, offsetFid, offset);
 }
 
 #endif // _ANDROID_JNI_UTILS_H

test/library.cpp

@@ -258,4 +258,12 @@ TEST_F(LibraryTest, filterCheck)
   EXPECT_EQ(bookIds.size(), 1U);
 
 }
+
+TEST_F(LibraryTest, getBookByPath)
+{
+  auto& book = lib.getBookById(lib.getBooksIds()[0]);
+  book.setPath("/some/abs/path.zim");
+  EXPECT_EQ(lib.getBookByPath("/some/abs/path.zim").getId(), book.getId());
+  EXPECT_THROW(lib.getBookByPath("non/existant/path.zim"), std::out_of_range);
+}
 };