Merge pull request #36 from kiwix/execption_handling

Author: mgautierfr

lib/build.gradle

@@ -342,7 +342,8 @@ String getLibzimFiles() {
         "${projectDir}/src/main/java/org/kiwix/libzim/SuggestionIterator.java " +
         "${projectDir}/src/main/java/org/kiwix/libzim/SuggestionSearcher.java " +
         "${projectDir}/src/main/java/org/kiwix/libzim/SuggestionSearch.java " +
-        "${projectDir}/src/main/java/org/kiwix/libzim/ZimFileFormatException.java"
+        "${projectDir}/src/main/java/org/kiwix/libzim/ZimFileFormatException.java " +
+        "${projectDir}/src/main/java/org/kiwix/libzim/EntryNotFoundException.java"
 }
 
 task buildLinuxBinding(type: Exec) {

lib/src/main/cpp/libkiwix/book.cpp

@@ -32,19 +32,19 @@
 METHOD0(void, allocate)
 {
   SET_PTR(std::make_shared<NATIVE_TYPE>());
-}
+} CATCH_EXCEPTION()
 
 DISPOSE
 
 METHOD(void, update__Lorg_kiwix_libkiwix_Book_2, jobject otherBook)
 {
   THIS->update(*getPtr<kiwix::Book>(env, otherBook));
-}
+} CATCH_EXCEPTION()
 
 METHOD(void, update__Lorg_kiwix_libzim_Archive_2, jobject archive)
 {
   THIS->update(*getPtr<zim::Archive>(env, archive));
-}
+} CATCH_EXCEPTION()
 
 GETTER(jstring, getId)
 
@@ -76,7 +76,7 @@ GETTER(jstring, getCategory)
 
 GETTER(jstring, getTags)
 
-METHOD(jstring, getTagStr, jstring tagName) try {
+METHOD(jstring, getTagStr, jstring tagName) {
   return TO_JNI(THIS->getTagStr(TO_C(tagName)));
 } catch(...) {
   return c2jni<std::string>("", env);
@@ -97,8 +97,8 @@ METHOD0(jobjectArray, getIllustrations) {
     env->SetObjectArrayElement(retArray, index++, wrapper);
   }
   return retArray;
-}
+} CATCH_EXCEPTION(nullptr)
 
 METHOD(jobject, getIllustration, jint size) {
   return BUILD_WRAPPER("org/kiwix/libkiwix/Illustration", THIS->getIllustration(TO_C(size)));
-}
+} CATCH_EXCEPTION(nullptr)

lib/src/main/cpp/libkiwix/bookmark.cpp

@@ -31,7 +31,7 @@
 METHOD0(void, setNativeBookmark)
 {
   SET_PTR(std::make_shared<NATIVE_TYPE>());
-}
+} CATCH_EXCEPTION()
 
 DISPOSE
 
@@ -49,24 +49,24 @@ GETTER(jstring, getDate)
 
 METHOD(void, setBookId, jstring bookId) {
   THIS->setBookId(TO_C(bookId));
-}
+} CATCH_EXCEPTION()
 
 METHOD(void, setBookTitle, jstring bookTitle) {
   THIS->setBookTitle(TO_C(bookTitle));
-}
+} CATCH_EXCEPTION()
 
 METHOD(void, setUrl, jstring url) {
   THIS->setUrl(TO_C(url));
-}
+} CATCH_EXCEPTION()
 
 METHOD(void, setTitle, jstring title) {
   THIS->setTitle(TO_C(title));
-}
+} CATCH_EXCEPTION()
 
 METHOD(void, setLanguage, jstring lang) {
   THIS->setLanguage(TO_C(lang));
-}
+} CATCH_EXCEPTION()
 
 METHOD(void, setDate, jstring date) {
   THIS->setDate(TO_C(date));
-}
+} CATCH_EXCEPTION()

lib/src/main/cpp/libkiwix/filter.cpp

@@ -33,21 +33,21 @@
 /* Kiwix Reader JNI functions */
 METHOD0(void, allocate) {
   SET_PTR(std::make_shared<NATIVE_TYPE>());
-}
+} CATCH_EXCEPTION()
 
 DISPOSE
 
 #define FORWARD(name, args_type) \
 METHOD(jobject, name, args_type value) { \
   THIS->name(jni2c(value, env)); \
   return thisObj; \
-}
+} CATCH_EXCEPTION(nullptr)
 
 #define FORWARDA(name, args_type) \
 METHOD(jobject, name, jobjectArray value) { \
   THIS->name(jni2c<args_type>(value, env)); \
   return thisObj; \
-}
+} CATCH_EXCEPTION(nullptr)
 
 
 

lib/src/main/cpp/libkiwix/illustration.cpp

@@ -32,22 +32,22 @@
 METHOD0(void, dispose)
 {
   dispose<NATIVE_TYPE>(env, thisObj);
-}
+} CATCH_EXCEPTION()
 
 METHOD0(jint, width) {
   return TO_JNI(THIS->width);
-}
+} CATCH_EXCEPTION(0)
 
 METHOD0(jint, height) {
   return TO_JNI(THIS->height);
-}
+} CATCH_EXCEPTION(0)
 
 METHOD0(jstring, mimeType) {
   return TO_JNI(THIS->mimeType);
-}
+} CATCH_EXCEPTION(nullptr)
 
 METHOD0(jstring, url) {
   return TO_JNI(THIS->url);
-}
+} CATCH_EXCEPTION(nullptr)
 
 GETTER(jstring, getData)

lib/src/main/cpp/libkiwix/kiwixicu.cpp

@@ -28,11 +28,9 @@
 #include "zim/tools.h"
 
 JNIEXPORT void JNICALL Java_org_kiwix_kiwixlib_JNIICU_setDataDirectory(
-    JNIEnv* env, jclass kclass, jstring dirStr)
+    JNIEnv* env, jclass kclass, jstring dirStr) try
 {
-  try {
-    zim::setICUDataDirectory(TO_C(dirStr));
-  } catch (...) {
-    std::cerr << "Unable to set data directory " << TO_C(dirStr) << std::endl;
-  }
+  zim::setICUDataDirectory(TO_C(dirStr));
+} catch(...) {
+  throwException(env, "java/lang/Exception", "Unable to set data directory");
 }

lib/src/main/cpp/libkiwix/kiwixserver.cpp

@@ -34,15 +34,11 @@
 /* Kiwix Reader JNI functions */
 METHOD(void, setNativeServer, jobject jLibrary)
 {
-  LOG("Attempting to create server");
-  try {
-    auto library = getPtr<kiwix::Library>(env, jLibrary);
-    SET_PTR(std::make_shared<NATIVE_TYPE>(library.get()));
-  } catch (std::exception& e) {
-    LOG("Error creating the server");
-    LOG("%s", e.what());
-  }
-}
+  auto library = getPtr<kiwix::Library>(env, jLibrary);
+  SET_PTR(std::make_shared<NATIVE_TYPE>(library.get()));
+} catch (std::exception& e) {
+  throwException(env, "java/lang/Exception", "Error creating the server");
+} CATCH_EXCEPTION()
 
 
 DISPOSE
@@ -51,39 +47,39 @@ DISPOSE
 METHOD(void, setRoot, jstring root)
 {
   THIS->setRoot(TO_C(root));
-}
+} CATCH_EXCEPTION()
 
 METHOD(void, setAddress, jstring address)
 {
   THIS->setAddress(TO_C(address));
-}
+} CATCH_EXCEPTION()
 
 METHOD(void, setPort, int port)
 {
   THIS->setPort(TO_C(port));
-}
+} CATCH_EXCEPTION()
 
 METHOD(void, setNbThreads, int threads)
 {
   THIS->setNbThreads(TO_C(threads));
-}
+} CATCH_EXCEPTION()
 
 METHOD(void, setTaskbar, jboolean withTaskbar, jboolean withLibraryButton)
 {
   THIS->setTaskbar(TO_C(withTaskbar), TO_C(withLibraryButton));
-}
+} CATCH_EXCEPTION()
 
 METHOD(void, setBlockExternalLinks, jboolean blockExternalLinks)
 {
   THIS->setBlockExternalLinks(TO_C(blockExternalLinks));
-}
+} CATCH_EXCEPTION()
 
 METHOD0(jboolean, start)
 {
   return THIS->start();
-}
+} CATCH_EXCEPTION(false)
 
 METHOD0(void, stop)
 {
   THIS->stop();
-}
+} CATCH_EXCEPTION()

lib/src/main/cpp/libkiwix/library.cpp

@@ -32,7 +32,7 @@
 METHOD0(void, setNativeHandler)
 {
   SET_PTR(std::make_shared<NATIVE_TYPE>());
-}
+} CATCH_EXCEPTION()
 
 DISPOSE
 
@@ -41,43 +41,41 @@ METHOD(jboolean, addBook, jobject book)
 {
   auto cBook = getPtr<kiwix::Book>(env, book);
 
-  try {
-    return THIS->addBook(*cBook);
-  } catch (std::exception& e) {
-    LOG("Unable to add the book");
-    LOG("%s", e.what()); }
-  return false;
-}
+  return THIS->addBook(*cBook);
+} CATCH_EXCEPTION(false)
 
 METHOD(jobject, getBookById, jstring id) {
   return BUILD_WRAPPER2("org/kiwix/libkiwix/Book", THIS->getBookById(TO_C(id)));
-}
+} CATCH_EXCEPTION(nullptr)
 
 METHOD(jobject, getArchiveById, jstring id) {
-  return BUILD_WRAPPER("org/kiwix/libzim/Archive", THIS->getArchiveById(TO_C(id)));
-}
+  auto archive = THIS->getArchiveById(TO_C(id));
+  std::cout << "archive is " << archive << std::endl;
+  return BUILD_WRAPPER2("org/kiwix/libzim/Archive", archive);
+} CATCH_EXCEPTION(nullptr)
 
 METHOD(jboolean, removeBookById, jstring id) {
   return TO_JNI(THIS->removeBookById(TO_C(id)));
-}
+} CATCH_EXCEPTION(false)
 
 METHOD(jboolean, writeToFile, jstring path) {
   return TO_JNI(THIS->writeToFile(TO_C(path)));
-}
+} CATCH_EXCEPTION(false)
+
 METHOD(jboolean, writeBookmarksToFile, jstring path) {
   return TO_JNI(THIS->writeBookmarksToFile(TO_C(path)));
-}
+} CATCH_EXCEPTION(false)
 
 METHOD(jint, getBookCount, jboolean localBooks, jboolean remoteBooks) {
   return TO_JNI(THIS->getBookCount(TO_C(localBooks), TO_C(remoteBooks)));
-}
+} CATCH_EXCEPTION(0)
 
 GETTER(jobjectArray, getBooksIds)
 
 METHOD(jobjectArray, filter, jobject filterObj) {
   auto filter = getPtr<kiwix::Filter>(env, filterObj);
   return c2jni(THIS->filter(*filter), env);
-}
+} CATCH_EXCEPTION(nullptr)
 
 GETTER(jobjectArray, getBooksLanguages)
 GETTER(jobjectArray, getBooksCategories)
@@ -87,11 +85,11 @@ GETTER(jobjectArray, getBooksPublishers)
 METHOD(void, addBookmark, jobject bookmark) {
   auto cBookmark = getPtr<kiwix::Bookmark>(env, bookmark);
   THIS->addBookmark(*cBookmark);
-}
+} CATCH_EXCEPTION()
 
 METHOD(jboolean, removeBookmark, jstring zimId, jstring url) {
   return TO_JNI(THIS->removeBookmark(TO_C(zimId), TO_C(url)));
-}
+} CATCH_EXCEPTION(false)
 
 METHOD(jobjectArray, getBookmarks, jboolean onlyValidBookmarks) {
   auto bookmarks = THIS->getBookmarks(TO_C(onlyValidBookmarks));
@@ -108,4 +106,4 @@ METHOD(jobjectArray, getBookmarks, jboolean onlyValidBookmarks) {
     env->SetObjectArrayElement(retArray, index++, wrapper);
   }
   return retArray;
-}
+} CATCH_EXCEPTION(nullptr)