node-sword-interface 0.252.0 → 0.254.0

package/README.md

@@ -101,7 +101,7 @@ These installation instructions are working on Debian/Ubuntu based Linux distrib
 
 To install the dependencies issue the following command on a Debian/Ubuntu based distribution:
     
-    sudo apt-get install build-essential nodejs npm libcurl4-gnutls-dev libicu-dev pkg-config cmake
+    sudo apt-get install build-essential nodejs npm libcurl4-gnutls-dev libicu-dev zlib1g-dev pkg-config cmake subversion
 
 #### Install dependencies on macOS
 

package/binding.gyp

@@ -70,7 +70,7 @@
             "src/napi_module/module_search_worker.cpp",
             "src/napi_module/napi_sword_helper.cpp",
             "src/napi_module/node_sword_interface.cpp",
-            "src/napi_module/api_lock.cpp",            
+            "src/napi_module/api_lock.cpp",
             "src/napi_module/binding.cpp"
         ],
         "conditions":[
@@ -113,10 +113,7 @@
                 "libraries": [
                     '<(module_root_dir)/sword_build/libsword.a',
                     '<!@(pkg-config --libs libcurl)',
-                    '/usr/local/opt/icu4c/lib/libicudata.a',
-                    '/usr/local/opt/icu4c/lib/libicuuc.a',
-                    '/usr/local/opt/icu4c/lib/libicui18n.a',
-                    '/usr/local/opt/icu4c/lib/libicuio.a'
+                    '<!@(PKG_CONFIG_PATH="/opt/homebrew/opt/icu4c/lib/pkgconfig:/usr/local/opt/icu4c/lib/pkgconfig" pkg-config --libs icu-uc icu-io icu-i18n)'
                 ],
                 "dependencies": [
                     "<!(node -p \"require('node-addon-api').gyp\")",
@@ -147,7 +144,7 @@
                 ],
                 'defines': [ 'SWUSINGDLL' ]
             }]
-        ], 
+        ],
         'dependencies': [
             "<!(node -p \"require('node-addon-api').gyp\")"
         ],

package/package.json

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

package/src/napi_module/node_sword_interface.cpp

@@ -142,9 +142,9 @@ NodeSwordInterface::NodeSwordInterface(const Napi::CallbackInfo& info) : Napi::O
     Napi::Env env = info.Env();
     Napi::HandleScope scope(env);
 
-    std::string customHomeDir = "";
     std::string localeDir = "";
-    FileSystemHelper fsHelper;
+    this->customHomeDir = "";
+
     bool homeDirError = false;
     bool localeDirError = false;
 
@@ -153,9 +153,9 @@ NodeSwordInterface::NodeSwordInterface(const Napi::CallbackInfo& info) : Napi::O
     this->_currentModuleSearchWorker = 0;
 
     if (info[0].IsString()) {
-        customHomeDir = string(info[0].As<Napi::String>());
+        this->customHomeDir = string(info[0].As<Napi::String>());
 
-        if (!this->dirExists(info, customHomeDir)) {
+        if (!this->dirExists(info, this->customHomeDir)) {
             homeDirError = true;
         }
     }
@@ -171,10 +171,10 @@ NodeSwordInterface::NodeSwordInterface(const Napi::CallbackInfo& info) : Napi::O
     }
 
     if (!homeDirError && !localeDirError) { // We only proceed if there has not been any issue with the homeDir or localeDir
-        this->_moduleStore = new ModuleStore(customHomeDir);
+        this->_moduleStore = new ModuleStore(this->customHomeDir);
         this->_moduleHelper = new ModuleHelper(*(this->_moduleStore));
-        this->_repoInterface = new RepositoryInterface(this->_swordStatusReporter, *(this->_moduleHelper), customHomeDir);
-        this->_moduleInstaller = new ModuleInstaller(*(this->_repoInterface), *(this->_moduleStore), customHomeDir);
+        this->_repoInterface = new RepositoryInterface(this->_swordStatusReporter, *(this->_moduleHelper), this->customHomeDir);
+        this->_moduleInstaller = new ModuleInstaller(*(this->_repoInterface), *(this->_moduleStore), this->customHomeDir);
         this->_napiSwordHelper = new NapiSwordHelper(*(this->_moduleHelper), *(this->_moduleStore));
         this->_textProcessor = new TextProcessor(*(this->_moduleStore), *(this->_moduleHelper));
         this->_moduleSearch = new ModuleSearch(*(this->_moduleStore), *(this->_moduleHelper), *(this->_textProcessor));
@@ -952,6 +952,10 @@ Napi::Value NodeSwordInterface::getSwordPath(const Napi::CallbackInfo& info)
     Napi::HandleScope scope(env);
 
     FileSystemHelper fsHelper;
+    if (this->customHomeDir != "") {
+      fsHelper.setCustomHomeDir(customHomeDir);
+    }
+
     Napi::String swordPath = Napi::String::New(env, fsHelper.getUserSwordDir());
     unlockApi();
     return swordPath;

package/src/napi_module/node_sword_interface.hpp

@@ -112,6 +112,8 @@ private:
     SwordTranslationHelper* _swordTranslationHelper;
     SwordStatusReporter _swordStatusReporter;
     ModuleSearchWorker* _currentModuleSearchWorker;
+
+    std::string customHomeDir;
 };
 
 #endif // _NODE_SWORD_INTERFACE

package/src/node_sword_cli.cpp

@@ -214,13 +214,13 @@ int main(int argc, char** argv)
     //string translation = sword_facade.getSwordTranslation(string("/usr/share/sword/locales.d"), string("de"), string("locales"));
     //cout << translation << endl;
 
-    vector<Verse> searchResults = moduleSearch.getModuleSearchResults("GerNeUe", "Glaube", SearchType::multiWord, SearchScope::NT, true);
+    /*vector<Verse> searchResults = moduleSearch.getModuleSearchResults("NASB", "faith", SearchType::multiWord, SearchScope::NT, true);
     cout << "Got " << searchResults.size() << " results!" << endl;
     for (unsigned int i=0; i < searchResults.size(); i++) {
         cout << searchResults[i].reference << endl;
-    }
+    }*/
 
-    /*get_book_headers(textProcessor);*/
+    get_book_headers(textProcessor);
 
     return 0;
 }