From 7c8d6bb2829f83c89f92cf0fdb5541fbbbeedda1 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Wed, 4 May 2022 23:15:57 -0400 Subject: [PATCH] Minor cleanup saved search database info --- .../tachiyomi/data/database/DatabaseHelper.kt | 6 +---- .../mappers/FeedSavedSearchTypeMapping.kt | 23 ++++++++++++---- .../mappers/SavedSearchTypeMapping.kt | 27 ++++++++++++++----- .../queries/FeedSavedSearchQueries.kt | 5 ---- .../queries/SavedSearchQueries.kt | 5 ---- .../tables/FeedSavedSearchTable.kt | 14 ---------- .../savedsearches/tables/SavedSearchTable.kt | 16 ----------- 7 files changed, 40 insertions(+), 56 deletions(-) delete mode 100644 app/src/main/java/exh/savedsearches/queries/FeedSavedSearchQueries.kt delete mode 100644 app/src/main/java/exh/savedsearches/queries/SavedSearchQueries.kt delete mode 100644 app/src/main/java/exh/savedsearches/tables/FeedSavedSearchTable.kt delete mode 100644 app/src/main/java/exh/savedsearches/tables/SavedSearchTable.kt diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt index 0eadbeb2b..5c353db6b 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt @@ -40,8 +40,6 @@ import exh.savedsearches.mappers.FeedSavedSearchTypeMapping import exh.savedsearches.mappers.SavedSearchTypeMapping import exh.savedsearches.models.FeedSavedSearch import exh.savedsearches.models.SavedSearch -import exh.savedsearches.queries.FeedSavedSearchQueries -import exh.savedsearches.queries.SavedSearchQueries /** * This class provides operations to manage the database through its interfaces. @@ -61,9 +59,7 @@ open class DatabaseHelper( SearchTagQueries, SearchTitleQueries, MergedQueries, - FavoriteEntryQueries, - SavedSearchQueries, - FeedSavedSearchQueries + FavoriteEntryQueries /* SY <-- */ { override val db = DefaultStorIOSQLite.builder() diff --git a/app/src/main/java/exh/savedsearches/mappers/FeedSavedSearchTypeMapping.kt b/app/src/main/java/exh/savedsearches/mappers/FeedSavedSearchTypeMapping.kt index aeb89787b..aa960ad0d 100644 --- a/app/src/main/java/exh/savedsearches/mappers/FeedSavedSearchTypeMapping.kt +++ b/app/src/main/java/exh/savedsearches/mappers/FeedSavedSearchTypeMapping.kt @@ -10,12 +10,25 @@ import com.pushtorefresh.storio.sqlite.operations.put.DefaultPutResolver import com.pushtorefresh.storio.sqlite.queries.DeleteQuery import com.pushtorefresh.storio.sqlite.queries.InsertQuery import com.pushtorefresh.storio.sqlite.queries.UpdateQuery +import exh.savedsearches.mappers.FeedSavedSearchTable.COL_GLOBAL +import exh.savedsearches.mappers.FeedSavedSearchTable.COL_ID +import exh.savedsearches.mappers.FeedSavedSearchTable.COL_SAVED_SEARCH_ID +import exh.savedsearches.mappers.FeedSavedSearchTable.COL_SOURCE +import exh.savedsearches.mappers.FeedSavedSearchTable.TABLE import exh.savedsearches.models.FeedSavedSearch -import exh.savedsearches.tables.FeedSavedSearchTable.COL_GLOBAL -import exh.savedsearches.tables.FeedSavedSearchTable.COL_ID -import exh.savedsearches.tables.FeedSavedSearchTable.COL_SAVED_SEARCH_ID -import exh.savedsearches.tables.FeedSavedSearchTable.COL_SOURCE -import exh.savedsearches.tables.FeedSavedSearchTable.TABLE + +private object FeedSavedSearchTable { + + const val TABLE = "feed_saved_search" + + const val COL_ID = "_id" + + const val COL_SOURCE = "source" + + const val COL_SAVED_SEARCH_ID = "saved_search" + + const val COL_GLOBAL = "global" +} class FeedSavedSearchTypeMapping : SQLiteTypeMapping( FeedSavedSearchPutResolver(), diff --git a/app/src/main/java/exh/savedsearches/mappers/SavedSearchTypeMapping.kt b/app/src/main/java/exh/savedsearches/mappers/SavedSearchTypeMapping.kt index 62574d5ad..2ef01c587 100644 --- a/app/src/main/java/exh/savedsearches/mappers/SavedSearchTypeMapping.kt +++ b/app/src/main/java/exh/savedsearches/mappers/SavedSearchTypeMapping.kt @@ -10,13 +10,28 @@ import com.pushtorefresh.storio.sqlite.operations.put.DefaultPutResolver import com.pushtorefresh.storio.sqlite.queries.DeleteQuery import com.pushtorefresh.storio.sqlite.queries.InsertQuery import com.pushtorefresh.storio.sqlite.queries.UpdateQuery +import exh.savedsearches.mappers.SavedSearchTable.COL_FILTERS_JSON +import exh.savedsearches.mappers.SavedSearchTable.COL_ID +import exh.savedsearches.mappers.SavedSearchTable.COL_NAME +import exh.savedsearches.mappers.SavedSearchTable.COL_QUERY +import exh.savedsearches.mappers.SavedSearchTable.COL_SOURCE +import exh.savedsearches.mappers.SavedSearchTable.TABLE import exh.savedsearches.models.SavedSearch -import exh.savedsearches.tables.SavedSearchTable.COL_FILTERS_JSON -import exh.savedsearches.tables.SavedSearchTable.COL_ID -import exh.savedsearches.tables.SavedSearchTable.COL_NAME -import exh.savedsearches.tables.SavedSearchTable.COL_QUERY -import exh.savedsearches.tables.SavedSearchTable.COL_SOURCE -import exh.savedsearches.tables.SavedSearchTable.TABLE + +private object SavedSearchTable { + + const val TABLE = "saved_search" + + const val COL_ID = "_id" + + const val COL_SOURCE = "source" + + const val COL_NAME = "name" + + const val COL_QUERY = "query" + + const val COL_FILTERS_JSON = "filters_json" +} class SavedSearchTypeMapping : SQLiteTypeMapping( SavedSearchPutResolver(), diff --git a/app/src/main/java/exh/savedsearches/queries/FeedSavedSearchQueries.kt b/app/src/main/java/exh/savedsearches/queries/FeedSavedSearchQueries.kt deleted file mode 100644 index fd1db5461..000000000 --- a/app/src/main/java/exh/savedsearches/queries/FeedSavedSearchQueries.kt +++ /dev/null @@ -1,5 +0,0 @@ -package exh.savedsearches.queries - -import eu.kanade.tachiyomi.data.database.DbProvider - -interface FeedSavedSearchQueries : DbProvider diff --git a/app/src/main/java/exh/savedsearches/queries/SavedSearchQueries.kt b/app/src/main/java/exh/savedsearches/queries/SavedSearchQueries.kt deleted file mode 100644 index 34d9f616e..000000000 --- a/app/src/main/java/exh/savedsearches/queries/SavedSearchQueries.kt +++ /dev/null @@ -1,5 +0,0 @@ -package exh.savedsearches.queries - -import eu.kanade.tachiyomi.data.database.DbProvider - -interface SavedSearchQueries : DbProvider diff --git a/app/src/main/java/exh/savedsearches/tables/FeedSavedSearchTable.kt b/app/src/main/java/exh/savedsearches/tables/FeedSavedSearchTable.kt deleted file mode 100644 index b23dd1d8d..000000000 --- a/app/src/main/java/exh/savedsearches/tables/FeedSavedSearchTable.kt +++ /dev/null @@ -1,14 +0,0 @@ -package exh.savedsearches.tables - -object FeedSavedSearchTable { - - const val TABLE = "feed_saved_search" - - const val COL_ID = "_id" - - const val COL_SOURCE = "source" - - const val COL_SAVED_SEARCH_ID = "saved_search" - - const val COL_GLOBAL = "global" -} diff --git a/app/src/main/java/exh/savedsearches/tables/SavedSearchTable.kt b/app/src/main/java/exh/savedsearches/tables/SavedSearchTable.kt deleted file mode 100644 index 35e1839b7..000000000 --- a/app/src/main/java/exh/savedsearches/tables/SavedSearchTable.kt +++ /dev/null @@ -1,16 +0,0 @@ -package exh.savedsearches.tables - -object SavedSearchTable { - - const val TABLE = "saved_search" - - const val COL_ID = "_id" - - const val COL_SOURCE = "source" - - const val COL_NAME = "name" - - const val COL_QUERY = "query" - - const val COL_FILTERS_JSON = "filters_json" -}