Skip to content

Commit

Permalink
Added alternate method to find maps in some modules
Browse files Browse the repository at this point in the history
  • Loading branch information
@rrgeorge
rrgeorge committed Sep 5, 2021
1 parent b9745c2 commit ccf8e6f
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 24 deletions.
35 changes: 26 additions & 9 deletions ddb.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1710,16 +1710,33 @@ function displayModal(path,id) {
const dom = new jsdom.JSDOM(page.page.content)
let mapsort = page.page._attrs.sort*100
mapJobs.push((async ()=>{
const figures = dom.window.document.querySelectorAll("figure")
let figures = dom.window.document.querySelectorAll("figure")
if (figures.length<1) {
figures = dom.window.document.querySelectorAll(".compendium-image-view-player")
}
if (figures) {
for (const figure of figures) {
const caption = figure.querySelector("figcaption")
if (!caption) continue
if (!caption.querySelector("A")?.dataset["title"]?.match(/[Pp]layer/)) continue
const mapTitle = [...caption.childNodes].filter(c=>c.data).map(c=>c.data).join(' ')
const mapUrl = caption.querySelector("A").getAttribute('href')
const dmMap = figure.querySelector("img").getAttribute('src')

for (let figure of figures) {
let mapTitle,mapUrl,dmMap
if (figure.tagName == "P") {
const caption = figure.previousElementSibling
if (!figure.querySelector("A")?.textContent?.match(/[Pp]layer/s))
{
console.log(figure)
console.log(figure.querySelector("A").textContent)
continue
}
if (!figure.id) figure.id = caption.id
mapTitle = caption.textContent.trim()
mapUrl = figure.querySelector("A").getAttribute('href')
dmMap = caption.querySelector("img").getAttribute('src')
} else {
const caption = figure.querySelector("figcaption")
if (!caption) continue
if (!caption.querySelector("A")?.dataset["title"]?.match(/[Pp]layer/)) continue
mapTitle = [...caption.childNodes].filter(c=>c.data).map(c=>c.data).join(' ')
mapUrl = caption.querySelector("A").getAttribute('href')
dmMap = figure.querySelector("img").getAttribute('src')
}
mapsort ++
prog.detail = `Found Map - ${mapTitle}`
prog.detail = `Found Map - ${mapTitle} - Analyzing grid`
Expand Down
12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "encounterlog",
"productName": "EncounterLog",
"version": "2.1.2",
"version": "2.1.3",
"description": "Connect D&D Beyond to EncounterPlus",
"repository": {
"type": "git",
Expand All @@ -14,11 +14,11 @@
"build-win": "npm_config_platform=win32 npm_config_arch=x64 yarn add opencv4nodejs-prebuilt@5.3.3 sharp; electron-builder build --win;yarn add opencv4nodejs-prebuilt@5.3.3 sharp",
"build-deb": "npm_config_platform=linux npm_config_arch=x64 yarn add opencv4nodejs-prebuilt@5.3.3 sharp; electron-builder build --linux deb;yarn add opencv4nodejs-prebuilt@5.3.3 sharp",
"build-all": "yarn build-mac;yarn build-win;yarn build-deb",
"publish-mac": "security unlock;electron-builder -p onTagOrDraft --mac",
"publish-win": "npm_config_platform=win32 npm_config_arch=x64 yarn add opencv4nodejs-prebuilt@5.3.3 sharp; electron-builder -p onTagOrDraft --win;yarn add opencv4nodejs-prebuilt@5.3.3 sharp",
"publish-deb": "npm_config_platform=linux npm_config_arch=x64 yarn add opencv4nodejs-prebuilt@5.3.3 sharp; electron-builder -p onTagOrDraft --linux;yarn add opencv4nodejs-prebuilt@5.3.3 sharp",
"publish-mac": "security unlock;electron-builder -p always --mac",
"publish-win": "npm_config_platform=win32 npm_config_arch=x64 yarn add opencv4nodejs-prebuilt@5.3.3 sharp; electron-builder -p always --win;yarn add opencv4nodejs-prebuilt@5.3.3 sharp",
"publish-deb": "npm_config_platform=linux npm_config_arch=x64 yarn add opencv4nodejs-prebuilt@5.3.3 sharp; electron-builder -p always --linux;yarn add opencv4nodejs-prebuilt@5.3.3 sharp",
"publish-all": "yarn publish-mac;yarn publish-win;yarn publish-deb",
"release": "yarn build-all",
"release": "yarn publish-all",
"postinstall": "electron-builder install-app-deps",
"app": "electron ."
},
Expand Down Expand Up @@ -136,7 +136,7 @@
"jsdom": "^17.0.0",
"jstoxml": "^2.0.6",
"mac": "^0.4.0",
"opencv4nodejs-prebuilt": "^5.3.3",
"opencv4nodejs-prebuilt": "5.3.3",
"sharp": "^0.29.0",
"slugify": "^1.5.3",
"tmp": "^0.2.1",
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2325,7 +2325,7 @@ ms@2.1.2, ms@^2.1.1:
resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==

nan@^2.13.2, nan@^2.15.0:
nan@^2.13.2, nan@^2.14.2:
version "2.15.0"
resolved "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz"
integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
Expand Down Expand Up @@ -2453,15 +2453,15 @@ one-time@^1.0.0:
dependencies:
fn.name "1.x.x"

opencv4nodejs-prebuilt@^5.3.4:
version "5.3.4"
resolved "https://registry.yarnpkg.com/opencv4nodejs-prebuilt/-/opencv4nodejs-prebuilt-5.3.4.tgz#6b8b0cd480a0f4faa5c96434291d01da972c8ffe"
integrity sha512-YaSTnM7+JJnz65DSkSkyLqpfXe+4N6UOiI0kbMpQQ8ii2HtIKpeILIpMErxKWd2E+/BOmGRj10/Iy6M2KXLEXQ==
opencv4nodejs-prebuilt@5.3.3:
version "5.3.3"
resolved "https://registry.yarnpkg.com/opencv4nodejs-prebuilt/-/opencv4nodejs-prebuilt-5.3.3.tgz#800c626d7205950ce5300a9e2f6937f2cb0fe0e6"
integrity sha512-c9n4bLoamHLwafqCR6W4Xh5O/35IJ2A01pWbW/4SVgYJDAhGAW/FrZw0q4VwUPxEe1cXZgr+Wy5HZUQIotkZdg==
dependencies:
nan "^2.15.0"
nan "^2.14.2"
native-node-utils "^0.2.7"
npmlog "^4.1.2"
prebuild-install "^6.1.4"
prebuild-install "^6.1.3"
optionalDependencies:
"@types/node" ">6"

Expand Down Expand Up @@ -2539,9 +2539,9 @@ plist@^3.0.1:
xmlbuilder "^9.0.7"
xmldom "^0.6.0"

prebuild-install@^6.1.4:
prebuild-install@^6.1.3, prebuild-install@^6.1.4:
version "6.1.4"
resolved "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz"
resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f"
integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ==
dependencies:
detect-libc "^1.0.3"
Expand Down

0 comments on commit ccf8e6f

Please sign in to comment.