fix(update-errors): Fix range selection & ordering latest error first (#914)

* Fix range selection

* Sort error list by latest error first

* Correct non-nullable lastUpdate & fix comment

app/build.gradle.kts

@@ -25,8 +25,8 @@ android {
     defaultConfig {
         applicationId = "app.komikku"
 
-        versionCode = 73
+        versionCode = 74
-        versionName = "1.13.1"
+        versionName = "1.13.2"
 
         buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
         buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")

app/src/main/java/eu/kanade/tachiyomi/ui/libraryUpdateError/LibraryUpdateErrorScreenModel.kt

@@ -32,7 +32,7 @@ class LibraryUpdateErrorScreenModel(
                     mutableState.update {
                         it.copy(
                             isLoading = false,
-                            items = toLibraryUpdateErrorItems(errors),
+                            items = errors.toLibraryUpdateErrorItems(),
                             messages = errorMessages,
                         )
                     }
@@ -40,13 +40,15 @@ class LibraryUpdateErrorScreenModel(
         }
     }
 
-    private fun toLibraryUpdateErrorItems(errors: List<LibraryUpdateErrorWithRelations>): List<LibraryUpdateErrorItem> {
+    private fun List<LibraryUpdateErrorWithRelations>.toLibraryUpdateErrorItems(): List<LibraryUpdateErrorItem> {
-        return errors.map { error ->
+        return map { error ->
             LibraryUpdateErrorItem(
                 error = error,
                 selected = error.errorId in selectedErrorIds,
             )
         }
+            // Sort by messageId to group errors by type, preserving last_update order within groups (from DB)
+            .sortedBy { it.error.messageId }
     }
 
     fun toggleSelection(

data/src/main/java/tachiyomi/data/libraryUpdateError/LibraryUpdateErrorMapper.kt

@@ -2,10 +2,11 @@ package tachiyomi.data.libraryUpdateError
 
 import tachiyomi.domain.libraryUpdateError.model.LibraryUpdateError
 
-val libraryUpdateErrorMapper: (Long, Long, Long) -> LibraryUpdateError = { id, mangaId, messageId ->
+val libraryUpdateErrorMapper: (Long, Long, Long, Long) -> LibraryUpdateError = { id, mangaId, messageId, lastUpdate ->
     LibraryUpdateError(
         id = id,
         mangaId = mangaId,
         messageId = messageId,
+        lastUpdate = lastUpdate,
     )
 }

data/src/main/java/tachiyomi/data/libraryUpdateError/LibraryUpdateErrorRepositoryImpl.kt

@@ -11,17 +11,13 @@ class LibraryUpdateErrorRepositoryImpl(
 
     override suspend fun getAll(): List<LibraryUpdateError> {
         return handler.awaitList {
-            libraryUpdateErrorQueries.getAllErrors(
+            libraryUpdateErrorQueries.getAllErrors(libraryUpdateErrorMapper)
-                libraryUpdateErrorMapper,
-            )
         }
     }
 
     override fun getAllAsFlow(): Flow<List<LibraryUpdateError>> {
         return handler.subscribeToList {
-            libraryUpdateErrorQueries.getAllErrors(
+            libraryUpdateErrorQueries.getAllErrors(libraryUpdateErrorMapper)
-                libraryUpdateErrorMapper,
-            )
         }
     }
 
@@ -39,9 +35,7 @@ class LibraryUpdateErrorRepositoryImpl(
 
     override suspend fun deleteMangaError(mangaId: Long) {
         return handler.await {
-            libraryUpdateErrorQueries.deleteMangaError(
+            libraryUpdateErrorQueries.deleteMangaError(mangaId = mangaId)
-                mangaId = mangaId,
-            )
         }
     }
 

data/src/main/java/tachiyomi/data/libraryUpdateError/LibraryUpdateErrorWithRelationsMapper.kt

@@ -4,8 +4,8 @@ import tachiyomi.domain.libraryUpdateError.model.LibraryUpdateErrorWithRelations
 import tachiyomi.domain.manga.model.MangaCover
 
 val libraryUpdateErrorWithRelationsMapper:
-    (Long, String, Long, Boolean, String?, Long, Long, Long) -> LibraryUpdateErrorWithRelations =
+    (Long, String, Long, Boolean, String?, Long, Long, Long, Long) -> LibraryUpdateErrorWithRelations =
-    { mangaId, mangaTitle, mangaSource, favorite, mangaThumbnail, coverLastModified, errorId, messageId ->
+    { mangaId, mangaTitle, mangaSource, favorite, mangaThumbnail, coverLastModified, errorId, messageId, lastUpdate ->
         LibraryUpdateErrorWithRelations(
             mangaId = mangaId,
             mangaTitle = mangaTitle,
@@ -19,5 +19,6 @@ val libraryUpdateErrorWithRelationsMapper:
             ),
             errorId = errorId,
             messageId = messageId,
+            lastUpdate = lastUpdate,
         )
     }

data/src/main/sqldelight/tachiyomi/data/libraryUpdateError.sq

@@ -1,7 +1,8 @@
 CREATE TABLE libraryUpdateError (
     _id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
     manga_id INTEGER NOT NULL UNIQUE,
-    message_id INTEGER NOT NULL
+    message_id INTEGER NOT NULL,
+    last_update INTEGER NOT NULL DEFAULT 0
 );
 
 getAllErrors:
@@ -9,15 +10,16 @@ SELECT *
 FROM libraryUpdateError;
 
 insert:
-INSERT INTO libraryUpdateError(manga_id, message_id) VALUES (:mangaId, :messageId);
+INSERT INTO libraryUpdateError(manga_id, message_id, last_update) VALUES (:mangaId, :messageId, strftime('%s', 'now'));
 
 upsert:
-INSERT INTO libraryUpdateError(manga_id, message_id)
+INSERT INTO libraryUpdateError(manga_id, message_id, last_update)
-VALUES (:mangaId, :messageId)
+VALUES (:mangaId, :messageId, strftime('%s', 'now'))
 ON CONFLICT(manga_id)
 DO UPDATE
 SET
-    message_id = :messageId
+    message_id = :messageId,
+    last_update = strftime('%s', 'now')
 WHERE manga_id = :mangaId;
 
 deleteAllErrors:

data/src/main/sqldelight/tachiyomi/migrations/39.sqm

@@ -0,0 +1,20 @@
+ALTER TABLE libraryUpdateError
+ADD COLUMN last_update INTEGER NOT NULL DEFAULT 0;
+
+DROP VIEW IF EXISTS libraryUpdateErrorView;
+
+CREATE VIEW libraryUpdateErrorView AS
+SELECT
+    mangas._id AS mangaId,
+    mangas.title AS mangaTitle,
+    mangas.source,
+    mangas.favorite,
+    mangas.thumbnail_url AS thumbnailUrl,
+    mangas.cover_last_modified AS coverLastModified,
+    libraryUpdateError._id AS errorId,
+    libraryUpdateError.message_id AS messageId,
+    libraryUpdateError.last_update AS lastUpdate
+FROM mangas JOIN libraryUpdateError
+ON mangas._id = libraryUpdateError.manga_id
+WHERE favorite = 1
+ORDER BY lastUpdate DESC;

data/src/main/sqldelight/tachiyomi/view/libraryUpdateErrorView.sq

@@ -7,10 +7,12 @@ SELECT
     mangas.thumbnail_url AS thumbnailUrl,
     mangas.cover_last_modified AS coverLastModified,
     libraryUpdateError._id AS errorId,
-    libraryUpdateError.message_id AS messageId
+    libraryUpdateError.message_id AS messageId,
+    libraryUpdateError.last_update AS lastUpdate
 FROM mangas JOIN libraryUpdateError
 ON mangas._id = libraryUpdateError.manga_id
-WHERE favorite = 1;
+WHERE favorite = 1
+ORDER BY lastUpdate DESC;
 
 errors:
 SELECT *

domain/src/main/java/tachiyomi/domain/libraryUpdateError/model/LibraryUpdateError.kt

@@ -6,4 +6,5 @@ data class LibraryUpdateError(
     val id: Long,
     val mangaId: Long,
     val messageId: Long,
+    val lastUpdate: Long = 0L,
 ) : Serializable

domain/src/main/java/tachiyomi/domain/libraryUpdateError/model/LibraryUpdateErrorWithRelations.kt

@@ -9,4 +9,5 @@ data class LibraryUpdateErrorWithRelations(
     val mangaCover: MangaCover,
     val errorId: Long,
     val messageId: Long,
+    val lastUpdate: Long,
 )