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

fix(opds): use servlet context path to build links

Browse source 
fixes #156
This commit is contained in:
Gauthier Roebroeck 2020-05-12 08:32:18 +08:00
parent 722d3bd56b
commit d82eefe19a
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
komga/src/main/kotlin/org/gotson/komga/interfaces/opds/OpdsController.kt
View file

@ -44,6 +44,7 @@ import java.net.URI
import java.text.DecimalFormat import java.text.DecimalFormat
import java.time.ZoneId import java.time.ZoneId
import java.time.ZonedDateTime import java.time.ZonedDateTime
import javax.servlet.ServletContext
private val logger = KotlinLogging.logger {} private val logger = KotlinLogging.logger {}
@ -61,13 +62,16 @@ private const val ID_LIBRARIES_ALL = "allLibraries"
@RestController @RestController
@RequestMapping(value = [ROUTE_BASE], produces = [MediaType.APPLICATION_ATOM_XML_VALUE, MediaType.APPLICATION_XML_VALUE, MediaType.TEXT_XML_VALUE]) @RequestMapping(value = [ROUTE_BASE], produces = [MediaType.APPLICATION_ATOM_XML_VALUE, MediaType.APPLICATION_XML_VALUE, MediaType.TEXT_XML_VALUE])
class OpdsController( class OpdsController(
servletContext: ServletContext,
private val seriesRepository: SeriesRepository, private val seriesRepository: SeriesRepository,
private val libraryRepository: LibraryRepository private val libraryRepository: LibraryRepository
) { ) {
private val routeBase = "${servletContext.contextPath}$ROUTE_BASE"
private val komgaAuthor = OpdsAuthor("Komga", URI("https://github.com/gotson/komga")) private val komgaAuthor = OpdsAuthor("Komga", URI("https://github.com/gotson/komga"))
private val linkStart = OpdsLinkFeedNavigation(OpdsLinkRel.START, "$ROUTE_BASE$ROUTE_CATALOG") private val linkStart = OpdsLinkFeedNavigation(OpdsLinkRel.START, "$routeBase$ROUTE_CATALOG")
private val linkSearch = OpdsLinkSearch("$ROUTE_BASE$ROUTE_SEARCH") private val linkSearch = OpdsLinkSearch("$routeBase$ROUTE_SEARCH")
private val decimalFormat = DecimalFormat("0.#") private val decimalFormat = DecimalFormat("0.#")
@ -79,7 +83,7 @@ class OpdsController(
updated = ZonedDateTime.now(), updated = ZonedDateTime.now(),
author = komgaAuthor, author = komgaAuthor,
links = listOf( links = listOf(
OpdsLinkFeedNavigation(OpdsLinkRel.SELF, "$ROUTE_BASE$ROUTE_CATALOG"), OpdsLinkFeedNavigation(OpdsLinkRel.SELF, "$routeBase$ROUTE_CATALOG"),
linkStart, linkStart,
linkSearch linkSearch
), ),
@ -89,21 +93,21 @@ class OpdsController(
updated = ZonedDateTime.now(), updated = ZonedDateTime.now(),
id = ID_SERIES_ALL, id = ID_SERIES_ALL,
content = "Browse by series", content = "Browse by series",
link = OpdsLinkFeedNavigation(OpdsLinkRel.SUBSECTION, "$ROUTE_BASE$ROUTE_SERIES_ALL") link = OpdsLinkFeedNavigation(OpdsLinkRel.SUBSECTION, "$routeBase$ROUTE_SERIES_ALL")
), ),
OpdsEntryNavigation( OpdsEntryNavigation(
title = "Latest series", title = "Latest series",
updated = ZonedDateTime.now(), updated = ZonedDateTime.now(),
id = ID_SERIES_LATEST, id = ID_SERIES_LATEST,
content = "Browse latest series", content = "Browse latest series",
link = OpdsLinkFeedNavigation(OpdsLinkRel.SUBSECTION, "$ROUTE_BASE$ROUTE_SERIES_LATEST") link = OpdsLinkFeedNavigation(OpdsLinkRel.SUBSECTION, "$routeBase$ROUTE_SERIES_LATEST")
), ),
OpdsEntryNavigation( OpdsEntryNavigation(
title = "All libraries", title = "All libraries",
updated = ZonedDateTime.now(), updated = ZonedDateTime.now(),
id = ID_LIBRARIES_ALL, id = ID_LIBRARIES_ALL,
content = "Browse by library", content = "Browse by library",
link = OpdsLinkFeedNavigation(OpdsLinkRel.SUBSECTION, "$ROUTE_BASE$ROUTE_LIBRARIES_ALL") link = OpdsLinkFeedNavigation(OpdsLinkRel.SUBSECTION, "$routeBase$ROUTE_LIBRARIES_ALL")
) )
) )
) )
@ -111,7 +115,7 @@ class OpdsController(
private val openSearchDescription = OpenSearchDescription( private val openSearchDescription = OpenSearchDescription(
shortName = "Search", shortName = "Search",
description = "Search for series", description = "Search for series",
url = OpenSearchDescription.OpenSearchUrl("$ROUTE_BASE$ROUTE_SERIES_ALL?search={searchTerms}") url = OpenSearchDescription.OpenSearchUrl("$routeBase$ROUTE_SERIES_ALL?search={searchTerms}")
) )
@GetMapping(ROUTE_CATALOG) @GetMapping(ROUTE_CATALOG)
@ -149,7 +153,7 @@ class OpdsController(
updated = ZonedDateTime.now(), updated = ZonedDateTime.now(),
author = komgaAuthor, author = komgaAuthor,
links = listOf( links = listOf(
OpdsLinkFeedNavigation(OpdsLinkRel.SELF, "$ROUTE_BASE$ROUTE_SERIES_ALL"), OpdsLinkFeedNavigation(OpdsLinkRel.SELF, "$routeBase$ROUTE_SERIES_ALL"),
linkStart linkStart
), ),
entries = series.map { it.toOpdsEntry() } entries = series.map { it.toOpdsEntry() }
@ -174,7 +178,7 @@ class OpdsController(
updated = ZonedDateTime.now(), updated = ZonedDateTime.now(),
author = komgaAuthor, author = komgaAuthor,
links = listOf( links = listOf(
OpdsLinkFeedNavigation(OpdsLinkRel.SELF, "$ROUTE_BASE$ROUTE_SERIES_LATEST"), OpdsLinkFeedNavigation(OpdsLinkRel.SELF, "$routeBase$ROUTE_SERIES_LATEST"),
linkStart linkStart
), ),
entries = series.map { it.toOpdsEntry() } entries = series.map { it.toOpdsEntry() }
@ -197,7 +201,7 @@ class OpdsController(
updated = ZonedDateTime.now(), updated = ZonedDateTime.now(),
author = komgaAuthor, author = komgaAuthor,
links = listOf( links = listOf(
OpdsLinkFeedNavigation(OpdsLinkRel.SELF, "$ROUTE_BASE$ROUTE_LIBRARIES_ALL"), OpdsLinkFeedNavigation(OpdsLinkRel.SELF, "$routeBase$ROUTE_LIBRARIES_ALL"),
linkStart linkStart
), ),
entries = libraries.map { it.toOpdsEntry() } entries = libraries.map { it.toOpdsEntry() }
@ -219,7 +223,7 @@ class OpdsController(
updated = series.lastModifiedDate?.atZone(ZoneId.systemDefault()) ?: ZonedDateTime.now(), updated = series.lastModifiedDate?.atZone(ZoneId.systemDefault()) ?: ZonedDateTime.now(),
author = komgaAuthor, author = komgaAuthor,
links = listOf( links = listOf(
OpdsLinkFeedNavigation(OpdsLinkRel.SELF, "${ROUTE_BASE}series/$id"), OpdsLinkFeedNavigation(OpdsLinkRel.SELF, "${routeBase}series/$id"),
linkStart linkStart
), ),
entries = series.books entries = series.books
@ -243,7 +247,7 @@ class OpdsController(
updated = library.lastModifiedDate?.atZone(ZoneId.systemDefault()) ?: ZonedDateTime.now(), updated = library.lastModifiedDate?.atZone(ZoneId.systemDefault()) ?: ZonedDateTime.now(),
author = komgaAuthor, author = komgaAuthor,
links = listOf( links = listOf(
OpdsLinkFeedNavigation(OpdsLinkRel.SELF, "${ROUTE_BASE}libraries/$id"), OpdsLinkFeedNavigation(OpdsLinkRel.SELF, "${routeBase}libraries/$id"),
linkStart linkStart
), ),
entries = seriesRepository.findByLibraryId(library.id, Sort.by(Sort.Order.asc("metadata.titleSort").ignoreCase())).map { it.toOpdsEntry() } entries = seriesRepository.findByLibraryId(library.id, Sort.by(Sort.Order.asc("metadata.titleSort").ignoreCase())).map { it.toOpdsEntry() }
@ -257,16 +261,16 @@ class OpdsController(
updated = lastModifiedDate?.atZone(ZoneId.systemDefault()) ?: ZonedDateTime.now(), updated = lastModifiedDate?.atZone(ZoneId.systemDefault()) ?: ZonedDateTime.now(),
id = id.toString(), id = id.toString(),
content = "", content = "",
link = OpdsLinkFeedNavigation(OpdsLinkRel.SUBSECTION, "${ROUTE_BASE}series/$id") link = OpdsLinkFeedNavigation(OpdsLinkRel.SUBSECTION, "${routeBase}series/$id")
) )
private fun Book.toOpdsEntry(prependNumber: Boolean): OpdsEntryAcquisition { private fun Book.toOpdsEntry(prependNumber: Boolean): OpdsEntryAcquisition {
val mediaTypes = media.pages.map { it.mediaType }.distinct() val mediaTypes = media.pages.map { it.mediaType }.distinct()
val opdsLinkPageStreaming = if (mediaTypes.size == 1 && mediaTypes.first() in opdsPseSupportedFormats) { val opdsLinkPageStreaming = if (mediaTypes.size == 1 && mediaTypes.first() in opdsPseSupportedFormats) {
OpdsLinkPageStreaming(mediaTypes.first(), "${ROUTE_BASE}books/$id/pages/{pageNumber}?zero_based=true", media.pages.size) OpdsLinkPageStreaming(mediaTypes.first(), "${routeBase}books/$id/pages/{pageNumber}?zero_based=true", media.pages.size)
} else { } else {
OpdsLinkPageStreaming("image/jpeg", "${ROUTE_BASE}books/$id/pages/{pageNumber}?convert=jpeg&zero_based=true", media.pages.size) OpdsLinkPageStreaming("image/jpeg", "${routeBase}books/$id/pages/{pageNumber}?convert=jpeg&zero_based=true", media.pages.size)
} }
return OpdsEntryAcquisition( return OpdsEntryAcquisition(
@ -281,9 +285,9 @@ class OpdsController(
}, },
authors = metadata.authors.map { OpdsAuthor(it.name) }, authors = metadata.authors.map { OpdsAuthor(it.name) },
links = listOf( links = listOf(
OpdsLinkImageThumbnail("image/jpeg", "${ROUTE_BASE}books/$id/thumbnail"), OpdsLinkImageThumbnail("image/jpeg", "${routeBase}books/$id/thumbnail"),
OpdsLinkImage(media.pages[0].mediaType, "${ROUTE_BASE}books/$id/pages/1"), OpdsLinkImage(media.pages[0].mediaType, "${routeBase}books/$id/pages/1"),
OpdsLinkFileAcquisition(media.mediaType, "${ROUTE_BASE}books/$id/file/${fileName()}"), OpdsLinkFileAcquisition(media.mediaType, "${routeBase}books/$id/file/${fileName()}"),
opdsLinkPageStreaming opdsLinkPageStreaming
) )
) )
@ -295,7 +299,7 @@ class OpdsController(
updated = lastModifiedDate?.atZone(ZoneId.systemDefault()) ?: ZonedDateTime.now(), updated = lastModifiedDate?.atZone(ZoneId.systemDefault()) ?: ZonedDateTime.now(),
id = id.toString(), id = id.toString(),
content = "", content = "",
link = OpdsLinkFeedNavigation(OpdsLinkRel.SUBSECTION, "${ROUTE_BASE}libraries/$id") link = OpdsLinkFeedNavigation(OpdsLinkRel.SUBSECTION, "${routeBase}libraries/$id")
) )
} }