Merge pull request #417 from d-i-t-a/develop

2.1.6
d-i-t-a · Dec 14, 2022 · 72e08f9 · 72e08f9
2 parents 79fc4d0 + 326b9b8
commit 72e08f9
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@d-i-t-a/reader",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "A viewer application for EPUB files.",
   "repository": "https://github.com/d-i-t-a/R2D2BC",
   "license": "Apache-2.0",

diff --git a/src/modules/search/SearchModule.ts b/src/modules/search/SearchModule.ts
@@ -717,15 +717,13 @@ export class SearchModule implements ReaderModule {
       }
       if (tocItem) {
         let href = this.publication.getAbsoluteHref(tocItem.Href);
-        await fetch(href, this.delegate.requestConfig)
-          .then((r) => r.text())
-          .then(async (data) => {
-            // ({ data, tocItem });
+        if (this.delegate.api?.getContent) {
+          this.delegate.api?.getContent(href).then((content) => {
             let parser = new DOMParser();
             let doc = parser.parseFromString(
               this.delegate.requestConfig?.encoded
-                ? this.decodeBase64(data)
-                : data,
+                ? this.decodeBase64(content)
+                : content,
               "application/xhtml+xml"
             );
             if (tocItem) {
@@ -739,6 +737,29 @@ export class SearchModule implements ReaderModule {
               );
             }
           });
+        } else {
+          await fetch(href, this.delegate.requestConfig)
+            .then((r) => r.text())
+            .then(async (data) => {
+              let parser = new DOMParser();
+              let doc = parser.parseFromString(
+                this.delegate.requestConfig?.encoded
+                  ? this.decodeBase64(data)
+                  : data,
+                "application/xhtml+xml"
+              );
+              if (tocItem) {
+                searchDocDomSeek(term, doc, tocItem.Href, tocItem.Title).then(
+                  (result) => {
+                    result.forEach((searchItem) => {
+                      localSearchResultBook.push(searchItem);
+                      this.bookSearchResult.push(searchItem);
+                    });
+                  }
+                );
+              }
+            });
+        }
       }
       if (index === this.publication.readingOrder.length - 1) {
         return localSearchResultBook;
@@ -768,17 +789,16 @@ export class SearchModule implements ReaderModule {
         this.delegate.currentResource() ?? 0
       ];
     }
+
     if (tocItem) {
       let href = this.publication.getAbsoluteHref(tocItem.Href);
-      await fetch(href, this.delegate.requestConfig)
-        .then((r) => r.text())
-        .then(async (data) => {
-          // ({ data, tocItem });
+      if (this.delegate.api?.getContent) {
+        this.delegate.api?.getContent(href).then((content) => {
           let parser = new DOMParser();
           let doc = parser.parseFromString(
             this.delegate.requestConfig?.encoded
-              ? this.decodeBase64(data)
-              : data,
+              ? this.decodeBase64(content)
+              : content,
             "application/xhtml+xml"
           );
           if (tocItem) {
@@ -791,6 +811,29 @@ export class SearchModule implements ReaderModule {
             );
           }
         });
+      } else {
+        await fetch(href, this.delegate.requestConfig)
+          .then((r) => r.text())
+          .then(async (data) => {
+            // ({ data, tocItem });
+            let parser = new DOMParser();
+            let doc = parser.parseFromString(
+              this.delegate.requestConfig?.encoded
+                ? this.decodeBase64(data)
+                : data,
+              "application/xhtml+xml"
+            );
+            if (tocItem) {
+              searchDocDomSeek(term, doc, tocItem.Href, tocItem.Title).then(
+                (result) => {
+                  result.forEach((searchItem) => {
+                    localSearchResultBook.push(searchItem);
+                  });
+                }
+              );
+            }
+          });
+      }
     }
 
     return localSearchResultBook;