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

fix(kobo): properly mark book as read when finished on Kobo

Browse source
This commit is contained in:
Gauthier Roebroeck 2024-09-02 15:49:21 +08:00
parent 63e1c0c932
commit c3fc37a5da
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
komga/src/main/kotlin/org/gotson/komga/interfaces/api/kobo/KoboController.kt
View file

@ -8,12 +8,14 @@ import io.github.oshai.kotlinlogging.KotlinLogging
import org.apache.commons.lang3.RandomStringUtils
import org.gotson.komga.domain.model.Book
import org.gotson.komga.domain.model.KomgaSyncToken
import org.gotson.komga.domain.model.MediaExtensionEpub
import org.gotson.komga.domain.model.R2Device
import org.gotson.komga.domain.model.R2Locator
import org.gotson.komga.domain.model.R2Progression
import org.gotson.komga.domain.model.ROLE_FILE_DOWNLOAD
import org.gotson.komga.domain.model.SyncPoint
import org.gotson.komga.domain.persistence.BookRepository
import org.gotson.komga.domain.persistence.MediaRepository
import org.gotson.komga.domain.persistence.ReadProgressRepository
import org.gotson.komga.domain.persistence.SyncPointRepository
import org.gotson.komga.domain.service.BookLifecycle
@ -141,6 +143,7 @@ class KoboController(
private val bookRepository: BookRepository,
private val readProgressRepository: ReadProgressRepository,
private val imageConverter: ImageConverter,
private val mediaRepository: MediaRepository,
) {
@GetMapping("ping")
fun ping() = "pong"
@ -432,15 +435,20 @@ class KoboController(
name = principal.apiKey?.comment ?: "unknown",
),
locator =
R2Locator(
href = koboUpdate.currentBookmark.location.source,
// assume default, will be overwritten by the correct type when saved
type = "application/xhtml+xml",
locations =
R2Locator.Location(
progression = koboUpdate.currentBookmark.contentSourceProgressPercent / 100,
),
),
if (koboUpdate.statusInfo.status == StatusDto.FINISHED) {
// If the book is finished, Kobo sends the first resource instead of the last, so we can't trust what Kobo sent
(mediaRepository.findExtensionByIdOrNull(book.id) as? MediaExtensionEpub ?: throw IllegalArgumentException("Epub extension not found")).positions.last()
} else {
R2Locator(
href = koboUpdate.currentBookmark.location.source,
// assume default, will be overwritten by the correct type when saved
type = "application/xhtml+xml",
locations =
R2Locator.Location(
progression = koboUpdate.currentBookmark.contentSourceProgressPercent / 100,
),
)
},
)
val response =