Merge pull request #26 from gmartin7/BL-12852Plus

BL-12852 Deal with + in sub filenames (#26) Co-Authored-By: Gordon Martin <[email protected]>
BloomBooks · Nov 13, 2023 · 87e0264 · 87e0264
2 parents 2b216b7 + 3109840
commit 87e0264
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bloompub-viewer",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "author": "Bloom Devs",
   "description": "Viewer for Bloom Digital books",
   "license": "MIT",

diff --git a/src/main/index.ts b/src/main/index.ts
@@ -75,11 +75,12 @@ let currentFolder: string;
 function convertUrlToPath(requestUrl: string): string {
   // console.log(`convertUrlToPath: requestUrl=${requestUrl}`);
 
-  const bloomPlayerOrigin = "bpub://bloom-player/";
-  const baseUrl = decodeURI(requestUrl);
+  const urlPrefix = "bpub://";
+  const bloomPlayerOrigin = urlPrefix + "bloom-player/";
+  const baseUrl = decodeURIComponent(requestUrl);
   const urlPath = baseUrl.startsWith(bloomPlayerOrigin)
-    ? baseUrl.substr(bloomPlayerOrigin.length)
-    : baseUrl.substr(7); // not from same origin? shouldn't happen.
+    ? baseUrl.substring(bloomPlayerOrigin.length)
+    : baseUrl.substring(urlPrefix.length); // not from same origin? shouldn't happen.
   const playerFolder =
     process.env.NODE_ENV === "development"
       ? Path.normalize(