node-sword-interface 1.0.8 → 1.0.10

package/CMakeLists.txt

@@ -14,17 +14,12 @@ include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_SOURCE_DIR}/node_modules/no
 
 link_directories(${CMAKE_SOURCE_DIR}/sword_build)
 
-# ICU Components Reference:
-# https://cmake.org/cmake/help/latest/module/FindICU.html
-# ICU components = data, i18n, io, le, lx, test, tu and uc.
-
-find_package(ICU COMPONENTS uc i18n data REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(CURL REQUIRED)
 find_package(BZip2 REQUIRED)
 
 set(SWORD_LIBRARY_NAME "libsword.a")
-set(DEPENDENT_LIBS ICU::uc ICU::data ICU::i18n ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} ${BZIP2_LIBRARIES})
+set(DEPENDENT_LIBS ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} ${BZIP2_LIBRARIES})
 
 if (UNIX)
     set(DEPENDENT_LIBS ${DEPENDENT_LIBS} pthread)

package/binding.gyp

@@ -82,8 +82,7 @@
                 ],
                 "libraries": [
                     '<!@(./scripts/get_sword_library.sh \"../sword_build/libsword.a\")',
-                    '<!@(pkg-config --libs libcurl)',
-                    '<!@(pkg-config --libs icu-uc icu-io)'
+                    '<!@(pkg-config --libs libcurl)'
                 ],
                 "dependencies": [
                     "<!(node -p \"require('node-addon-api').gyp\")",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-sword-interface",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Javascript (N-API) interface to SWORD library",
   "keywords": [
     "C++",

package/scripts/build_sword.sh

@@ -75,7 +75,9 @@ else
   # macOS & Linux
 
   cd sword_build
-  cmake -DLIBSWORD_LIBRARY_TYPE=Static -DCMAKE_CXX_STANDARD=11 -DCMAKE_BUILD_TYPE=Release ../sword
+  cmake -DLIBSWORD_LIBRARY_TYPE=Static -DCMAKE_CXX_STANDARD=11 -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_DISABLE_FIND_PACKAGE_ICU=TRUE \
+  ../sword
 fi
 
 make -j4 sword_static

package/src/sword_backend/module_search.cpp

@@ -23,6 +23,7 @@
 #include <algorithm>
 
 // sword includes
+#include <swmgr.h>
 #include <swmodule.h>
 #include <versekey.h>
 
@@ -100,7 +101,7 @@ vector<Verse> ModuleSearch::getModuleSearchResults(string moduleName,
                                                    bool useExtendedVerseBoundaries)
 {
     this->_currentModuleName = moduleName;
-    SWModule* module = this->_moduleStore.getLocalModule(moduleName);
+    SWModule* module = this->_moduleStore.getSearchSwMgr()->getModule(moduleName.c_str());
     ListKey listKey;
     SWKey* scope = 0;
     int flags = 0;
@@ -196,7 +197,7 @@ vector<Verse> ModuleSearch::getModuleSearchResults(string moduleName,
 void ModuleSearch::terminate()
 {
     if (this->_currentModuleName != "") {
-        SWModule* module = this->_moduleStore.getLocalModule(this->_currentModuleName);
+        SWModule* module = this->_moduleStore.getSearchSwMgr()->getModule(this->_currentModuleName.c_str());
         module->terminateSearch = true;
         this->_currentModuleName = "";
     }

package/src/sword_backend/module_store.cpp

@@ -36,60 +36,78 @@ ModuleStore::ModuleStore(string customHomeDir)
 {
     this->_fileSystemHelper.setCustomHomeDir(customHomeDir);
     this->_fileSystemHelper.createBasicDirectories();
+    this->customHomeDir = customHomeDir;
 
+    this->_mgr = this->createSWMgr();
+    this->_mgr->setGlobalOption("Headings", "On");
+
+    // After creating the searchMgr we turn off features that we are not interested in when searching
+    this->_searchMgr = this->createSWMgr();
+    this->_searchMgr->setGlobalOption("Headings", "Off");
+}
+
+ModuleStore::~ModuleStore()
+{
+    if (this->_mgr != 0) {
+        delete this->_mgr;
+    }
+
+    if (this->_searchMgr != 0) {
+        delete this->_searchMgr;
+    }
+}
+
+SWMgr* ModuleStore::createSWMgr()
+{
+    SWMgr* swMgr = 0;
     bool isAndroid = false;
     #if defined(__ANDROID__)
         isAndroid = true;
     #endif
 
     if (customHomeDir != "" || isAndroid) {
-        this->_mgr = new SWMgr(this->_fileSystemHelper.getUserSwordDir().c_str(),
-                               true, // autoload
-                               0, // filterMgr
-                               false, // multiMod
-                               false); // augmentHome
+        swMgr = new SWMgr(this->_fileSystemHelper.getUserSwordDir().c_str(),
+                          true, // autoload
+                          0, // filterMgr
+                          false, // multiMod
+                          false); // augmentHome
 
         if (isAndroid) {
           // Also consider the originally used path for Android, which does not work anymore from Android 11, but is still relevant
           // for existing translations on Android versions < 11.
-          this->_mgr->augmentModules("/sdcard/sword"); 
+          swMgr->augmentModules("/sdcard/sword"); 
         }
     } else {
         #ifdef _WIN32
-            this->_mgr = new SWMgr(this->_fileSystemHelper.getUserSwordDir().c_str());
+            swMgr = new SWMgr(this->_fileSystemHelper.getUserSwordDir().c_str());
 
             // This has been disabled because it lead to a crash.
             // We're keeping it here for now in case this becomes relevant again.
             // this->_mgr->augmentModules(this->_fileSystemHelper.getSystemSwordDir().c_str());
         #elif defined(__APPLE__)
-            this->_mgr = new SWMgr();
+            swMgr = new SWMgr();
 
             stringstream appSupport;
             appSupport << string(getenv("HOME")) << "/Library/Application Support/Sword";            
-            this->_mgr->augmentModules(appSupport.str().c_str());
+            swMgr->augmentModules(appSupport.str().c_str());
         #else
-            this->_mgr = new SWMgr();
+            swMgr = new SWMgr();
         #endif
     }
 
-    this->_mgr->setGlobalOption("Headings", "On");
-}
-
-ModuleStore::~ModuleStore()
-{
-    if (this->_mgr != 0) {
-        delete this->_mgr;
-    }
+    return swMgr;
 }
 
 void ModuleStore::refreshMgr()
 {
     this->_mgr->augmentModules(this->_fileSystemHelper.getUserSwordDir().c_str());
+    this->_searchMgr->augmentModules(this->_fileSystemHelper.getUserSwordDir().c_str());
 }
 
 void ModuleStore::deleteModule(string moduleName)
 {
     this->_mgr->deleteModule(moduleName.c_str());
+    this->_searchMgr->deleteModule(moduleName.c_str());
 }
 
 SWModule* ModuleStore::getLocalModule(string moduleName)
@@ -189,7 +207,12 @@ string ModuleStore::getModuleDataPath(sword::SWModule* module)
     return dataPath;
 }
 
-sword::SWMgr* ModuleStore::getSwMgr()
+SWMgr* ModuleStore::getSwMgr()
 {
     return this->_mgr;
 }
+
+SWMgr* ModuleStore::getSearchSwMgr()
+{
+    return this->_searchMgr;
+}

package/src/sword_backend/module_store.hpp

@@ -35,6 +35,7 @@ public:
     ModuleStore(std::string customHomeDir="");
     virtual ~ModuleStore();
 
+    sword::SWMgr* createSWMgr();
     sword::SWModule* getLocalModule(std::string moduleName);
     std::vector<sword::SWModule*> getAllLocalModules(ModuleType moduleType=ModuleType::bible);
     
@@ -46,10 +47,13 @@ public:
     void deleteModule(std::string moduleName);
 
     sword::SWMgr* getSwMgr();
+    sword::SWMgr* getSearchSwMgr();
     
 private:
+    std::string customHomeDir;
     std::vector<std::string> getModuleLanguages(ModuleType moduleType=ModuleType::bible);
     sword::SWMgr* _mgr = 0;
+    sword::SWMgr* _searchMgr = 0;
     FileSystemHelper _fileSystemHelper;
 };