Mirrors/audiobookshelf
Mirrors/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2024-12-20 19:06:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3422 from mikiher/parse-comic-metadata-try-catch

Browse Source 
Catch file extraction errors in parseComicMetadata
This commit is contained in:
advplyr 2024-09-15 16:10:13 -05:00 committed by GitHub
commit fa0c90de70
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 54 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
server/utils/parsers/parseComicMetadata.js
View File

@ -13,13 +13,13 @@ const parseComicInfoMetadata = require('./parseComicInfoMetadata')
*/ */
async function getComicFileBuffer(filepath) { async function getComicFileBuffer(filepath) {
if (!(await fs.pathExists(filepath))) { if (!(await fs.pathExists(filepath))) {
Logger.error(`Comic path does not exist "${filepath}"`) Logger.error(`[parseComicMetadata] Comic path does not exist "${filepath}"`)
return null return null
} }
try { try {
return fs.readFile(filepath) return fs.readFile(filepath)
} catch (error) { } catch (error) {
Logger.error(`Failed to read comic at "${filepath}"`, error) Logger.error(`[parseComicMetadata] Failed to read comic at "${filepath}"`, error)
return null return null
} }
} }
@ -36,23 +36,25 @@ async function extractCoverImage(comicPath, comicImageFilepath, outputCoverPath)
const comicFileBuffer = await getComicFileBuffer(comicPath) const comicFileBuffer = await getComicFileBuffer(comicPath)
if (!comicFileBuffer) return null if (!comicFileBuffer) return null
const archive = await Archive.open(comicFileBuffer) let archive = null
const fileEntry = await archive.extractSingleFile(comicImageFilepath)
if (!fileEntry?.fileData) {
Logger.error(`[parseComicMetadata] Invalid file entry data for comicPath "${comicPath}"/${comicImageFilepath}`)
return false
}
try { try {
archive = await Archive.open(comicFileBuffer)
const fileEntry = await archive.extractSingleFile(comicImageFilepath)
if (!fileEntry?.fileData) {
Logger.error(`[parseComicMetadata] Invalid file entry data for comicPath "${comicPath}"/${comicImageFilepath}`)
return false
}
await fs.writeFile(outputCoverPath, fileEntry.fileData) await fs.writeFile(outputCoverPath, fileEntry.fileData)
return true return true
} catch (error) { } catch (error) {
Logger.error(`[parseComicMetadata] Failed to extract image from comicPath "${comicPath}"`, error) Logger.error(`[parseComicMetadata] Failed to extract image "${comicImageFilepath}" from comicPath "${comicPath}" into "${outputCoverPath}"`, error)
return false return false
} finally { } finally {
// Ensure we free the memory // Ensure we free the memory
archive.close() archive?.close()
} }
} }
module.exports.extractCoverImage = extractCoverImage module.exports.extractCoverImage = extractCoverImage
@ -70,46 +72,52 @@ async function parse(ebookFile) {
const comicFileBuffer = await getComicFileBuffer(comicPath) const comicFileBuffer = await getComicFileBuffer(comicPath)
if (!comicFileBuffer) return null if (!comicFileBuffer) return null
const archive = await Archive.open(comicFileBuffer) let archive = null
try {
archive = await Archive.open(comicFileBuffer)
const fileObjects = await archive.getFilesArray() const fileObjects = await archive.getFilesArray()
fileObjects.sort((a, b) => { fileObjects.sort((a, b) => {
return a.file.name.localeCompare(b.file.name, undefined, { return a.file.name.localeCompare(b.file.name, undefined, {
numeric: true, numeric: true,
sensitivity: 'base' sensitivity: 'base'
})
}) })
})
let metadata = null let metadata = null
const comicInfo = fileObjects.find((fo) => fo.file.name === 'ComicInfo.xml') const comicInfo = fileObjects.find((fo) => fo.file.name === 'ComicInfo.xml')
if (comicInfo) { if (comicInfo) {
const comicInfoEntry = await comicInfo.file.extract() const comicInfoEntry = await comicInfo.file.extract()
if (comicInfoEntry?.fileData) { if (comicInfoEntry?.fileData) {
const comicInfoStr = new TextDecoder().decode(comicInfoEntry.fileData) const comicInfoStr = new TextDecoder().decode(comicInfoEntry.fileData)
const comicInfoJson = await xmlToJSON(comicInfoStr) const comicInfoJson = await xmlToJSON(comicInfoStr)
if (comicInfoJson) { if (comicInfoJson) {
metadata = parseComicInfoMetadata.parse(comicInfoJson) metadata = parseComicInfoMetadata.parse(comicInfoJson)
}
} }
} }
const payload = {
path: comicPath,
ebookFormat: ebookFile.ebookFormat,
metadata
}
const firstImage = fileObjects.find((fo) => globals.SupportedImageTypes.includes(Path.extname(fo.file.name).toLowerCase().slice(1)))
if (firstImage?.file?._path) {
payload.ebookCoverPath = firstImage.file._path
} else {
Logger.warn(`[parseComicMetadata] Cover image not found in comic at "${comicPath}"`)
}
return payload
} catch (error) {
Logger.error(`[parseComicMetadata] Failed to parse comic metadata at "${comicPath}"`, error)
return null
} finally {
// Ensure we free the memory
archive?.close()
} }
const payload = {
path: comicPath,
ebookFormat: ebookFile.ebookFormat,
metadata
}
const firstImage = fileObjects.find((fo) => globals.SupportedImageTypes.includes(Path.extname(fo.file.name).toLowerCase().slice(1)))
if (firstImage?.file?._path) {
payload.ebookCoverPath = firstImage.file._path
} else {
Logger.warn(`Cover image not found in comic at "${comicPath}"`)
}
// Ensure we close the archive to free memory
archive.close()
return payload
} }
module.exports.parse = parse module.exports.parse = parse