Rewrite filter and preference mutations (#577)

Suwayomi · Jun 24, 2023 · b9b115d · b9b115d
1 parent 08af195
commit b9b115d
Show file tree

Hide file tree

Showing 5 changed files with 318 additions and 45 deletions.
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SourceMutation.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SourceMutation.kt
@@ -1,11 +1,18 @@
 package suwayomi.tachidesk.graphql.mutations
 
+import androidx.preference.CheckBoxPreference
+import androidx.preference.EditTextPreference
+import androidx.preference.ListPreference
+import androidx.preference.MultiSelectListPreference
+import androidx.preference.SwitchPreferenceCompat
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.types.FilterChange
 import suwayomi.tachidesk.graphql.types.MangaType
-import suwayomi.tachidesk.graphql.types.PreferenceObject
+import suwayomi.tachidesk.graphql.types.Preference
+import suwayomi.tachidesk.graphql.types.preferenceOf
+import suwayomi.tachidesk.graphql.types.updateFilterList
 import suwayomi.tachidesk.manga.impl.MangaList.insertOrGet
-import suwayomi.tachidesk.manga.impl.Search
 import suwayomi.tachidesk.manga.impl.Source
 import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
 import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource
@@ -20,10 +27,6 @@ class SourceMutation {
         POPULAR,
         LATEST
     }
-    data class FilterChange(
-        val position: Int,
-        val state: String
-    )
     data class FetchSourceMangaInput(
         val clientMutationId: String? = null,
         val source: Long,
@@ -50,11 +53,7 @@ class SourceMutation {
                     source.fetchSearchManga(
                         page = page,
                         query = query.orEmpty(),
-                        filters = Search.buildFilterList(
-                            sourceId = sourceId,
-                            changes = filters?.map { Search.FilterChange(it.position, it.state) }
-                                .orEmpty()
-                        )
+                        filters = updateFilterList(source, filters)
                     ).awaitSingle()
                 }
                 FetchSourceMangaType.POPULAR -> {
@@ -85,7 +84,11 @@ class SourceMutation {
 
     data class SourcePreferenceChange(
         val position: Int,
-        val state: String
+        val switchState: Boolean? = null,
+        val checkBoxState: Boolean? = null,
+        val editTextState: String? = null,
+        val listState: String? = null,
+        val multiSelectState: List<String>? = null
     )
     data class UpdateSourcePreferenceInput(
         val clientMutationId: String? = null,
@@ -94,19 +97,28 @@ class SourceMutation {
     )
     data class UpdateSourcePreferencePayload(
         val clientMutationId: String?,
-        val preferences: List<PreferenceObject>
+        val preferences: List<Preference>
     )
 
     fun updateSourcePreference(
         input: UpdateSourcePreferenceInput
     ): UpdateSourcePreferencePayload {
         val (clientMutationId, sourceId, change) = input
 
-        Source.setSourcePreference(sourceId, Source.SourcePreferenceChange(change.position, change.state))
+        Source.setSourcePreference(sourceId, change.position, "") { preference ->
+            when (preference) {
+                is SwitchPreferenceCompat -> change.switchState
+                is CheckBoxPreference -> change.checkBoxState
+                is EditTextPreference -> change.editTextState
+                is ListPreference -> change.listState
+                is MultiSelectListPreference -> change.multiSelectState?.toSet()
+                else -> throw RuntimeException("sealed class cannot have more subtypes!")
+            } ?: throw Exception("Expected change to ${preference::class.simpleName}")
+        }
 
         return UpdateSourcePreferencePayload(
             clientMutationId = clientMutationId,
-            preferences = Source.getSourcePreferences(sourceId).map { PreferenceObject(it.type, it.props) }
+            preferences = Source.getSourcePreferencesRaw(sourceId).map { preferenceOf(it) }
         )
     }
 }
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLSchema.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLSchema.kt
@@ -11,7 +11,6 @@ import com.expediagroup.graphql.generator.SchemaGeneratorConfig
 import com.expediagroup.graphql.generator.TopLevelObject
 import com.expediagroup.graphql.generator.hooks.FlowSubscriptionSchemaGeneratorHooks
 import com.expediagroup.graphql.generator.toSchema
-import graphql.scalars.ExtendedScalars
 import graphql.schema.GraphQLType
 import suwayomi.tachidesk.graphql.mutations.CategoryMutation
 import suwayomi.tachidesk.graphql.mutations.ChapterMutation
@@ -36,7 +35,6 @@ class CustomSchemaGeneratorHooks : FlowSubscriptionSchemaGeneratorHooks() {
     override fun willGenerateGraphQLType(type: KType): GraphQLType? = when (type.classifier as? KClass<*>) {
         Long::class -> GraphQLLongAsString // encode to string for JS
         Cursor::class -> GraphQLCursor
-        Any::class -> ExtendedScalars.Json
         else -> super.willGenerateGraphQLType(type)
     }
 }