Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2026-01-07 16:33:48 +01:00
Code Issues Projects Releases Wiki Activity

refactor: use files instead of streams for rar files

Browse source
This commit is contained in:
Gauthier Roebroeck 2020-07-28 17:47:18 +08:00
parent 289551a7e3
commit a64e68d646
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
komga/build.gradle.kts
View file

@ -77,7 +77,7 @@ dependencies {
implementation("org.apache.tika:tika-core:1.24.1")
implementation("org.apache.commons:commons-compress:1.20")
implementation("com.github.junrar:junrar:4.0.0")
implementation("com.github.junrar:junrar:7.2.0")
implementation("org.apache.pdfbox:pdfbox:2.0.19")
implementation("net.grey-panther:natural-comparator:1.1")
implementation("org.jsoup:jsoup:1.13.1")

19
komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/RarExtractor.kt
View file

@ -6,9 +6,8 @@ import net.greypanther.natsort.CaseInsensitiveSimpleNaturalComparator
import org.gotson.komga.domain.model.MediaContainerEntry
import org.gotson.komga.domain.model.MediaUnsupportedException
import org.springframework.stereotype.Service
import java.nio.file.Files
import java.nio.file.Path
import java.util.*
import java.util.Comparator
private val logger = KotlinLogging.logger {}
@ -22,26 +21,26 @@ class RarExtractor(
override fun mediaTypes(): List<String> = listOf("application/x-rar-compressed", "application/x-rar-compressed; version=4")
override fun getEntries(path: Path): List<MediaContainerEntry> =
Archive(Files.newInputStream(path)).use { rar ->
if (rar.mainHeader.isEncrypted) throw MediaUnsupportedException("Encrypted RAR archives are not supported")
Archive(path.toFile()).use { rar ->
if (rar.isPasswordProtected) throw MediaUnsupportedException("Encrypted RAR archives are not supported")
if (rar.mainHeader.isSolid) throw MediaUnsupportedException("Solid RAR archives are not supported")
if (rar.mainHeader.isMultiVolume) throw MediaUnsupportedException("Multi-Volume RAR archives are not supported")
rar.fileHeaders
.filter { !it.isDirectory }
.map {
try {
MediaContainerEntry(name = it.fileNameString, mediaType = contentDetector.detectMediaType(rar.getInputStream(it)))
MediaContainerEntry(name = it.fileName, mediaType = contentDetector.detectMediaType(rar.getInputStream(it)))
} catch (e: Exception) {
logger.warn(e) { "Could not analyze entry: ${it.fileNameString}" }
MediaContainerEntry(name = it.fileNameString, comment = e.message)
logger.warn(e) { "Could not analyze entry: ${it.fileName}" }
MediaContainerEntry(name = it.fileName, comment = e.message)
}
}
.sortedWith(compareBy(natSortComparator) { it.name })
}
override fun getEntryStream(path: Path, entryName: String): ByteArray =
Archive(Files.newInputStream(path)).use { rar ->
val header = rar.fileHeaders.find { it.fileNameString == entryName }
rar.getInputStream(header).readBytes()
Archive(path.toFile()).use { rar ->
val header = rar.fileHeaders.find { it.fileName == entryName }
rar.getInputStream(header).readBytes()
}
}