Implement extension store

2026-07-04 11:24:35 -05:00 · 2026-06-16 22:38:03 -04:00
parent 85fe9802e2
commit 41ef220a0b
44 changed files with 1338 additions and 381 deletions
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt
@@ -24,6 +24,7 @@ import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
 import suwayomi.tachidesk.graphql.queries.filter.Filter
 import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
 import suwayomi.tachidesk.graphql.queries.filter.IntFilter
+import suwayomi.tachidesk.graphql.queries.filter.LongFilter
 import suwayomi.tachidesk.graphql.queries.filter.OpAnd
 import suwayomi.tachidesk.graphql.queries.filter.StringFilter
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompare
@@ -38,6 +39,7 @@ import suwayomi.tachidesk.graphql.server.primitives.applyBeforeAfter
 import suwayomi.tachidesk.graphql.server.primitives.greaterNotUnique
 import suwayomi.tachidesk.graphql.server.primitives.lessNotUnique
 import suwayomi.tachidesk.graphql.server.primitives.maybeSwap
+import suwayomi.tachidesk.graphql.types.ContentRating
 import suwayomi.tachidesk.graphql.types.ExtensionNodeList
 import suwayomi.tachidesk.graphql.types.ExtensionType
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
@@ -55,21 +57,23 @@ class ExtensionQuery {
    ) : OrderBy<ExtensionType> {
        PKG_NAME(ExtensionTable.pkgName),
        NAME(ExtensionTable.name),
-        APK_NAME(ExtensionTable.apkName),
+
+        @GraphQLDeprecated("")
+        APK_NAME(ExtensionTable.pkgName),
        ;

        override fun greater(cursor: Cursor): Op<Boolean> =
            when (this) {
                PKG_NAME -> ExtensionTable.pkgName greater cursor.value
                NAME -> greaterNotUnique(ExtensionTable.name, ExtensionTable.pkgName, cursor, String::toString)
-                APK_NAME -> greaterNotUnique(ExtensionTable.apkName, ExtensionTable.pkgName, cursor, String::toString)
+                APK_NAME -> ExtensionTable.pkgName greater cursor.value
            }

        override fun less(cursor: Cursor): Op<Boolean> =
            when (this) {
                PKG_NAME -> ExtensionTable.pkgName less cursor.value
                NAME -> lessNotUnique(ExtensionTable.name, ExtensionTable.pkgName, cursor, String::toString)
-                APK_NAME -> lessNotUnique(ExtensionTable.apkName, ExtensionTable.pkgName, cursor, String::toString)
+                APK_NAME -> ExtensionTable.pkgName less cursor.value
            }

        override fun asCursor(type: ExtensionType): Cursor {
@@ -89,29 +93,41 @@ class ExtensionQuery {
    ) : Order<ExtensionOrderBy>

    data class ExtensionCondition(
+        val storeIndexUrl: String? = null,
+        @GraphQLDeprecated("", ReplaceWith("storeIndexUrl"))
        val repo: String? = null,
        val apkName: String? = null,
        val iconUrl: String? = null,
        val name: String? = null,
        val pkgName: String? = null,
+        val apkUrl: String? = null,
+        val extensionLib: String? = null,
        val versionName: String? = null,
        val versionCode: Int? = null,
+        val versionCodeLong: Long? = null,
        val lang: String? = null,
+        @GraphQLDeprecated("", ReplaceWith("contentRating"))
        val isNsfw: Boolean? = null,
+        val contentRating: ContentRating? = null,
        val isInstalled: Boolean? = null,
        val hasUpdate: Boolean? = null,
        val isObsolete: Boolean? = null,
    ) : HasGetOp {
        override fun getOp(): Op<Boolean>? {
            val opAnd = OpAnd()
-            opAnd.eq(repo, ExtensionTable.repo)
+            opAnd.eq(storeIndexUrl, ExtensionTable.storeIndexUrl)
+            opAnd.eq(repo, ExtensionTable.storeIndexUrl)
            opAnd.eq(apkName, ExtensionTable.apkName)
            opAnd.eq(iconUrl, ExtensionTable.iconUrl)
+            opAnd.eq(apkUrl, ExtensionTable.apkUrl)
            opAnd.eq(name, ExtensionTable.name)
+            opAnd.eq(extensionLib, ExtensionTable.extensionLib)
            opAnd.eq(versionName, ExtensionTable.versionName)
-            opAnd.eq(versionCode, ExtensionTable.versionCode)
+            opAnd.eq(versionCode?.toLong(), ExtensionTable.versionCode)
+            opAnd.eq(versionCodeLong, ExtensionTable.versionCode)
            opAnd.eq(lang, ExtensionTable.lang)
-            opAnd.eq(isNsfw, ExtensionTable.isNsfw)
+            opAnd.eq(isNsfw?.let { if (it) 3 else 0 }, ExtensionTable.contentRating)
+            opAnd.eq(contentRating?.ordinal, ExtensionTable.contentRating)
            opAnd.eq(isInstalled, ExtensionTable.isInstalled)
            opAnd.eq(hasUpdate, ExtensionTable.hasUpdate)
            opAnd.eq(isObsolete, ExtensionTable.isObsolete)
@@ -121,15 +137,23 @@ class ExtensionQuery {
    }

    data class ExtensionFilter(
+        val storeIndexUrl: StringFilter? = null,
+        @GraphQLDeprecated("", ReplaceWith("storeIndexUrl"))
        val repo: StringFilter? = null,
        val apkName: StringFilter? = null,
        val iconUrl: StringFilter? = null,
        val name: StringFilter? = null,
        val pkgName: StringFilter? = null,
+        val apkUrl: StringFilter? = null,
        val versionName: StringFilter? = null,
+        val extensionLib: StringFilter? = null,
+        @GraphQLDeprecated("", ReplaceWith("versionCodeLong"))
        val versionCode: IntFilter? = null,
+        val versionCodeLong: LongFilter? = null,
        val lang: StringFilter? = null,
+        @GraphQLDeprecated("", ReplaceWith("storeIndexUrl"))
        val isNsfw: BooleanFilter? = null,
+        // val contentRating: EnumFilter<ContentRating>? = null,
        val isInstalled: BooleanFilter? = null,
        val hasUpdate: BooleanFilter? = null,
        val isObsolete: BooleanFilter? = null,
@@ -139,15 +163,18 @@ class ExtensionQuery {
    ) : Filter<ExtensionFilter> {
        override fun getOpList(): List<Op<Boolean>> =
            listOfNotNull(
-                andFilterWithCompareString(ExtensionTable.repo, repo),
+                andFilterWithCompareString(ExtensionTable.storeIndexUrl, storeIndexUrl),
+                andFilterWithCompareString(ExtensionTable.storeIndexUrl, repo),
                andFilterWithCompareString(ExtensionTable.apkName, apkName),
                andFilterWithCompareString(ExtensionTable.iconUrl, iconUrl),
                andFilterWithCompareString(ExtensionTable.name, name),
                andFilterWithCompareString(ExtensionTable.pkgName, pkgName),
+                andFilterWithCompareString(ExtensionTable.apkUrl, apkUrl),
+                andFilterWithCompareString(ExtensionTable.extensionLib, extensionLib),
                andFilterWithCompareString(ExtensionTable.versionName, versionName),
-                andFilterWithCompare(ExtensionTable.versionCode, versionCode),
+                andFilterWithCompare(ExtensionTable.versionCode, versionCodeLong),
                andFilterWithCompareString(ExtensionTable.lang, lang),
-                andFilterWithCompare(ExtensionTable.isNsfw, isNsfw),
+                // andFilterWithCompareEnum(ExtensionTable.contentRating, contentRating),
                andFilterWithCompare(ExtensionTable.isInstalled, isInstalled),
                andFilterWithCompare(ExtensionTable.hasUpdate, hasUpdate),
                andFilterWithCompare(ExtensionTable.isObsolete, isObsolete),
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionStoreQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionStoreQuery.kt
@@ -0,0 +1,39 @@
+package suwayomi.tachidesk.graphql.queries
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import suwayomi.tachidesk.graphql.directives.RequireAuth
+import suwayomi.tachidesk.graphql.types.ExtensionStoreType
+import suwayomi.tachidesk.manga.model.table.ExtensionStoreTable
+import java.util.concurrent.CompletableFuture
+
+class ExtensionStoreQuery {
+    @RequireAuth
+    fun extensionStore(indexUrl: String): CompletableFuture<ExtensionStoreType?> =
+        CompletableFuture.supplyAsync {
+            transaction {
+                ExtensionStoreTable
+                    .selectAll()
+                    .where { ExtensionStoreTable.indexUrl eq indexUrl }
+                    .firstOrNull()
+                    ?.let { ExtensionStoreType(it) }
+            }
+        }
+
+    @RequireAuth
+    fun extensionStores(): List<ExtensionStoreType> =
+        transaction {
+            ExtensionStoreTable
+                .selectAll()
+                .toList()
+                .map { ExtensionStoreType(it) }
+        }
+}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt
@@ -13,7 +13,9 @@ import graphql.schema.DataFetchingEnvironment
 import org.jetbrains.exposed.v1.core.Column
 import org.jetbrains.exposed.v1.core.Op
 import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.v1.core.eq
 import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.v1.core.greaterEq
 import org.jetbrains.exposed.v1.core.less
 import org.jetbrains.exposed.v1.jdbc.selectAll
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
@@ -24,7 +26,6 @@ import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
 import suwayomi.tachidesk.graphql.queries.filter.LongFilter
 import suwayomi.tachidesk.graphql.queries.filter.OpAnd
 import suwayomi.tachidesk.graphql.queries.filter.StringFilter
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompare
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareEntity
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
 import suwayomi.tachidesk.graphql.queries.filter.applyOps
@@ -37,6 +38,7 @@ import suwayomi.tachidesk.graphql.server.primitives.applyBeforeAfter
 import suwayomi.tachidesk.graphql.server.primitives.greaterNotUnique
 import suwayomi.tachidesk.graphql.server.primitives.lessNotUnique
 import suwayomi.tachidesk.graphql.server.primitives.maybeSwap
+import suwayomi.tachidesk.graphql.types.ContentRating
 import suwayomi.tachidesk.graphql.types.SourceNodeList
 import suwayomi.tachidesk.graphql.types.SourceType
 import suwayomi.tachidesk.manga.model.table.SourceTable
@@ -91,14 +93,17 @@ class SourceQuery {
        val id: Long? = null,
        val name: String? = null,
        val lang: String? = null,
+        @GraphQLDeprecated("replace with contentRating == 3", ReplaceWith("contentRating"))
        val isNsfw: Boolean? = null,
+        val contentRating: ContentRating? = null,
    ) : HasGetOp {
        override fun getOp(): Op<Boolean>? {
            val opAnd = OpAnd()
            opAnd.eq(id, SourceTable.id)
            opAnd.eq(name, SourceTable.name)
            opAnd.eq(lang, SourceTable.lang)
-            opAnd.eq(isNsfw, SourceTable.isNsfw)
+            opAnd.andWhere(isNsfw) { if (it) SourceTable.contentRating greaterEq 3 else SourceTable.contentRating less 3 }
+            opAnd.andWhere(contentRating) { SourceTable.contentRating eq it.getValue() }

            return opAnd.op
        }
@@ -108,7 +113,9 @@ class SourceQuery {
        val id: LongFilter? = null,
        val name: StringFilter? = null,
        val lang: StringFilter? = null,
+        @GraphQLDeprecated("replace with contentRating == 3", ReplaceWith("contentRating"))
        val isNsfw: BooleanFilter? = null,
+        // val contentRating: EnumFilter<ContentRating>? = null,
        override val and: List<SourceFilter>? = null,
        override val or: List<SourceFilter>? = null,
        override val not: SourceFilter? = null,
@@ -118,7 +125,7 @@ class SourceQuery {
                andFilterWithCompareEntity(SourceTable.id, id),
                andFilterWithCompareString(SourceTable.name, name),
                andFilterWithCompareString(SourceTable.lang, lang),
-                andFilterWithCompare(SourceTable.isNsfw, isNsfw),
+                // andFilterWithCompareEnum(SourceTable.contentRating, contentRating)
            )
    }

--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/filter/Filter.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/filter/Filter.kt
@@ -329,6 +329,24 @@ data class DoubleFilter(
        )
 }

+data class EnumFilter<T : Enum<T>>(
+    override val isNull: Boolean? = null,
+    override val equalTo: T? = null,
+    override val notEqualTo: T? = null,
+    override val notEqualToAll: List<T>? = null,
+    override val notEqualToAny: List<T>? = null,
+    override val distinctFrom: T? = null,
+    override val distinctFromAll: List<T>? = null,
+    override val distinctFromAny: List<T>? = null,
+    override val notDistinctFrom: T? = null,
+    override val `in`: List<T>? = null,
+    override val notIn: List<T>? = null,
+    override val lessThan: T? = null,
+    override val lessThanOrEqualTo: T? = null,
+    override val greaterThan: T? = null,
+    override val greaterThanOrEqualTo: T? = null,
+) : ComparableScalarFilter<T>
+
 data class StringFilter(
    override val isNull: Boolean? = null,
    override val equalTo: String? = null,
@@ -618,6 +636,35 @@ fun <T : Comparable<T>, S : T?> andFilterWithCompare(
    return opAnd.op
 }

+@Suppress("UNCHECKED_CAST")
+fun <T : Enum<T>> andFilterWithCompareEnum(
+    column: Column<Int>,
+    filter: ComparableScalarFilter<T>?,
+): Op<Boolean>? {
+    filter ?: return null
+    val opAnd = OpAnd()
+
+    opAnd.andWhere(filter.lessThan) { column less it.ordinal }
+    opAnd.andWhere(filter.lessThanOrEqualTo) { column lessEq it.ordinal }
+    opAnd.andWhere(filter.greaterThan) { column greater it.ordinal }
+    opAnd.andWhere(filter.greaterThanOrEqualTo) { column greaterEq it.ordinal }
+
+    opAnd.andWhere(filter.isNull) { if (it) column.isNull() else column.isNotNull() }
+
+    opAnd.andWhere(filter.equalTo) { column eq it.ordinal }
+    opAnd.andNotWhere(filter.notEqualTo, filter.notEqualToAll, filter.notEqualToAny) { column neq it.ordinal }
+    opAnd.andWhere(filter.distinctFrom, filter.distinctFromAll, filter.distinctFromAny) { DistinctFromOp.distinctFrom(column, it.ordinal) }
+    opAnd.andWhere(filter.notDistinctFrom) { DistinctFromOp.notDistinctFrom(column, it.ordinal) }
+    if (!filter.`in`.isNullOrEmpty()) {
+        opAnd.andWhere(filter.`in`) { column inList it.map { it.ordinal } }
+    }
+    if (!filter.notIn.isNullOrEmpty()) {
+        opAnd.andWhere(filter.notIn) { column notInList it.map { it.ordinal } }
+    }
+
+    return opAnd.op
+}
+
 fun <T : Comparable<T>> andFilterWithCompareEntity(
    column: Column<EntityID<T>>,
    filter: ComparableScalarFilter<T>?,