node-sword-interface 1.0.29 → 1.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-sword-interface",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "description": "Javascript (N-API) interface to SWORD library",
   "keywords": [
     "C++",
@@ -23,7 +23,7 @@
   "license": "GPL-2.0+",
   "dependencies": {
     "glob": "^8.0.3",
-    "node-addon-api": "^7.1.0",
+    "node-addon-api": "^8.2.2",
     "node-html-parser": "^6.1.13"
   },
   "repository": {
@@ -32,6 +32,6 @@
   },
   "devDependencies": {
     "jsdoc-to-markdown": "^8.0.3",
-    "node-gyp": "^9.1.0"
+    "node-gyp": "^10.2.0"
   }
 }

package/src/node_sword_cli.cpp

@@ -29,14 +29,16 @@ void show_repos(RepositoryInterface& repoInterface)
 
 void show_modules(RepositoryInterface& repoInterface)
 {
-    cout << "German MODULES of CrossWire:" << endl;
-    vector<SWModule*> modules = repoInterface.getRepoModulesByLang("CrossWire", "de");
+    string repo = "CrossWire";
+    cout << "DICT MODULES of " << repo << ":" << endl;
+    vector<SWModule*> modules = repoInterface.getRepoModulesByLang(repo, "en", ModuleType::dict);
+
     for (unsigned int i = 0; i < modules.size(); i++) {
         SWModule* currentModule = modules[i];
 
         cout << currentModule->getName();
 
-        if (currentModule->getConfigEntry("Abbreviation")) {
+        /*if (currentModule->getConfigEntry("Abbreviation")) {
             string moduleShortcut = currentModule->getConfigEntry("Abbreviation");
             cout << " " << moduleShortcut;
         }
@@ -47,10 +49,10 @@ void show_modules(RepositoryInterface& repoInterface)
         }
 
         string moduleVersion = currentModule->getConfigEntry("Version");
-        cout << " " << moduleVersion << " ";
+        cout << " " << moduleVersion << " ";*/
 
-        string moduleLocked = currentModule->getConfigEntry("CipherKey") ? "LOCKED" : "";
-        cout << moduleLocked << " ";
+        //string moduleLocked = currentModule->getConfigEntry("CipherKey") ? "LOCKED" : "";
+        //cout << moduleLocked << " ";
 
         /*ConfigEntMap::const_iterator begin = currentModule->getConfig().lower_bound("GlobalOptionFilter");
         ConfigEntMap::const_iterator end = currentModule->getConfig().upper_bound("GlobalOptionFilter");
@@ -199,9 +201,9 @@ int main(int argc, char** argv)
 
     //test_unlock_key(moduleInstaller, moduleStore, textProcessor);
 
-    /*show_repos(repoInterface);
+    /*show_repos(repoInterface);*/
 
-    show_modules(repoInterface);*/
+    show_modules(repoInterface);
 
     /*int error = moduleInstaller.installModule("UKJV");
 
@@ -230,7 +232,7 @@ int main(int argc, char** argv)
 
     //get_book_list(moduleHelper);
 
-    get_dict_key_list(dictHelper);
+    //get_dict_key_list(dictHelper);
 
     //string translation = sword_facade.getSwordTranslation(string("/usr/share/sword/locales.d"), string("de"), string("locales"));
     //cout << translation << endl;

package/src/sword_backend/module_helper.cpp

@@ -43,14 +43,6 @@ bool ModuleHelper::moduleHasFeature(sword::SWModule* module, std::string feature
     return this->moduleHasKeyValuePair(module, "Feature", feature);
 }
 
-bool ModuleHelper::moduleHasStrongsKeys(sword::SWModule* module)
-{
-    bool hasHebrewStrongsKeys = this->moduleHasFeature(module, "HebrewDef");
-    bool hasGreekStrongsKeys = this->moduleHasFeature(module, "GreekDef");
-
-    return hasHebrewStrongsKeys || hasGreekStrongsKeys;
-}
-
 bool ModuleHelper::moduleHasKeyValuePair(sword::SWModule* module, std::string key, std::string value)
 {
     bool hasKeyValuePair = false;

package/src/sword_backend/module_helper.hpp

@@ -42,7 +42,6 @@ public:
 
     bool moduleHasGlobalOption(sword::SWModule* module, std::string globalOption);
     bool moduleHasFeature(sword::SWModule* module, std::string feature);
-    bool moduleHasStrongsKeys(sword::SWModule* module);
     bool moduleHasBook(sword::SWModule* module, std::string bookCode);
 
     std::vector<std::string> getBookList(std::string moduleName);

package/src/sword_backend/repository_interface.cpp

@@ -230,10 +230,6 @@ vector<SWModule*> RepositoryInterface::getAllRepoModules(string repoName, Module
             SWModule* currentModule = it->second;
             string currentModuleType = currentModule->getType();
 
-            if (moduleType == ModuleType::dict && !this->_moduleHelper.moduleHasStrongsKeys(currentModule)) {
-                continue;
-            }
-
             if (moduleTypeString == "ANY" || currentModuleType == moduleTypeString) {
                 modules.push_back(currentModule);
             }
@@ -288,11 +284,6 @@ vector<SWModule*> RepositoryInterface::getRepoModulesByLang(string repoName,
             continue;
         }
 
-        /*if (moduleType == ModuleType::dict && !hasHebrewStrongsKeys && !hasGreekStrongsKeys) {
-            // In case of a dictionary module we ignore it if there are not Strong's keys
-            continue;
-        }*/
-
         if (hebrewStrongsKeys && !hasHebrewStrongsKeys) {
             continue;
         }