From f685fa013fd23bc197e5175a0a4478a33e67fd9c Mon Sep 17 00:00:00 2001 From: Gauthier Roebroeck Date: Fri, 16 Aug 2024 16:52:25 +0800 Subject: [PATCH] kobo sync fix store sync merge --- .../org/gotson/komga/interfaces/api/kobo/KoboController.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/kobo/KoboController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/kobo/KoboController.kt index 5dfd1071e86..22a56a2442a 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/kobo/KoboController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/kobo/KoboController.kt @@ -175,7 +175,7 @@ class KoboController( fun syncLibrary( @AuthenticationPrincipal principal: KomgaPrincipal, @PathVariable authToken: String, - ): ResponseEntity> { + ): ResponseEntity> { val syncTokenReceived = komgaSyncTokenGenerator.fromRequestHeaders(getCurrentRequest()) ?: KomgaSyncToken() // find the ongoing sync point, else create one @@ -278,7 +278,7 @@ class KoboController( if (koboProxy.isEnabled()) { try { val koboStoreResponse = koboProxy.proxyCurrentRequest(includeSyncToken = true) - val syncResultsKobo = koboStoreResponse.body?.let { mapper.treeToValue>(it) } ?: emptyList() + val syncResultsKobo = koboStoreResponse.body?.let { mapper.treeToValue>(it) } ?: emptyList() val syncTokenKobo = koboStoreResponse.headers[X_KOBO_SYNCTOKEN]?.firstOrNull()?.let { komgaSyncTokenGenerator.fromBase64(it) } val shouldContinueSyncKobo = koboStoreResponse.headers[X_KOBO_SYNC]?.firstOrNull()?.lowercase() == "continue"