node-sword-interface 1.0.13 → 1.0.15

package/API.md

@@ -635,9 +635,11 @@ An object representation of a SWORD module.
 | shortCopyright | <code>String</code> | The short copyright information of the SWORD module |
 | version | <code>String</code> | The version of the SWORD module |
 | lastUpdate | <code>String</code> | The date of the last version update of the SWORD module |
+| category | <code>String</code> | The category of the SWORD module |
 | repository | <code>String</code> | The repository of the SWORD module (only returned by methods interacting with module repositories) |
 | about | <code>String</code> | Extended description of the SWORD module |
 | abbreviation | <code>String</code> | The abbreviation of the SWORD module |
+| sourceRepo | <code>String</code> | The repository from which this SWORD modules has been installed |
 | size | <code>Number</code> | The file size of the SWORD module (in KB) |
 | location | <code>String</code> | The filesystem location where the module is stored |
 | unlockInfo | <code>String</code> | Information about how to retrieve an unlock key (in case the module is locked) |

package/examples/install_kjv.js

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/examples/print_kjv_matthew.js

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/index.js

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -43,9 +43,11 @@ const nodeSwordInterfaceModule = require('./build/Release/node_sword_interface.n
  * @property {String} shortCopyright - The short copyright information of the SWORD module
  * @property {String} version - The version of the SWORD module
  * @property {String} lastUpdate - The date of the last version update of the SWORD module
+ * @property {String} category - The category of the SWORD module
  * @property {String} repository - The repository of the SWORD module (only returned by methods interacting with module repositories)
  * @property {String} about - Extended description of the SWORD module
  * @property {String} abbreviation - The abbreviation of the SWORD module
+ * @property {String} sourceRepo - The repository from which this SWORD modules has been installed 
  * @property {Number} size - The file size of the SWORD module (in KB)
  * @property {String} location - The filesystem location where the module is stored
  * @property {String} unlockInfo - Information about how to retrieve an unlock key (in case the module is locked)

package/package.json

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

package/scripts/build_sword.sh

@@ -2,7 +2,7 @@
 
 #   This file is part of node-sword-interface.
 #
-#   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+#   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 #
 #   node-sword-interface is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by

package/scripts/get_sword_build_win32.ps1

@@ -1,6 +1,6 @@
 #   This file is part of node-sword-interface.
 #
-#   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+#   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 #
 #   node-sword-interface is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by

package/scripts/get_sword_include_path.sh

@@ -2,7 +2,7 @@
 
 #   This file is part of node-sword-interface.
 #
-#   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+#   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 #
 #   node-sword-interface is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by

package/scripts/get_sword_library.sh

@@ -2,7 +2,7 @@
 
 #   This file is part of node-sword-interface.
 #
-#   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+#   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 #
 #   node-sword-interface is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by

package/scripts/postinstall.js

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/api_lock.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/api_lock.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/binding.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/install_module_worker.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/install_module_worker.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/module_search_worker.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/module_search_worker.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/napi_sword_helper.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -61,6 +61,13 @@ void NapiSwordHelper::swordModuleToNapiObject(const Napi::Env& env, SWModule* sw
 
     object["name"] = swModule->getName();
     object["type"] = swModule->getType();
+
+    if (swModule->getConfigEntry("Category")) {
+        object["category"] = string(swModule->getConfigEntry("Category"));
+    } else {
+        object["category"] = "";
+    }
+
     object["description"] = swModule->getDescription();
     object["language"] = swModule->getLanguage();
     object["location"] = this->_moduleStore.getModuleDataPath(swModule);
@@ -84,6 +91,12 @@ void NapiSwordHelper::swordModuleToNapiObject(const Napi::Env& env, SWModule* sw
         object["isRightToLeft"] = Napi::Boolean::New(env, false);
     }
 
+    if (swModule->getConfigEntry("InstallSourceCaption")) {
+        object["sourceRepo"] = string(swModule->getConfigEntry("InstallSourceCaption"));
+    } else {
+        object["sourceRepo"] = "";
+    }
+
     if (swModule->getConfigEntry("InstallSize")) {
         std::string configInstallSize = string(swModule->getConfigEntry("InstallSize"));
 

package/src/napi_module/napi_sword_helper.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/node_sword_interface.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/node_sword_interface.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/worker.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/common_defs.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/file_system_helper.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/file_system_helper.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/module_helper.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/module_helper.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/module_installer.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/module_installer.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/module_search.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/module_search.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/module_store.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 
 // Sword includes
 #include <swmgr.h>
+#include <markupfiltmgr.h>
 #include <swmodule.h>
 
 // Own includes
@@ -68,7 +69,7 @@ SWMgr* ModuleStore::createSWMgr()
     if (customHomeDir != "" || isAndroid) {
         swMgr = new SWMgr(this->_fileSystemHelper.getUserSwordDir().c_str(),
                           true, // autoload
-                          0, // filterMgr
+                          new MarkupFilterMgr(sword::FMT_OSIS, sword::ENC_UTF8),
                           false, // multiMod
                           false); // augmentHome
 
@@ -79,19 +80,23 @@ SWMgr* ModuleStore::createSWMgr()
         }
     } else {
         #ifdef _WIN32
-            swMgr = new SWMgr(this->_fileSystemHelper.getUserSwordDir().c_str());
+            swMgr = new SWMgr(this->_fileSystemHelper.getUserSwordDir().c_str(),
+                              true, // autoload
+                              new MarkupFilterMgr(sword::FMT_OSIS, sword::ENC_UTF8),
+                              false, // multimod
+                              true); // augmentHome
 
             // 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__)
-            swMgr = new SWMgr();
+            swMgr = new SWMgr(new MarkupFilterMgr(sword::FMT_OSIS, sword::ENC_UTF8));
 
             stringstream appSupport;
             appSupport << string(getenv("HOME")) << "/Library/Application Support/Sword";            
             swMgr->augmentModules(appSupport.str().c_str());
-        #else
-            swMgr = new SWMgr();
+        #else // LINUX!
+            swMgr = new SWMgr(new MarkupFilterMgr(sword::FMT_OSIS, sword::ENC_UTF8));
         #endif
     }
 

package/src/sword_backend/module_store.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/mutex.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/mutex.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/percentage_calc.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/repository_interface.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/repository_interface.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/string_helper.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/string_helper.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/strongs_entry.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/strongs_entry.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/sword_status_reporter.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/sword_status_reporter.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/sword_translation_helper.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/text_processor.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/text_processor.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2023 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by