From a4a7f8fb6d463db8360df3dbd243094e51198a09 Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Fri, 29 Nov 2024 12:08:17 +0700 Subject: [PATCH] refactor(db): Migrate last category queries (that can be migrated) to SQLDelight --- .../tachiyomi/data/database/queries/CategoryQueries.kt | 4 ---- .../java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt | 6 ++++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/CategoryQueries.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/CategoryQueries.kt index 5b5a960061..d4275421bb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/CategoryQueries.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/CategoryQueries.kt @@ -18,8 +18,4 @@ interface CategoryQueries : DbProvider { ) .prepare() - fun insertCategory(category: Category) = db.put().`object`(category).prepare() - - fun insertCategories(categories: List) = db.put().objects(categories).prepare() - } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt index 7dba6bfd6a..58ffd0e425 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt @@ -285,10 +285,12 @@ class LibraryPresenter( } } - private fun reorderCategories(categories: List) { + private suspend fun reorderCategories(categories: List) { val sortedCategories = categories.sortedBy { it.order } sortedCategories.forEachIndexed { i, category -> category.order = i } - db.insertCategories(sortedCategories).executeAsBlocking() + updateCategories.await( + sortedCategories.map { CategoryUpdate(id = it.id!!.toLong(), order = it.order.toLong()) } + ) } fun switchSection(order: Int) {