kobo sync read progress

gotson · Aug 26, 2024 · 5b9c8ea · 5b9c8ea
1 parent 3fc3b49
commit 5b9c8ea
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SyncPointDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SyncPointDao.kt
@@ -219,7 +219,11 @@ class SyncPointDao(
             .and(spb.BOOK_FILE_HASH.eq(spbFrom.BOOK_FILE_HASH).or(spbFrom.BOOK_FILE_HASH.isNull))
             .and(spb.BOOK_METADATA_LAST_MODIFIED_DATE.eq(spbFrom.BOOK_METADATA_LAST_MODIFIED_DATE))
             // with changed read progress
-            .and(spb.BOOK_READ_PROGRESS_LAST_MODIFIED_DATE.ne(spbFrom.BOOK_READ_PROGRESS_LAST_MODIFIED_DATE)),
+            .and(
+              spb.BOOK_READ_PROGRESS_LAST_MODIFIED_DATE.ne(spbFrom.BOOK_READ_PROGRESS_LAST_MODIFIED_DATE)
+                .or(spb.BOOK_READ_PROGRESS_LAST_MODIFIED_DATE.isNull.and(spbFrom.BOOK_READ_PROGRESS_LAST_MODIFIED_DATE.isNotNull))
+                .or(spb.BOOK_READ_PROGRESS_LAST_MODIFIED_DATE.isNotNull.and(spbFrom.BOOK_READ_PROGRESS_LAST_MODIFIED_DATE.isNull)),
+            ),
         )
 
     return queryToPage(query, pageable)

diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/kobo/dto/ResultDto.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/kobo/dto/ResultDto.kt
@@ -1,14 +1,16 @@
 package org.gotson.komga.interfaces.api.kobo.dto
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategies
-import com.fasterxml.jackson.databind.annotation.JsonNaming
+import com.fasterxml.jackson.annotation.JsonProperty
 
-@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy::class)
 enum class ResultDto {
+  @JsonProperty("Success")
   SUCCESS,
 
-  // Not sure about those
+  // Not sure what Kobo accepts exactly, so I made up my own
+  @JsonProperty("Failure")
   FAILURE,
+
+  @JsonProperty("Ignored")
   IGNORED,
   ;