fix(kobo-sync): use KoboSpan for progress sync

booklore-api/src/main/java/org/booklore/convertor/KoboSpanMapJsonConverter.java

@@ -0,0 +1,37 @@
+package org.booklore.convertor;
+
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+import org.booklore.model.dto.kobo.KoboSpanPositionMap;
+import tools.jackson.core.JacksonException;
+import tools.jackson.databind.ObjectMapper;
+
+@Converter
+public class KoboSpanMapJsonConverter implements AttributeConverter<KoboSpanPositionMap, String> {
+
+    private static final ObjectMapper objectMapper = new ObjectMapper();
+
+    @Override
+    public String convertToDatabaseColumn(KoboSpanPositionMap attribute) {
+        if (attribute == null) {
+            return null;
+        }
+        try {
+            return objectMapper.writeValueAsString(attribute);
+        } catch (JacksonException e) {
+            throw new IllegalStateException("Failed to serialize Kobo span map to JSON", e);
+        }
+    }
+
+    @Override
+    public KoboSpanPositionMap convertToEntityAttribute(String dbData) {
+        if (dbData == null || dbData.isEmpty()) {
+            return null;
+        }
+        try {
+            return objectMapper.readValue(dbData, KoboSpanPositionMap.class);
+        } catch (JacksonException e) {
+            throw new IllegalStateException("Failed to deserialize Kobo span map from JSON", e);
+        }
+    }
+}

booklore-api/src/main/java/org/booklore/model/dto/kobo/KoboSpanPositionMap.java

@@ -0,0 +1,25 @@
+package org.booklore.model.dto.kobo;
+
+import java.util.List;
+
+public record KoboSpanPositionMap(List<Chapter> chapters) {
+
+    public KoboSpanPositionMap {
+        chapters = chapters == null ? List.of() : List.copyOf(chapters);
+    }
+
+    public record Chapter(String sourceHref,
+                          String normalizedHref,
+                          int spineIndex,
+                          float globalStartProgress,
+                          float globalEndProgress,
+                          List<Span> spans) {
+
+        public Chapter {
+            spans = spans == null ? List.of() : List.copyOf(spans);
+        }
+    }
+
+    public record Span(String id, float progression) {
+    }
+}

booklore-api/src/main/java/org/booklore/model/dto/progress/EpubProgress.java

@@ -11,9 +11,9 @@
 @AllArgsConstructor
 @NoArgsConstructor
 public class EpubProgress {
-    @NotNull
     String cfi;
     String href;
+    Float contentSourceProgressPercent;
     @NotNull
     Float percentage;
     String ttsPositionCfi;

booklore-api/src/main/java/org/booklore/model/dto/request/BookFileProgress.java

@@ -7,5 +7,6 @@ public record BookFileProgress(
         String positionData,
         String positionHref,
         @NotNull Float progressPercent,
-        String ttsPositionCfi) {
+        String ttsPositionCfi,
+        Float contentSourceProgressPercent) {
 }

booklore-api/src/main/java/org/booklore/model/dto/settings/KoboSettings.java

@@ -13,7 +13,7 @@
 @NoArgsConstructor
 public class KoboSettings {
     @Builder.Default @JsonSetter(nulls = Nulls.SKIP)
-    private boolean convertToKepub = false;
+    private boolean convertToKepub = true;
     @Builder.Default @JsonSetter(nulls = Nulls.SKIP)
     private int conversionLimitInMb = 100;
     @Builder.Default @JsonSetter(nulls = Nulls.SKIP)

booklore-api/src/main/java/org/booklore/model/entity/KoboSpanMapEntity.java

@@ -0,0 +1,37 @@
+package org.booklore.model.entity;
+
+import jakarta.persistence.*;
+import lombok.*;
+import org.booklore.convertor.KoboSpanMapJsonConverter;
+import org.booklore.model.dto.kobo.KoboSpanPositionMap;
+
+import java.time.Instant;
+
+@Entity
+@Table(name = "kobo_span_map",
+        uniqueConstraints = @UniqueConstraint(name = "uk_kobo_span_map_book_file", columnNames = "book_file_id"))
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class KoboSpanMapEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @OneToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "book_file_id", nullable = false)
+    private BookFileEntity bookFile;
+
+    @Column(name = "file_hash", nullable = false, length = 128)
+    private String fileHash;
+
+    @Convert(converter = KoboSpanMapJsonConverter.class)
+    @Column(name = "span_map_json", nullable = false, columnDefinition = "LONGTEXT")
+    private KoboSpanPositionMap spanMap;
+
+    @Column(name = "created_at", nullable = false)
+    private Instant createdAt;
+}

booklore-api/src/main/java/org/booklore/model/entity/UserBookFileProgressEntity.java

@@ -36,6 +36,9 @@ public class UserBookFileProgressEntity {
     @Column(name = "progress_percent")
     private Float progressPercent;
 
+    @Column(name = "content_source_progress_percent")
+    private Float contentSourceProgressPercent;
+
     @Column(name = "tts_position_cfi", length = 1000)
     private String ttsPositionCfi;
 

booklore-api/src/main/java/org/booklore/repository/KoboSpanMapRepository.java

@@ -0,0 +1,21 @@
+package org.booklore.repository;
+
+import org.booklore.model.entity.KoboSpanMapEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
+@Repository
+public interface KoboSpanMapRepository extends JpaRepository<KoboSpanMapEntity, Long> {
+
+    @Query("SELECT ksm FROM KoboSpanMapEntity ksm WHERE ksm.bookFile.id = :bookFileId")
+    Optional<KoboSpanMapEntity> findByBookFileId(@Param("bookFileId") Long bookFileId);
+
+    @Query("SELECT ksm FROM KoboSpanMapEntity ksm WHERE ksm.bookFile.id IN :bookFileIds")
+    List<KoboSpanMapEntity> findByBookFileIdIn(@Param("bookFileIds") Collection<Long> bookFileIds);
+}

booklore-api/src/main/java/org/booklore/repository/UserBookFileProgressRepository.java

@@ -63,6 +63,17 @@ List<UserBookFileProgressEntity> findByUserIdAndBookFileBookIdIn(
             @Param("bookIds") Iterable<Long> bookIds
     );
 
+    @EntityGraph(attributePaths = {"bookFile", "bookFile.book"})
+    @Query("""
+        SELECT ubfp FROM UserBookFileProgressEntity ubfp
+        WHERE ubfp.user.id = :userId
+          AND ubfp.bookFile.id IN :bookFileIds
+    """)
+    List<UserBookFileProgressEntity> findByUserIdAndBookFileIdIn(
+            @Param("userId") Long userId,
+            @Param("bookFileIds") Iterable<Long> bookFileIds
+    );
+
     @Modifying
     @Transactional
     @Query("""

booklore-api/src/main/java/org/booklore/service/appsettings/SettingPersistenceHelper.java

@@ -298,7 +298,7 @@ public MetadataPublicReviewsSettings getDefaultMetadataPublicReviewsSettings() {
 
     public KoboSettings getDefaultKoboSettings() {
         return KoboSettings.builder()
-                .convertToKepub(false)
+                .convertToKepub(true)
                 .conversionLimitInMb(100)
                 .convertCbxToEpub(false)
                 .conversionLimitInMbForCbx(100)

booklore-api/src/main/java/org/booklore/service/book/BookDownloadService.java

@@ -13,6 +13,7 @@
 import org.booklore.service.appsettings.AppSettingService;
 import org.booklore.service.kobo.CbxConversionService;
 import org.booklore.service.kobo.KepubConversionService;
+import org.booklore.service.kobo.KoboSpanMapService;
 import org.booklore.util.FileUtils;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
@@ -48,6 +49,7 @@ public class BookDownloadService {
     private final BookFileRepository bookFileRepository;
     private final KepubConversionService kepubConversionService;
     private final CbxConversionService cbxConversionService;
+    private final KoboSpanMapService koboSpanMapService;
     private final AppSettingService appSettingService;
 
     public ResponseEntity<Resource> downloadBook(Long bookId) {
@@ -252,7 +254,7 @@ public void downloadKoboBook(Long bookId, HttpServletResponse response) {
             throw ApiError.GENERIC_BAD_REQUEST.createException("Kobo settings not found.");
         }
 
-        boolean convertEpubToKepub = isEpub && koboSettings.isConvertToKepub() && primaryFile.getFileSizeKb() <= (long) koboSettings.getConversionLimitInMb() * 1024;
+        boolean convertEpubToKepub = isEpub && !primaryFile.isFixedLayout() && koboSettings.isConvertToKepub() && primaryFile.getFileSizeKb() <= (long) koboSettings.getConversionLimitInMb() * 1024;
         boolean convertCbxToEpub = isCbx && koboSettings.isConvertCbxToEpub() && primaryFile.getFileSizeKb() <= (long) koboSettings.getConversionLimitInMbForCbx() * 1024;
 
         int compressionPercentage = koboSettings.getConversionImageCompressionPercentage();
@@ -272,6 +274,11 @@ public void downloadKoboBook(Long bookId, HttpServletResponse response) {
             if (convertEpubToKepub) {
                 fileToSend = kepubConversionService.convertEpubToKepub(inputFile, tempDir.toFile(),
                     koboSettings.isForceEnableHyphenation());
+                try {
+                    koboSpanMapService.computeAndStoreIfNeeded(primaryFile, fileToSend);
+                } catch (Exception e) {
+                    log.warn("Failed to compute Kobo span map for file {}: {}", primaryFile.getId(), e.getMessage());
+                }
             }
 
             setResponseHeaders(response, fileToSend);