node-sword-interface 1.0.109 → 1.0.111

package/API.md

@@ -53,7 +53,7 @@ This is the main class of node-sword-interface and it provides a set of static f
     * [.enableMarkup()](#NodeSwordInterface+enableMarkup)
     * [.disableMarkup()](#NodeSwordInterface+disableMarkup)
     * [.enableStrongsWithNbsp()](#NodeSwordInterface+enableStrongsWithNbsp)
-    * [.getRawModuleEntry(moduleCode, key)](#NodeSwordInterface+getRawModuleEntry) ⇒ <code>String</code>
+    * [.getRawModuleEntry(moduleCode, key, processImageUrls)](#NodeSwordInterface+getRawModuleEntry) ⇒ <code>String</code>
     * [.getReferenceText(moduleCode, key)](#NodeSwordInterface+getReferenceText) ⇒ [<code>VerseObject</code>](#VerseObject)
     * [.getChapterText(moduleCode, bookCode, chapter)](#NodeSwordInterface+getChapterText) ⇒ [<code>Array.&lt;VerseObject&gt;</code>](#VerseObject)
     * [.getBookText(moduleCode, bookCode, startVerseNr, verseCount)](#NodeSwordInterface+getBookText) ⇒ [<code>Array.&lt;VerseObject&gt;</code>](#VerseObject)
@@ -346,7 +346,7 @@ Enables rendering of Strongs elements with non-breaking spaces.
 **Kind**: instance method of [<code>NodeSwordInterface</code>](#NodeSwordInterface)  
 <a name="NodeSwordInterface+getRawModuleEntry"></a>
 
-### nodeSwordInterface.getRawModuleEntry(moduleCode, key) ⇒ <code>String</code>
+### nodeSwordInterface.getRawModuleEntry(moduleCode, key, processImageUrls) ⇒ <code>String</code>
 Returns the raw text of an entry for the given module and key.
 If no entry exists for the given key the return value is undefined.
 
@@ -356,6 +356,7 @@ If no entry exists for the given key the return value is undefined.
 | --- | --- | --- |
 | moduleCode | <code>String</code> | The module code of the SWORD module. |
 | key | <code>String</code> | The key of the entry. |
+| processImageUrls | <code>Boolean</code> | Whether to pre-process image URLs with platform-specific file paths (Optional, default: false). |
 
 <a name="NodeSwordInterface+getReferenceText"></a>
 

package/deploy_local.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-PROJECT_DIR='ezra-bible-app'
+PROJECT_DIR='ezra-project-git'
 WORK_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 rm -rf $WORK_DIR/../$PROJECT_DIR/node_modules/node-sword-interface
 cp -a $WORK_DIR $WORK_DIR/../$PROJECT_DIR/node_modules/node-sword-interface

package/index.js

@@ -382,10 +382,11 @@ class NodeSwordInterface {
    *
    * @param {String} moduleCode - The module code of the SWORD module.
    * @param {String} key - The key of the entry.
+   * @param {Boolean} processImageUrls - Whether to pre-process image URLs with platform-specific file paths (Optional, default: false).
    * @return {String}
    */
-  getRawModuleEntry(moduleCode, key) {
-    return this.nativeInterface.getRawModuleEntry(moduleCode, key);
+  getRawModuleEntry(moduleCode, key, processImageUrls = false) {
+    return this.nativeInterface.getRawModuleEntry(moduleCode, key, processImageUrls);
   }
 
   /**

package/package.json

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

package/src/napi_module/node_sword_interface.cpp

@@ -599,10 +599,12 @@ Napi::Value NodeSwordInterface::enableStrongsWithNbsp(const Napi::CallbackInfo&
 Napi::Value NodeSwordInterface::getRawModuleEntry(const Napi::CallbackInfo& info)
 {
     lockApi();
-    INIT_SCOPE_AND_VALIDATE(ParamType::string, ParamType::string);
+    INIT_SCOPE_AND_VALIDATE(ParamType::string, ParamType::string, ParamType::boolean);
     Napi::Env env = info.Env();
     Napi::String moduleName = info[0].As<Napi::String>();
     Napi::String key = info[1].As<Napi::String>();
+    Napi::Boolean processImageUrls = info[2].As<Napi::Boolean>();
+
     ASSERT_SW_MODULE_EXISTS(moduleName);
 
     SWModule* swordModule = this->_moduleStore->getLocalModule(moduleName);
@@ -610,7 +612,13 @@ Napi::Value NodeSwordInterface::getRawModuleEntry(const Napi::CallbackInfo& info
     bool entryExisting = swordModule->hasEntry(swordModule->getKey());
 
     if (entryExisting) {
-      Napi::String entryText = Napi::String::New(env, swordModule->getRawEntry());
+      string rawEntry = swordModule->getRawEntry();
+
+      if (processImageUrls) {
+          this->_textProcessor->processImageUrls(rawEntry, swordModule);
+      }
+
+      Napi::String entryText = Napi::String::New(env, rawEntry);
       unlockApi();
       return entryText;
     } else {

package/src/sword_backend/text_processor.cpp

@@ -247,11 +247,7 @@ string TextProcessor::getFilteredText(const string& text, int chapter, int verse
     }
 
     // Prefix img src attributes starting with "/" with the module file URL
-    if (!moduleFileUrl.empty()) {
-        static string imgSrcSlash = "src=\"/";
-        string imgSrcReplacement = "src=\"" + moduleFileUrl + "/";
-        this->findAndReplaceAll(filteredText, imgSrcSlash, imgSrcReplacement);
-    }
+    this->processImageUrls(filteredText, moduleFileUrl);
 
     return filteredText;
 }
@@ -610,16 +606,27 @@ string TextProcessor::getBookIntroduction(string moduleName, string bookCode)
         filteredText = regex_replace(filteredText, chapterDivFilter, "");
 
         // Prefix img src attributes starting with "/" with the module file URL
-        if (!moduleFileUrl.empty()) {
-            static string imgSrcSlash = "src=\"/";
-            string imgSrcReplacement = "src=\"" + moduleFileUrl + "/";
-            this->findAndReplaceAll(filteredText, imgSrcSlash, imgSrcReplacement);
-        }
+        this->processImageUrls(filteredText, moduleFileUrl);
     }
 
     return filteredText;
 }
 
+void TextProcessor::processImageUrls(string& text, const string& moduleFileUrl)
+{
+    if (!moduleFileUrl.empty()) {
+        static string imgSrcSlash = "src=\"/";
+        string imgSrcReplacement = "src=\"" + moduleFileUrl + "/";
+        this->findAndReplaceAll(text, imgSrcSlash, imgSrcReplacement);
+    }
+}
+
+void TextProcessor::processImageUrls(string& text, sword::SWModule* module)
+{
+    string moduleFileUrl = this->getFileUrl(this->_moduleStore.getModuleDataPath(module));
+    this->processImageUrls(text, moduleFileUrl);
+}
+
 string TextProcessor::replaceSpacesInStrongs(const string& text)
 {
     string input = text;

package/src/sword_backend/text_processor.hpp

@@ -51,6 +51,9 @@ public:
 
     StrongsEntry* getStrongsEntry(std::string key);
 
+    void processImageUrls(std::string& text, const std::string& moduleFileUrl);
+    void processImageUrls(std::string& text, sword::SWModule* module);
+
     bool moduleHasStrongsZeroPrefixes(sword::SWModule* module);
     bool moduleHasStrongsPaddedZeroPrefixes(sword::SWModule* module);
     std::string padStrongsNumber(const std::string strongsNumber);