Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2025-12-22 00:13:30 +01:00
Code Issues Projects Releases Wiki Activity

fix(epub): epub not loading correctly on windows (again)

Browse source
This commit is contained in:
Gauthier Roebroeck 2020-05-05 10:53:38 +08:00
parent 6d40601aec
commit 8535f46848
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/EpubExtractor.kt
View file

@ -22,7 +22,7 @@ class EpubExtractor(contentDetector: ContentDetector) : ZipExtractor(contentDete
val opfFile = getPackagePath(zip)
val opfDoc = zip.getInputStream(zip.getEntry(opfFile)).use { Jsoup.parse(it, null, "") }
val opfDir = Paths.get(opfFile).parentOrEmpty()
val opfDir = Paths.get(opfFile).parent
val manifest = opfDoc.select("manifest > item")
.associate { it.attr("id") to ManifestItem(it.attr("id"), it.attr("href"), it.attr("media-type")) }
@ -32,16 +32,18 @@ class EpubExtractor(contentDetector: ContentDetector) : ZipExtractor(contentDete
.map { it.href }
val images = pages
.map { opfDir.resolve(it).normalize() }
.map { opfDir?.resolve(it)?.normalize() ?: Paths.get(it) }
.flatMap { pagePath ->
val doc = zip.getInputStream(zip.getEntry(pagePath.separatorsToUnix())).use { Jsoup.parse(it, null, "") }
doc.getElementsByTag("img")
.map { it.attr("src") }
.map { pagePath.parentOrEmpty().resolve(it).normalize() }
.map { it.attr("src") } //get the src, which can be a relative path
.map { pagePath.parentOrEmpty().resolve(it).normalize() } //resolve it against the page folder
}
return images.map { image ->
MediaContainerEntry(image.toString(), manifest.values.first { it.href == opfDir.relativize(image).separatorsToUnix() }.mediaType)
MediaContainerEntry(image.separatorsToUnix(), manifest.values.first {
it.href == (opfDir?.relativize(image) ?: image).separatorsToUnix()
}.mediaType)
}
} catch (e: Exception) {
logger.error(e) { "File is not a proper Epub, treating it as a zip file" }