Use SQLDelight for all Manga related queries (#7447)

(cherry picked from commit 17951cfd68) # Conflicts: # app/src/main/java/eu/kanade/domain/DomainModule.kt # app/src/main/java/eu/kanade/domain/manga/repository/MangaRepository.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/DbExtensions.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/DbProvider.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/ChapterTypeMapping.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaCategoryTypeMapping.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterProgressPutResolver.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/LibraryMangaGetResolver.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFlagsPutResolver.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/tables/CategoryTable.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/tables/ChapterTable.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaCategoryTable.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaTable.kt # app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
2022-07-03 16:17:41 +02:00
parent 0c89c4cd64
commit ea38ffc53e
90 changed files with 878 additions and 2368 deletions
@@ -91,9 +91,5 @@ class AndroidDatabaseHandler(

    // SY -->
    fun getLibraryQuery() = LibraryQuery(driver)
-
-    fun rawQuery(query: (SqlDriver) -> Unit) {
-        return query(driver)
-    }
    // SY <--
 }
@@ -1,7 +1,9 @@
 package eu.kanade.data.manga

+import eu.kanade.data.listOfStringsAndAdapter
 import eu.kanade.domain.chapter.model.Chapter
 import eu.kanade.domain.manga.model.Manga
+import eu.kanade.tachiyomi.data.database.models.LibraryManga

 val mangaMapper: (Long, Long, String, String?, String?, String?, List<String>?, String, Long, String?, Boolean, Long?, Long?, Boolean, Long, Long, Long, Long, List<String>?) -> Manga =
    { id, source, url, artist, author, description, genre, title, status, thumbnailUrl, favorite, lastUpdate, _, initialized, viewer, chapterFlags, coverLastModified, dateAdded, filteredScanlators ->
@@ -71,3 +73,30 @@ val mangaChapterMapper: (Long, Long, String, String?, String?, String?, List<Str
            scanlator = scanlator,
        )
    }
+
+val libraryManga: (Long, Long, String, String?, String?, String?, List<String>?, String, Long, String?, Boolean, Long?, Long?, Boolean, Long, Long, Long, Long, List<String>?, Long, Long, Long) -> LibraryManga =
+    { _id, source, url, artist, author, description, genre, title, status, thumbnail_url, favorite, last_update, next_update, initialized, viewer, chapter_flags, cover_last_modified, date_added, filtered_scanlators, unread_count, read_count, category ->
+        LibraryManga().apply {
+            this.id = _id
+            this.source = source
+            this.url = url
+            this.artist = artist
+            this.author = author
+            this.description = description
+            this.genre = genre?.joinToString()
+            this.title = title
+            this.status = status.toInt()
+            this.thumbnail_url = thumbnail_url
+            this.favorite = favorite
+            this.last_update = last_update ?: 0
+            this.initialized = initialized
+            this.viewer_flags = viewer.toInt()
+            this.chapter_flags = chapter_flags.toInt()
+            this.cover_last_modified = cover_last_modified
+            this.date_added = date_added
+            this.filtered_scanlators = filtered_scanlators?.let(listOfStringsAndAdapter::encode)
+            this.unreadCount = unread_count.toInt()
+            this.readCount = read_count.toInt()
+            this.category = category.toInt()
+        }
+    }
@@ -72,4 +72,57 @@ class MangaMergeRepositoryImpl(
            }
        }
    }
+
+    override suspend fun insert(reference: MergedMangaReference): Long? {
+        return handler.awaitOneOrNull {
+            mergedQueries.insert(
+                infoManga = reference.isInfoManga,
+                getChapterUpdates = reference.getChapterUpdates,
+                chapterSortMode = reference.chapterSortMode.toLong(),
+                chapterPriority = reference.chapterPriority.toLong(),
+                downloadChapters = reference.downloadChapters,
+                mergeId = reference.mergeId!!,
+                mergeUrl = reference.mergeUrl,
+                mangaId = reference.mangaId,
+                mangaUrl = reference.mangaUrl,
+                mangaSource = reference.mangaSourceId,
+            )
+            mergedQueries.selectLastInsertedRowId()
+        }
+    }
+
+    override suspend fun insertAll(references: List<MergedMangaReference>) {
+        handler.await(true) {
+            references.forEach { reference ->
+                mergedQueries.insert(
+                    infoManga = reference.isInfoManga,
+                    getChapterUpdates = reference.getChapterUpdates,
+                    chapterSortMode = reference.chapterSortMode.toLong(),
+                    chapterPriority = reference.chapterPriority.toLong(),
+                    downloadChapters = reference.downloadChapters,
+                    mergeId = reference.mergeId!!,
+                    mergeUrl = reference.mergeUrl,
+                    mangaId = reference.mangaId,
+                    mangaUrl = reference.mangaUrl,
+                    mangaSource = reference.mangaSourceId,
+                )
+            }
+        }
+    }
+
+    override suspend fun deleteById(id: Long) {
+        handler.await {
+            mergedQueries.deleteById(id)
+        }
+    }
+
+    override suspend fun deleteByMergeId(mergeId: Long) {
+        handler.await {
+            mergedQueries.deleteByMergeId(mergeId)
+        }
+    }
+
+    override suspend fun getMergeMangaForDownloading(mergeId: Long): List<Manga> {
+        return handler.awaitList { mergedQueries.selectMergedMangasForDownloadingById(mergeId, mangaMapper) }
+    }
 }
@@ -1,5 +1,6 @@
 package eu.kanade.data.manga

+import eu.kanade.data.AndroidDatabaseHandler
 import eu.kanade.data.DatabaseHandler
 import eu.kanade.data.listOfStringsAdapter
 import eu.kanade.data.listOfStringsAndAdapter
@@ -7,6 +8,7 @@ import eu.kanade.data.toLong
 import eu.kanade.domain.manga.model.Manga
 import eu.kanade.domain.manga.model.MangaUpdate
 import eu.kanade.domain.manga.repository.MangaRepository
+import eu.kanade.tachiyomi.data.database.models.LibraryManga
 import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.flow.Flow
 import logcat.LogPriority
@@ -19,26 +21,28 @@ class MangaRepositoryImpl(
        return handler.awaitOne { mangasQueries.getMangaById(id, mangaMapper) }
    }

-    override suspend fun subscribeMangaById(id: Long): Flow<Manga> {
-        return handler.subscribeToOne { mangasQueries.getMangaById(id, mangaMapper) }
-    }
-
    override suspend fun getMangaByIdAsFlow(id: Long): Flow<Manga> {
        return handler.subscribeToOne { mangasQueries.getMangaById(id, mangaMapper) }
    }

-    override suspend fun getMangaByUrlAndSource(url: String, sourceId: Long): Manga? {
+    override suspend fun getMangaByUrlAndSourceId(url: String, sourceId: Long): Manga? {
        return handler.awaitOneOrNull { mangasQueries.getMangaByUrlAndSource(url, sourceId, mangaMapper) }
    }

-    override suspend fun subscribeMangaByUrlAndSource(url: String, sourceId: Long): Flow<Manga?> {
-        return handler.subscribeToOneOrNull { mangasQueries.getMangaByUrlAndSource(url, sourceId, mangaMapper) }
-    }
-
    override suspend fun getFavorites(): List<Manga> {
        return handler.awaitList { mangasQueries.getFavorites(mangaMapper) }
    }

+    override suspend fun getLibraryManga(): List<LibraryManga> {
+        return handler.awaitList { (handler as AndroidDatabaseHandler).getLibraryQuery() }
+        // return handler.awaitList { mangasQueries.getLibrary(libraryManga) }
+    }
+
+    override fun getLibraryMangaAsFlow(): Flow<List<LibraryManga>> {
+        return handler.subscribeToList { (handler as AndroidDatabaseHandler).getLibraryQuery() }
+        // return handler.subscribeToList { mangasQueries.getLibrary(libraryManga) }
+    }
+
    override fun getFavoritesBySourceId(sourceId: Long): Flow<List<Manga>> {
        return handler.subscribeToList { mangasQueries.getFavoriteBySourceId(sourceId, mangaMapper) }
    }
@@ -68,6 +72,31 @@ class MangaRepositoryImpl(
        }
    }

+    override suspend fun insert(manga: Manga): Long? {
+        return handler.awaitOneOrNull {
+            mangasQueries.insert(
+                source = manga.source,
+                url = manga.url,
+                artist = manga.artist,
+                author = manga.author,
+                description = manga.description,
+                genre = manga.genre,
+                title = manga.title,
+                status = manga.status,
+                thumbnail_url = manga.thumbnailUrl,
+                favorite = manga.favorite,
+                last_update = manga.lastUpdate,
+                next_update = null,
+                initialized = manga.initialized,
+                viewer = manga.viewerFlags,
+                chapter_flags = manga.chapterFlags,
+                cover_last_modified = manga.coverLastModified,
+                date_added = manga.dateAdded,
+            )
+            mangasQueries.selectLastInsertedRowId()
+        }
+    }
+
    override suspend fun update(update: MangaUpdate): Boolean {
        return try {
            partialUpdate(update)
@@ -115,11 +144,15 @@ class MangaRepositoryImpl(
        }
    }

-    override suspend fun getMangaBySource(sourceId: Long): List<Manga> {
+    override suspend fun getMangaBySourceId(sourceId: Long): List<Manga> {
        return handler.awaitList { mangasQueries.getBySource(sourceId, mangaMapper) }
    }

    override suspend fun getAll(): List<Manga> {
        return handler.awaitList { mangasQueries.getAll(mangaMapper) }
    }
+
+    override suspend fun deleteManga(mangaId: Long) {
+        handler.await { mangasQueries.deleteById(mangaId) }
+    }
 }