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

change endpoint to get book file to return proper content type and filename

Browse source
This commit is contained in:
Gauthier Roebroeck 2019-08-22 15:45:58 +08:00
parent 69bacd15a2
commit fc282200d4
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
komga/src/main/kotlin/org/gotson/komga/interfaces/web/SerieController.kt
View file

@ -1,6 +1,7 @@
package org.gotson.komga.interfaces.web
import com.github.klinq.jpaspec.likeLower
import org.apache.commons.io.FilenameUtils
import org.gotson.komga.domain.model.Book
import org.gotson.komga.domain.model.Serie
import org.gotson.komga.domain.model.Status
@ -13,6 +14,8 @@ import org.springframework.data.domain.PageRequest
import org.springframework.data.domain.Pageable
import org.springframework.data.domain.Sort
import org.springframework.data.repository.findByIdOrNull
import org.springframework.http.ContentDisposition
import org.springframework.http.HttpHeaders
import org.springframework.http.HttpStatus
import org.springframework.http.MediaType
import org.springframework.http.ResponseEntity
@ -118,14 +121,28 @@ class SerieController(
} ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)
}
@GetMapping(value = ["{serieId}/books/{bookId}/content"], produces = [MediaType.APPLICATION_OCTET_STREAM_VALUE])
fun getBookContent(
@GetMapping("{serieId}/books/{bookId}/file")
fun getBookFile(
@PathVariable serieId: Long,
@PathVariable bookId: Long
): ByteArray {
): ResponseEntity<ByteArray> {
if (!serieRepository.existsById(serieId)) throw ResponseStatusException(HttpStatus.NOT_FOUND)
return bookRepository.findByIdOrNull(bookId)?.let {
File(it.url.toURI()).readBytes()
return bookRepository.findByIdOrNull(bookId)?.let { book ->
val mediaType = try {
MediaType.parseMediaType(book.metadata.mediaType!!)
} catch (ex: Exception) {
MediaType.APPLICATION_OCTET_STREAM
}
ResponseEntity.ok()
.headers(HttpHeaders().apply {
contentDisposition = ContentDisposition.builder("attachment")
.filename(FilenameUtils.getName(book.url.toString()))
.build()
})
.contentType(mediaType)
.body(File(book.url.toURI()).readBytes())
} ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)
}