From a940722f2b713a665e3b99a545a1ebb219be9a70 Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Sat, 30 Nov 2024 17:27:20 +0700 Subject: [PATCH] chore(db): Remove StorIO related stuff --- app/build.gradle.kts | 4 ---- .../restorers/CategoriesBackupRestorer.kt | 4 +--- .../database/queries/SearchMetadataQueries.kt | 6 ------ .../manga/process/MigrationProcessAdapter.kt | 2 -- .../tachiyomi/util/system/DatabaseExtensions.kt | 16 ---------------- 5 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 app/src/main/java/eu/kanade/tachiyomi/util/system/DatabaseExtensions.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e0f1c157d5..6cd059fc49 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -212,10 +212,6 @@ dependencies { // Database implementation(libs.sqlite.android) implementation(libs.bundles.sqlite) - //noinspection UseTomlInstead - implementation("com.github.inorichi.storio:storio-common:8be19de@aar") - //noinspection UseTomlInstead - implementation("com.github.inorichi.storio:storio-sqlite:8be19de@aar") // Model View Presenter implementation(libs.conductor) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesBackupRestorer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesBackupRestorer.kt index 6582aa746e..1a6718d872 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesBackupRestorer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesBackupRestorer.kt @@ -12,14 +12,12 @@ class CategoriesBackupRestorer( ) { suspend fun restoreCategories(backupCategories: List, onComplete: () -> Unit) { // Get categories from file and from db - // Do it outside of transaction because StorIO might hang because we're using SQLDelight - val dbCategories = getCategories.await() handler.await(true) { // Iterate over them backupCategories.map { it.getCategoryImpl() }.forEach { category -> // Used to know if the category is already in the db var found = false - for (dbCategory in dbCategories) { + for (dbCategory in getCategories.await()) { // If the category is already in the db, assign the id to the file's category // and do nothing if (category.name == dbCategory.name) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/SearchMetadataQueries.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/SearchMetadataQueries.kt index 62d8f7f886..c4f39db900 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/SearchMetadataQueries.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/SearchMetadataQueries.kt @@ -3,12 +3,6 @@ FIXME: Delete `search_metadata` from sqldelight migration package eu.kanade.tachiyomi.data.database.queries -import com.pushtorefresh.storio.sqlite.queries.DeleteQuery -import com.pushtorefresh.storio.sqlite.queries.Query -import eu.kanade.tachiyomi.data.database.DbProvider -import eu.kanade.tachiyomi.data.database.models.SearchMetadata -import eu.kanade.tachiyomi.data.database.tables.SearchMetadataTable - interface SearchMetadataQueries : DbProvider { fun getSearchMetadataForManga(mangaId: Long) = db.get() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt index e695174b57..709970c89d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt @@ -133,7 +133,6 @@ class MigrationProcessAdapter( sourceFinished() } - // FIXME: Migrate to SQLDelight, on halt: in StorIO transaction private suspend fun migrateMangaInternal( prevSource: Source?, source: Source, @@ -158,7 +157,6 @@ class MigrationProcessAdapter( companion object { - // FIXME: Migrate to SQLDelight, on halt: in StorIO transaction suspend fun migrateMangaInternal( flags: Int, enhancedServices: List, diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/DatabaseExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/DatabaseExtensions.kt deleted file mode 100644 index 11839005e1..0000000000 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/DatabaseExtensions.kt +++ /dev/null @@ -1,16 +0,0 @@ -package eu.kanade.tachiyomi.util.system - -import com.pushtorefresh.storio.sqlite.operations.get.PreparedGetListOfObjects -import com.pushtorefresh.storio.sqlite.operations.get.PreparedGetObject -import com.pushtorefresh.storio.sqlite.operations.put.PreparedPutCollectionOfObjects -import com.pushtorefresh.storio.sqlite.operations.put.PreparedPutObject -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.withContext - -suspend fun PreparedGetListOfObjects.executeOnIO(): List = withContext(Dispatchers.IO) { executeAsBlocking() } - -suspend fun PreparedGetObject.executeOnIO(): T? = withContext(Dispatchers.IO) { executeAsBlocking() } - -suspend fun PreparedPutObject.executeOnIO() = withContext(Dispatchers.IO) { executeAsBlocking() } - -suspend fun PreparedPutCollectionOfObjects.executeOnIO() = withContext(Dispatchers.IO) { executeAsBlocking() }