node-sword-interface 1.0.7 → 1.0.9

package/.github/workflows/build.yml

@@ -3,15 +3,29 @@ name: node-sword-interface build
 on: push
 
 jobs:
-    test:
-        name: Run build
+    build-linux:
+        name: Run Linux build
         runs-on: ubuntu-20.04
         steps:
         - uses: actions/checkout@v2
         - uses: actions/setup-node@v2
           with:
-            node-version: '12'
+            node-version: '14'
 
         - run: sudo apt update && sudo apt install -y libcurl4-gnutls-dev
         - run: npm install
+        - run: npm run doc
+    
+    build-windows:
+        name: Run Windows build
+        runs-on: windows-2019
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        steps:
+        - uses: actions/checkout@v2
+        - uses: actions/setup-node@v2
+          with:
+            node-version: '14'
+
+        - run: npm install --arch=ia32
         - run: npm run doc

package/package.json

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

package/scripts/get_sword_build_win32.ps1

@@ -31,17 +31,23 @@ $AllProtocols = [System.Net.SecurityProtocolType]'Tls11,Tls12'
 
 $headers = @{}
 
-if (Test-Path env:CI) {
-		$headers = @{
-				Authorization="Bearer ${$secrets.GITHUB_TOKEN}"
-		}
-}
+$github_token = $env:GITHUB_TOKEN
 
 # --- Set the uri for the release
 $URI = "https://api.github.com/repos/ezra-bible-app/sword-build-win32/releases/tags/v1.8.900-2022-11-06"
 
+if ($Env:CI -eq "true") {
+		Write-Host "GitHub actions build ... using GITHUB_TOKEN for authentication!"
+
+		$headers = @{
+			Authorization="Bearer $github_token"
+			ContentType='application/json'
+		}
+}
+
 # --- Query the API to get the url of the zip
 $Response = Invoke-RestMethod -Method Get -Uri $URI -Headers $headers
+
 $ZipName = $Response.assets[0].name
 $ZipUrl = $Response.assets[0].browser_download_url
 
@@ -52,7 +58,7 @@ if (Test-Path sword-build-win32) {
 
 # --- Download the file to the current location
 $OutputPath = "$((Get-Location).Path)\$ZipName"
-Invoke-RestMethod -Method Get -Uri $ZipUrl -OutFile $OutputPath
+Invoke-RestMethod -Method Get -Uri $ZipUrl -OutFile $OutputPath -Headers $headers
 
 # --- Unzip the zip file and remove it afterwards
 unzip $OutputPath $((Get-Location).Path)
@@ -61,3 +67,5 @@ Remove-Item $OutputPath
 # --- Rename the extracted folder to a standard name
 $LibDirName = $ZipName.Replace(".zip", "")
 Rename-Item -Path $LibDirName -NewName sword-build-win32
+
+Write-Host "Download of Windows library artifacts completed!"

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;
 };