Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2026-05-04 18:42:10 +02:00
Code Issues Projects Releases Wiki Activity

refactor: use Commons Compress instead of java.util.zip

Browse source 
also setMethod and setLevel more explicitely
This commit is contained in:
Gauthier Roebroeck 2021-02-17 11:37:30 +08:00 committed by Gauthier
parent e44bc7b491
commit 8ff5cff116
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/SeriesController.kt
View file

@ -6,6 +6,8 @@ import io.swagger.v3.oas.annotations.media.Content
import io.swagger.v3.oas.annotations.media.Schema
import io.swagger.v3.oas.annotations.responses.ApiResponse
import mu.KotlinLogging
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream
import org.apache.commons.io.IOUtils
import org.gotson.komga.application.tasks.TaskReceiver
import org.gotson.komga.domain.model.BookSearchWithReadProgress
@ -58,8 +60,7 @@ import org.springframework.web.bind.annotation.RestController
import org.springframework.web.server.ResponseStatusException
import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody
import java.io.OutputStream
import java.util.zip.ZipEntry
import java.util.zip.ZipOutputStream
import java.util.zip.Deflater
import javax.validation.Valid
private val logger = KotlinLogging.logger {}
@ -380,8 +381,9 @@ class SeriesController(
val books = bookRepository.findBySeriesId(seriesId)
val streamingResponse = StreamingResponseBody { responseStream: OutputStream ->
ZipOutputStream(responseStream).use { zipStream ->
zipStream.setLevel(0)
ZipArchiveOutputStream(responseStream).use { zipStream ->
zipStream.setMethod(ZipArchiveOutputStream.DEFLATED)
zipStream.setLevel(Deflater.NO_COMPRESSION)
books.forEach { book ->
val file = FileSystemResource(book.path())
if (!file.exists()) {
@ -391,9 +393,9 @@ class SeriesController(
logger.debug { "Adding file to zip archive: ${file.path}" }
file.inputStream.use {
zipStream.putNextEntry(ZipEntry(file.filename))
zipStream.putArchiveEntry(ZipArchiveEntry(file.filename))
IOUtils.copyLarge(it, zipStream, ByteArray(8192))
zipStream.closeEntry()
zipStream.closeArchiveEntry()
}
}
}