Cleanup data layer (#7450)

app/src/main/java/eu/kanade/data/chapter/ChapterRepositoryImpl.kt

@@ -41,39 +41,28 @@ class ChapterRepositoryImpl(
     }
 
     override suspend fun update(chapterUpdate: ChapterUpdate) {
-        handler.await {
+        partialUpdate(chapterUpdate)
-            chaptersQueries.update(
-                chapterUpdate.mangaId,
-                chapterUpdate.url,
-                chapterUpdate.name,
-                chapterUpdate.scanlator,
-                chapterUpdate.read?.toLong(),
-                chapterUpdate.bookmark?.toLong(),
-                chapterUpdate.lastPageRead,
-                chapterUpdate.chapterNumber?.toDouble(),
-                chapterUpdate.sourceOrder,
-                chapterUpdate.dateFetch,
-                chapterUpdate.dateUpload,
-                chapterId = chapterUpdate.id,
-            )
-        }
     }
 
     override suspend fun updateAll(chapterUpdates: List<ChapterUpdate>) {
+        partialUpdate(*chapterUpdates.toTypedArray())
+    }
+
+    private suspend fun partialUpdate(vararg chapterUpdates: ChapterUpdate) {
         handler.await(inTransaction = true) {
             chapterUpdates.forEach { chapterUpdate ->
                 chaptersQueries.update(
-                    chapterUpdate.mangaId,
+                    mangaId = chapterUpdate.mangaId,
-                    chapterUpdate.url,
+                    url = chapterUpdate.url,
-                    chapterUpdate.name,
+                    name = chapterUpdate.name,
-                    chapterUpdate.scanlator,
+                    scanlator = chapterUpdate.scanlator,
-                    chapterUpdate.read?.toLong(),
+                    read = chapterUpdate.read?.toLong(),
-                    chapterUpdate.bookmark?.toLong(),
+                    bookmark = chapterUpdate.bookmark?.toLong(),
-                    chapterUpdate.lastPageRead,
+                    lastPageRead = chapterUpdate.lastPageRead,
-                    chapterUpdate.chapterNumber?.toDouble(),
+                    chapterNumber = chapterUpdate.chapterNumber?.toDouble(),
-                    chapterUpdate.sourceOrder,
+                    sourceOrder = chapterUpdate.sourceOrder,
-                    chapterUpdate.dateFetch,
+                    dateFetch = chapterUpdate.dateFetch,
-                    chapterUpdate.dateUpload,
+                    dateUpload = chapterUpdate.dateUpload,
                     chapterId = chapterUpdate.id,
                 )
             }

app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt

@@ -79,15 +79,15 @@ class MangaRepositoryImpl(
                 genre = manga.genre,
                 title = manga.title,
                 status = manga.status,
-                thumbnail_url = manga.thumbnailUrl,
+                thumbnailUrl = manga.thumbnailUrl,
                 favorite = manga.favorite,
-                last_update = manga.lastUpdate,
+                lastUpdate = manga.lastUpdate,
-                next_update = null,
+                nextUpdate = null,
                 initialized = manga.initialized,
-                viewer = manga.viewerFlags,
+                viewerFlags = manga.viewerFlags,
-                chapter_flags = manga.chapterFlags,
+                chapterFlags = manga.chapterFlags,
-                cover_last_modified = manga.coverLastModified,
+                coverLastModified = manga.coverLastModified,
-                date_added = manga.dateAdded,
+                dateAdded = manga.dateAdded,
             )
             mangasQueries.selectLastInsertedRowId()
         }

app/src/main/java/eu/kanade/data/track/TrackRepositoryImpl.kt

@@ -37,27 +37,16 @@ class TrackRepositoryImpl(
     }
 
     override suspend fun insert(track: Track) {
-        handler.await {
+        insertValues(track)
-            manga_syncQueries.insert(
-                mangaId = track.mangaId,
-                syncId = track.syncId,
-                remoteId = track.remoteId,
-                libraryId = track.libraryId,
-                title = track.title,
-                lastChapterRead = track.lastChapterRead,
-                totalChapters = track.totalChapters,
-                status = track.status,
-                score = track.score,
-                remoteUrl = track.remoteUrl,
-                startDate = track.startDate,
-                finishDate = track.finishDate,
-            )
-        }
     }
 
     override suspend fun insertAll(tracks: List<Track>) {
+        insertValues(*tracks.toTypedArray())
+    }
+
+    private suspend fun insertValues(vararg values: Track) {
         handler.await(inTransaction = true) {
-            tracks.forEach { mangaTrack ->
+            values.forEach { mangaTrack ->
                 manga_syncQueries.insert(
                     mangaId = mangaTrack.mangaId,
                     syncId = mangaTrack.syncId,

app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupManager.kt

@@ -86,15 +86,15 @@ abstract class AbstractBackupManager(protected val context: Context) {
                 genre = manga.getGenres(),
                 title = manga.title,
                 status = manga.status.toLong(),
-                thumbnail_url = manga.thumbnail_url,
+                thumbnailUrl = manga.thumbnail_url,
                 favorite = manga.favorite,
-                last_update = manga.last_update,
+                lastUpdate = manga.last_update,
-                next_update = 0L,
+                nextUpdate = 0L,
                 initialized = manga.initialized,
-                viewer = manga.viewer_flags.toLong(),
+                viewerFlags = manga.viewer_flags.toLong(),
-                chapter_flags = manga.chapter_flags.toLong(),
+                chapterFlags = manga.chapter_flags.toLong(),
-                cover_last_modified = manga.cover_last_modified,
+                coverLastModified = manga.cover_last_modified,
-                date_added = manga.date_added,
+                dateAdded = manga.date_added,
             )
             mangasQueries.selectLastInsertedRowId()
         }

app/src/main/sqldelight/data/mangas.sq

@@ -25,10 +25,6 @@ CREATE TABLE mangas(
 CREATE INDEX library_favorite_index ON mangas(favorite) WHERE favorite = 1;
 CREATE INDEX mangas_url_index ON mangas(url);
 
-insert:
-INSERT INTO mangas(source,url,artist,author,description,genre,title,status,thumbnail_url,favorite,last_update,next_update,initialized,viewer,chapter_flags,cover_last_modified,date_added)
-VALUES (:source,:url,:artist,:author,:description,:genre,:title,:status,:thumbnail_url,:favorite,:last_update,:next_update,:initialized,:viewer,:chapter_flags,:cover_last_modified,:date_added);
-
 getMangaById:
 SELECT *
 FROM mangas
@@ -145,43 +141,9 @@ deleteMangasNotInLibraryBySourceIds:
 DELETE FROM mangas
 WHERE favorite = 0 AND source IN :sourceIds;
 
-INSERT INTO mangas(
+insert:
-    source,
+INSERT INTO mangas(source,url,artist,author,description,genre,title,status,thumbnail_url,favorite,last_update,next_update,initialized,viewer,chapter_flags,cover_last_modified,date_added)
-    url,
+VALUES (:source,:url,:artist,:author,:description,:genre,:title,:status,:thumbnailUrl,:favorite,:lastUpdate,:nextUpdate,:initialized,:viewerFlags,:chapterFlags,:coverLastModified,:dateAdded);
-    artist,
-    author,
-    description,
-    genre,
-    title,
-    status,
-    thumbnail_url,
-    favorite,
-    last_update,
-    next_update,
-    initialized,
-    viewer,
-    chapter_flags,
-    cover_last_modified,
-    date_added
-) VALUES (
-    :source,
-    :url,
-    :artist,
-    :author,
-    :description,
-    :genre,
-    :title,
-    :status,
-    :thumbnailUrl,
-    :favorite,
-    :lastUpdate,
-    0,
-    :initialized,
-    :viewerFlags,
-    :chapterFlags,
-    :coverLastModified,
-    :dateAdded
-);
 
 update:
 UPDATE mangas SET