Add the filter functionality.

src/android/filter.cpp

@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2019-2020 Matthieu Gautier <mgautier@kymeria.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU  General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+
+#include <jni.h>
+#include <android/log.h>
+#include "org_kiwix_kiwixlib_Filter.h"
+
+#include "library.h"
+#include "utils.h"
+
+/* Kiwix Reader JNI functions */
+METHOD0(void, Filter, allocate) {
+  allocate<kiwix::Filter>(env, thisObj);
+}
+
+METHOD0(void, Filter, dispose) {
+  dispose<kiwix::Library>(env, thisObj);
+}
+
+#define FILTER (getPtr<kiwix::Filter>(env, thisObj))
+
+#define FORWARD(name, args_type) \
+METHOD(jobject, Filter, name, args_type value) { \
+  FILTER->name(jni2c(value, env)); \
+  return thisObj; \
+}
+
+#define FORWARDA(name, args_type) \
+METHOD(jobject, Filter, name, jobjectArray value) { \
+  FILTER->name(jni2c<args_type>(value, env)); \
+  return thisObj; \
+}
+
+
+
+FORWARD(local, jboolean)
+FORWARD(remote, jboolean)
+FORWARD(valid, jboolean)
+FORWARDA(acceptTags, jstring)
+FORWARDA(rejectTags, jstring)
+FORWARD(lang, jstring)
+FORWARD(publisher, jstring)
+FORWARD(creator, jstring)
+FORWARD(maxSize, jlong)
+FORWARD(query, jstring)
+
+

src/android/kiwixreader.cpp

@@ -284,8 +284,8 @@ JNIEXPORT jbyteArray JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getContentPa
   /* Default values */
   /* Retrieve the content */
   std::string cUrl = jni2c(url, env);
-  unsigned int cOffset = jni2c(offset);
-  unsigned int cLen = jni2c(len);
+  unsigned int cOffset = jni2c(offset, env);
+  unsigned int cLen = jni2c(len, env);
   try {
     auto entry = READER->getEntryFromEncodedPath(cUrl);
     entry = entry.getFinalEntry();
@@ -336,7 +336,7 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_searchSuggestions(JNIEnv* env,
 {
   jboolean retVal = JNI_FALSE;
   std::string cPrefix = jni2c(prefix, env);
-  unsigned int cCount = jni2c(count);
+  unsigned int cCount = jni2c(count, env);
 
   try {
     if (READER->searchSuggestionsSmart(cPrefix, cCount)) {

src/android/kiwixsearcher.cpp

@@ -59,7 +59,7 @@ JNIEXPORT void JNICALL Java_org_kiwix_kiwixlib_JNIKiwixSearcher_search(
     JNIEnv* env, jobject obj, jstring query, jint count)
 {
   std::string cquery = jni2c(query, env);
-  unsigned int ccount = jni2c(count);
+  unsigned int ccount = jni2c(count, env);
 
   SEARCHER->search(cquery, 0, ccount);
 }

src/android/library.cpp

@@ -79,6 +79,11 @@ METHOD0(jobjectArray, Library, getBooksIds) {
   return c2jni(LIBRARY->getBooksIds(), env);
 }
 
+METHOD(jobjectArray, Library, filter, jobject filterObj) {
+  auto filter = getPtr<kiwix::Filter>(env, filterObj);
+  return c2jni(LIBRARY->filter(*filter), env);
+}
+
 METHOD0(jobjectArray, Library, getBooksLanguages) {
   return c2jni(LIBRARY->getBooksLanguages(), env);
 }

src/android/meson.build

@@ -5,6 +5,7 @@ kiwix_jni = custom_target('jni',
           'org/kiwix/kiwixlib/JNIKiwixReader.java',
           'org/kiwix/kiwixlib/Library.java',
           'org/kiwix/kiwixlib/Manager.java',
+          'org/kiwix/kiwixlib/Filter.java',
           'org/kiwix/kiwixlib/JNIKiwixSearcher.java',
           'org/kiwix/kiwixlib/JNIKiwixServer.java',
           'org/kiwix/kiwixlib/JNIKiwixInt.java',
@@ -17,6 +18,7 @@ kiwix_jni = custom_target('jni',
            'org_kiwix_kiwixlib_JNIKiwixReader.h',
            'org_kiwix_kiwixlib_Library.h',
            'org_kiwix_kiwixlib_Manager.h',
+           'org_kiwix_kiwixlib_Filter.h',
            'org_kiwix_kiwixlib_JNIKiwixServer.h',
            'org_kiwix_kiwixlib_JNIKiwixSearcher.h',
            'org_kiwix_kiwixlib_JNIKiwixSearcher_Result.h'],
@@ -29,6 +31,7 @@ kiwix_sources += [
     'android/kiwixreader.cpp',
     'android/library.cpp',
     'android/manager.cpp',
+    'android/filter.cpp',
     'android/kiwixsearcher.cpp',
     'android/kiwixserver.cpp',
     kiwix_jni]

src/android/org/kiwix/kiwixlib/Filter.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2019-2020 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.
+ */
+
+package org.kiwix.kiwixlib;
+
+public class Filter
+{
+
+  public native Filter local(boolean accept);
+  public native Filter remote(boolean accept);
+  public native Filter valid(boolean accept);
+  public native Filter acceptTags(String[] tags);
+  public native Filter rejectTags(String[] tags);
+  public native Filter lang(String lang);
+  public native Filter publisher(String publisher);
+  public native Filter creator(String creator);
+  public native Filter maxSize(long size);
+  public native Filter query(String query);
+
+
+  public Filter() { allocate(); }
+
+  @Override
+  protected void finalize() { dispose(); }
+  private native void allocate();
+  private native void dispose();
+  private long nativeHandle;
+}

src/android/org/kiwix/kiwixlib/Library.java

@@ -30,7 +30,7 @@ public class Library
   public native int  getBookCount(boolean localBooks, boolean remoteBooks);
 
   public native String[] getBooksIds();
-//  public native String[] filter(Filter filter);
+  public native String[] filter(Filter filter);
 
   public native String[] getBooksLanguages();
   public native String[] getBooksCreators();

src/android/utils.h

@@ -175,9 +175,27 @@ inline jobjectArray c2jni(const std::vector<std::string>& val, JNIEnv* env)
   return array;
 }
 
+template<typename T, typename U=T>
+struct CType { };
+
+template<> struct CType<jboolean>{ typedef bool type_t; };
+template<> struct CType<jint>{ typedef int type_t; };
+template<> struct CType<jlong>{ typedef long type_t; };
+template<> struct CType<jstring>{ typedef std::string type_t; };
+
+template<typename U>
+struct CType<jobjectArray, U>{ typedef std::vector<typename CType<U>::type_t> type_t; };
 
 /* jni2c type conversion functions */
-inline bool jni2c(const jboolean& val) { return val == JNI_TRUE; }
+template<typename T, typename U=T>
+inline typename CType<T>::type_t jni2c(const T& val, JNIEnv* env) {
+  return static_cast<typename CType<T>::type_t>(val);
+}
+
+template<>
+inline bool jni2c(const jboolean& val, JNIEnv* env) { return val == JNI_TRUE; }
+
+template<>
 inline std::string jni2c(const jstring& val, JNIEnv* env)
 {
   const char* chars = env->GetStringUTFChars(val, 0);
@@ -186,7 +204,21 @@ inline std::string jni2c(const jstring& val, JNIEnv* env)
   return ret;
 }
 
-inline int jni2c(const jint val) { return (int)val; }
+template<typename U>
+inline typename CType<jobjectArray, U>::type_t jni2c(const jobjectArray& val, JNIEnv* env)
+{
+  jsize length = env->GetArrayLength(val);
+  typename CType<jobjectArray, U>::type_t v(length);
+
+  int i;
+  for (i = 0; i < length; i++) {
+    U obj = (U) env->GetObjectArrayElement(val, i);
+    auto cobj = jni2c<U>(obj, env);
+    v.push_back(cobj);
+  }
+  return v;
+}
+
 /* Method to deal with variable passed by reference */
 inline std::string getStringObjValue(const jobject obj, JNIEnv* env)
 {