Fix handling of accents in map file name, fix handling of bad cached

modules
rrgeorge · Jul 21, 2022 · ed33311 · ed33311
1 parent 4379d04
commit ed33311
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/ddb.js b/ddb.js
@@ -1487,13 +1487,18 @@ ${(monster.sourceId)?`<i>Source: ${this.ruledata.sources.find((s)=> monster.sour
                 manifestVersion = parseInt(manifest.readAsText("version.txt").trim())
             }
             let modVersion = 0
+            let bookkey = null
             let modCache = new AdmZip(path.join(app.getPath("cache"),app.getName(),"imagecache",`${book.name.toLowerCase()}.zip`))
-            modVersion = parseInt(modCache.readAsText("version.txt").trim())
-            const bookkey = modCache.getZipEntryComment(`${book.name.toLowerCase()}.db3`)
+            try {
+                bookkey = modCache.getZipEntryComment(`${book.name.toLowerCase()}.db3`)
+                modVersion = parseInt(modCache.readAsText("version.txt").trim())
+            } catch (e) {
+                console.log(`Error getting module version ${e}`)
+            }
             let modsObj = {}
             modsObj[moduleId.toString()] = modVersion
             const manifest = await this.checkManifestVersion(manifestVersion,modsObj)
-            if (manifest?.data?.sourceUpdatesAvailable?.[moduleId.toString()] !== true) {
+            if (bookkey && manifest?.data?.sourceUpdatesAvailable?.[moduleId.toString()] !== true) {
                 console.log("Using cached Module")
                 prog = new ProgressBar({
                     title: "Converting module...",
@@ -2916,6 +2921,8 @@ function doSearch(el,resId) {
                                     dmMap = figure.querySelector("img").getAttribute('src')
                                     mapUrl = caption.querySelector("A")?.getAttribute('href') || dmMap;
                                 }
+                                dmMap = encodeURI(dmMap)
+                                mapUrl = encodeURI(mapUrl)
                                 if (!mapTitle) {
                                     let figParent = figure
                                     while(figParent = figParent.parentElement) {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "encounterlog",
   "productName": "EncounterLog",
-  "version": "2.6.6",
+  "version": "2.6.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/rrgeorge/encounterlog"
@@ -159,7 +159,7 @@
   "dependencies": {
     "@google-cloud/vision": "^2.3.8",
     "@journeyapps/sqlcipher": "^5.3.1",
-    "adm-zip": "^0.5.5",
+    "adm-zip": "^0.5.9",
     "build": "^0.1.4",
     "electron-dl": "^3.2.1",
     "electron-preferences": "^2.3.1",

diff --git a/yarn.lock b/yarn.lock
@@ -569,7 +569,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"adm-zip@npm:^0.5.5":
+"adm-zip@npm:^0.5.9":
   version: 0.5.9
   resolution: "adm-zip@npm:0.5.9"
   checksum: 4909bc04119fdd5e8f8ba43826e50623e5c427cf0a939c809d4f9456a6a03c6aa0544e82088739de9ba16b7649f71b99ccbbddc7b2c38bd6143f9c4726cc7ed9
@@ -1980,7 +1980,7 @@ __metadata:
     "@electron/universal": ^1.2.1
     "@google-cloud/vision": ^2.3.8
     "@journeyapps/sqlcipher": ^5.3.1
-    adm-zip: ^0.5.5
+    adm-zip: ^0.5.9
     build: ^0.1.4
     electron: ^18.0.3
     electron-builder: ^23.0.3