From 0254d7d8671a3743bfedbcd42472dbe974a76c98 Mon Sep 17 00:00:00 2001 From: Gauthier Roebroeck Date: Tue, 31 Dec 2019 15:36:05 +0800 Subject: [PATCH] fix(zip extractor): better handling of exotic charsets replacement of java.util.zip.ZipFile by org.apache.commons.compress.archivers.zip.ZipFile closes #41 --- komga/build.gradle.kts | 1 + .../org/gotson/komga/infrastructure/archive/ZipExtractor.kt | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/komga/build.gradle.kts b/komga/build.gradle.kts index 066e35aa7..ac8ccc578 100644 --- a/komga/build.gradle.kts +++ b/komga/build.gradle.kts @@ -66,6 +66,7 @@ dependencies { implementation("org.apache.commons:commons-lang3:3.9") implementation("org.apache.tika:tika-core:1.23") + implementation("org.apache.commons:commons-compress:1.19") implementation("com.github.junrar:junrar:4.0.0") implementation("org.apache.pdfbox:pdfbox:2.0.17") implementation("net.grey-panther:natural-comparator:1.1") diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/archive/ZipExtractor.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/archive/ZipExtractor.kt index 5d7add7f2..1369748f3 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/archive/ZipExtractor.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/archive/ZipExtractor.kt @@ -1,9 +1,9 @@ package org.gotson.komga.infrastructure.archive +import org.apache.commons.compress.archivers.zip.ZipFile import org.gotson.komga.domain.model.BookPage import org.springframework.stereotype.Service import java.nio.file.Path -import java.util.zip.ZipFile @Service class ZipExtractor( @@ -12,7 +12,7 @@ class ZipExtractor( override fun getPagesList(path: Path): List = ZipFile(path.toFile()).use { zip -> - zip.entries().toList() + zip.entries.toList() .filter { !it.isDirectory } .map { BookPage( @@ -27,4 +27,4 @@ class ZipExtractor( ZipFile(path.toFile()).use { it.getInputStream(it.getEntry(entryName)).readBytes() } -} \ No newline at end of file +}