Remove asDataFetcherResult

.editorconfig

@@ -12,7 +12,3 @@ ktlint_standard_no-consecutive-comments=disabled
 
 [**/generated/**]
 ktlint=disabled
-
-[*.json]
-indent_size=2
-indent_style = space

.github/workflows/build_pull_request.yml

@@ -67,7 +67,7 @@ jobs:
           export LD_PRELOAD="$(pwd)/scripts/resources/catch_abort.so"
           JAR=$(ls ./server/build/*.jar| head -1)
           set +e
-          timeout 30s java \
+          timeout 30s java -DcrashOnFailedMigration=true \
               -Dsuwayomi.tachidesk.config.server.systemTrayEnabled=false \
               -Dsuwayomi.tachidesk.config.server.initialOpenInBrowserEnabled=false \
               -Dsuwayomi.tachidesk.config.server.databaseType=POSTGRESQL \
@@ -83,7 +83,7 @@ jobs:
             exit "$ecode"
           fi
 
-          timeout 30s java \
+          timeout 30s java -DcrashOnFailedMigration=true \
               -Dsuwayomi.tachidesk.config.server.systemTrayEnabled=false \
               -Dsuwayomi.tachidesk.config.server.initialOpenInBrowserEnabled=false \
               -jar "$JAR"
@@ -96,10 +96,6 @@ jobs:
           fi
           exit 0
 
-      - name: "Run tests"
-        working-directory: master
-        run: ./gradlew test --stacktrace
-
   check_docs:
     name: Validate that all options are documented
     runs-on: ubuntu-latest

.github/workflows/wiki.yml

@@ -1,7 +1,6 @@
 name: GitHub Wiki upload
 
 on:
-  workflow_dispatch:
   push:
     branches:
       - master
@@ -24,8 +23,6 @@ jobs:
         with:
           repository: ${{github.repository}}
           path: ${{github.repository}}
-          fetch-depth: 0 # fetch history & tags to determine stable version
-          fetch-tags: true
 
       - name: Checkout Wiki
         uses: actions/checkout@v6
@@ -38,13 +35,6 @@ jobs:
           set -e
           cd $GITHUB_WORKSPACE/${{github.repository}}.wiki
           cp -r $GITHUB_WORKSPACE/${{github.repository}}/docs/* .
-          
-          stable="$(git -C $GITHUB_WORKSPACE/${{github.repository}} describe --abbrev=0 --tags)"
-          if ! git -C $GITHUB_WORKSPACE/${{github.repository}} log --exit-code --pretty= "$stable.." -- docs/Configuring-Suwayomi‐Server.md; then
-            echo "Changes to config detected, embedding link to stable"
-            sed -i '1s/^/> [!WARNING]\n> This document describes the settings available in the preview version. Please head to ['$stable'](https:\/\/github.com\/Suwayomi\/Suwayomi-Server\/blob\/'$stable'\/docs\/Configuring-Suwayomi%E2%80%90Server.md) for the current stable version\n\n/' Configuring-Suwayomi‐Server.md
-          fi
-          
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
           git add .

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/util/SafePath.kt

@@ -9,9 +9,6 @@ package xyz.nulldev.androidcompat.util
 
 // adopted from: https://github.com/tachiyomiorg/tachiyomi/blob/4cefbce7c34e724b409b6ba127f3c6c5c346ad8d/app/src/main/java/eu/kanade/tachiyomi/util/storage/DiskUtil.kt
 object SafePath {
-    private const val MAX_FILENAME_CHARS = 240
-    private const val MAX_FILENAME_UTF8_BYTES = 240
-
     /**
      * Mutate the given filename to make it valid for a FAT filesystem,
      * replacing any invalid characters with "_". This method doesn't allow hidden files (starting
@@ -30,39 +27,9 @@ object SafePath {
                 sb.append('_')
             }
         }
-
+        // Even though vfat allows 255 UCS-2 chars, we might eventually write to
-        return truncateFilename(sb.toString())
+        // ext4 through a FUSE layer, so use that limit minus 15 reserved characters.
-    }
+        return sb.toString().take(240)
-
-    private fun truncateFilename(filename: String): String {
-        // Keep a safety margin under common filesystem limits and satisfy both
-        // character count and UTF-8 byte-length constraints.
-        val output = StringBuilder(minOf(filename.length, MAX_FILENAME_CHARS))
-        var usedBytes = 0
-        var index = 0
-
-        while (index < filename.length && output.length < MAX_FILENAME_CHARS) {
-            val codePoint = Character.codePointAt(filename, index)
-            val codePointBytes = utf8ByteCount(codePoint)
-
-            if (usedBytes + codePointBytes > MAX_FILENAME_UTF8_BYTES) {
-                break
-            }
-
-            output.appendCodePoint(codePoint)
-            usedBytes += codePointBytes
-            index += Character.charCount(codePoint)
-        }
-
-        return output.toString()
-    }
-
-    private fun utf8ByteCount(codePoint: Int): Int =
-        when {
-            codePoint <= 0x7f -> 1
-            codePoint <= 0x7ff -> 2
-            codePoint <= 0xffff -> 3
-            else -> 4
     }
 
     /**

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/CefHelper.kt

@@ -1,47 +0,0 @@
-package xyz.nulldev.androidcompat.webkit
-
-import io.github.oshai.kotlinlogging.KotlinLogging
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.first
-import org.cef.CefApp
-import org.cef.CefClient
-
-private val logger = KotlinLogging.logger {}
-
-object CefHelper {
-    val cefApp = MutableStateFlow<Result<CefApp?>>(Result.success(null))
-
-    suspend fun createClient(): CefClient {
-        val app = waitForInit().first()
-        val client = app.createClient()
-        JsHandler(client) // This adds itself to a global map
-        return client
-    }
-
-    fun waitForInit() =
-        callbackFlow {
-            val app = cefApp.first { it.isFailure || it.getOrThrow() != null }.getOrThrow()!!
-            app.onInitialization {
-                logger.debug { "CEF: Initialization state $it" }
-                when (it) {
-                    CefApp.CefAppState.INITIALIZED -> {
-                        trySend(app)
-                        close()
-                    }
-
-                    CefApp.CefAppState.SHUTTING_DOWN, CefApp.CefAppState.TERMINATED -> {
-                        close(CefException("Shutting down"))
-                    }
-
-                    else -> {}
-                }
-            }
-            awaitClose {}
-        }
-
-    class CefException(
-        msg: String,
-    ) : Exception(msg)
-}

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/KcefHelper.kt

@@ -1,136 +0,0 @@
-package xyz.nulldev.androidcompat.webkit
-
-import io.github.oshai.kotlinlogging.KotlinLogging
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
-import org.cef.CefClient
-import org.cef.browser.CefBrowser
-import org.cef.browser.CefFrame
-import org.cef.browser.CefMessageRouter
-import org.cef.callback.CefQueryCallback
-import org.cef.handler.CefMessageRouterHandlerAdapter
-import kotlin.random.Random
-
-private val logger = KotlinLogging.logger {}
-private val jsHandler: MutableMap<CefClient, JsHandler> = mutableMapOf()
-
-fun CefBrowser.evaluateJavaScript(
-    expression: String,
-    cb: (String?) -> Unit,
-) = jsHandler[this.client]!!.eval(this, expression, cb)
-
-fun CefBrowser.dispose() {
-    stopLoad()
-    setCloseAllowed()
-    close(true)
-}
-
-class JsHandler : CefMessageRouterHandlerAdapter {
-    private val handler: MutableMap<String, (String?) -> Unit> = mutableMapOf()
-
-    constructor(client: CefClient) {
-        val config = CefMessageRouter.CefMessageRouterConfig()
-        config.jsQueryFunction = QUERY_FN
-        config.jsCancelFunction = QUERY_CANCEL_FN
-        client.addMessageRouter(CefMessageRouter.create(config, this))
-        jsHandler[client] = this
-    }
-
-    fun eval(
-        frame: CefFrame,
-        expression: String,
-        cb: (String?) -> Unit,
-    ) {
-        val id = Random.nextBytes(48).toHexString()
-        handler[id] = cb
-        frame.executeJavaScript(expression.toCode(id), "about:cef", 0)
-    }
-
-    fun eval(
-        browser: CefBrowser,
-        expression: String,
-        cb: (String?) -> Unit,
-    ) {
-        val id = Random.nextBytes(48).toHexString()
-        handler[id] = cb
-        browser.executeJavaScript(expression.toCode(id), "about:cef", 0)
-    }
-
-    override fun onQuery(
-        browser: CefBrowser?,
-        frame: CefFrame?,
-        queryId: Long,
-        request: String?,
-        persistent: Boolean,
-        callback: CefQueryCallback?,
-    ): Boolean {
-        super.onQuery(browser, frame, queryId, request, persistent, callback)
-
-        if (request != null) {
-            val invoke =
-                try {
-                    Json.decodeFromString<FunctionCall>(request)
-                } catch (e: Exception) {
-                    logger.warn(e) { "Invalid request received" }
-                    return false
-                }
-            val handler = handler.remove(invoke.id) ?: return false
-            handler(invoke.result)
-            callback?.success("")
-            return true
-        }
-
-        return false
-    }
-
-    @Serializable
-    private data class FunctionCall(
-        val id: String,
-        val result: String? = null,
-    )
-
-    companion object {
-        const val QUERY_FN = "__\$_evalQuery"
-        const val QUERY_CANCEL_FN = "__\$_evalQueryCancel"
-
-        private fun Char.isLineBreak(): Boolean = this == '\n' || this == '\r'
-
-        private fun String.containsLineBreak(): Boolean =
-            this.any {
-                it.isLineBreak()
-            }
-
-        private fun String.asFunctionBody(): String =
-            let { expression ->
-                when {
-                    expression.containsLineBreak() -> expression
-                    expression.trim().startsWith("return", false) -> expression
-                    else -> "return $expression"
-                }
-            }
-
-        private fun String.toCode(id: String): String =
-            """
-            function payload() {
-              ${this.asFunctionBody()}
-            }
-
-            try {
-              var result = payload();
-
-              window.${QUERY_FN}({
-                  request: JSON.stringify({ id: "$id", result }),
-                  onSuccess: function (response) {},
-                  onFailure: function (error_code, error_message) {}
-              });
-            } catch (e) {
-              console.error("Failed to eval $id", e)
-              window.${QUERY_CANCEL_FN}({
-                  request: JSON.stringify({ id: "$id", error: ""+e }),
-                  onSuccess: function (response) {},
-                  onFailure: function (error_code, error_message) {}
-              });
-            }
-            """.trimIndent()
-    }
-}

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/KcefWebViewProvider.kt

@@ -51,10 +51,12 @@ import android.webkit.WebViewProvider.ScrollDelegate
 import android.webkit.WebViewProvider.ViewDelegate
 import android.webkit.WebViewRenderProcess
 import android.webkit.WebViewRenderProcessClient
-import kotlinx.coroutines.runBlocking
+import dev.datlag.kcef.KCEF
+import dev.datlag.kcef.KCEFBrowser
+import dev.datlag.kcef.KCEFClient
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
-import org.cef.CefClient
 import org.cef.CefSettings
 import org.cef.browser.CefBrowser
 import org.cef.browser.CefFrame
@@ -68,7 +70,6 @@ import org.cef.handler.CefLoadHandler
 import org.cef.handler.CefLoadHandlerAdapter
 import org.cef.handler.CefMessageRouterHandlerAdapter
 import org.cef.handler.CefPermissionHandler
-import org.cef.handler.CefRenderHandlerAdapter
 import org.cef.handler.CefRequestHandler
 import org.cef.handler.CefRequestHandlerAdapter
 import org.cef.handler.CefResourceHandler
@@ -83,14 +84,12 @@ import org.cef.network.CefPostDataElement
 import org.cef.network.CefRequest
 import org.cef.network.CefResponse
 import org.koin.mp.KoinPlatformTools
-import java.awt.Rectangle
 import java.io.BufferedWriter
 import java.io.File
 import java.io.IOException
-import java.nio.ByteBuffer
 import java.util.concurrent.Executor
-import javax.swing.JPanel
+import kotlin.collections.Map
-import kotlin.math.min
+import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.full.declaredMemberFunctions
 import kotlin.reflect.jvm.javaMethod
@@ -101,13 +100,12 @@ class KcefWebViewProvider(
     private val settings = KcefWebSettings()
     private var viewClient = WebViewClient()
     private var chromeClient = WebChromeClient()
-    private val renderHandler = RenderHandler()
     private val mappings: MutableList<FunctionMapping> = mutableListOf()
     private val urlHttpMapping: MutableMap<String, String> = mutableMapOf()
     private var initialRequestData: InitialRequestData? = null
 
-    private var kcefClient: CefClient? = null
+    private var kcefClient: KCEFClient? = null
-    private var browser: CefBrowser? = null
+    private var browser: KCEFBrowser? = null
 
     private val handler = Handler(view.webViewLooper)
 
@@ -119,8 +117,8 @@ class KcefWebViewProvider(
         private val initHandler: InitBrowserHandler by KoinPlatformTools.defaultContext().get().inject()
     }
 
-    interface InitBrowserHandler {
+    public interface InitBrowserHandler {
-        fun init(provider: KcefWebViewProvider): Unit
+        public fun init(provider: KcefWebViewProvider): Unit
     }
 
     private data class InitialRequestData(
@@ -196,7 +194,7 @@ class KcefWebViewProvider(
         }
     }
 
-    private class DisplayHandler : CefDisplayHandlerAdapter() {
+    private inner class DisplayHandler : CefDisplayHandlerAdapter() {
         override fun onConsoleMessage(
             browser: CefBrowser,
             level: CefSettings.LogSeverity,
@@ -224,7 +222,6 @@ class KcefWebViewProvider(
         }
     }
 
-    @Suppress("DEPRECATION")
     private inner class LoadHandler : CefLoadHandlerAdapter() {
         override fun onLoadEnd(
             browser: CefBrowser,
@@ -371,7 +368,7 @@ class KcefWebViewProvider(
             callback: CefCallback,
         ): Boolean {
             val data = resolvedData ?: return false
-            val bytesToTransfer = min(bytesToRead, data.size - readOffset)
+            val bytesToTransfer = Math.min(bytesToRead, data.size - readOffset)
             Log.v(
                 TAG,
                 "readResponse: $readOffset/${data.size}, reading $bytesToRead->$bytesToTransfer",
@@ -383,7 +380,7 @@ class KcefWebViewProvider(
         }
     }
 
-    private class WebResponseResourceHandler(
+    private inner class WebResponseResourceHandler(
         val webResponse: WebResourceResponse,
     ) : ArrayResponseResourceHandler() {
         override fun processRequest(
@@ -413,7 +410,7 @@ class KcefWebViewProvider(
         }
     }
 
-    private class HtmlResponseResourceHandler(
+    private inner class HtmlResponseResourceHandler(
         val html: String,
     ) : ArrayResponseResourceHandler() {
         override fun processRequest(
@@ -444,7 +441,7 @@ class KcefWebViewProvider(
                     view,
                     CefWebResourceRequest(request, frame, false),
                 )
-            Log.v(TAG, "Resource ${request.url}, result is cancel? $cancel")
+            Log.v(TAG, "Resource ${request?.url}, result is cancel? $cancel")
 
             handler.post { viewClient.onLoadResource(view, frame?.url) }
 
@@ -471,7 +468,7 @@ class KcefWebViewProvider(
                 }
             if (response == null) {
                 // prefer user's response override
-                urlHttpMapping[request.url.trimEnd('/')]?.let {
+                urlHttpMapping.get(request.url.trimEnd('/'))?.let {
                     return HtmlResponseResourceHandler(it)
                 }
             }
@@ -480,7 +477,6 @@ class KcefWebViewProvider(
         }
     }
 
-    @Suppress("DEPRECATION")
     private inner class RequestHandler : CefRequestHandlerAdapter() {
         override fun getResourceRequestHandler(
             browser: CefBrowser,
@@ -490,13 +486,11 @@ class KcefWebViewProvider(
             isDownload: Boolean,
             requestInitiator: String,
             disableDefaultHandling: BoolRef,
-        ): CefResourceRequestHandler = ResourceRequestHandler()
+        ): CefResourceRequestHandler? = ResourceRequestHandler()
 
         override fun onRenderProcessTerminated(
             browser: CefBrowser,
             status: CefRequestHandler.TerminationStatus,
-            errorCode: Int,
-            errorString: String,
         ) {
             handler.post {
                 viewClient.onRenderProcessGone(
@@ -515,33 +509,18 @@ class KcefWebViewProvider(
         override fun onRequestMediaAccessPermission(
             browser: CefBrowser,
             frame: CefFrame,
-            requestingUrl: String,
+            requesting_url: String,
-            requestedPermissions: Int,
+            requested_permissions: Int,
             callback: CefMediaAccessCallback,
         ): Boolean {
             handler.post {
-                Log.v(TAG, "Checking permission for $requestingUrl: $requestedPermissions")
+                Log.v(TAG, "Checking permission for $requesting_url: $requested_permissions")
-                chromeClient.onPermissionRequest(CefPermissionRequest(requestingUrl, requestedPermissions, callback))
+                chromeClient.onPermissionRequest(CefPermissionRequest(requesting_url, requested_permissions, callback))
             }
             return true
         }
     }
 
-    private class RenderHandler : CefRenderHandlerAdapter() {
-        override fun getViewRect(browser: CefBrowser): Rectangle = Rectangle(0, 0, 1280, 2856)
-
-        override fun onPaint(
-            browser: CefBrowser,
-            popup: Boolean,
-            dirtyRects: Array<Rectangle>,
-            buffer: ByteBuffer,
-            width: Int,
-            height: Int,
-        ) {
-            // do nothing
-        }
-    }
-
     override fun init(
         javaScriptInterfaces: Map<String, Any>?,
         privateBrowsing: Boolean,
@@ -549,8 +528,7 @@ class KcefWebViewProvider(
         Log.v(TAG, "KcefWebViewProvider: initialize")
         destroy()
         kcefClient =
-            runBlocking {
+            KCEF.newClientBlocking().apply {
-                CefHelper.createClient().apply {
                 addDisplayHandler(DisplayHandler())
                 addLoadHandler(LoadHandler())
                 addRequestHandler(RequestHandler())
@@ -561,7 +539,6 @@ class KcefWebViewProvider(
                 config.jsCancelFunction = QUERY_CANCEL_FN
                 addMessageRouter(CefMessageRouter.create(config, MessageRouterHandler()))
             }
-            }
         initHandler.init(this)
     }
 
@@ -637,8 +614,7 @@ class KcefWebViewProvider(
             kcefClient!!
                 .createBrowser(
                     loadUrl,
-                    CefRendering.CefRenderingWithHandler(renderHandler, JPanel()),
+                    CefRendering.OFFSCREEN,
-                    false,
                 ).apply {
                     // NOTE: Without this, we don't seem to be receiving any events
                     createImmediately()
@@ -662,8 +638,7 @@ class KcefWebViewProvider(
             kcefClient!!
                 .createBrowser(
                     url,
-                    CefRendering.CefRenderingWithHandler(renderHandler, JPanel()),
+                    CefRendering.OFFSCREEN,
-                    false,
                 ).apply {
                     // NOTE: Without this, we don't seem to be receiving any events
                     createImmediately()
@@ -689,15 +664,23 @@ class KcefWebViewProvider(
         browser?.close(true)
         browser?.dispose()
         chromeClient.onProgressChanged(view, 0)
-        val url = baseUrl ?: "about:blank"
-        urlHttpMapping[url.trimEnd('/')] = data
 
         browser =
-            kcefClient!!
+            (
-                .createBrowser(
+                baseUrl?.let { url ->
+                    urlHttpMapping.put(url.trimEnd('/'), data)
+                    kcefClient!!.createBrowser(
                         url,
-                    CefRendering.CefRenderingWithHandler(renderHandler, JPanel()),
+                        CefRendering.OFFSCREEN,
-                    false,
+                    )
+                }
+                    ?: run {
+                        kcefClient!!.createBrowserWithHtml(
+                            data,
+                            KCEFBrowser.BLANK_URI,
+                            CefRendering.OFFSCREEN,
+                        )
+                    }
             ).apply {
                 // NOTE: Without this, we don't seem to be receiving any events
                 createImmediately()
@@ -711,11 +694,11 @@ class KcefWebViewProvider(
     ) {
         browser!!.evaluateJavaScript(
             script.removePrefix("javascript:"),
-        )
             {
                 Log.v(TAG, "JS returned: $it")
                 it?.let { handler.post { resultCallback?.onReceiveValue(it) } }
-            }
+            },
+        )
     }
 
     override fun saveWebArchive(filename: String): Unit = throw RuntimeException("Stub!")
@@ -795,23 +778,15 @@ class KcefWebViewProvider(
 
     override fun getContentWidth(): Int = throw RuntimeException("Stub!")
 
-    override fun pauseTimers() {
+    override fun pauseTimers(): Unit = throw RuntimeException("Stub!")
-        Log.v(TAG, "pauseTimers: doing nothing")
-    }
 
-    override fun resumeTimers() {
+    override fun resumeTimers(): Unit = throw RuntimeException("Stub!")
-        Log.v(TAG, "resumeTimers: doing nothing")
-    }
 
-    override fun onPause() {
+    override fun onPause(): Unit = throw RuntimeException("Stub!")
-        Log.v(TAG, "onPause: doing nothing")
-    }
 
-    override fun onResume() {
+    override fun onResume(): Unit = throw RuntimeException("Stub!")
-        Log.v(TAG, "onResume: doing nothing")
-    }
 
-    override fun isPaused(): Boolean = false
+    override fun isPaused(): Boolean = throw RuntimeException("Stub!")
 
     override fun freeMemory(): Unit = throw RuntimeException("Stub!")
 
@@ -865,7 +840,6 @@ class KcefWebViewProvider(
 
     override fun getWebChromeClient(): WebChromeClient = chromeClient
 
-    @Suppress("DEPRECATION")
     override fun setPictureListener(listener: PictureListener): Unit = throw RuntimeException("Stub!")
 
     @Serializable
@@ -888,7 +862,7 @@ class KcefWebViewProvider(
         obj: Any,
         interfaceName: String,
     ) {
-        val cls = obj::class
+        val cls = obj::class as KClass<Any>
         mappings.addAll(
             cls.declaredMemberFunctions.map {
                 // This is ridiculous, but necessary, otherwise "public final" throws
@@ -950,8 +924,7 @@ class KcefWebViewProvider(
     override fun getRendererPriorityWaivedWhenNotVisible(): Boolean = throw RuntimeException("Stub!")
 
     @SuppressWarnings("unused")
-    override fun setTextClassifier(textClassifier: TextClassifier?) {
+    override fun setTextClassifier(textClassifier: TextClassifier?) {}
-    }
 
     override fun getTextClassifier(): TextClassifier = TextClassifier.NO_OP
 
@@ -977,13 +950,11 @@ class KcefWebViewProvider(
         override fun onProvideAutofillVirtualStructure(
             @SuppressWarnings("unused") structure: android.view.ViewStructure,
             @SuppressWarnings("unused") flags: Int,
-        ) {
+        ) {}
-        }
 
         override fun autofill(
             @SuppressWarnings("unused") values: SparseArray<AutofillValue>,
-        ) {
+        ) {}
-        }
 
         override fun isVisibleToUserForAutofill(
             @SuppressWarnings("unused") virtualId: Int,
@@ -994,8 +965,7 @@ class KcefWebViewProvider(
         override fun onProvideContentCaptureStructure(
             @SuppressWarnings("unused") structure: android.view.ViewStructure,
             @SuppressWarnings("unused") flags: Int,
-        ) {
+        ) {}
-        }
 
         override fun getAccessibilityNodeProvider(): AccessibilityNodeProvider = throw RuntimeException("Stub!")
 
@@ -1065,8 +1035,7 @@ class KcefWebViewProvider(
         override fun onMovedToDisplay(
             displayId: Int,
             config: Configuration,
-        ) {
+        ) {}
-        }
 
         override fun onVisibilityChanged(
             changedView: View,

CHANGELOG.md

@@ -7,30 +7,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 ## [Unreleased] (Preview)
 
 ### Added
-- (**Sync**) Added [SyncYomi](https://github.com/syncyomi/syncyomi) support
+- .
-- (**OPDS**) Add option to skip chapter metadata feed providing direct stream/download links
 
 ### Changed
-- (**Database/H2**) Use the latest H2 database engine
+- .
-- (**Startup**) Crash on startup if an unrecoverable error happens
-- (**WebView**) Use JCEF directly and update to newest Chromium
-- (**Extension/Android**) Switch MessageQueue to LegacyMessageQueue from ConcurrentMessageQueue
 
 ### Fixed
-- (**CloudFlareInterceptor**) Don't send the `cf_clearance` cookie back to Flaresolverr
+- (WebUI) Handle serving non-default webui with "bundled"
-- (**WebUI**) Handle serving non-default webui with "bundled"
-- (**WebUI**) Wait until WebUI is ready to open in browser
-- (**Downloads**) Truncate filenames by byte length to prevent "File name too long" IO errors
-- (**Downloads**) Fix being unable to find downloads after manga was renamed during an update
-- (**Downloads**) Fix preserving chapter download states during an update
-- (**Extension**) Do not indicate an update is available when the extension is not installed
-- (**Chapter**) Fix losing chapter data on failed chapter list update
-- (**Chapter**) Fix database error when fetching chapter updates
-- (**Manga/API**) Fix "mangas" graphql query with active sorting and using a PostgreSQL database (QUERY "mangas")
-- (**API**) Fix GraphQL `Filter` `notAll` and `notAny` being inversed
-- (**API**) Fix GraphQL `Filter` causing an UnsupportedOperationException when passing an empty list as a `Any` filter value
-- (**Build**) Fix CURL failing silently in builds
-- (**Backup/Database**) Fix backup creation slowdown when mapping chapters
 
 ## [v2.2.2100] + [WebUI: v20260508.01] - 2026-05-08
 

README.md

@@ -8,7 +8,7 @@
   - [Features](#features)
 - [Suwayomi client projects](#suwayomi-client-projects)
   - [Integrated clients](#integrated-clients)
-  - [Other clients](#other-clients-potentially-inactive-or-abandoned)
+  - [Other clients](#other-clients-potentially-inactive-or-abondend)
 - [Downloading and Running the app](#downloading-and-running-the-app)
   - [Using Operating System Specific Bundles](#using-operating-system-specific-bundles)
     - [Windows](#windows)
@@ -82,7 +82,6 @@ These clients are built-in options, and the server can keep them automatically u
 - [Tachidesk-JUI](https://github.com/Suwayomi/Tachidesk-JUI): Desktop app (windows, linux, mac); can manage its own suwayomi server instance
 - [Tachidesk-Sorayomi](https://github.com/Suwayomi/Tachidesk-Sorayomi): Web app; Desktop app (windows, linux, mac); Android app; requires access to a running server
 - [Tachidesk-qtui](https://github.com/Suwayomi/Tachidesk-qtui): Android app; iOS app Desktop app (linux); requires access to a running server
-- [Suwayomi Client for KOReader](https://github.com/LK4D4/suwayomi.koplugin): KOReader plugin; works anywhere KOReader can run (Android, Kindle, Kobo, etc.); requires access to a running server
 
 # Downloading and Running the app
 ## Using Operating System Specific Bundles
@@ -107,21 +106,22 @@ Download the latest `linux-x64`(x86_64) release from [the releases section](http
 
 #### WebView support (GNU/Linux)
 
-WebView support is implemented via [JCEF](https://github.com/JetBrains/jcef).
+WebView support is implemented via [KCEF](https://github.com/DATL4G/KCEF).
 This is optional, and is only necessary to support some extensions.
 
-To have a functional WebView, some X11 dependencies are required for rendering Chromium.
+To have a functional WebView, several dependencies are required; aside from X11 libraries necessary for rendering Chromium, some JNI bindings are necessary: gluegen and jogl (found in Ubuntu as `libgluegen2-jni` and `libjogl2-jni`).
-These include `libxrender`, `libxcomposite` `libxdamage`, `libxkbcommon` and `libxtst`.
+Note that on some systems (e.g. Ubuntu), the JNI libraries are not automatically found, see below.
 
-A CEF server is launched on startup, which loads the X11 libraries.
+A KCEF server is launched on startup, which loads the X11 libraries.
 If those are missing, you should see "Could not load 'jcef' library".
 If so, use `ldd ~/.local/share/Tachidesk/bin/kcef/libjcef.so | grep not` to figure out which libraries are not found on your system.
 
-Refer to the [Dockerfile](https://github.com/Suwayomi/Suwayomi-Server-docker/blob/main/Dockerfile) for more details.
+The JNI bindings are only loaded when a browser is actually launched.
+This is done by extensions that rely on WebView, not by Suwayomi itself.
+If there is a problem loading the JNI libraries, you should see a message indicating the library and the search path.
+This search path includes the current working directory, if you do not want to modify system directories.
 
-Note that it is required to have an X session active and available to Suwayomi (i.e. `DISPLAY` is set).
+Refer to the [Dockerfile](https://github.com/Suwayomi/Suwayomi-Server-docker/blob/main/Dockerfile) for more details.
-It is not enough to have `WAYLAND_DISPLAY`, if your environment does not provide xwayland (or if you run Suwayomi as a service), you need to use a tool like [`Xvfb`](https://en.wikipedia.org/wiki/Xvfb).
-The Dockerfile linked above also does this.
 
 ## Other methods of getting Suwayomi
 ### Docker

build.gradle.kts

@@ -25,7 +25,6 @@ allprojects {
         maven("https://github.com/Suwayomi/Suwayomi-Server/raw/android-jar/")
         maven("https://jitpack.io")
         maven("https://jogamp.org/deployment/maven")
-        maven("https://packages.jetbrains.team/maven/p/ij/intellij-dependencies")
     }
 }
 

buildSrc/src/main/kotlin/Constants.kt

@@ -14,8 +14,6 @@ val getTachideskVersion = { "v2.2.${getCommitCount()}" }
 
 val webUIRevisionTag = "r3136"
 
-val webviewJbrRelease = "jbr-release-25.0.3b508.4"
-
 private val getCommitCount = {
     runCatching {
         ProcessBuilder()

docs/Configuring-Suwayomi‐Server.md

@@ -63,14 +63,6 @@ server.webUISubpath = ""
 - `server.webUIUpdateCheckInterval` the interval time in hours at which to check for updates. Use `0` to disable update checking.
 - `server.webUISubpath` controls on which sub-path the UI is served; by default, it will be accessible on `/` (i.e. directly), with this setting it can also be set to appear at e.g. `/suwayomi`
 
-
-### webView
-```
-server.kcefEnabled = true
-```
-- `server.kcefEnabled` controls if KCEF WebView provider is enabled.
-
-
 ### Downloader
 ```
 server.downloadAsCbz = true
@@ -232,7 +224,6 @@ server.opdsShowOnlyUnreadChapters = false
 server.opdsShowOnlyDownloadedChapters = false
 server.opdsChapterSortOrder = "DESC"
 server.opdsCbzMimetype = "MODERN"
-server.opdsSkipChapterMetadataFeed = false
 ```
 - `server.opdsUseBinaryFileSizes = false` controls if Suwayomi should display file sizes in binary units (KiB, MiB, GiB) or decimal (KB, MB, GB) in OPDS listings.
 - `server.opdsItemsPerPage = 50` sets the number of items per page in OPDS listings. Range: 10 <= n <= 5000.
@@ -242,7 +233,6 @@ server.opdsSkipChapterMetadataFeed = false
 - `server.opdsShowOnlyDownloadedChapters = false` controls if OPDS listings should only include downloaded chapters.
 - `server.opdsChapterSortOrder = "DESC"` sets the default chapter sort order in OPDS listings, either `"ASC"` or `"DESC"`
 - `server.opdsCbzMimetype = "MODERN"` controls which mimetype to use for CBZ downloads. This affects the offered link in OPDS, as well as the content type of the CBZ download. Allowed is MODERN (current IANA standard), LEGACY (deprecated mimetype for .cbz) and COMPATIBLE (deprecated mimetype for all comic archives). Use LEGACY or COMPATIBLE if older clients don't offer the chapter download (note that the chapter needs to first be downloaded in Suwayomi, before it is available in OPDS).
-- `server.opdsSkipChapterMetadataFeed = false` controls if the metadata feed should be skipped. When enabled, download and streaming links are provided directly in the chapter list. This improves compatibility with automated downloaders (like KOReader). KoSync strategies are applied, but `PROMPT` conflicts are ignored (treating local progress as priority).
 
 ### KOReader Sync
 ```
@@ -278,28 +268,6 @@ server.useHikariConnectionPool = true
 - `server.databasePassword` the username with which to authenticate at the PostgreSQL instance.
 - `server.useHikariConnectionPool` use Hikari Connection Pool to connect to the database.
 
-### SyncYomi
-```
-server.syncYomiEnabled = false
-server.syncYomiHost = ""
-server.syncYomiApiKey = ""
-server.syncDataManga = true
-server.syncDataChapters = true
-server.syncDataTracking = true
-server.syncDataHistory = true
-server.syncDataCategories = true
-server.syncInterval = "0s"
-```
-- `server.syncYomiEnabled` controls whether SyncYomi is enabled.
-- `server.syncYomiHost` base URL of the SyncYomi server instance. e.g. `http://localhost:8282`
-- `server.syncYomiApiKey` API key to authenticate with SyncYomi. You must use the same API key in both Suwayomi and SyncYomi.
-- `server.syncDataManga` enables syncing manga.
-- `server.syncDataChapters` enables syncing chapters.
-- `server.syncDataTracking` enables syncing tracking data.
-- `server.syncDataHistory` enables syncing reading history.
-- `server.syncDataCategories` enables syncing categories.
-- `server.syncInterval` interval between automatic sync operations. Use `0s` to disable.
-
 **Note:** The example [docker-compose.yml file](https://github.com/Suwayomi/Suwayomi-Server-docker/blob/main/docker-compose.yml) contains everything you need to get started with Suwayomi+PostgreSQL. Please be aware that PostgreSQL support is currently still in beta.
 
 **Note:** These settings are excluded from backups, so a backup can be used to easily switch database installations by setting up the connection first, then restoring the backup.

docs/Troubleshooting.md

@@ -1,92 +1,19 @@
-# Troubleshooting
-
-This page is laid out in several sections, where each section describes a specific problem, followed by one or more possible solutions.
-
-At the end, you will find a General section, which is the nuclear option if nothing else works.
-
-For further support, visit the [official Suwayomi Discord server](https://discord.gg/DDZdqZWaHA).  
-In such cases, it will be helpful to have logs ready. You can find them in [The Data Directory](./The-Data-Directory) in the logs directory.
-
-**All steps below assume that you have stopped Suwayomi**.
-
-
-## Broken database
-
-- `failed due to
-org.jetbrains.exposed.exceptions.ExposedSQLException: org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "CATEGORY.SORT_ORDER" not found`
-- `org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "CHAPTER.KOREADER_HASH" not found`
-- `java.lang.IllegalStateException: Unable to read the page at position 96170708817765466`
-- Any other error text that includes "SQL Statement"
-
-Your database is either corrupted or incompatible.
-
-One of these is the cause:
-- You were running a preview version and decided to downgrade to stable.
-- You did not shut down Suwayomi properly.
-- Suwayomi crashed in an unexpected way.
-
-Solutions:
-- If you downgraded, upgrade to preview again.
-- Otherwise, you will need to reset and restore from a backup. See [General Troubleshooting](#general-troubleshooting) below.
-
-
-## `HTTP error 429`
-
-The source (or, if trackers are enabled, possibly the tracker) has blocked you for sending too many requests.  
-Note that Mass-Migration can result in an unexpectedly high number of requests to both the source and any configured trackers.
-
-Solution: Use other/more sources, download less, and wait between request-heavy actions.
-
-
-## Extension times out
-
-- `Timed out waiting for 20000 ms…`
-- `Timed out waiting for page list`
-
-First, check if this is an extension issue or a Suwayomi issue.
-On the manga page of the problematic entry, click "Open in WebView".
-
-Solutions:
-- If the WebView loads: The issue is with the extension. Search [the issues](https://github.com/Suwayomi/Suwayomi-Server/issues) and discord if there are known problems with that extension.
-- If the WebView errors: Go to [The Data Directory](./The-Data-Directory) and remove the `bin` and `cache` folders.
-    - If the WebView still does not work after a restart, your installation is incomplete. On Linux, refer to [the README](https://github.com/Suwayomi/Suwayomi-Server#webview-support-gnulinux).
-
-
-## Flaresolverr required
-
-- `java.io.IOException: Cloudflare bypass currently disabled`
-
-The source you are using has enabled CloudFlare's bot protection.
-If you open the source's website in your browser, you should see the "Confirm I'm human" page.
-
-Solution:
-- Download and set up [Flaresolverr](https://github.com/FlareSolverr/FlareSolverr) or [Byparr](https://github.com/ThePhaseless/Byparr). Make sure to run Flaresolverr/Byparr every time you use this source.
-
-
-## Flaresolverr not running
-
-- `java.io.IOException: Failed to connect to localhost/[0:0:0:0:0:0:0:1]:8191`
-
-You have configured Flaresolverr by enabling the `server.flareSolverrEnabled` setting, but Flaresolverr is not installed and/or running.
-
-Solutions:
-- Install Flaresolverr if you haven't already (see previous section). Then ensure it is running (Windows: do not close the console window!).
-- If it is running, ensure the configured url in `server.flareSolverrUrl` is correct. There is usually no need to change this.
-- If it is running and the url is correct, check your firewall settings, your system may be blocking access to Flaresolverr.
-
-
 ## General Troubleshooting
 This guide will try to fix Suwayomi by reseting it to a clean installation state.
 
-> [!WARNING]
-> This will remove all your data, including the library.
-> Make sure you have copied your backups as described above!
-
 - Make sure you have a recent backup of your library or create one in the app (if possible) because we **are going to wipe all Suwayomi data**.
 - Make sure Suwayomi is not running (right click on tray icon and quit or kill it through the way your Operating System provides)
 - Clear all browsing data on your browser if you use Suwayomi from a browser.
-- Delete the Suwayomi data directory located below and re-run the app. See the article [The Data Directory](./The-Data-Directory) for information on how to find it.
+- Delete the Suwayomi data directory located below and re-run the app.
-    - If you wish to keep your downloads, you may also attempt to surgically remove only parts. You will need to remove `database.mv.db`, `database.trace.db`, `bin`, `cache`, `extensions`, `settings`, `webUI`. Removing only a subset of these files and folders may fail to resolve the problem.
+
-- Open Suwayomi and go to Settings > Backup > Restore Backup, and select the latest backup you have.
+Note: Replace `<Account>` with the currently logged in account/username on your pc.
-    - Restoring from backup does not restore your downloads. If you chose to keep them in the above step, you will now need to re-download all manga. Suwayomi will pick up on the existing files and not actually download anything that isn't new.
+
+On Mac OS X : `/Users/<Account>/Library/Application Support/Tachidesk`
+
+On Windows XP : `C:\Documents and Settings\<Account>\Application Data\Local Settings\Tachidesk`
+
+On Windows 7 and later : `C:\Users\<Account>\AppData\Local\Tachidesk`
+
+On Unix/Linux : `/home/<account>/.local/share/Tachidesk`
+
 - In the case that you have to periodically perform this fix or the problem persists or the method failed to fix it, open an issue or Join the [Suwayomi discord server](https://discord.gg/DDZdqZWaHA) to hang out with the community and to receive support and help.

gradle/libs.versions.toml

@@ -1,23 +1,22 @@
 [versions]
-kotlin = "2.4.0"
+kotlin = "2.3.21"
 coroutines = "1.11.0"
 serialization = "1.11.0"
 jvmTarget = "21"
-okhttp = "5.4.0" # Major version is locked by Tachiyomi extensions
+okhttp = "5.3.2" # Major version is locked by Tachiyomi extensions
-javalin = "7.2.2"
+javalin = "7.2.0"
 jte = "3.2.4"
-jackson = "3.2.0" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
+jackson = "3.1.2" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
-exposed = "1.3.0"
+exposed = "0.61.0"
-dex2jar = "2.4.37"
+dex2jar = "2.4.36"
 polyglot = "25.0.3"
 settings = "1.3.0"
 twelvemonkeys = "3.13.1"
-graphqlkotlin = "10.0.0"
+graphqlkotlin = "10.0.0-alpha.3"
 xmlserialization = "0.91.3"
 ktlint = "1.8.0"
-koin = "4.2.2"
+koin = "4.2.1"
 moko = "0.26.4"
-jcef = "144.0.15-g72717cf-chromium-144.0.7559.172-api-1.21-262-b37"
 
 [libraries]
 # Kotlin
@@ -38,9 +37,9 @@ serialization-xml-core = { module = "io.github.pdvrieze.xmlutil:core", version.r
 serialization-xml = { module = "io.github.pdvrieze.xmlutil:serialization-jvm", version.ref = "xmlserialization" }
 
 # Logging
-slf4japi = "org.slf4j:slf4j-api:2.0.18"
+slf4japi = "org.slf4j:slf4j-api:2.0.17"
-logback = "ch.qos.logback:logback-classic:1.5.34"
+logback = "ch.qos.logback:logback-classic:1.5.32"
-kotlinlogging = "io.github.oshai:kotlin-logging-jvm:8.0.4"
+kotlinlogging = "io.github.oshai:kotlin-logging-jvm:8.0.02"
 
 # OkHttp
 okhttp-core = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
@@ -55,7 +54,7 @@ javalin-openapi = { module = "io.javalin:javalin-openapi", version.ref = "javali
 javalin-rendering = { module = "io.javalin:javalin-rendering-jte", version.ref = "javalin" }
 jackson-databind = { module = "tools.jackson.core:jackson-databind", version.ref = "jackson" }
 jackson-kotlin = { module = "tools.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
-jackson-annotations = "com.fasterxml.jackson.core:jackson-annotations:2.22"
+jackson-annotations = "com.fasterxml.jackson.core:jackson-annotations:2.20"
 jte = { module = "gg.jte:jte", version.ref = "jte" }
 kte = { module = "gg.jte:jte-kotlin", version.ref = "jte" }
 
@@ -69,13 +68,12 @@ exposed-core = { module = "org.jetbrains.exposed:exposed-core", version.ref = "e
 exposed-dao = { module = "org.jetbrains.exposed:exposed-dao", version.ref = "exposed" }
 exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "exposed" }
 exposed-javatime = { module = "org.jetbrains.exposed:exposed-java-time", version.ref = "exposed" }
-exposed-kotlintime = { module = "org.jetbrains.exposed:exposed-kotlin-datetime", version.ref = "exposed" }
 postgres = "org.postgresql:postgresql:42.7.11"
-h2 = "com.h2database:h2:2.4.240"
+h2 = "com.h2database:h2:1.4.200" # current database driver, can't update to h2 v2 without sql migration
-hikaricp = "com.zaxxer:HikariCP:7.1.0"
+hikaricp = "com.zaxxer:HikariCP:7.0.2"
 
 # Exposed Migrations
-exposed-migrations = "com.github.Suwayomi:exposed-migrations:3.10.1"
+exposed-migrations = "com.github.Suwayomi:exposed-migrations:3.8.0"
 
 # Dependency Injection
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
@@ -91,7 +89,7 @@ rxjava = "io.reactivex:rxjava:1.3.8"
 jsoup = "org.jsoup:jsoup:1.22.2"
 
 # Config
-config = "com.typesafe:config:1.4.9"
+config = "com.typesafe:config:1.4.8"
 config4k = "io.github.config4k:config4k:0.7.0"
 
 # Sort
@@ -117,7 +115,7 @@ appdirs = "ca.gosyer:kotlin-multiplatform-appdirs:2.0.0"
 cache4k = "io.github.reactivecircus.cache4k:cache4k:0.14.0"
 zip4j = "net.lingala.zip4j:zip4j:2.11.6"
 commonscompress = "org.apache.commons:commons-compress:1.28.0"
-junrar = "com.github.junrar:junrar:7.6.0"
+junrar = "com.github.junrar:junrar:7.5.10"
 
 # AES/CBC/PKCS7Padding Cypher provider
 bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.84"
@@ -145,10 +143,10 @@ twelvemonkeys-imageio-metadata = { module = "com.twelvemonkeys.imageio:imageio-m
 twelvemonkeys-imageio-jpeg = { module = "com.twelvemonkeys.imageio:imageio-jpeg", version.ref = "twelvemonkeys" }
 twelvemonkeys-imageio-webp = { module = "com.twelvemonkeys.imageio:imageio-webp", version.ref = "twelvemonkeys" }
 
-imageio-webp = "com.github.usefulness:webp-imageio:0.11.0"
+imageio-webp = "com.github.usefulness:webp-imageio:0.10.2"
 
 # Testing
-mockk = "io.mockk:mockk:1.14.11"
+mockk = "io.mockk:mockk:1.14.9"
 
 # cron scheduler
 cron4j = "it.sauronsoftware.cron4j:cron4j:2.2.5"
@@ -157,7 +155,7 @@ cron4j = "it.sauronsoftware.cron4j:cron4j:2.2.5"
 cronUtils = "com.cronutils:cron-utils:9.2.1"
 
 # Webview
-jcef = { module = "org.jetbrains.intellij.deps.jcef:jcef", version.ref = "jcef" }
+kcef = "dev.datlag:kcef:2024.04.20.4"
 
 # User
 jwt = "com.auth0:java-jwt:4.5.2"
@@ -178,13 +176,13 @@ kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "14.2.0"}
 
 # Build config
-buildconfig = { id = "com.github.gmazzo.buildconfig", version = "6.0.10"}
+buildconfig = { id = "com.github.gmazzo.buildconfig", version = "6.0.9"}
 
 # Download
 download = { id = "de.undercouch.download", version = "5.7.0"}
 
 # ShadowJar
-shadowjar = { id = "com.gradleup.shadow", version = "8.3.11"}
+shadowjar = { id = "com.gradleup.shadow", version = "8.3.10"}
 
 # Moko
 moko = { id = "dev.icerock.mobile.multiplatform-resources", version.ref = "moko" }
@@ -214,7 +212,7 @@ shared = [
     "dex2jar-tools",
     "apk-parser",
     "jackson-annotations",
-    "jcef",
+    "kcef"
 ]
 
 sharedTest = [
@@ -244,7 +242,6 @@ exposed = [
     "exposed-dao",
     "exposed-jdbc",
     "exposed-javatime",
-    "exposed-kotlintime",
 ]
 systemtray = [
     "systemtray-core",

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

renovate.json

@@ -16,43 +16,14 @@
       "depNameTemplate": "zulu",
       "datasourceTemplate": "custom.zulu",
       "versioningTemplate": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+).*$"
-    },
-    {
-      "customType": "regex",
-      "managerFilePatterns": [
-        "/buildSrc/src/main/kotlin/Constants.kt/"
-      ],
-      "matchStrings": [
-        "val\\s+webviewJbrRelease\\s*=\\s*\"(?<currentValue>[^\"]+)\""
-      ],
-      "depNameTemplate": "JetBrainsRuntime",
-      "packageNameTemplate": "JetBrains/JetBrainsRuntime",
-      "datasourceTemplate": "github-releases",
-      "versioningTemplate": "regex:^jbr-release-(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)b(?<build>\\d+)\\.(?<revision>\\d+)$"
     }
   ],
   "customDatasources": {
     "zulu": {
       "defaultRegistryUrlTemplate": "https://api.azul.com/metadata/v1/zulu/packages?availability_types=ca&release_status=both&java_package_type=jre&crac_supported=false&javafx_bundled=false&support_term=lts&arch=x86&os=linux&archive_type=zip&page_size=1000&include_fields=java_package_features,release_status,support_term,os,arch,hw_bitness,abi,java_package_type,javafx_bundled,sha256_hash,cpu_gen,size,archive_type,certifications,lib_c_type,crac_supported&page=1&azul_com=true",
       "transformTemplates": [
-        "{ \"releases\": $map($, function($v) { { \"version\": $join([$string($v.distro_version[0]), \".\", $string($v.distro_version[1]), \".\", $string($v.distro_version[2]), \"_\", $string($v.java_version[0]), \".\", $string($v.java_version[1]), \".\", $string($v.java_version[2])]) } }) }"
+        "{\"releases\": $$.$join([$join($map(distro_version[[0..2]], $string), \".\"), \"_\", $join($map(java_version, $string), \".\")])}"
       ]
     }
-  },
-  "packageRules": [
-    {
-      "matchPackageNames": [
-        "org.jetbrains.intellij.deps.jcef:jcef",
-        "JetBrains/JetBrainsRuntime"
-      ],
-      "groupName": "JCEF + JetBrains Runtime",
-      "groupSlug": "jcef-jbr"
-    },
-    {
-      "matchPackageNames": [
-        "com.github.Suwayomi:android-jar"
-      ],
-      "enabled": false
   }
-  ]
 }

scripts/bundler.sh

@@ -42,7 +42,7 @@ main() {
     gcc -fPIC -shared scripts/resources/catch_abort.c -lpthread -o scripts/resources/catch_abort.so
   fi
 
-  JRE_ZULU="25.34.17_25.0.3"
+  JRE_ZULU="25.30.17_25.0.1"
   JRE_RELEASE="jre${JRE_ZULU#*_}" # e.g. jre25.0.1
   ZULU_RELEASE="zulu${JRE_ZULU%_*}" # e.g. zulu25.30.17
 
@@ -149,15 +149,15 @@ move_release_to_output_dir() {
 }
 
 download_launcher() {
-  LAUNCHER_URL=$(curl -sf "https://api.github.com/repos/Suwayomi/Suwayomi-Launcher/releases/latest" | grep "browser_download_url" | grep ".jar" | head -n 1 | cut -d '"' -f 4)
+  LAUNCHER_URL=$(curl -s "https://api.github.com/repos/Suwayomi/Suwayomi-Launcher/releases/latest" | grep "browser_download_url" | grep ".jar" | head -n 1 | cut -d '"' -f 4)
-  curl -fL "$LAUNCHER_URL" -o "Suwayomi-Launcher.jar"
+  curl -L "$LAUNCHER_URL" -o "Suwayomi-Launcher.jar"
   mv "Suwayomi-Launcher.jar" "$RELEASE_NAME/Suwayomi-Launcher.jar"
 }
 
 download_jogamp() {
   local platform="$1"
   if [ ! -f jogamp-all-platforms.7z ]; then
-    curl -f "https://jogamp.org/deployment/jogamp-current/archive/jogamp-all-platforms.7z" -o jogamp-all-platforms.7z
+    curl "https://jogamp.org/deployment/jogamp-current/archive/jogamp-all-platforms.7z" -o jogamp-all-platforms.7z
   fi
 
   7z x jogamp-all-platforms.7z "jogamp-all-platforms/lib/$platform/"
@@ -168,7 +168,7 @@ download_jogamp() {
 
 download_electron() {
   if [ ! -f "$ELECTRON" ]; then
-    curl -fL "$ELECTRON_URL" -o "$ELECTRON"
+    curl -L "$ELECTRON_URL" -o "$ELECTRON"
   fi
 
   unzip "$ELECTRON" -d "$RELEASE_NAME/electron/"
@@ -181,7 +181,7 @@ setup_jre() {
     mv "jre" "$RELEASE_NAME/jre"
   else
     if [ ! -f "$JRE" ]; then
-      curl -fL "$JRE_URL" -o "$JRE"
+      curl -L "$JRE_URL" -o "$JRE"
     fi
 
     local ext="${JRE##*.}"
@@ -273,7 +273,7 @@ make_appimage() {
     sudo apt update
     sudo apt install libfuse2
   fi
-  curl -fL $APPIMAGE_URL -o $APPIMAGE_TOOLNAME
+  curl -L $APPIMAGE_URL -o $APPIMAGE_TOOLNAME
   chmod +x $APPIMAGE_TOOLNAME
   ARCH=x86_64 ./$APPIMAGE_TOOLNAME "$RELEASE_NAME" "$RELEASE"
 }
@@ -300,7 +300,7 @@ make_windows_bundle() {
   #local rcedit_url="https://github.com/electron/rcedit/releases/download/v0.1.1/$rcedit"
   ## change electron's icon
   #if [ ! -f "$rcedit" ]; then
-    #curl -fL "$rcedit_url" -o "$rcedit"
+    #curl -L "$rcedit_url" -o "$rcedit"
   #fi
 
   #local icon="server/src/main/resources/icon/faviconlogo.ico"

server/build.gradle.kts

@@ -159,8 +159,6 @@ buildConfig {
 
     buildConfigField("String", "GITHUB", quoteWrap("https://github.com/Suwayomi/Suwayomi-Server"))
     buildConfigField("String", "DISCORD", quoteWrap("https://discord.gg/DDZdqZWaHA"))
-    buildConfigField("String", "JCEF_VERSION", quoteWrap(libs.versions.jcef.get()))
-    buildConfigField("String", "JCEF_JBR_RELEASE", quoteWrap(webviewJbrRelease))
 }
 
 tasks {
@@ -173,8 +171,6 @@ tasks {
                 "Implementation-Vendor" to "The Suwayomi Project",
                 "Specification-Version" to getTachideskVersion(),
                 "Implementation-Version" to getTachideskRevision(),
-                "Multi-Release" to true, // needed for polyglot
-                "X-JBR-Release" to webviewJbrRelease,
             )
         }
         archiveBaseName.set(rootProject.name)
@@ -185,11 +181,7 @@ tasks {
     }
 
     test {
-        useJUnitPlatform {
+        useJUnitPlatform()
-            if (!project.hasProperty("masstest")) {
-                exclude("**/masstest/*")
-            }
-        }
         testLogging {
             showStandardStreams = true
             events("passed", "skipped", "failed")

server/i18n/src/commonMain/moko-resources/values/base/strings.xml

@@ -50,7 +50,6 @@
     <!-- OPDS errors -->
     <string name="opds_error_manga_not_found">Series with ID %1$d not found.</string>
     <string name="opds_error_chapter_not_found">Chapter with index %1$d not found.</string>
-    <string name="opds_error_chapters_not_found">No chapters found or the source is unreachable on page %1$d.</string>
 
     <!-- OPDS facets (Filters and Sorting) -->
     <string name="opds_facetgroup_sort_order">Sort Order</string>
@@ -154,7 +153,4 @@
     <string name="login_label_login">Log In</string>
     <string name="login_placeholder_username">Type username...</string>
     <string name="login_placeholder_password">Secret...</string>
-
-    <string name="opds_chapter_title_oneshot">Oneshot</string>
-    <string name="opds_chapter_title_fallback">Chapter %1$s</string>
 </resources>

server/i18n/src/commonMain/moko-resources/values/el/strings.xml

@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="opds_feeds_root">Suwayomi OPDS Κατάλογος</string>
-    <string name="opds_feeds_manga_chapters">Κεφάλαια %1$s</string>
-    <string name="opds_feeds_chapter_details">%1$s | %2$s | Λεπτομέρειες</string>
-    <string name="opds_feeds_explore_title">Εξερεύνηση</string>
-    <string name="opds_feeds_explore_entry_content">Εξερεύνησε νέες σειρές από τις πηγές σου</string>
-    <string name="opds_feeds_history_title">Ιστορικό</string>
-    <string name="opds_feeds_history_entry_content">Πρόσφατα διαβασμένα κεφάλαια</string>
-    <string name="opds_feeds_all_series_in_library_title">Όλες οι σειρές</string>
-    <string name="opds_feeds_all_series_in_library_entry_content">Περιήγηση σε όλες τις σειρές της βιβλιοθήκης σου</string>
-    <string name="opds_feeds_library_sources_title">Πηγές</string>
-    <string name="opds_feeds_library_sources_entry_content">Περιήγηση σε σειρές της βιβλιοθήκης σου φιλτραρισμένες κατά πηγή</string>
-    <string name="opds_feeds_categories_title">Κατηγορίες</string>
-    <string name="opds_feeds_categories_entry_content">Περιήγηση σε σειρές οργανωμένες κατά κατηγορία</string>
-    <string name="opds_feeds_genres_title">Είδη</string>
-    <string name="opds_feeds_genres_entry_content">Περιήγηση σε σειρές κατά ετικέτες είδους</string>
-    <string name="opds_feeds_status_title">Κατάσταση</string>
-    <string name="opds_feeds_status_entry_content">Περιήγηση σε σειρές κατά κατάσταση δημοσίευσης</string>
-    <string name="opds_feeds_languages_title">Γλώσσες</string>
-    <string name="opds_feeds_languages_entry_content">Περιήγηση σε σειρές κατά γλώσσα περιεχομένου</string>
-    <string name="opds_feeds_library_updates_title">Ιστορικό ενημερώσεων βιβλιοθήκης</string>
-    <string name="opds_feeds_library_updates_entry_content">Πρόσφατα ενημερωμένα κεφάλαια από τη βιβλιοθήκη σου</string>
-    <string name="opds_feeds_search_results_title">Αποτελέσματα αναζήτησης</string>
-    <string name="opds_feeds_sources_title">Όλες οι πηγές</string>
-    <string name="opds_feeds_category_specific_title">Κατηγορία: %1$s</string>
-    <string name="opds_feeds_genre_specific_title">Είδος: %1$s</string>
-    <string name="opds_feeds_status_specific_title">Κατάσταση: %1$s</string>
-    <string name="opds_feeds_language_specific_title">Γλώσσα: %1$s</string>
-    <string name="opds_feeds_source_specific_title">Πηγή: %1$s</string>
-    <string name="opds_feeds_library_source_specific_title">Βιβλιοθήκη - Πηγή: %1$s</string>
-    <string name="opds_feeds_source_specific_popular_title">Πηγή: %1$s - Δημοφιλές</string>
-    <string name="opds_feeds_source_specific_latest_title">Πηγή: %1$s - Τελευταίο</string>
-    <string name="opds_search_shortname">Suwayomi OPDS Αναζήτηση</string>
-    <string name="opds_search_description">Αναζήτηση σειρών στον κατάλογο.</string>
-    <string name="opds_error_manga_not_found">Η σειρά με ID %1$d δεν βρέθηκε.</string>
-    <string name="opds_error_chapter_not_found">Το κεφάλαιο με δείκτη %1$d δεν βρέθηκε.</string>
-    <string name="opds_facetgroup_sort_order">Σειρά ταξινόμησης</string>
-    <string name="opds_facetgroup_filter_read_status">Φίλτρο κατά κατάσταση ανάγνωσης</string>
-    <string name="opds_facetgroup_filter_content">Φίλτρο περιεχομένου</string>
-    <string name="opds_facetgroup_filter_source">Φίλτρο κατά πηγή</string>
-    <string name="opds_facetgroup_filter_category">Φίλτρο κατά κατηγορία</string>
-    <string name="opds_facetgroup_filter_status">Φίλτρο κατά κατάσταση</string>
-    <string name="opds_facetgroup_filter_language">Φίλτρο κατά γλώσσα</string>
-    <string name="opds_facetgroup_filter_genre">Φίλτρο κατά είδος</string>
-    <string name="opds_facet_sort_oldest_first">Παλαιότερα πρώτα</string>
-    <string name="opds_facet_sort_newest_first">Νεότερα πρώτα</string>
-    <string name="opds_facet_sort_date_asc">Ημερομηνία αύξουσα</string>
-    <string name="opds_facet_sort_date_desc">Ημερομηνία φθίνουσα</string>
-    <string name="opds_facet_sort_popular">Δημοφιλές</string>
-    <string name="opds_facet_sort_latest">Τελευταίο</string>
-    <string name="opds_facet_sort_alpha_asc">Αλφαβητικά Α-Ω</string>
-    <string name="opds_facet_sort_alpha_desc">Αλφαβητικά Ω-Α</string>
-    <string name="opds_facet_sort_last_read_desc">Τελευταία ανάγνωση</string>
-    <string name="opds_facet_sort_latest_chapter_desc">Τελευταίο κεφάλαιο</string>
-    <string name="opds_facet_sort_date_added_desc">Ημερομηνία προσθήκης</string>
-    <string name="opds_facet_sort_unread_desc">Αδιάβαστα κεφάλαια</string>
-    <string name="opds_facet_filter_all">Όλα</string>
-    <string name="opds_facet_filter_all_chapters">Όλα τα κεφάλαια</string>
-    <string name="opds_facet_filter_unread_only">Αδιάβαστα</string>
-    <string name="opds_facet_filter_read_only">Διαβασμένα</string>
-    <string name="opds_facet_filter_downloaded">Ληφθέντα</string>
-    <string name="opds_facet_filter_ongoing">Σε εξέλιξη</string>
-    <string name="opds_facet_filter_completed">Ολοκληρωμένα</string>
-    <string name="opds_facet_all_sources">Όλες οι πηγές</string>
-    <string name="opds_facet_all_categories">Όλες οι κατηγορίες</string>
-    <string name="opds_facet_all_statuses">Όλες οι καταστάσεις</string>
-    <string name="opds_facet_all_languages">Όλες οι γλώσσες</string>
-    <string name="opds_facet_all_genres">Όλα τα είδη</string>
-    <string name="opds_linktitle_catalog_root">Ρίζα καταλόγου</string>
-    <string name="opds_linktitle_search_catalog">Αναζήτηση καταλόγου</string>
-    <string name="opds_linktitle_first_page">Πρώτη σελίδα</string>
-    <string name="opds_linktitle_previous_page">Προηγούμενη σελίδα</string>
-    <string name="opds_linktitle_next_page">Επόμενη σελίδα</string>
-    <string name="opds_linktitle_last_page">Τελευταία σελίδα</string>
-    <string name="opds_linktitle_self_feed">Τρέχουσα ροή</string>
-    <string name="opds_linktitle_view_on_web">Προβολή στο Web</string>
-    <string name="opds_linktitle_stream_pages_start">Διάβασε Online</string>
-    <string name="opds_linktitle_stream_pages_continue">Συνέχισε να διαβάζεις Online</string>
-    <string name="opds_linktitle_stream_pages_start_local">Διάβασε Online (Τοπική πρόοδος)</string>
-    <string name="opds_linktitle_stream_pages_continue_local">Συνέχισε να διαβάζεις Online (Τοπική πρόοδος)</string>
-    <string name="opds_linktitle_stream_pages_start_remote">Διάβασε Online (Συγχρονισμένο από %1$s)</string>
-    <string name="opds_linktitle_stream_pages_continue_remote">Συνέχισε να διαβάζεις Online (Συγχρονισμένο από %1$s)</string>
-    <string name="opds_linktitle_download_cbz">Λήψη CBZ</string>
-    <string name="opds_linktitle_chapter_cover">Εξώφυλλο κεφαλαίου</string>
-    <string name="opds_linktitle_view_chapter_details">Λεπτομέρειες κεφαλαίου &amp; Σελίδες</string>
-    <string name="opds_chapter_status_read">✅</string>
-    <string name="opds_chapter_status_in_progress">⌛</string>
-    <string name="opds_chapter_status_unread">⭕</string>
-    <string name="opds_chapter_status_downloaded">⬇️</string>
-    <string name="opds_chapter_status_synced">🌐</string>
-    <string name="opds_chapter_details_base">Σειρά: %1$s | %2$s</string>
-    <string name="opds_chapter_details_scanlator">| Από %1$s</string>
-    <string name="opds_chapter_details_progress">| Πρόοδος: %1$d από %2$d</string>
-    <string name="opds_manga_summary_status">Κατάσταση: %1$s</string>
-    <string name="opds_manga_summary_source">Πηγή: %1$s</string>
-    <string name="opds_manga_summary_language">Γλώσσα: %1$s</string>
-    <string name="manga_status_ongoing">Σε εξέλιξη</string>
-    <string name="manga_status_completed">Ολοκληρωμένο</string>
-    <string name="manga_status_licensed">Υπό άδεια</string>
-    <string name="manga_status_publishing_finished">Δημοσίευση ολοκληρωμένη</string>
-    <string name="manga_status_cancelled">Ακυρωμένο</string>
-    <string name="manga_status_on_hiatus">Σε παύση</string>
-    <string name="manga_status_unknown">Άγνωστο</string>
-    <string name="label_error">Σφάλμα</string>
-    <string name="label_version">Έκδοση <xliff:g id="version" example="v2.0.1833">%1$s</xliff:g></string>
-    <string name="label_close">Κλείσε</string>
-    <string name="webview_label_title">Suwayomi WebView</string>
-    <string name="webview_label_disconnected">Αποσυνδεδεμένο, κάνε ανανέωση</string>
-    <string name="webview_label_reversescroll">Αντίστροφη κύλιση</string>
-    <string name="webview_label_bindingshint">Σημείωση: Όταν η εστίαση είναι στο τμήμα WebView, καμία συντόμευση πληκτρολογίου, συμπεριλαμβανομένης της ανανέωσης, δεν θα αντιμετωπίζεται από το πρόγραμμα περιήγησης.</string>
-    <string name="webview_label_init">Αρχικοποίηση... Παρακαλώ περίμενε</string>
-    <string name="webview_label_getstarted">Εισήγαγε μια διεύθυνση URL για να ξεκινήσεις</string>
-    <string name="webview_label_loading">Φόρτωση σελίδας...</string>
-    <string name="webview_label_copy">Αντιγραφή στο πρόχειρο</string>
-    <string name="webview_label_copy_description">Η αυτόματη αντιγραφή στο πρόχειρο απέτυχε, χρησιμοποίησε το παρακάτω πεδίο για να αντιγράψεις χειροκίνητα την τιμή.</string>
-    <string name="webview_label_login_required">Η διαμόρφωσή σου απαιτεί σύνδεση. Εισήγαγε όνομα χρήστη και κωδικό.</string>
-    <string name="webview_placeholder_url">Εισήγαγε URL...</string>
-    <string name="login_label_title">Suwayomi Σύνδεση</string>
-    <string name="login_label_username">Όνομα χρήστη</string>
-    <string name="login_label_password">Κωδικός</string>
-    <string name="login_label_login">Σύνδεση</string>
-    <string name="login_placeholder_username">Πληκτρολόγησε όνομα χρήστη...</string>
-    <string name="login_placeholder_password">Μυστικό...</string>
-</resources>

server/server-config-generate/src/main/kotlin/suwayomi/tachidesk/server/settings/generation/SettingsBackupServerSettingsGenerator.kt

@@ -2,6 +2,7 @@ package suwayomi.tachidesk.server.settings.generation
 
 import suwayomi.tachidesk.server.settings.SettingsRegistry
 import java.io.File
+import kotlin.text.appendLine
 
 object SettingsBackupServerSettingsGenerator {
     fun generate(

server/server-config-generate/src/main/kotlin/suwayomi/tachidesk/server/settings/generation/SettingsBackupSettingsHandlerGenerator.kt

@@ -2,6 +2,7 @@ package suwayomi.tachidesk.server.settings.generation
 
 import suwayomi.tachidesk.server.settings.SettingsRegistry
 import java.io.File
+import kotlin.text.appendLine
 
 object SettingsBackupSettingsHandlerGenerator {
     fun generate(

server/server-config-generate/src/main/kotlin/suwayomi/tachidesk/server/settings/generation/SettingsGraphqlTypeGenerator.kt

@@ -2,6 +2,7 @@ package suwayomi.tachidesk.server.settings.generation
 
 import suwayomi.tachidesk.server.settings.SettingsRegistry
 import java.io.File
+import kotlin.text.appendLine
 
 object SettingsGraphqlTypeGenerator {
     fun generate(

server/server-config/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt

@@ -15,15 +15,17 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.onEach
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
 import suwayomi.tachidesk.graphql.types.AuthMode
 import suwayomi.tachidesk.graphql.types.CbzMediaType
 import suwayomi.tachidesk.graphql.types.DatabaseType
@@ -54,14 +56,16 @@ import suwayomi.tachidesk.server.settings.PathSetting
 import suwayomi.tachidesk.server.settings.SettingGroup
 import suwayomi.tachidesk.server.settings.SettingsRegistry
 import suwayomi.tachidesk.server.settings.StringSetting
-import uy.kohesive.injekt.injectLazy
 import xyz.nulldev.ts.config.GlobalConfigManager
 import xyz.nulldev.ts.config.SystemPropertyOverridableConfigModule
+import kotlin.collections.associate
+import kotlin.getValue
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
+import uy.kohesive.injekt.injectLazy
 
 val mutableConfigValueScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
 
@@ -71,21 +75,6 @@ val serverConfig: ServerConfig by lazy { GlobalConfigManager.module() }
 
 private val application: Application by injectLazy()
 
-@OptIn(ExperimentalCoroutinesApi::class)
-fun <T> subscribeTo(
-    flow: Flow<T>,
-    ignoreInitialValue: Boolean = true,
-    onChange: suspend (value: T) -> Unit,
-) {
-    val actualFlow =
-        if (ignoreInitialValue) {
-            flow.drop(1)
-        } else {
-            flow
-        }
-    actualFlow.distinctUntilChanged().conflate().onEach { onChange(it) }.launchIn(mutableConfigValueScope)
-}
-
 // Settings are ordered by "protoNumber".
 class ServerConfig(
     getConfig: () -> Config,
@@ -593,7 +582,7 @@ class ServerConfig(
         privacySafe = true,
         defaultValue = SortOrder.DESC,
         enumClass = SortOrder::class,
-        typeInfo = SettingsRegistry.PartialTypeInfo(imports = listOf("org.jetbrains.exposed.v1.core.SortOrder")),
+        typeInfo = SettingsRegistry.PartialTypeInfo(imports = listOf("org.jetbrains.exposed.sql.SortOrder")),
     )
 
     val authMode: MutableStateFlow<AuthMode> by EnumSetting(
@@ -1027,85 +1016,7 @@ class ServerConfig(
         description = "Use Hikari Connection Pool to connect to the database.",
     )
 
-    val kcefEnabled: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 86,
-        group = SettingGroup.WEB_VIEW,
-        privacySafe = true,
-        defaultValue = true,
-        description = "Enable the WebView via CEF (Chromium)"
-    )
 
-    val syncYomiEnabled: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 87,
-        defaultValue = false,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true
-    )
-
-    val syncYomiHost: MutableStateFlow<String> by StringSetting(
-        protoNumber = 88,
-        defaultValue = "",
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncYomiApiKey: MutableStateFlow<String> by StringSetting(
-        protoNumber = 89,
-        defaultValue = "",
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = false,
-    )
-
-    val syncDataManga: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 90,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncDataChapters: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 91,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncDataTracking: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 92,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncDataHistory: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 93,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncDataCategories: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 94,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncInterval: MutableStateFlow<Duration> by DurationSetting(
-        protoNumber = 95,
-        defaultValue = 0.seconds,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val opdsSkipChapterMetadataFeed: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 96,
-        group = SettingGroup.OPDS,
-        privacySafe = true,
-        defaultValue = false,
-        description = "Skips the metadata feed and provides download/stream links directly in the chapter list. Improves compatibility with KOReader auto-downloader. KoSync strategies are applied, but PROMPT conflicts are ignored (treating local progress as priority)."
-
-    )
 
     /** ****************************************************************** **/
     /**                                                                    **/
@@ -1150,7 +1061,18 @@ class ServerConfig(
         flow: Flow<T>,
         onChange: suspend (value: T) -> Unit,
         ignoreInitialValue: Boolean = true,
-    ) = subscribeTo(flow, ignoreInitialValue, onChange)
+    ) {
+        val actualFlow =
+            if (ignoreInitialValue) {
+                flow.drop(1)
+            } else {
+                flow
+            }
+
+        val sharedFlow = MutableSharedFlow<T>(extraBufferCapacity = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
+        actualFlow.distinctUntilChanged().mapLatest { sharedFlow.emit(it) }.launchIn(mutableConfigValueScope)
+        sharedFlow.onEach { onChange(it) }.launchIn(mutableConfigValueScope)
+    }
 
     fun <T> subscribeTo(
         flow: Flow<T>,

server/server-config/src/main/kotlin/suwayomi/tachidesk/server/settings/SettingGroup.kt

@@ -17,8 +17,6 @@ enum class SettingGroup(
     CLOUDFLARE("Cloudflare"),
     OPDS("OPDS"),
     KOREADER_SYNC("KOReader sync"),
-    WEB_VIEW("WebView"),
-    SYNCYOMI("SyncYomi")
     ;
 
     override fun toString(): String = value

server/server-config/src/main/kotlin/suwayomi/tachidesk/server/settings/SettingsRegistry.kt

@@ -2,6 +2,7 @@ package suwayomi.tachidesk.server.settings
 
 import com.typesafe.config.ConfigValue
 import com.typesafe.config.parser.ConfigDocument
+import kotlin.collections.find
 import kotlin.reflect.KClass
 
 /**
@@ -88,6 +89,4 @@ object SettingsRegistry {
     fun get(name: String): SettingMetadata? = settings[name]
 
     fun getAll(): Map<String, SettingMetadata> = settings.toMap()
-
-    fun clear() = settings.clear()
 }

server/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt

@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.network
 
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.okio.decodeFromBufferedSource
 import kotlinx.serialization.serializer

server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt

@@ -103,7 +103,7 @@ class CloudflareInterceptor(
     companion object {
         private val ERROR_CODES = listOf(403, 503)
         private val SERVER_CHECK = arrayOf("cloudflare-nginx", "cloudflare")
-        val COOKIE_NAMES = listOf("cf_clearance")
+        private val COOKIE_NAMES = listOf("cf_clearance")
         private val CHROME_IMAGE_TEMPLATE_REGEX = Regex("""<title>(.*?) \(\d+×\d+\)</title>""")
     }
 }
@@ -205,11 +205,8 @@ object CFClearance {
                                             session = serverConfig.flareSolverrSessionName.value,
                                             sessionTtlMinutes = serverConfig.flareSolverrSessionTtl.value,
                                             cookies =
-                                                network.cookieStore
+                                                network.cookieStore.get(originalRequest.url).map {
-                                                    .get(originalRequest.url)
+                                                    FlareSolverCookie(it.name, it.value)
-                                                    .filter { it.name !in CloudflareInterceptor.COOKIE_NAMES }
-                                                    .map { cookie ->
-                                                        FlareSolverCookie(cookie.name, cookie.value)
                                                 },
                                             returnOnlyCookies = onlyCookies,
                                             maxTimeout = timeout.inWholeMilliseconds.toInt(),

server/src/main/kotlin/eu/kanade/tachiyomi/source/local/LocalSource.kt

@@ -36,11 +36,10 @@ import nl.adaptivity.xmlutil.ExperimentalXmlUtilApi
 import nl.adaptivity.xmlutil.core.KtXmlReader
 import nl.adaptivity.xmlutil.serialization.XML
 import org.apache.commons.compress.archivers.zip.ZipFile
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.insert
-import org.jetbrains.exposed.v1.jdbc.insert
+import org.jetbrains.exposed.sql.insertAndGetId
-import org.jetbrains.exposed.v1.jdbc.insertAndGetId
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.registerCatalogueSource
 import suwayomi.tachidesk.manga.impl.util.storage.ImageUtil
 import suwayomi.tachidesk.manga.model.table.ExtensionTable

server/src/main/kotlin/suwayomi/tachidesk/global/impl/GlobalMeta.kt

@@ -1,12 +1,10 @@
 package suwayomi.tachidesk.global.impl
 
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.batchInsert
-import org.jetbrains.exposed.v1.core.statements.BatchUpdateStatement
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.batchInsert
+import org.jetbrains.exposed.sql.statements.BatchUpdateStatement
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.global.model.table.GlobalMetaTable
 
 /*
@@ -34,14 +32,13 @@ object GlobalMeta {
             val (existingMeta, newMeta) = meta.toList().partition { (key) -> key in dbMetaMap.keys }
 
             if (existingMeta.isNotEmpty()) {
-                BatchUpdateStatement(GlobalMetaTable)
+                BatchUpdateStatement(GlobalMetaTable).apply {
-                    .apply {
                     existingMeta.forEach { (key, value) ->
                         addBatch(EntityID(dbMetaMap[key]!![GlobalMetaTable.id].value, GlobalMetaTable))
                         this[GlobalMetaTable.value] = value
                     }
-                    }.toExecutable()
+                    execute(this@transaction)
-                    .execute(this@transaction)
+                }
             }
 
             if (newMeta.isNotEmpty()) {

server/src/main/kotlin/suwayomi/tachidesk/global/impl/KcefWebView.kt

@@ -1,14 +1,15 @@
 package suwayomi.tachidesk.global.impl
 
+import dev.datlag.kcef.KCEF
+import dev.datlag.kcef.KCEFBrowser
+import dev.datlag.kcef.KCEFClient
 import eu.kanade.tachiyomi.network.NetworkHelper
 import io.github.oshai.kotlinlogging.KotlinLogging
-import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.Cookie
 import okhttp3.HttpUrl
-import org.cef.CefClient
 import org.cef.CefSettings
 import org.cef.browser.CefBrowser
 import org.cef.browser.CefFrame
@@ -25,9 +26,6 @@ import org.cef.network.CefCookie
 import org.cef.network.CefCookieManager
 import org.cef.network.CefRequest
 import uy.kohesive.injekt.injectLazy
-import xyz.nulldev.androidcompat.webkit.CefHelper
-import xyz.nulldev.androidcompat.webkit.dispose
-import xyz.nulldev.androidcompat.webkit.evaluateJavaScript
 import java.awt.Component
 import java.awt.HeadlessException
 import java.awt.Rectangle
@@ -49,8 +47,8 @@ import javax.swing.JPanel
 class KcefWebView {
     private val logger = KotlinLogging.logger {}
     private val renderHandler = RenderHandler()
-    private var kcefClient: CefClient? = null
+    private var kcefClient: KCEFClient? = null
-    private var browser: CefBrowser? = null
+    private var browser: KCEFBrowser? = null
     private var width = 1000
     private var height = 1000
 
@@ -78,8 +76,7 @@ class KcefWebView {
         }
     }
 
-    @Serializable
+    @Serializable sealed class Event
-    sealed class Event
 
     @Serializable
     @SerialName("consoleMessage")
@@ -250,13 +247,11 @@ class KcefWebView {
     init {
         destroy()
         kcefClient =
-            runBlocking {
+            KCEF.newClientBlocking().apply {
-                CefHelper.createClient().apply {
                 addDisplayHandler(DisplayHandler())
                 addLoadHandler(LoadHandler())
                 addRequestHandler(RequestHandler())
             }
-            }
 
         logger.debug { "Start loading cookies" }
         CefCookieManager.getGlobalManager().apply {
@@ -294,7 +289,6 @@ class KcefWebView {
                 .createBrowser(
                     url,
                     CefRendering.CefRenderingWithHandler(renderHandler, JPanel()),
-                    false,
                     // NOTE: with a context, we don't seem to be getting any cookies
                 ).apply {
                     // NOTE: Without this, we don't seem to be receiving any events

server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncManager.kt

@@ -1,519 +0,0 @@
-package suwayomi.tachidesk.global.impl.sync
-
-import android.app.Application
-import android.content.Context
-import io.github.oshai.kotlinlogging.KotlinLogging
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.protobuf.ProtoBuf
-import org.jetbrains.exposed.v1.core.and
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
-import suwayomi.tachidesk.graphql.types.StartSyncResult
-import suwayomi.tachidesk.manga.impl.Category
-import suwayomi.tachidesk.manga.impl.Library.handleMangaThumbnail
-import suwayomi.tachidesk.manga.impl.backup.BackupFlags
-import suwayomi.tachidesk.manga.impl.backup.proto.ProtoBackupImport
-import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupCategoryHandler
-import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupMangaHandler
-import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupSourceHandler
-import suwayomi.tachidesk.manga.impl.backup.proto.models.Backup
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupChapter
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupManga
-import suwayomi.tachidesk.manga.model.dataclass.ChapterDataClass
-import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
-import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
-import suwayomi.tachidesk.manga.model.table.CategoryTable
-import suwayomi.tachidesk.manga.model.table.ChapterTable
-import suwayomi.tachidesk.manga.model.table.MangaTable
-import suwayomi.tachidesk.manga.model.table.toDataClass
-import suwayomi.tachidesk.server.serverConfig
-import suwayomi.tachidesk.util.HAScheduler
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import kotlin.time.Clock
-import kotlin.time.Duration.Companion.seconds
-import kotlin.time.Instant
-import kotlin.time.measureTime
-
-@Serializable
-data class SyncData(
-    val backup: Backup? = null,
-)
-
-object SyncManager {
-    private val syncPreferences = Injekt.get<Application>().getSharedPreferences("sync", Context.MODE_PRIVATE)
-    private val logger = KotlinLogging.logger {}
-
-    private var currentTaskId: String? = null
-    private val syncMutex = Mutex()
-
-    private val _lastSyncState: MutableStateFlow<SyncState?> = MutableStateFlow(null)
-    val lastSyncState: StateFlow<SyncState?> = _lastSyncState.asStateFlow()
-
-    @OptIn(DelicateCoroutinesApi::class)
-    fun scheduleSyncTask() {
-        serverConfig.subscribeTo(
-            combine(
-                serverConfig.syncYomiEnabled,
-                serverConfig.syncInterval,
-            ) { enabled, interval -> Pair(enabled, interval) },
-            { (enabled, interval) ->
-                currentTaskId?.let { HAScheduler.deschedule(it) }
-
-                currentTaskId =
-                    if (enabled && interval > 0.seconds) {
-                        val lastSyncDate =
-                            syncPreferences
-                                .getLong("last_scheduled_sync", 0L)
-                                .takeIf { it != 0L }
-                                ?.let { Instant.fromEpochMilliseconds(it) }
-
-                        if (lastSyncDate == null) {
-                            syncPreferences
-                                .edit()
-                                .putLong("last_scheduled_sync", Clock.System.now().toEpochMilliseconds())
-                                .apply()
-                        }
-
-                        val delay =
-                            if (lastSyncDate != null) {
-                                ((interval) - (Clock.System.now() - lastSyncDate)).coerceAtLeast(0.seconds)
-                            } else {
-                                interval
-                            }
-
-                        HAScheduler.schedule(
-                            {
-                                startSync(periodic = true)
-
-                                syncPreferences
-                                    .edit()
-                                    .putLong("last_scheduled_sync", Clock.System.now().toEpochMilliseconds())
-                                    .apply()
-                            },
-                            interval = interval.inWholeMilliseconds,
-                            delay = delay.inWholeMilliseconds,
-                            name = "sync",
-                        )
-                    } else {
-                        syncPreferences
-                            .edit()
-                            .remove("last_scheduled_sync")
-                            .apply()
-                        null
-                    }
-            },
-            ignoreInitialValue = false,
-        )
-    }
-
-    @OptIn(DelicateCoroutinesApi::class)
-    fun startSync(periodic: Boolean = false): StartSyncResult {
-        if (!serverConfig.syncYomiEnabled.value) {
-            return StartSyncResult.SYNC_DISABLED
-        }
-
-        if (!syncMutex.tryLock()) {
-            return StartSyncResult.SYNC_IN_PROGRESS
-        }
-
-        GlobalScope.launch {
-            try {
-                syncData(periodic)
-            } finally {
-                syncMutex.unlock()
-            }
-        }
-
-        return StartSyncResult.SUCCESS
-    }
-
-    suspend fun ensureSync() {
-        if (!serverConfig.syncYomiEnabled.value) {
-            return
-        }
-
-        if (syncMutex.tryLock()) {
-            // there is no ongoing sync, so start one
-            try {
-                syncData()
-            } finally {
-                syncMutex.unlock()
-            }
-        } else {
-            // wait for the ongoing sync to finish
-            syncMutex.withLock {}
-        }
-    }
-
-    private suspend fun syncData(periodic: Boolean = false) {
-        val startInstant = Clock.System.now()
-        _lastSyncState.value = SyncState.Started(startInstant)
-
-        try {
-            logger.info {
-                if (periodic) {
-                    "Starting periodic sync"
-                } else {
-                    "Starting manual sync"
-                }
-            }
-
-            transaction {
-                MangaTable.update({ MangaTable.isSyncing eq true }) {
-                    it[isSyncing] = false
-                }
-                ChapterTable.update({ ChapterTable.isSyncing eq true }) {
-                    it[isSyncing] = false
-                }
-                CategoryTable.update({ CategoryTable.isSyncing eq true }) {
-                    it[isSyncing] = false
-                }
-            }
-
-            val backupFlags =
-                BackupFlags(
-                    includeManga = serverConfig.syncDataManga.value,
-                    includeCategories = serverConfig.syncDataCategories.value,
-                    includeChapters = serverConfig.syncDataChapters.value,
-                    includeTracking = serverConfig.syncDataTracking.value,
-                    includeHistory = serverConfig.syncDataHistory.value,
-                    includeClientData = false,
-                    includeServerSettings = false,
-                )
-
-            _lastSyncState.value = SyncState.CreatingBackup(startInstant)
-            val backupMangas = BackupMangaHandler.backup(backupFlags)
-            val backup =
-                Backup(
-                    backupMangas,
-                    BackupCategoryHandler.backup(backupFlags).filter { it.name != Category.DEFAULT_CATEGORY_NAME },
-                    BackupSourceHandler.backup(backupMangas, backupFlags),
-                    emptyMap(),
-                    null,
-                )
-
-            val syncData =
-                SyncData(
-                    backup = backup,
-                )
-
-            val remoteBackup =
-                SyncYomiSyncService.doSync(syncData, startInstant) {
-                    _lastSyncState.value = it
-                }
-
-            if (remoteBackup == null) {
-                logger.debug { "Skip restore due to network issues" }
-                finishWithError(startInstant, "Network error", periodic)
-                return
-            }
-
-            if (remoteBackup === syncData.backup) {
-                // nothing changed
-                logger.debug { "Skip restore due to remote was overwrite from local" }
-                finishWithSuccess(startInstant, periodic)
-                return
-            }
-
-            // Stop the sync early if the remote backup is null or empty
-            if (remoteBackup.backupManga.isEmpty() && remoteBackup.backupCategories.isEmpty() && remoteBackup.backupSources.isEmpty()) {
-                logger.error { "No data found on remote server." }
-                finishWithError(startInstant, "No data found on remote server.", periodic)
-                return
-            }
-
-            val isLibraryEmpty =
-                transaction {
-                    MangaTable
-                        .selectAll()
-                        .where { MangaTable.inLibrary eq true }
-                        .empty()
-                }
-
-            // Check if it's first sync based on lastSyncTimestamp
-            if (syncPreferences.getLong("last_sync_timestamp", 0) == 0L && !isLibraryEmpty) {
-                // It's first sync no need to restore data. (just update remote data)
-                finishWithSuccess(startInstant, periodic)
-                return
-            }
-
-            val (filteredFavorites, nonFavorites) = filterFavoritesAndNonFavorites(remoteBackup)
-            updateNonFavorites(nonFavorites)
-
-            val newSyncData =
-                backup.copy(
-                    backupManga = filteredFavorites,
-                    backupCategories = remoteBackup.backupCategories,
-                    backupSources = remoteBackup.backupSources,
-                )
-
-            val hasMangaChanges = filteredFavorites.isNotEmpty()
-            val hasCategoryChanges = remoteBackup.backupCategories != backup.backupCategories
-            val hasSourceChanges = remoteBackup.backupSources != backup.backupSources
-
-            if (!hasMangaChanges && !hasCategoryChanges && !hasSourceChanges) {
-                // update the sync timestamp
-                finishWithSuccess(startInstant, periodic)
-                return
-            }
-
-            if (serverConfig.syncDataCategories.value) {
-                val mergedUids = newSyncData.backupCategories.map { it.uid }.toSet()
-                val mergedNames = newSyncData.backupCategories.map { it.name }.toSet()
-                val localCategories = Category.getCategoryList().filterNot { it.default } // Exclude system category
-                val categoriesToDelete =
-                    localCategories.filter {
-                        it.uid !in mergedUids && it.name !in mergedNames
-                    }
-                if (categoriesToDelete.isNotEmpty()) {
-                    transaction {
-                        categoriesToDelete.forEach {
-                            Category.removeCategory(it.id)
-                        }
-                    }
-                }
-            }
-
-            val backupStream = ProtoBuf.encodeToByteArray(Backup.serializer(), newSyncData).inputStream()
-            val restoreId =
-                ProtoBackupImport.restore(
-                    sourceStream = backupStream,
-                    flags = backupFlags,
-                    isSync = true,
-                )
-            _lastSyncState.value = SyncState.Restoring(startInstant, restoreId)
-
-            ProtoBackupImport.notifyFlow.first {
-                val restoreState = ProtoBackupImport.getRestoreState(restoreId)
-
-                restoreState == ProtoBackupImport.BackupRestoreState.Success ||
-                    restoreState == ProtoBackupImport.BackupRestoreState.Failure
-            }
-
-            // update the sync timestamp
-            finishWithSuccess(startInstant, periodic)
-        } catch (e: Throwable) {
-            logger.error { "Error syncing: ${e.message}" }
-            finishWithError(startInstant, "${e::class.qualifiedName}: ${e.message}", periodic)
-        }
-    }
-
-    private fun finishWithSuccess(
-        startInstant: Instant,
-        periodic: Boolean,
-    ) {
-        syncPreferences
-            .edit()
-            .putLong("last_sync_timestamp", Clock.System.now().toEpochMilliseconds())
-            .apply()
-        _lastSyncState.value = SyncState.Success(startInstant)
-
-        logger.info {
-            if (periodic) {
-                "Periodic sync completed successfully"
-            } else {
-                "Manual sync completed successfully"
-            }
-        }
-    }
-
-    private fun finishWithError(
-        startInstant: Instant,
-        message: String,
-        periodic: Boolean,
-    ) {
-        _lastSyncState.value = SyncState.Error(startInstant, message)
-
-        logger.info {
-            if (periodic) {
-                "Periodic sync failed: $message"
-            } else {
-                "Manual sync failed: $message"
-            }
-        }
-    }
-
-    private fun isMangaDifferent(
-        localManga: MangaDataClass,
-        remoteManga: BackupManga,
-    ): Boolean {
-        if (localManga.version != remoteManga.version) {
-            return true
-        }
-
-        val localChapters =
-            transaction {
-                ChapterTable
-                    .selectAll()
-                    .where { ChapterTable.manga eq localManga.id }
-                    .map { ChapterTable.toDataClass(it) }
-            }
-
-        if (areChaptersDifferent(localChapters, remoteManga.chapters)) {
-            return true
-        }
-
-        val localCategories =
-            transaction {
-                CategoryMangaTable
-                    .innerJoin(CategoryTable)
-                    .selectAll()
-                    .where { CategoryMangaTable.manga eq localManga.id }
-                    .map { it[CategoryTable.order] }
-            }
-
-        return localCategories.toSet() != remoteManga.categories.toSet()
-    }
-
-    private fun areChaptersDifferent(
-        localChapters: List<ChapterDataClass>,
-        remoteChapters: List<BackupChapter>,
-    ): Boolean {
-        val localChapterMap = localChapters.associateBy { it.url }
-        val remoteChapterMap = remoteChapters.associateBy { it.url }
-
-        if (localChapterMap.size != remoteChapterMap.size) {
-            return true
-        }
-
-        for ((url, localChapter) in localChapterMap) {
-            val remoteChapter = remoteChapterMap[url]
-
-            // If a matching remote chapter doesn't exist, or the version numbers are different, consider them different
-            if (remoteChapter == null || localChapter.version != remoteChapter.version) {
-                return true
-            }
-        }
-
-        return false
-    }
-
-    private fun filterFavoritesAndNonFavorites(backup: Backup): Pair<List<BackupManga>, List<BackupManga>> {
-        val favorites = mutableListOf<BackupManga>()
-        val nonFavorites = mutableListOf<BackupManga>()
-
-        val elapsedTime =
-            measureTime {
-                logger.debug { "Starting to filter favorites and non-favorites from backup data." }
-
-                backup.backupManga.forEach { remoteManga ->
-                    val localManga =
-                        transaction {
-                            MangaTable
-                                .selectAll()
-                                .where {
-                                    (MangaTable.sourceReference eq remoteManga.source) and
-                                        (MangaTable.url eq remoteManga.url)
-                                }.limit(1)
-                                .map { MangaTable.toDataClass(it) }
-                                .firstOrNull()
-                        }
-
-                    when {
-                        // Checks if the manga is in favorites and needs updating or adding
-                        remoteManga.favorite -> {
-                            if (localManga == null || isMangaDifferent(localManga, remoteManga)) {
-                                logger.debug { "Adding to favorites: ${remoteManga.title}" }
-                                favorites.add(remoteManga)
-                            } else {
-                                logger.debug { "Already up-to-date favorite: ${remoteManga.title}" }
-                            }
-                        }
-
-                        // Handle non-favorites
-                        !remoteManga.favorite -> {
-                            logger.debug { "Adding to non-favorites: ${remoteManga.title}" }
-                            nonFavorites.add(remoteManga)
-                        }
-                    }
-                }
-            }
-
-        logger.debug {
-            "Filtering completed in $elapsedTime. Favorites found: ${favorites.size}, Non-favorites found: ${nonFavorites.size}"
-        }
-
-        return Pair(favorites, nonFavorites)
-    }
-
-    private fun updateNonFavorites(nonFavorites: List<BackupManga>) {
-        nonFavorites.forEach { nonFavorite ->
-            val localManga =
-                transaction {
-                    MangaTable
-                        .selectAll()
-                        .where {
-                            (MangaTable.sourceReference eq nonFavorite.source) and
-                                (MangaTable.url eq nonFavorite.url)
-                        }.limit(1)
-                        .map { MangaTable.toDataClass(it) }
-                        .firstOrNull()
-                }
-
-            if (localManga != null) {
-                if (localManga.inLibrary != nonFavorite.favorite) {
-                    transaction {
-                        MangaTable.update({ MangaTable.id eq localManga.id }) {
-                            it[inLibrary] = nonFavorite.favorite
-                        }
-                    }.apply {
-                        handleMangaThumbnail(localManga.id, nonFavorite.favorite)
-                    }
-                }
-            }
-        }
-    }
-
-    sealed class SyncState(
-        open val startDate: Instant,
-    ) {
-        data class Started(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class CreatingBackup(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class Downloading(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class Merging(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class Uploading(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class Restoring(
-            override val startDate: Instant,
-            val restoreId: String,
-        ) : SyncState(startDate)
-
-        data class Success(
-            override val startDate: Instant,
-            val endDate: Instant = Clock.System.now(),
-        ) : SyncState(startDate)
-
-        data class Error(
-            override val startDate: Instant,
-            val message: String,
-            val endDate: Instant = Clock.System.now(),
-        ) : SyncState(startDate)
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncYomiSyncService.kt

@@ -1,517 +0,0 @@
-package suwayomi.tachidesk.global.impl.sync
-
-import android.app.Application
-import android.content.Context
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.NetworkHelper
-import eu.kanade.tachiyomi.network.PUT
-import eu.kanade.tachiyomi.network.await
-import io.github.oshai.kotlinlogging.KotlinLogging
-import io.javalin.http.HttpStatus
-import kotlinx.serialization.SerializationException
-import kotlinx.serialization.protobuf.ProtoBuf
-import okhttp3.Headers
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.RequestBody.Companion.toRequestBody
-import suwayomi.tachidesk.manga.impl.backup.proto.models.Backup
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupCategory
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupChapter
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupManga
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupSource
-import suwayomi.tachidesk.server.serverConfig
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import uy.kohesive.injekt.injectLazy
-import kotlin.time.Duration.Companion.milliseconds
-import kotlin.time.Duration.Companion.seconds
-import kotlin.time.Instant
-
-object SyncYomiSyncService {
-    private val syncPreferences = Injekt.get<Application>().getSharedPreferences("sync", Context.MODE_PRIVATE)
-
-    private val network: NetworkHelper by injectLazy()
-    private val logger = KotlinLogging.logger {}
-
-    private class SyncYomiException(
-        message: String?,
-    ) : Exception(message)
-
-    suspend fun doSync(
-        syncData: SyncData,
-        startDate: Instant,
-        setSyncState: (SyncManager.SyncState) -> Unit,
-    ): Backup? {
-        setSyncState(SyncManager.SyncState.Downloading(startDate))
-        val (remoteData, etag) = pullSyncData()
-
-        val finalSyncData =
-            if (remoteData != null) {
-                require(etag.isNotEmpty()) { "ETag should never be empty if remote data is not null" }
-                logger.debug { "Try update remote data with ETag($etag)" }
-                setSyncState(SyncManager.SyncState.Merging(startDate))
-                mergeSyncData(syncData, remoteData)
-            } else {
-                // init or overwrite remote data
-                logger.debug { "Try overwrite remote data with ETag($etag)" }
-                syncData
-            }
-
-        if (finalSyncData.backup != null) {
-            setSyncState(SyncManager.SyncState.Uploading(startDate))
-        }
-        pushSyncData(finalSyncData, etag)
-        return finalSyncData.backup
-    }
-
-    private suspend fun pullSyncData(): Pair<SyncData?, String> {
-        val host = serverConfig.syncYomiHost.value
-        val apiKey = serverConfig.syncYomiApiKey.value
-        val downloadUrl = "$host/api/sync/content"
-
-        val headersBuilder = Headers.Builder().add("X-API-Token", apiKey)
-        val lastETag = syncPreferences.getString("last_sync_etag", "") ?: ""
-        if (lastETag != "") {
-            headersBuilder.add("If-None-Match", lastETag)
-        }
-        val headers = headersBuilder.build()
-
-        val downloadRequest =
-            GET(
-                url = downloadUrl,
-                headers = headers,
-            )
-
-        val response = network.client.newCall(downloadRequest).await()
-
-        if (response.code == HttpStatus.NOT_MODIFIED.code) {
-            // not modified
-            require(lastETag.isNotEmpty())
-            logger.info { "Remote server not modified" }
-            return Pair(null, lastETag)
-        } else if (response.code == HttpStatus.NOT_FOUND.code) {
-            // maybe got deleted from remote
-            return Pair(null, "")
-        }
-
-        if (response.isSuccessful) {
-            val newETag =
-                response.headers["ETag"]
-                    ?.takeIf { it.isNotEmpty() } ?: throw SyncYomiException("Missing ETag")
-
-            val byteArray =
-                response.body.byteStream().use {
-                    return@use it.readBytes()
-                }
-
-            return try {
-                val backup = ProtoBuf.decodeFromByteArray(Backup.serializer(), byteArray)
-                return Pair(SyncData(backup = backup), newETag)
-            } catch (_: SerializationException) {
-                logger.info { "Bad content responsed from server" }
-                // the body is invalid
-                // return default value so we can overwrite it
-                Pair(null, "")
-            }
-        } else {
-            val responseBody = response.body.string()
-            logger.error { "SyncError: $responseBody" }
-            throw SyncYomiException("Failed to download sync data: $responseBody")
-        }
-    }
-
-    private suspend fun pushSyncData(
-        syncData: SyncData,
-        eTag: String,
-    ) {
-        val backup = syncData.backup ?: return
-
-        val host = serverConfig.syncYomiHost.value
-        val apiKey = serverConfig.syncYomiApiKey.value
-        val uploadUrl = "$host/api/sync/content"
-
-        val headersBuilder = Headers.Builder().add("X-API-Token", apiKey)
-        if (eTag.isNotEmpty()) {
-            headersBuilder.add("If-Match", eTag)
-        }
-        val headers = headersBuilder.build()
-
-        // Set timeout to 30 seconds
-        val timeout = 30.seconds
-        val client =
-            network.client
-                .newBuilder()
-                .connectTimeout(timeout)
-                .readTimeout(timeout)
-                .writeTimeout(timeout)
-                .build()
-
-        val byteArray = ProtoBuf.encodeToByteArray(Backup.serializer(), backup)
-        if (byteArray.isEmpty()) {
-            throw IllegalStateException("Empty backup error")
-        }
-        val body = byteArray.toRequestBody("application/octet-stream".toMediaType())
-
-        val uploadRequest =
-            PUT(
-                url = uploadUrl,
-                headers = headers,
-                body = body,
-            )
-
-        val response = client.newCall(uploadRequest).await()
-
-        if (response.isSuccessful) {
-            val newETag =
-                response.headers["ETag"]
-                    ?.takeIf { it.isNotEmpty() } ?: throw SyncYomiException("Missing ETag")
-            syncPreferences
-                .edit()
-                .putString("last_sync_etag", newETag)
-                .apply()
-            logger.debug { "SyncYomi sync completed" }
-        } else if (response.code == HttpStatus.PRECONDITION_FAILED.code) {
-            // other clients updated remote data, will try next time
-            logger.debug { "SyncYomi sync failed with 412" }
-        } else {
-            val responseBody = response.body.string()
-            logger.error { "SyncError: $responseBody" }
-        }
-    }
-
-    fun mergeSyncData(
-        localSyncData: SyncData,
-        remoteSyncData: SyncData,
-    ): SyncData {
-        val mergedCategoriesList =
-            mergeCategoriesLists(localSyncData.backup?.backupCategories, remoteSyncData.backup?.backupCategories)
-
-        val mergedMangaList =
-            mergeMangaLists(
-                localSyncData.backup?.backupManga,
-                remoteSyncData.backup?.backupManga,
-                localSyncData.backup?.backupCategories ?: emptyList(),
-                remoteSyncData.backup?.backupCategories ?: emptyList(),
-                mergedCategoriesList,
-            )
-
-        val mergedSourcesList =
-            mergeSourcesLists(localSyncData.backup?.backupSources, remoteSyncData.backup?.backupSources)
-
-        // Create the merged Backup object
-        val mergedBackup =
-            Backup(
-                backupManga = mergedMangaList,
-                backupCategories = mergedCategoriesList,
-                backupSources = mergedSourcesList,
-                meta = emptyMap(),
-                serverSettings = null,
-            )
-
-        // Create the merged SData object
-        return SyncData(
-            backup = mergedBackup,
-        )
-    }
-
-    private fun mergeMangaLists(
-        localMangaList: List<BackupManga>?,
-        remoteMangaList: List<BackupManga>?,
-        localCategories: List<BackupCategory>,
-        remoteCategories: List<BackupCategory>,
-        mergedCategories: List<BackupCategory>,
-    ): List<BackupManga> {
-        val localMangaListSafe = localMangaList.orEmpty()
-        val remoteMangaListSafe = remoteMangaList.orEmpty()
-
-        logger.debug { "Starting merge. Local list size: ${localMangaListSafe.size}, Remote list size: ${remoteMangaListSafe.size}" }
-
-        fun mangaCompositeKey(manga: BackupManga): String =
-            "${manga.source}|${manga.url}|${manga.title.lowercase().trim()}|${manga.author?.lowercase()?.trim()}"
-
-        // Create maps using composite keys
-        val localMangaMap = localMangaListSafe.associateBy { mangaCompositeKey(it) }
-        val remoteMangaMap = remoteMangaListSafe.associateBy { mangaCompositeKey(it) }
-
-        val localCategoriesMapByOrder = localCategories.associateBy { it.order }
-        val remoteCategoriesMapByOrder = remoteCategories.associateBy { it.order }
-        val mergedCategoriesMapByName = mergedCategories.associateBy { it.name }
-
-        fun updateCategories(
-            theManga: BackupManga,
-            theMap: Map<Int, BackupCategory>,
-        ): BackupManga =
-            theManga.copy(
-                categories =
-                    theManga.categories.mapNotNull {
-                        theMap[it]?.let { category ->
-                            mergedCategoriesMapByName[category.name]?.order
-                        }
-                    },
-            )
-
-        val lastSyncTime = syncPreferences.getLong("last_sync_timestamp", 0).milliseconds.inWholeSeconds
-
-        val mergedList =
-            (localMangaMap.keys + remoteMangaMap.keys).distinct().mapNotNull { compositeKey ->
-                val local = localMangaMap[compositeKey]
-                val remote = remoteMangaMap[compositeKey]
-
-                // New version comparison logic
-                when {
-                    local != null && remote == null -> {
-                        if (lastSyncTime == 0L || local.lastModifiedAt > lastSyncTime) {
-                            updateCategories(local, localCategoriesMapByOrder)
-                        } else {
-                            logger.debug { "Dropping local manga deleted on remote: ${local.title}." }
-                            null
-                        }
-                    }
-
-                    local == null && remote != null -> {
-                        if (lastSyncTime == 0L || remote.lastModifiedAt > lastSyncTime) {
-                            updateCategories(remote, remoteCategoriesMapByOrder)
-                        } else {
-                            logger.debug { "Dropping deleted remote manga: ${remote.title}." }
-                            null
-                        }
-                    }
-
-                    local != null && remote != null -> {
-                        // Compare versions to decide which manga to keep
-                        if (local.version >= remote.version) {
-                            logger.debug { "Keeping local version of ${local.title} with merged chapters." }
-                            updateCategories(
-                                local.copy(
-                                    chapters =
-                                        mergeChapters(
-                                            local.chapters,
-                                            remote.chapters,
-                                            lastSyncTime,
-                                            serverConfig.syncDataChapters.value,
-                                        ),
-                                ),
-                                localCategoriesMapByOrder,
-                            )
-                        } else {
-                            logger.debug { "Keeping remote version of ${remote.title} with merged chapters." }
-                            updateCategories(
-                                remote.copy(
-                                    chapters =
-                                        mergeChapters(
-                                            local.chapters,
-                                            remote.chapters,
-                                            lastSyncTime,
-                                            serverConfig.syncDataChapters.value,
-                                        ),
-                                ),
-                                remoteCategoriesMapByOrder,
-                            )
-                        }
-                    }
-
-                    else -> {
-                        null
-                    } // No manga found for key
-                }
-            }
-
-        // Counting favorites and non-favorites
-        val (favorites, nonFavorites) = mergedList.partition { it.favorite }
-
-        logger.debug {
-            "Merge completed. Total merged manga: ${mergedList.size}, Favorites: ${favorites.size}, Non-Favorites: ${nonFavorites.size}"
-        }
-
-        return mergedList
-    }
-
-    private fun mergeChapters(
-        localChapters: List<BackupChapter>,
-        remoteChapters: List<BackupChapter>,
-        lastSyncTime: Long,
-        syncingChapters: Boolean,
-    ): List<BackupChapter> {
-        if (!syncingChapters) {
-            return remoteChapters // If not syncing chapters, keep remote untouched
-        }
-
-        fun chapterCompositeKey(chapter: BackupChapter): String = "${chapter.url}|${chapter.name}|${chapter.chapterNumber}"
-
-        val localChapterMap = localChapters.associateBy { chapterCompositeKey(it) }
-        val remoteChapterMap = remoteChapters.associateBy { chapterCompositeKey(it) }
-
-        logger.debug { "Starting chapter merge. Local chapters: ${localChapters.size}, Remote chapters: ${remoteChapters.size}" }
-
-        // Merge both chapter maps based on version numbers
-        val mergedChapters =
-            (localChapterMap.keys + remoteChapterMap.keys).distinct().mapNotNull { compositeKey ->
-                val localChapter = localChapterMap[compositeKey]
-                val remoteChapter = remoteChapterMap[compositeKey]
-
-                logger.debug {
-                    "Processing chapter key: $compositeKey. Local chapter: ${localChapter != null}, Remote chapter: ${remoteChapter != null}"
-                }
-
-                when {
-                    localChapter != null && remoteChapter == null -> {
-                        if (lastSyncTime == 0L || localChapter.lastModifiedAt > lastSyncTime) {
-                            logger.debug { "Keeping local chapter: ${localChapter.name}." }
-                            localChapter
-                        } else {
-                            logger.debug { "Dropping local chapter deleted on remote: ${localChapter.name}." }
-                            null
-                        }
-                    }
-
-                    localChapter == null && remoteChapter != null -> {
-                        if (lastSyncTime == 0L || remoteChapter.lastModifiedAt > lastSyncTime) {
-                            logger.debug { "Taking remote chapter: ${remoteChapter.name}." }
-                            remoteChapter
-                        } else {
-                            logger.debug { "Dropping deleted remote chapter: ${remoteChapter.name}." }
-                            null
-                        }
-                    }
-
-                    localChapter != null && remoteChapter != null -> {
-                        // Use version number to decide which chapter to keep
-                        val chosenChapter =
-                            if (localChapter.version >= remoteChapter.version) {
-                                // If there are more chapter on remote, local sourceOrder will need to be updated to maintain correct source order.
-                                if (localChapters.size < remoteChapters.size) {
-                                    localChapter.copy(sourceOrder = remoteChapter.sourceOrder)
-                                } else {
-                                    localChapter
-                                }
-                            } else {
-                                remoteChapter
-                            }
-                        logger.debug {
-                            "Merging chapter: ${chosenChapter.name}. Chosen version from: ${if (localChapter.version >= remoteChapter.version) "Local" else "Remote"}, Local version: ${localChapter.version}, Remote version: ${remoteChapter.version}."
-                        }
-                        chosenChapter
-                    }
-
-                    else -> {
-                        logger.debug { "No chapter found for composite key: $compositeKey. Skipping." }
-                        null
-                    }
-                }
-            }
-
-        logger.debug { "Chapter merge completed. Total merged chapters: ${mergedChapters.size}" }
-
-        return mergedChapters
-    }
-
-    private fun mergeCategoriesLists(
-        localCategoriesList: List<BackupCategory>?,
-        remoteCategoriesList: List<BackupCategory>?,
-    ): List<BackupCategory> {
-        if (localCategoriesList == null) return remoteCategoriesList ?: emptyList()
-        if (remoteCategoriesList == null) return localCategoriesList
-        val result = mutableListOf<BackupCategory>()
-        val processedLocals = mutableSetOf<BackupCategory>()
-
-        val localMapByUid = localCategoriesList.filter { it.uid != 0L }.associateBy { it.uid }
-        val localMapByName = localCategoriesList.associateBy { it.name }
-
-        val lastSyncTime = syncPreferences.getLong("last_sync_timestamp", 0)
-
-        remoteCategoriesList.forEach { remote ->
-            var localMatch: BackupCategory? = null
-
-            // 1. Try match by UID
-            if (remote.uid != 0L) {
-                localMatch = localMapByUid[remote.uid]
-            }
-
-            // 2. Try match by Name (fallback)
-            if (localMatch == null) {
-                localMatch = localMapByName[remote.name]
-            }
-
-            if (localMatch != null) {
-                processedLocals.add(localMatch)
-                // Conflict resolution
-                if (localMatch.version >= remote.version) {
-                    logger.debug { "Keeping local category: ${localMatch.name} (UID: ${localMatch.uid})" }
-                    result.add(localMatch)
-                } else {
-                    logger.debug { "Keeping remote category: ${remote.name} (UID: ${remote.uid})" }
-                    // Preserve Local UID if Remote was 0
-                    if (remote.uid == 0L) {
-                        remote.uid = localMatch.uid
-                    }
-                    result.add(remote)
-                }
-            } else {
-                val remoteModifiedTimeMillis = remote.lastModifiedAt.seconds.inWholeMilliseconds
-                if (lastSyncTime == 0L || remoteModifiedTimeMillis > lastSyncTime) {
-                    logger.debug { "Adding new remote category: ${remote.name} (UID: ${remote.uid})" }
-                    result.add(remote)
-                } else {
-                    logger.debug { "Dropping deleted remote category: ${remote.name} (UID: ${remote.uid})" }
-                }
-            }
-        }
-
-        // Add remaining Local Categories
-        localCategoriesList.forEach { local ->
-            if (local !in processedLocals) {
-                val localModifiedTimeMillis = local.lastModifiedAt.seconds.inWholeMilliseconds
-                if (lastSyncTime == 0L || localModifiedTimeMillis > lastSyncTime) {
-                    logger.debug { "Keeping local only category: ${local.name} (UID: ${local.uid})" }
-                    result.add(local)
-                } else {
-                    logger.debug { "Dropping local category deleted on remote: ${local.name} (UID: ${local.uid})" }
-                }
-            }
-        }
-
-        return result.sortedBy { it.order }
-    }
-
-    private fun mergeSourcesLists(
-        localSources: List<BackupSource>?,
-        remoteSources: List<BackupSource>?,
-    ): List<BackupSource> {
-        // Create maps using sourceId as key
-        val localSourceMap = localSources?.associateBy { it.sourceId } ?: emptyMap()
-        val remoteSourceMap = remoteSources?.associateBy { it.sourceId } ?: emptyMap()
-
-        logger.debug { "Starting source merge. Local sources: ${localSources?.size}, Remote sources: ${remoteSources?.size}" }
-
-        // Merge both source maps
-        val mergedSources =
-            (localSourceMap.keys + remoteSourceMap.keys).distinct().mapNotNull { sourceId ->
-                val localSource = localSourceMap[sourceId]
-                val remoteSource = remoteSourceMap[sourceId]
-
-                logger.debug {
-                    "Processing source ID: $sourceId. Local source: ${localSource != null}, Remote source: ${remoteSource != null}"
-                }
-
-                when {
-                    localSource != null && remoteSource == null -> {
-                        logger.debug { "Using local source: ${localSource.name}." }
-                        localSource
-                    }
-
-                    remoteSource != null && localSource == null -> {
-                        logger.debug { "Using remote source: ${remoteSource.name}." }
-                        remoteSource
-                    }
-
-                    else -> {
-                        logger.debug { "Remote and local have the same source ID: $sourceId. Keeping local." }
-                        localSource
-                    }
-                }
-            }
-
-        logger.debug { "Source merge completed. Total merged sources: ${mergedSources.size}" }
-
-        return mergedSources
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/global/model/table/GlobalMetaTable.kt

@@ -7,12 +7,12 @@ package suwayomi.tachidesk.global.model.table
  * 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.dao.id.IntIdTable
+import org.jetbrains.exposed.dao.id.IntIdTable
 
 /**
  * Metadata storage for clients, server/global level.
  */
 object GlobalMetaTable : IntIdTable() {
-    val key = varchar("meta_key", 256)
+    val key = varchar("key", 256)
     val value = varchar("value", 4096)
 }

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/CategoryDataLoader.kt

@@ -11,10 +11,10 @@ import com.expediagroup.graphql.dataloader.KotlinDataLoader
 import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.types.CategoryNodeList
 import suwayomi.tachidesk.graphql.types.CategoryNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.CategoryType

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ChapterDataLoader.kt

@@ -11,17 +11,13 @@ import com.expediagroup.graphql.dataloader.KotlinDataLoader
 import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.core.count
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.count
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.core.greaterEq
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.core.inList
-import org.jetbrains.exposed.v1.jdbc.select
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.graphql.types.ChapterNodeList
 import suwayomi.tachidesk.graphql.types.ChapterNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.ChapterType

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ExtensionDataLoader.kt

@@ -11,10 +11,10 @@ import com.expediagroup.graphql.dataloader.KotlinDataLoader
 import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.types.ExtensionType
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import suwayomi.tachidesk.manga.model.table.SourceTable

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MangaDataLoader.kt

@@ -12,13 +12,11 @@ import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
 import org.dataloader.DataLoaderOptions
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.v1.core.isNull
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.andWhere
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.graphql.cache.CustomCacheMap
 import suwayomi.tachidesk.graphql.types.MangaNodeList
 import suwayomi.tachidesk.graphql.types.MangaNodeList.Companion.toNodeList

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MetaDataLoader.kt

@@ -4,10 +4,10 @@ import com.expediagroup.graphql.dataloader.KotlinDataLoader
 import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.global.model.table.GlobalMetaTable
 import suwayomi.tachidesk.graphql.types.CategoryMetaType
 import suwayomi.tachidesk.graphql.types.ChapterMetaType

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/SourceDataLoader.kt

@@ -11,10 +11,10 @@ import com.expediagroup.graphql.dataloader.KotlinDataLoader
 import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.types.SourceNodeList
 import suwayomi.tachidesk.graphql.types.SourceNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.SourceType

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/TrackDataLoader.kt

@@ -11,10 +11,10 @@ import com.expediagroup.graphql.dataloader.KotlinDataLoader
 import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.types.TrackRecordNodeList
 import suwayomi.tachidesk.graphql.types.TrackRecordNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.TrackRecordType

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/CategoryMutation.kt

@@ -2,22 +2,21 @@
 
 package suwayomi.tachidesk.graphql.mutations
 
-import org.jetbrains.exposed.v1.core.LikePattern
+import graphql.execution.DataFetcherResult
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.LikePattern
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.greaterEq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.like
-import org.jetbrains.exposed.v1.core.lessEq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.minus
-import org.jetbrains.exposed.v1.core.like
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.plus
-import org.jetbrains.exposed.v1.core.minus
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.or
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.core.plus
+import org.jetbrains.exposed.sql.insertAndGetId
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.or
-import org.jetbrains.exposed.v1.jdbc.insertAndGetId
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.update
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.CategoryMetaType
 import suwayomi.tachidesk.graphql.types.CategoryType

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ChapterMutation.kt

@@ -4,21 +4,19 @@ package suwayomi.tachidesk.graphql.mutations
 
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import org.jetbrains.exposed.v1.core.LikePattern
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.LikePattern
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.like
-import org.jetbrains.exposed.v1.core.like
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.or
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.core.statements.BatchUpdateStatement
+import org.jetbrains.exposed.sql.or
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.select
+import org.jetbrains.exposed.sql.statements.BatchUpdateStatement
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
+import org.jetbrains.exposed.sql.update
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.ChapterMetaType
 import suwayomi.tachidesk.graphql.types.ChapterType
@@ -92,8 +90,7 @@ class ChapterMutation {
             if (patch.isRead != null || patch.isBookmarked != null || patch.lastPageRead != null) {
                 val now = Instant.now().epochSecond
 
-                BatchUpdateStatement(ChapterTable)
+                BatchUpdateStatement(ChapterTable).apply {
-                    .apply {
                     ids.forEach { chapterId ->
                         addBatch(EntityID(chapterId, ChapterTable))
                         patch.isRead?.also {
@@ -107,8 +104,8 @@ class ChapterMutation {
                             this[ChapterTable.lastReadAt] = now
                         }
                     }
-                    }.toExecutable()
+                    execute(this@transaction)
-                    .execute(this@transaction)
+                }
             }
         }
 

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/DownloadMutation.kt

@@ -2,12 +2,11 @@
 
 package suwayomi.tachidesk.graphql.mutations
 
+import graphql.execution.DataFetcherResult
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withTimeout
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.transactions.transaction
-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.ChapterType
 import suwayomi.tachidesk.graphql.types.DownloadStatus

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ExtensionMutation.kt

@@ -3,12 +3,10 @@
 package suwayomi.tachidesk.graphql.mutations
 
 import eu.kanade.tachiyomi.source.local.LocalSource
+import graphql.execution.DataFetcherResult
 import io.javalin.http.UploadedFile
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.core.neq
-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.ExtensionType
 import suwayomi.tachidesk.manga.impl.extension.Extension

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/InfoMutation.kt

@@ -2,6 +2,7 @@
 
 package suwayomi.tachidesk.graphql.mutations
 
+import graphql.execution.DataFetcherResult
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withTimeout
 import suwayomi.tachidesk.graphql.directives.RequireAuth

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/KoreaderSyncMutation.kt

@@ -2,10 +2,10 @@
 
 package suwayomi.tachidesk.graphql.mutations
 
-import org.jetbrains.exposed.v1.core.eq
+import graphql.execution.DataFetcherResult
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
+import org.jetbrains.exposed.sql.update
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.ChapterType
 import suwayomi.tachidesk.graphql.types.KoSyncConnectPayload

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MangaMutation.kt

@@ -2,17 +2,17 @@
 
 package suwayomi.tachidesk.graphql.mutations
 
-import org.jetbrains.exposed.v1.core.LikePattern
+import org.jetbrains.exposed.sql.LikePattern
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.like
-import org.jetbrains.exposed.v1.core.like
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.or
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.or
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
+import org.jetbrains.exposed.sql.update
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.MangaMetaType
 import suwayomi.tachidesk.graphql.types.MangaType

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MetaMutation.kt

@@ -2,15 +2,16 @@
 
 package suwayomi.tachidesk.graphql.mutations
 
-import org.jetbrains.exposed.v1.core.LikePattern
+import graphql.execution.DataFetcherResult
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.LikePattern
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.like
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
-import org.jetbrains.exposed.v1.core.or
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.like
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.or
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.selectAll
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.global.impl.GlobalMeta
 import suwayomi.tachidesk.global.model.table.GlobalMetaTable
 import suwayomi.tachidesk.graphql.directives.RequireAuth

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SourceMutation.kt

@@ -7,16 +7,16 @@ import androidx.preference.EditTextPreference
 import androidx.preference.ListPreference
 import androidx.preference.MultiSelectListPreference
 import androidx.preference.SwitchPreferenceCompat
-import org.jetbrains.exposed.v1.core.LikePattern
+import org.jetbrains.exposed.sql.LikePattern
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.like
-import org.jetbrains.exposed.v1.core.like
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.or
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.or
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.FilterChange
 import suwayomi.tachidesk.graphql.types.MangaType

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SyncMutation.kt

@@ -1,28 +0,0 @@
-package suwayomi.tachidesk.graphql.mutations
-
-import suwayomi.tachidesk.global.impl.sync.SyncManager
-import suwayomi.tachidesk.graphql.directives.RequireAuth
-import suwayomi.tachidesk.graphql.types.StartSyncResult
-
-class SyncMutation {
-    data class StartSyncInput(
-        val clientMutationId: String? = null,
-    )
-
-    data class StartSyncPayload(
-        val clientMutationId: String? = null,
-        val result: StartSyncResult,
-    )
-
-    @RequireAuth
-    fun startSync(input: StartSyncInput): StartSyncPayload {
-        val (clientMutationId) = input
-
-        val result = SyncManager.startSync()
-
-        return StartSyncPayload(
-            clientMutationId = clientMutationId,
-            result = result,
-        )
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/TrackMutation.kt

@@ -4,10 +4,10 @@ package suwayomi.tachidesk.graphql.mutations
 
 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import com.expediagroup.graphql.generator.annotations.GraphQLDescription
-import org.jetbrains.exposed.v1.core.and
+import graphql.execution.DataFetcherResult
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.TrackRecordType
 import suwayomi.tachidesk.graphql.types.TrackerType

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/UpdateMutation.kt

@@ -2,6 +2,7 @@
 
 package suwayomi.tachidesk.graphql.mutations
 
+import graphql.execution.DataFetcherResult
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withTimeout
 import suwayomi.tachidesk.graphql.directives.RequireAuth

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/UserMutation.kt

@@ -4,6 +4,7 @@ package suwayomi.tachidesk.graphql.mutations
 
 import graphql.schema.DataFetchingEnvironment
 import suwayomi.tachidesk.global.impl.util.Jwt
+import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.server.getAttribute
 import suwayomi.tachidesk.server.JavalinSetup.Attribute
 import suwayomi.tachidesk.server.serverConfig

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/CategoryQuery.kt

@@ -10,13 +10,13 @@ package suwayomi.tachidesk.graphql.queries
 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.Column
+import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.v1.core.less
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
 import suwayomi.tachidesk.graphql.queries.filter.Filter

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ChapterQuery.kt

@@ -10,14 +10,14 @@ package suwayomi.tachidesk.graphql.queries
 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.Column
+import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.v1.core.less
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.v1.jdbc.andWhere
+import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
 import suwayomi.tachidesk.graphql.queries.filter.DoubleFilter

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt

@@ -11,14 +11,14 @@ import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import eu.kanade.tachiyomi.source.local.LocalSource
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.Column
+import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.v1.core.less
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.v1.core.neq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.neq
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
 import suwayomi.tachidesk.graphql.queries.filter.Filter

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MangaQuery.kt

@@ -10,17 +10,12 @@ package suwayomi.tachidesk.graphql.queries
 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.Column
+import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.v1.core.inSubQuery
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.core.less
-import org.jetbrains.exposed.v1.core.like
-import org.jetbrains.exposed.v1.jdbc.select
-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.queries.filter.BooleanFilter
 import suwayomi.tachidesk.graphql.queries.filter.ComparableScalarFilter
@@ -245,16 +240,13 @@ class MangaQuery {
     ): MangaNodeList {
         val queryResults =
             transaction {
-                val mangaIdsQuery =
+                val res =
                     MangaTable
                         .leftJoin(CategoryMangaTable)
-                        .select(MangaTable.id)
+                        .select(MangaTable.columns)
-                        .withDistinct()
+                        .withDistinctOn(MangaTable.id)
 
-                mangaIdsQuery.applyOps(condition, filter)
+                res.applyOps(condition, filter)
-
-                val res =
-                    MangaTable.selectAll().where { MangaTable.id inSubQuery mangaIdsQuery }
 
                 if (order != null || orderBy != null || (last != null || before != null)) {
                     val baseSort = listOf(MangaOrder(MangaOrderBy.ID, SortOrder.ASC))

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MetaQuery.kt

@@ -10,13 +10,13 @@ package suwayomi.tachidesk.graphql.queries
 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.Column
+import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.v1.core.less
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.global.model.table.GlobalMetaTable
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.Filter

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt

@@ -10,13 +10,13 @@ package suwayomi.tachidesk.graphql.queries
 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.Column
+import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.v1.core.less
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
 import suwayomi.tachidesk.graphql.queries.filter.Filter

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SyncQuery.kt

@@ -1,11 +0,0 @@
-package suwayomi.tachidesk.graphql.queries
-
-import suwayomi.tachidesk.global.impl.sync.SyncManager
-import suwayomi.tachidesk.graphql.directives.RequireAuth
-import suwayomi.tachidesk.graphql.types.SyncStatus
-import suwayomi.tachidesk.graphql.types.toStatus
-
-class SyncQuery {
-    @RequireAuth
-    fun lastSyncStatus(): SyncStatus? = SyncManager.lastSyncState.value?.toStatus()
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/TrackQuery.kt

@@ -3,13 +3,13 @@ package suwayomi.tachidesk.graphql.queries
 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.Column
+import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.v1.core.less
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
 import suwayomi.tachidesk.graphql.queries.filter.DoubleFilter

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/filter/Filter.kt

@@ -1,33 +1,21 @@
 package suwayomi.tachidesk.graphql.queries.filter
 
-import org.jetbrains.exposed.v1.core.Column
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.ComparisonOp
+import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.v1.core.Expression
+import org.jetbrains.exposed.sql.ComparisonOp
-import org.jetbrains.exposed.v1.core.ExpressionWithColumnType
+import org.jetbrains.exposed.sql.Expression
-import org.jetbrains.exposed.v1.core.LikePattern
+import org.jetbrains.exposed.sql.ExpressionWithColumnType
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.LikePattern
-import org.jetbrains.exposed.v1.core.QueryBuilder
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.Query
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.sql.QueryBuilder
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.greaterEq
+import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.not
-import org.jetbrains.exposed.v1.core.isNotNull
+import org.jetbrains.exposed.sql.or
-import org.jetbrains.exposed.v1.core.isNull
+import org.jetbrains.exposed.sql.stringParam
-import org.jetbrains.exposed.v1.core.less
+import org.jetbrains.exposed.sql.upperCase
-import org.jetbrains.exposed.v1.core.lessEq
-import org.jetbrains.exposed.v1.core.like
-import org.jetbrains.exposed.v1.core.neq
-import org.jetbrains.exposed.v1.core.not
-import org.jetbrains.exposed.v1.core.notInList
-import org.jetbrains.exposed.v1.core.notLike
-import org.jetbrains.exposed.v1.core.or
-import org.jetbrains.exposed.v1.core.stringParam
-import org.jetbrains.exposed.v1.core.upperCase
-import org.jetbrains.exposed.v1.core.wrap
-import org.jetbrains.exposed.v1.jdbc.Query
-import org.jetbrains.exposed.v1.jdbc.andWhere
 
 class ILikeEscapeOp(
     expr1: Expression<*>,
@@ -100,7 +88,9 @@ class DistinctFromOp(
         ): DistinctFromOp =
             DistinctFromOp(
                 expression,
-                expression.wrap(t),
+                with(SqlExpressionBuilder) {
+                    expression.wrap(t)
+                },
                 false,
             )
 
@@ -110,7 +100,9 @@ class DistinctFromOp(
         ): DistinctFromOp =
             DistinctFromOp(
                 expression,
-                expression.wrap(t),
+                with(SqlExpressionBuilder) {
+                    expression.wrap(t)
+                },
                 true,
             )
 
@@ -120,7 +112,9 @@ class DistinctFromOp(
         ): DistinctFromOp =
             DistinctFromOp(
                 expression,
-                expression.wrap(t),
+                with(SqlExpressionBuilder) {
+                    expression.wrap(t)
+                },
                 false,
             )
 
@@ -130,7 +124,9 @@ class DistinctFromOp(
         ): DistinctFromOp =
             DistinctFromOp(
                 expression,
-                expression.wrap(t),
+                with(SqlExpressionBuilder) {
+                    expression.wrap(t)
+                },
                 true,
             )
     }
@@ -435,7 +431,7 @@ fun <T : String, S : T?> andFilterWithCompareString(
 
     opAnd.andWhere(filter.isNull) { if (it) column.isNull() else column.isNotNull() }
     opAnd.andWhere(filter.equalTo) { column eq it as S }
-    opAnd.andNotWhere(filter.notEqualTo, filter.notEqualToAll, filter.notEqualToAny) { column neq it as S }
+    opAnd.andWhere(filter.notEqualTo, filter.notEqualToAll, filter.notEqualToAny) { column neq it as S }
     opAnd.andWhere(
         filter.distinctFrom,
         filter.distinctFromAll,
@@ -455,36 +451,36 @@ fun <T : String, S : T?> andFilterWithCompareString(
     opAnd.andWhere(filter.greaterThanOrEqualTo) { column greaterEq it }
 
     opAnd.andWhere(filter.includes, filter.includesAll, filter.includesAny) { column like "%$it%" }
-    opAnd.andNotWhere(filter.notIncludes, filter.notIncludesAll, filter.notIncludesAny) { column notLike "%$it%" }
+    opAnd.andWhere(filter.notIncludes, filter.notIncludesAll, filter.notIncludesAny) { column notLike "%$it%" }
     opAnd.andWhere(filter.includesInsensitive, filter.includesInsensitiveAll, filter.includesInsensitiveAny) {
         ILikeEscapeOp.iLike(column, "%$it%")
     }
-    opAnd.andNotWhere(filter.notIncludesInsensitive, filter.notIncludesInsensitiveAll, filter.notIncludesInsensitiveAny) {
+    opAnd.andWhere(filter.notIncludesInsensitive, filter.notIncludesInsensitiveAll, filter.notIncludesInsensitiveAny) {
         ILikeEscapeOp.iNotLike(column, "%$it%")
     }
 
     opAnd.andWhere(filter.startsWith, filter.startsWithAll, filter.startsWithAny) { column like "$it%" }
-    opAnd.andNotWhere(filter.notStartsWith, filter.notStartsWithAll, filter.notStartsWithAny) { column notLike "$it%" }
+    opAnd.andWhere(filter.notStartsWith, filter.notStartsWithAll, filter.notStartsWithAny) { column notLike "$it%" }
     opAnd.andWhere(filter.startsWithInsensitive, filter.startsWithInsensitiveAll, filter.startsWithInsensitiveAny) {
         ILikeEscapeOp.iLike(column, "$it%")
     }
-    opAnd.andNotWhere(filter.notStartsWithInsensitive, filter.notStartsWithInsensitiveAll, filter.notStartsWithInsensitiveAny) {
+    opAnd.andWhere(filter.notStartsWithInsensitive, filter.notStartsWithInsensitiveAll, filter.notStartsWithInsensitiveAny) {
         ILikeEscapeOp.iNotLike(column, "$it%")
     }
 
     opAnd.andWhere(filter.endsWith, filter.endsWithAll, filter.endsWithAny) { column like "%$it" }
-    opAnd.andNotWhere(filter.notEndsWith, filter.notEndsWithAll, filter.notEndsWithAny) { column notLike "%$it" }
+    opAnd.andWhere(filter.notEndsWith, filter.notEndsWithAll, filter.notEndsWithAny) { column notLike "%$it" }
     opAnd.andWhere(filter.endsWithInsensitive, filter.endsWithInsensitiveAll, filter.endsWithInsensitiveAny) {
         ILikeEscapeOp.iLike(column, "%$it")
     }
-    opAnd.andNotWhere(filter.notEndsWithInsensitive, filter.notEndsWithInsensitiveAll, filter.notEndsWithInsensitiveAny) {
+    opAnd.andWhere(filter.notEndsWithInsensitive, filter.notEndsWithInsensitiveAll, filter.notEndsWithInsensitiveAny) {
         ILikeEscapeOp.iNotLike(column, "%$it")
     }
 
     opAnd.andWhere(filter.like, filter.likeAll, filter.likeAny) { column like it }
-    opAnd.andNotWhere(filter.notLike, filter.notLikeAll, filter.notLikeAny) { column notLike it }
+    opAnd.andWhere(filter.notLike, filter.notLikeAll, filter.notLikeAny) { column notLike it }
     opAnd.andWhere(filter.likeInsensitive, filter.likeInsensitiveAll, filter.likeInsensitiveAny) { ILikeEscapeOp.iLike(column, it) }
-    opAnd.andNotWhere(filter.notLikeInsensitive, filter.notLikeInsensitiveAll, filter.notLikeInsensitiveAny) {
+    opAnd.andWhere(filter.notLikeInsensitive, filter.notLikeInsensitiveAll, filter.notLikeInsensitiveAny) {
         ILikeEscapeOp.iNotLike(column, it)
     }
 
@@ -509,75 +505,48 @@ class OpAnd(
 ) {
     fun <T> andWhere(
         value: T?,
-        andPart: (T & Any) -> Op<Boolean>,
+        andPart: SqlExpressionBuilder.(T & Any) -> Op<Boolean>,
     ) {
         value ?: return
-        val expr = andPart(value)
+        val expr = Op.build { andPart(value) }
         op = if (op == null) expr else (op!! and expr)
     }
 
     fun <T : Any> andWhere(
         values: List<T>?,
-        andPart: (List<T>) -> Op<Boolean>,
+        andPart: SqlExpressionBuilder.(List<T>) -> Op<Boolean>,
     ) {
         @Suppress("UNCHECKED_CAST")
-        return andWhere(values as T?, andPart as (Any) -> Op<Boolean>)
+        return andWhere(values as T?, andPart as SqlExpressionBuilder.(Any) -> Op<Boolean>)
     }
 
     fun <T : Any> andWhere(
         valueDefault: T?,
         valueAll: List<T>?,
         valueAny: List<T>?,
-        expr: (T) -> Op<Boolean>,
+        expr: SqlExpressionBuilder.(T) -> Op<Boolean>,
     ) {
         andWhere(valueDefault, expr)
         andWhereAll(valueAll, expr)
         andWhereAny(valueAny, expr)
     }
 
-    fun <T : Any> andNotWhere(
-        valueDefault: T?,
-        valueAll: List<T>?,
-        valueAny: List<T>?,
-        expr: (T) -> Op<Boolean>,
-    ) {
-        andWhere(valueDefault, expr)
-        andNotWhereAll(valueAll, expr)
-        andNotWhereAny(valueAny, expr)
-    }
-
     fun <T : Any> andWhereAll(
         values: List<T>?,
-        andPart: (T) -> Op<Boolean>,
+        andPart: SqlExpressionBuilder.(T) -> Op<Boolean>,
     ) {
         values?.map { andWhere(it, andPart) }
     }
 
-    fun <T : Any> andNotWhereAll(
-        values: List<T>?,
-        andPart: (T) -> Op<Boolean>,
-    ) {
-        // Inversed all equals any
-        andWhereAny(values, andPart)
-    }
-
     fun <T : Any> andWhereAny(
         values: List<T>?,
-        andPart: (T) -> Op<Boolean>,
+        andPart: SqlExpressionBuilder.(T) -> Op<Boolean>,
     ) {
         values ?: return
-        val expr = values.map { andPart(it) }.reduceOrNull { acc, op -> acc or op } ?: return
+        val expr = values.map { Op.build { andPart(it) } }.reduce { acc, op -> acc or op }
         op = if (op == null) expr else (op!! and expr)
     }
 
-    fun <T : Any> andNotWhereAny(
-        values: List<T>?,
-        andPart: (T) -> Op<Boolean>,
-    ) {
-        // Inversed any equals all
-        andWhereAll(values, andPart)
-    }
-
     fun <T> eq(
         value: T?,
         column: Column<T>,
@@ -605,7 +574,7 @@ fun <T : Comparable<T>, S : T?> andFilterWithCompare(
     opAnd.andWhere(filter.isNull) { if (it) column.isNull() else column.isNotNull() }
 
     opAnd.andWhere(filter.equalTo) { column eq it as S }
-    opAnd.andNotWhere(filter.notEqualTo, filter.notEqualToAll, filter.notEqualToAny) { column neq it as S }
+    opAnd.andWhere(filter.notEqualTo, filter.notEqualToAll, filter.notEqualToAny) { column neq it as S }
     opAnd.andWhere(filter.distinctFrom, filter.distinctFromAll, filter.distinctFromAny) { DistinctFromOp.distinctFrom(column, it as S) }
     opAnd.andWhere(filter.notDistinctFrom) { DistinctFromOp.notDistinctFrom(column, it as S) }
     if (!filter.`in`.isNullOrEmpty()) {
@@ -633,7 +602,7 @@ fun <T : Comparable<T>> andFilterWithCompareEntity(
     opAnd.andWhere(filter.isNull) { if (it) column.isNull() else column.isNotNull() }
 
     opAnd.andWhere(filter.equalTo) { column eq it }
-    opAnd.andNotWhere(filter.notEqualTo, filter.notEqualToAll, filter.notEqualToAny) { column neq it }
+    opAnd.andWhere(filter.notEqualTo, filter.notEqualToAll, filter.notEqualToAny) { column neq it }
     opAnd.andWhere(filter.distinctFrom, filter.distinctFromAll, filter.distinctFromAny) { DistinctFromOp.distinctFrom(column, it) }
     opAnd.andWhere(filter.notDistinctFrom) { DistinctFromOp.notDistinctFrom(column, it) }
     if (!filter.`in`.isNullOrEmpty()) {

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/JavalinGraphQLRequestParser.kt

@@ -14,6 +14,7 @@ import com.expediagroup.graphql.server.types.GraphQLServerRequest
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.javalin.http.Context
 import io.javalin.http.UploadedFile
+import io.javalin.json.JavalinJackson
 import io.javalin.json.fromJsonStream
 import io.javalin.json.fromJsonString
 import java.io.IOException

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLSchema.kt

@@ -27,7 +27,6 @@ import suwayomi.tachidesk.graphql.mutations.MangaMutation
 import suwayomi.tachidesk.graphql.mutations.MetaMutation
 import suwayomi.tachidesk.graphql.mutations.SettingsMutation
 import suwayomi.tachidesk.graphql.mutations.SourceMutation
-import suwayomi.tachidesk.graphql.mutations.SyncMutation
 import suwayomi.tachidesk.graphql.mutations.TrackMutation
 import suwayomi.tachidesk.graphql.mutations.UpdateMutation
 import suwayomi.tachidesk.graphql.mutations.UserMutation
@@ -42,7 +41,6 @@ import suwayomi.tachidesk.graphql.queries.MangaQuery
 import suwayomi.tachidesk.graphql.queries.MetaQuery
 import suwayomi.tachidesk.graphql.queries.SettingsQuery
 import suwayomi.tachidesk.graphql.queries.SourceQuery
-import suwayomi.tachidesk.graphql.queries.SyncQuery
 import suwayomi.tachidesk.graphql.queries.TrackQuery
 import suwayomi.tachidesk.graphql.queries.UpdateQuery
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
@@ -52,7 +50,6 @@ import suwayomi.tachidesk.graphql.server.primitives.GraphQLLongAsString
 import suwayomi.tachidesk.graphql.server.primitives.GraphQLUpload
 import suwayomi.tachidesk.graphql.subscriptions.DownloadSubscription
 import suwayomi.tachidesk.graphql.subscriptions.InfoSubscription
-import suwayomi.tachidesk.graphql.subscriptions.SyncSubscription
 import suwayomi.tachidesk.graphql.subscriptions.UpdateSubscription
 import kotlin.reflect.KClass
 import kotlin.reflect.KType
@@ -101,7 +98,6 @@ val schema =
                 TopLevelObject(MetaQuery()),
                 TopLevelObject(SettingsQuery()),
                 TopLevelObject(SourceQuery()),
-                TopLevelObject(SyncQuery()),
                 TopLevelObject(TrackQuery()),
                 TopLevelObject(UpdateQuery()),
             ),
@@ -118,7 +114,6 @@ val schema =
                 TopLevelObject(MangaMutation()),
                 TopLevelObject(MetaMutation()),
                 TopLevelObject(SettingsMutation()),
-                TopLevelObject(SyncMutation()),
                 TopLevelObject(SourceMutation()),
                 TopLevelObject(TrackMutation()),
                 TopLevelObject(UpdateMutation()),
@@ -128,7 +123,6 @@ val schema =
             listOf(
                 TopLevelObject(DownloadSubscription()),
                 TopLevelObject(InfoSubscription()),
-                TopLevelObject(SyncSubscription()),
                 TopLevelObject(UpdateSubscription()),
             ),
     )

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLServer.kt

@@ -15,6 +15,7 @@ import graphql.GraphQL
 import graphql.execution.AsyncExecutionStrategy
 import graphql.execution.DataFetcherExceptionHandler
 import graphql.execution.DataFetcherExceptionHandlerResult
+import graphql.schema.idl.RuntimeWiring
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.javalin.http.Context
 import io.javalin.websocket.WsCloseContext

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/primitives/OrderBy.kt

@@ -1,16 +1,16 @@
 package suwayomi.tachidesk.graphql.server.primitives
 
-import org.jetbrains.exposed.v1.core.Column
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.Query
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.v1.core.less
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.v1.core.or
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.jdbc.Query
+import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.v1.jdbc.andWhere
+import org.jetbrains.exposed.sql.or
 
 interface OrderBy<T> {
     val column: Column<*>

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/primitives/QueryResults.kt

@@ -1,6 +1,6 @@
 package suwayomi.tachidesk.graphql.server.primitives
 
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
 
 data class QueryResults<T>(
     val total: Long,

server/src/main/kotlin/suwayomi/tachidesk/graphql/subscriptions/SyncSubscription.kt

@@ -1,17 +0,0 @@
-package suwayomi.tachidesk.graphql.subscriptions
-
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.map
-import suwayomi.tachidesk.global.impl.sync.SyncManager
-import suwayomi.tachidesk.graphql.directives.RequireAuth
-import suwayomi.tachidesk.graphql.types.SyncStatus
-import suwayomi.tachidesk.graphql.types.toStatus
-
-class SyncSubscription {
-    @RequireAuth
-    fun syncStatusChanged(): Flow<SyncStatus> =
-        SyncManager.lastSyncState
-            .filterNotNull()
-            .map { it.toStatus() }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/CategoryType.kt

@@ -9,7 +9,7 @@ package suwayomi.tachidesk.graphql.types
 
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Edge
 import suwayomi.tachidesk.graphql.server.primitives.Node

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/ChapterType.kt

@@ -9,7 +9,7 @@ package suwayomi.tachidesk.graphql.types
 
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Edge
 import suwayomi.tachidesk.graphql.server.primitives.Node

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/ExtensionType.kt

@@ -9,7 +9,7 @@ package suwayomi.tachidesk.graphql.types
 
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Edge
 import suwayomi.tachidesk.graphql.server.primitives.Node

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/MangaType.kt

@@ -10,7 +10,7 @@ package suwayomi.tachidesk.graphql.types
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
 import suwayomi.tachidesk.graphql.cache.CustomCacheMap
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Edge

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/MetaType.kt

@@ -2,7 +2,7 @@ package suwayomi.tachidesk.graphql.types
 
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
 import suwayomi.tachidesk.global.model.table.GlobalMetaTable
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Edge

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SourceType.kt

@@ -13,9 +13,8 @@ import eu.kanade.tachiyomi.source.ConfigurableSource
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.online.HttpSource
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.selectAll
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Edge
 import suwayomi.tachidesk.graphql.server.primitives.Node

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SyncType.kt

@@ -1,91 +0,0 @@
-package suwayomi.tachidesk.graphql.types
-
-import suwayomi.tachidesk.global.impl.sync.SyncManager
-
-enum class StartSyncResult {
-    SUCCESS,
-    SYNC_IN_PROGRESS,
-    SYNC_DISABLED,
-}
-
-enum class SyncState {
-    STARTED,
-    CREATING_BACKUP,
-    DOWNLOADING,
-    MERGING,
-    UPLOADING,
-    RESTORING,
-    SUCCESS,
-    ERROR,
-}
-
-data class SyncStatus(
-    val state: SyncState,
-    val startDate: Long,
-    val endDate: Long? = null,
-    val backupRestoreId: String? = null,
-    val errorMessage: String? = null,
-)
-
-fun SyncManager.SyncState.toStatus(): SyncStatus =
-    when (this) {
-        is SyncManager.SyncState.Started -> {
-            SyncStatus(
-                state = SyncState.STARTED,
-                startDate = startDate.toEpochMilliseconds(),
-            )
-        }
-
-        is SyncManager.SyncState.CreatingBackup -> {
-            SyncStatus(
-                state = SyncState.CREATING_BACKUP,
-                startDate = startDate.toEpochMilliseconds(),
-            )
-        }
-
-        is SyncManager.SyncState.Downloading -> {
-            SyncStatus(
-                state = SyncState.DOWNLOADING,
-                startDate = startDate.toEpochMilliseconds(),
-            )
-        }
-
-        is SyncManager.SyncState.Merging -> {
-            SyncStatus(
-                state = SyncState.MERGING,
-                startDate = startDate.toEpochMilliseconds(),
-            )
-        }
-
-        is SyncManager.SyncState.Uploading -> {
-            SyncStatus(
-                state = SyncState.UPLOADING,
-                startDate = startDate.toEpochMilliseconds(),
-            )
-        }
-
-        is SyncManager.SyncState.Restoring -> {
-            SyncStatus(
-                state = SyncState.RESTORING,
-                startDate = startDate.toEpochMilliseconds(),
-                backupRestoreId = restoreId,
-            )
-        }
-
-        is SyncManager.SyncState.Success -> {
-            SyncStatus(
-                state = SyncState.SUCCESS,
-                startDate = startDate.toEpochMilliseconds(),
-                endDate = endDate.toEpochMilliseconds(),
-            )
-        }
-
-        is SyncManager.SyncState.Error -> {
-            SyncStatus(
-                state = SyncState.ERROR,
-                startDate = startDate.toEpochMilliseconds(),
-                endDate = endDate.toEpochMilliseconds(),
-                errorMessage = message,
-            )
-        }
-    }

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/TrackType.kt

@@ -2,7 +2,7 @@ package suwayomi.tachidesk.graphql.types
 
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Edge
 import suwayomi.tachidesk.graphql.server.primitives.Node

server/src/main/kotlin/suwayomi/tachidesk/manga/controller/MangaController.kt

@@ -12,9 +12,8 @@ import io.javalin.http.HttpStatus
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.update
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.manga.impl.CategoryManga
 import suwayomi.tachidesk.manga.impl.Chapter
 import suwayomi.tachidesk.manga.impl.ChapterDownloadHelper

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Category.kt

@@ -7,27 +7,25 @@ package suwayomi.tachidesk.manga.impl
  * 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.SortOrder
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.v1.core.isNull
+import org.jetbrains.exposed.sql.batchInsert
-import org.jetbrains.exposed.v1.core.neq
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.core.statements.BatchUpdateStatement
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.andWhere
+import org.jetbrains.exposed.sql.statements.BatchUpdateStatement
-import org.jetbrains.exposed.v1.jdbc.batchInsert
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.update
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.manga.model.dataclass.CategoryDataClass
 import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
 import suwayomi.tachidesk.manga.model.table.CategoryMetaTable
 import suwayomi.tachidesk.manga.model.table.CategoryTable
 import suwayomi.tachidesk.manga.model.table.MangaTable
 import suwayomi.tachidesk.manga.model.table.toDataClass
+import kotlin.collections.component1
+import kotlin.collections.orEmpty
 
 object Category {
     /**
@@ -250,14 +248,13 @@ object Category {
                 }
 
             if (existingMetaByMetaId.isNotEmpty()) {
-                BatchUpdateStatement(CategoryMetaTable)
+                BatchUpdateStatement(CategoryMetaTable).apply {
-                    .apply {
                     existingMetaByMetaId.forEach { (metaId, entry) ->
                         addBatch(EntityID(metaId, CategoryMetaTable))
                         this[CategoryMetaTable.value] = entry.value
                     }
-                    }.toExecutable()
+                    execute(this@transaction)
-                    .execute(this@transaction)
+                }
             }
 
             if (newMetaByCategoryId.isNotEmpty()) {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt

@@ -7,22 +7,19 @@ package suwayomi.tachidesk.manga.impl
  * 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.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.alias
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.alias
-import org.jetbrains.exposed.v1.core.count
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.batchInsert
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.count
-import org.jetbrains.exposed.v1.core.isNull
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.core.leftJoin
+import org.jetbrains.exposed.sql.leftJoin
-import org.jetbrains.exposed.v1.core.max
+import org.jetbrains.exposed.sql.max
-import org.jetbrains.exposed.v1.core.wrapAsExpression
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.batchInsert
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.wrapAsExpression
-import org.jetbrains.exposed.v1.jdbc.select
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.manga.impl.Category.DEFAULT_CATEGORY_ID
 import suwayomi.tachidesk.manga.model.dataclass.CategoryDataClass
 import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
@@ -85,12 +82,6 @@ object CategoryManga {
         }
     }
 
-    fun removeMangaFromAllCategories(mangaId: Int) {
-        transaction {
-            CategoryMangaTable.deleteWhere { CategoryMangaTable.manga eq mangaId }
-        }
-    }
-
     /**
      * list of mangas that belong to a category
      */
@@ -117,14 +108,12 @@ object CategoryManga {
 
         val transform: (ResultRow) -> MangaDataClass = {
             // Map the data from the result row to the MangaDataClass
-            MangaTable
+            val dataClass = MangaTable.toDataClass(it)
-                .toDataClass(it)
+            dataClass.lastReadAt = it[lastReadAt]
-                .copy(
+            dataClass.unreadCount = it[unreadCount]
-                    lastReadAt = it[lastReadAt],
+            dataClass.downloadCount = it[downloadedCount]
-                    unreadCount = it[unreadCount],
+            dataClass.chapterCount = it[chapterCount]
-                    downloadCount = it[downloadedCount],
+            dataClass
-                    chapterCount = it[chapterCount],
-                )
         }
 
         return transaction {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Chapter.kt

@@ -17,21 +17,17 @@ import io.github.reactivecircus.cache4k.Cache
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.serialization.Serializable
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.batchInsert
-import org.jetbrains.exposed.v1.core.less
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.core.statements.BatchUpdateStatement
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.batchInsert
+import org.jetbrains.exposed.sql.statements.BatchUpdateStatement
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.select
+import org.jetbrains.exposed.sql.update
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.manga.impl.Manga.getManga
 import suwayomi.tachidesk.manga.impl.download.DownloadManager
 import suwayomi.tachidesk.manga.impl.download.DownloadManager.EnqueueInput
@@ -104,6 +100,9 @@ object Chapter {
                     .associateBy({ it[ChapterTable.url] }, { it })
             }
 
+        val chapterIds = chapterList.map { dbChapterMap.getValue(it.url)[ChapterTable.id] }
+        val chapterMetas = getChaptersMetaMaps(chapterIds.map { it.value })
+
         return chapterList.mapIndexed { index, it ->
 
             val dbChapter = dbChapterMap.getValue(it.url)
@@ -125,8 +124,8 @@ object Chapter {
                 realUrl = dbChapter[ChapterTable.realUrl],
                 downloaded = dbChapter[ChapterTable.isDownloaded],
                 pageCount = dbChapter[ChapterTable.pageCount],
-                lastModifiedAt = dbChapter[ChapterTable.lastModifiedAt],
+                chapterCount = chapterList.size,
-                version = dbChapter[ChapterTable.version],
+                meta = chapterMetas.getValue(dbChapter[ChapterTable.id].value),
             )
         }
     }
@@ -189,7 +188,7 @@ object Chapter {
                     }
 
                 // new chapters after they have been added to the database for auto downloads
-                val insertedChapterIds = mutableListOf<Int>()
+                val insertedChapters = mutableListOf<ChapterDataClass>()
 
                 val chaptersToInsert = mutableListOf<ChapterDataClass>() // do not yet have an ID from the database
                 val chaptersToUpdate = mutableListOf<ChapterDataClass>()
@@ -233,7 +232,7 @@ object Chapter {
                 val deletedChapterNumbers = TreeSet<Float>()
                 val deletedReadChapterNumbers = TreeSet<Float>()
                 val deletedBookmarkedChapterNumbers = TreeSet<Float>()
-                val deletedDownloadedChapterNumberToChapter = mutableMapOf<Float, ChapterDataClass>()
+                val deletedDownloadedChapterNumberInfoMap = mutableMapOf<Float, MutableMap<String?, Int>>()
                 val deletedChapterNumberDateFetchMap = mutableMapOf<Float, Long>()
 
                 // clear any orphaned/duplicate chapters that are in the db but not in `chapterList`
@@ -244,7 +243,13 @@ object Chapter {
                         if (!chapterUrls.contains(dbChapter.url)) {
                             if (dbChapter.read) deletedReadChapterNumbers.add(dbChapter.chapterNumber)
                             if (dbChapter.bookmarked) deletedBookmarkedChapterNumbers.add(dbChapter.chapterNumber)
-                            if (dbChapter.downloaded) deletedDownloadedChapterNumberToChapter[dbChapter.chapterNumber] = dbChapter
+                            if (dbChapter.downloaded) {
+                                val pageCountByScanlator =
+                                    deletedDownloadedChapterNumberInfoMap.getOrPut(
+                                        dbChapter.chapterNumber,
+                                    ) { mutableMapOf() }
+                                pageCountByScanlator[dbChapter.scanlator] = dbChapter.pageCount
+                            }
                             deletedChapterNumbers.add(dbChapter.chapterNumber)
                             deletedChapterNumberDateFetchMap[dbChapter.chapterNumber] = dbChapter.fetchedAt
                             dbChapter.id
@@ -253,14 +258,16 @@ object Chapter {
                         }
                     }
 
-                transaction {
                 // we got some clean up due
                 if (chaptersIdsToDelete.isNotEmpty()) {
                     DownloadManager.dequeue(chaptersIdsToDelete)
+                    transaction {
                         PageTable.deleteWhere { chapter inList chaptersIdsToDelete }
                         ChapterTable.deleteWhere { id inList chaptersIdsToDelete }
                     }
+                }
 
+                transaction {
                     if (chaptersToInsert.isNotEmpty()) {
                         ChapterTable
                             .batchInsert(chaptersToInsert) { chapter ->
@@ -276,72 +283,42 @@ object Chapter {
                                 this[ChapterTable.isRead] = false
                                 this[ChapterTable.isBookmarked] = false
                                 this[ChapterTable.isDownloaded] = false
-                                this[ChapterTable.lastModifiedAt] = chapter.lastModifiedAt
-                                this[ChapterTable.version] = chapter.version
-                                this[ChapterTable.pageCount] = -1
 
                                 // is recognized chapter number
                                 if (chapter.chapterNumber >= 0f && chapter.chapterNumber in deletedChapterNumbers) {
                                     this[ChapterTable.isRead] = chapter.chapterNumber in deletedReadChapterNumbers
                                     this[ChapterTable.isBookmarked] = chapter.chapterNumber in deletedBookmarkedChapterNumbers
 
+                                    // only preserve download status for chapters of the same scanlator, otherwise,
+                                    // the downloaded files won't be found anyway
+                                    val downloadedChapterInfo = deletedDownloadedChapterNumberInfoMap[chapter.chapterNumber]
+                                    val pageCount = downloadedChapterInfo?.get(chapter.scanlator)
+                                    if (pageCount != null) {
+                                        this[ChapterTable.isDownloaded] = true
+                                        this[ChapterTable.pageCount] = pageCount
+                                    }
                                     // Try to use the fetch date of the original entry to not pollute 'Updates' tab
                                     deletedChapterNumberDateFetchMap[chapter.chapterNumber]?.let {
                                         this[ChapterTable.fetchedAt] = it
                                     }
-
-                                    deletedDownloadedChapterNumberToChapter[chapter.chapterNumber]?.let {
-                                        val hasDownloadedPages = it.pageCount > 0
-                                        val isSameName = it.name == chapter.name
-                                        val isSameScanlator = it.scanlator == chapter.scanlator
-
-                                        // Only preserve download status for chapters with the same name and of the same scanlator; otherwise,
-                                        // the downloaded files won't be found anyway
-                                        val isDownloadPreservable = hasDownloadedPages && isSameName && isSameScanlator
-                                        if (isDownloadPreservable) {
-                                            this[ChapterTable.isDownloaded] = true
-                                            this[ChapterTable.pageCount] = it.pageCount
                                 }
-                                    }
+                            }.forEach { insertedChapters.add(ChapterTable.toDataClass(it)) }
-                                }
-                            }.forEach { insertedChapterIds.add(it[ChapterTable.id].value) }
                     }
 
                     if (chaptersToUpdate.isNotEmpty()) {
-                        BatchUpdateStatement(ChapterTable)
+                        BatchUpdateStatement(ChapterTable).apply {
-                            .apply {
                             chaptersToUpdate.forEach {
                                 addBatch(EntityID(it.id, ChapterTable))
-
-                                    val currentChapter = chaptersInDb.find { dbChapter -> dbChapter.id == it.id }!!
-
                                 this[ChapterTable.name] = it.name
                                 this[ChapterTable.date_upload] = it.uploadDate
                                 this[ChapterTable.chapter_number] = it.chapterNumber
                                 this[ChapterTable.scanlator] = it.scanlator
                                 this[ChapterTable.sourceOrder] = it.index
                                 this[ChapterTable.realUrl] = it.realUrl
-                                    this[ChapterTable.lastModifiedAt] = it.lastModifiedAt
-                                    this[ChapterTable.version] = it.version
-                                    this[ChapterTable.isDownloaded] = currentChapter.downloaded
-                                    this[ChapterTable.pageCount] = currentChapter.pageCount
-
-                                    if (!currentChapter.downloaded) {
-                                        return@forEach
                             }
-
+                            execute(this@transaction)
-                                    val isSameScanlator = currentChapter.scanlator == it.scanlator
-                                    val isSameName = currentChapter.name == it.name
-
-                                    val isDownloadPreservable = isSameName && isSameScanlator
-                                    if (!isDownloadPreservable) {
-                                        this[ChapterTable.isDownloaded] = false
-                                        this[ChapterTable.pageCount] = -1
                         }
                     }
-                            }.toExecutable()
-                            .execute(this@transaction)
-                    }
 
                     MangaTable.update({ MangaTable.id eq mangaId }) {
                         it[chaptersLastFetchedAt] = Instant.now().epochSecond
@@ -349,13 +326,6 @@ object Chapter {
                 }
 
                 if (manga.inLibrary) {
-                    // We have to query the inserted chapters to get the up-to-date data. I.e. "last_modified_at" is not returned by the insert statement, due to being set by a DB trigger
-                    val insertedChapters =
-                        transaction {
-                            ChapterTable.selectAll().where { ChapterTable.id inList insertedChapterIds }.map(
-                                ChapterTable::toDataClass,
-                            )
-                        }
                     downloadNewChapters(mangaId, currentLatestChapterNumber, numberOfCurrentChapters, insertedChapters)
                 }
 
@@ -547,11 +517,11 @@ object Chapter {
                     // mangaId is not null, scope query under manga
                     when {
                         input.chapterIds != null -> {
-                            (ChapterTable.manga eq mangaId) and (ChapterTable.id inList input.chapterIds)
+                            Op.build { (ChapterTable.manga eq mangaId) and (ChapterTable.id inList input.chapterIds) }
                         }
 
                         input.chapterIndexes != null -> {
-                            (ChapterTable.manga eq mangaId) and (ChapterTable.sourceOrder inList input.chapterIndexes)
+                            Op.build { (ChapterTable.manga eq mangaId) and (ChapterTable.sourceOrder inList input.chapterIndexes) }
                         }
 
                         else -> {
@@ -564,7 +534,7 @@ object Chapter {
                     // mangaId is null, only chapterIndexes is valid for this case
                     when {
                         input.chapterIds != null -> {
-                            (ChapterTable.id inList input.chapterIds)
+                            Op.build { (ChapterTable.id inList input.chapterIds) }
                         }
 
                         else -> {
@@ -613,7 +583,7 @@ object Chapter {
                 .withDefault { emptyMap() }
         }
 
-    fun getChapterMetaMap(chapter: Int): Map<String, String> =
+    fun getChapterMetaMap(chapter: EntityID<Int>): Map<String, String> =
         transaction {
             ChapterMetaTable
                 .selectAll()
@@ -680,14 +650,13 @@ object Chapter {
                 }
 
             if (existingMetaByMetaId.isNotEmpty()) {
-                BatchUpdateStatement(ChapterMetaTable)
+                BatchUpdateStatement(ChapterMetaTable).apply {
-                    .apply {
                     existingMetaByMetaId.forEach { (metaId, entry) ->
                         addBatch(EntityID(metaId, ChapterMetaTable))
                         this[ChapterMetaTable.value] = entry.value
                     }
-                    }.toExecutable()
+                    execute(this@transaction)
-                    .execute(this@transaction)
+                }
             }
 
             if (newMetaByChapterId.isNotEmpty()) {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/ChapterDownloadHelper.kt

@@ -1,9 +1,7 @@
 package suwayomi.tachidesk.manga.impl
 
 import kotlinx.coroutines.CoroutineScope
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.select
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.manga.impl.chapter.getChapterDownloadReady
 import suwayomi.tachidesk.manga.impl.download.fileProvider.ChaptersFilesProvider
 import suwayomi.tachidesk.manga.impl.download.fileProvider.impl.ArchiveProvider
@@ -64,11 +62,6 @@ object ChapterDownloadHelper {
         chapterId: Int,
     ): Pair<InputStream, Long> = provider(mangaId, chapterId).getAsArchiveStream()
 
-    fun getChapterArchiveSize(
-        mangaId: Int,
-        chapterId: Int,
-    ): Long = provider(mangaId, chapterId).getArchiveSize()
-
     private fun getChapterWithCbzFileName(chapterId: Int): Pair<ChapterDataClass, String> =
         transaction {
             val row =

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Library.kt

@@ -12,14 +12,11 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.insert
-import org.jetbrains.exposed.v1.core.neq
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.insert
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.select
+import org.jetbrains.exposed.sql.update
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.manga.impl.Manga.getManga
 import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
 import suwayomi.tachidesk.manga.model.table.CategoryTable

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt

@@ -20,18 +20,15 @@ import io.github.oshai.kotlinlogging.KotlinLogging
 import io.javalin.http.HttpStatus
 import okhttp3.CacheControl
 import okhttp3.Response
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.ResultRow
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.batchInsert
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.core.statements.BatchUpdateStatement
+import org.jetbrains.exposed.sql.statements.BatchUpdateStatement
-import org.jetbrains.exposed.v1.jdbc.batchInsert
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.update
-import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.manga.impl.MangaList.proxyThumbnailUrl
 import suwayomi.tachidesk.manga.impl.Source.getSource
 import suwayomi.tachidesk.manga.impl.download.fileProvider.impl.MissingThumbnailException
@@ -92,14 +89,13 @@ object Manga {
                 inLibrary = mangaEntry[MangaTable.inLibrary],
                 inLibraryAt = mangaEntry[MangaTable.inLibraryAt],
                 source = getSource(mangaEntry[MangaTable.sourceReference]),
+                meta = getMangaMetaMap(mangaId),
                 realUrl = mangaEntry[MangaTable.realUrl],
                 lastFetchedAt = mangaEntry[MangaTable.lastFetchedAt],
                 chaptersLastFetchedAt = mangaEntry[MangaTable.chaptersLastFetchedAt],
                 updateStrategy = UpdateStrategy.valueOf(mangaEntry[MangaTable.updateStrategy]),
                 freshData = true,
                 trackers = Track.getTrackRecordsByMangaId(mangaId),
-                lastModifiedAt = mangaEntry[MangaTable.lastModifiedAt],
-                version = mangaEntry[MangaTable.version],
             )
         }
     }
@@ -134,7 +130,7 @@ object Manga {
                         ""
                     }
                 if (remoteTitle.isNotEmpty() && remoteTitle != mangaEntry[MangaTable.title]) {
-                    val canUpdateTitle = updateMangaDownloadDir(mangaEntry[MangaTable.title], source.toString(), remoteTitle)
+                    val canUpdateTitle = updateMangaDownloadDir(mangaId, remoteTitle)
 
                     if (canUpdateTitle) {
                         it[MangaTable.title] = remoteTitle
@@ -212,12 +208,12 @@ object Manga {
                     .orderBy(ChapterTable.sourceOrder to SortOrder.DESC)
                     .firstOrNull { it[ChapterTable.isRead] }
 
-            mangaDaaClass.copy(
+            mangaDaaClass.unreadCount = unreadCount
-                unreadCount = unreadCount,
+            mangaDaaClass.downloadCount = downloadCount
-                downloadCount = downloadCount,
+            mangaDaaClass.chapterCount = chapterCount
-                chapterCount = chapterCount,
+            mangaDaaClass.lastChapterRead = lastChapterRead?.let { ChapterTable.toDataClass(it) }
-                lastChapterRead = lastChapterRead?.let { ChapterTable.toDataClass(it) },
+
-            )
+            mangaDaaClass
         }
     }
 
@@ -240,14 +236,13 @@ object Manga {
         inLibrary = mangaEntry[MangaTable.inLibrary],
         inLibraryAt = mangaEntry[MangaTable.inLibraryAt],
         source = getSource(mangaEntry[MangaTable.sourceReference]),
+        meta = getMangaMetaMap(mangaId),
         realUrl = mangaEntry[MangaTable.realUrl],
         lastFetchedAt = mangaEntry[MangaTable.lastFetchedAt],
         chaptersLastFetchedAt = mangaEntry[MangaTable.chaptersLastFetchedAt],
         updateStrategy = UpdateStrategy.valueOf(mangaEntry[MangaTable.updateStrategy]),
         freshData = false,
         trackers = Track.getTrackRecordsByMangaId(mangaId),
-        lastModifiedAt = mangaEntry[MangaTable.lastModifiedAt],
-        version = mangaEntry[MangaTable.version],
     )
 
     fun getMangaMetaMap(mangaId: Int): Map<String, String> =
@@ -300,14 +295,13 @@ object Manga {
                 }
 
             if (existingMetaByMetaId.isNotEmpty()) {
-                BatchUpdateStatement(MangaMetaTable)
+                BatchUpdateStatement(MangaMetaTable).apply {
-                    .apply {
                     existingMetaByMetaId.forEach { (metaId, entry) ->
                         addBatch(EntityID(metaId, MangaMetaTable))
                         this[MangaMetaTable.value] = entry.value
                     }
-                    }.toExecutable()
+                    execute(this@transaction)
-                    .execute(this@transaction)
+                }
             }
 
             if (newMetaByMangaId.isNotEmpty()) {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/MangaList.kt

@@ -9,15 +9,12 @@ package suwayomi.tachidesk.manga.impl
 
 import eu.kanade.tachiyomi.source.local.LocalSource
 import eu.kanade.tachiyomi.source.model.MangasPage
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.batchInsert
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.core.statements.BatchUpdateStatement
+import org.jetbrains.exposed.sql.statements.BatchUpdateStatement
-import org.jetbrains.exposed.v1.jdbc.batchInsert
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub
 import suwayomi.tachidesk.manga.model.dataclass.PagedMangaListDataClass
 import suwayomi.tachidesk.manga.model.table.MangaTable
@@ -91,8 +88,7 @@ object MangaList {
                     }
 
             if (mangaToUpdate.isNotEmpty()) {
-                BatchUpdateStatement(MangaTable)
+                BatchUpdateStatement(MangaTable).apply {
-                    .apply {
                     mangaToUpdate.forEach { (sManga, manga) ->
                         addBatch(EntityID(manga[MangaTable.id].value, MangaTable))
                         this[MangaTable.title] = sManga.title
@@ -111,8 +107,8 @@ object MangaList {
                                 manga[MangaTable.thumbnailUrlLastFetched]
                         }
                     }
-                    }.toExecutable()
+                    execute(this@transaction)
-                    .execute(this@transaction)
+                }
             }
 
             val mangaUrlsToId =

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Page.kt

@@ -13,12 +13,11 @@ import eu.kanade.tachiyomi.source.online.HttpSource
 import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlinx.coroutines.flow.StateFlow
 import libcore.net.MimeUtils
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.update
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.graphql.types.DownloadConversion
 import suwayomi.tachidesk.manga.impl.util.getChapterCachePath
 import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Source.kt

@@ -15,16 +15,12 @@ import eu.kanade.tachiyomi.source.sourcePreferences
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.javalin.json.JsonMapper
 import io.javalin.json.fromJsonString
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.batchInsert
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.core.statements.BatchUpdateStatement
+import org.jetbrains.exposed.sql.statements.BatchUpdateStatement
-import org.jetbrains.exposed.v1.jdbc.batchInsert
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import suwayomi.tachidesk.manga.impl.Source.preferenceScreenMap
 import suwayomi.tachidesk.manga.impl.extension.Extension.getExtensionIconUrl
 import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrNull
 import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub
@@ -214,14 +210,13 @@ object Source {
                 }
 
             if (existingMetaByMetaId.isNotEmpty()) {
-                BatchUpdateStatement(SourceMetaTable)
+                BatchUpdateStatement(SourceMetaTable).apply {
-                    .apply {
                     existingMetaByMetaId.forEach { (metaId, entry) ->
                         addBatch(EntityID(metaId, SourceMetaTable))
                         this[SourceMetaTable.value] = entry.value
                     }
-                    }.toExecutable()
+                    execute(this@transaction)
-                    .execute(this@transaction)
+                }
             }
 
             if (newMetaBySourceId.isNotEmpty()) {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt

@@ -19,7 +19,7 @@ import okio.Buffer
 import okio.Sink
 import okio.buffer
 import okio.gzip
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.manga.impl.backup.BackupFlags
 import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupCategoryHandler
 import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupGlobalMetaHandler
@@ -148,11 +148,13 @@ object ProtoBackupExport : ProtoBackupBase() {
 
     fun createBackup(flags: BackupFlags): InputStream {
         // Create root object
+
+        val backupMangas = BackupMangaHandler.backup(flags)
+
         val backup: Backup =
             transaction {
-                val backupMangas = BackupMangaHandler.backup(flags)
                 Backup(
-                    backupMangas,
+                    BackupMangaHandler.backup(flags),
                     BackupCategoryHandler.backup(flags),
                     BackupSourceHandler.backup(backupMangas, flags),
                     BackupGlobalMetaHandler.backup(flags),

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupImport.kt

@@ -21,9 +21,6 @@ import kotlinx.coroutines.sync.withLock
 import okio.buffer
 import okio.gzip
 import okio.source
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.graphql.types.toStatus
 import suwayomi.tachidesk.manga.impl.backup.BackupFlags
 import suwayomi.tachidesk.manga.impl.backup.proto.ProtoBackupValidator.ValidationResult
@@ -34,8 +31,6 @@ import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupMangaHandler
 import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupSettingsHandler
 import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupSourceHandler
 import suwayomi.tachidesk.manga.impl.backup.proto.models.Backup
-import suwayomi.tachidesk.manga.model.table.ChapterTable
-import suwayomi.tachidesk.manga.model.table.MangaTable
 import java.io.InputStream
 import java.util.Date
 import java.util.Timer
@@ -114,7 +109,6 @@ object ProtoBackupImport : ProtoBackupBase() {
     fun restore(
         sourceStream: InputStream,
         flags: BackupFlags,
-        isSync: Boolean = false,
     ): String {
         val restoreId = System.currentTimeMillis().toString()
 
@@ -123,7 +117,7 @@ object ProtoBackupImport : ProtoBackupBase() {
         updateRestoreState(restoreId, BackupRestoreState.Idle)
 
         GlobalScope.launch {
-            restoreLegacy(sourceStream, restoreId, flags, isSync)
+            restoreLegacy(sourceStream, restoreId, flags)
         }
 
         return restoreId
@@ -133,12 +127,11 @@ object ProtoBackupImport : ProtoBackupBase() {
         sourceStream: InputStream,
         restoreId: String = "legacy",
         flags: BackupFlags = BackupFlags.DEFAULT,
-        isSync: Boolean = false,
     ): ValidationResult =
         backupMutex.withLock {
             try {
                 logger.info { "restore($restoreId): restoring..." }
-                performRestore(restoreId, sourceStream, flags, isSync)
+                performRestore(restoreId, sourceStream, flags)
             } catch (e: Exception) {
                 logger.error(e) { "restore($restoreId): failed due to" }
 
@@ -159,14 +152,12 @@ object ProtoBackupImport : ProtoBackupBase() {
         id: String,
         sourceStream: InputStream,
         flags: BackupFlags,
-        isSync: Boolean,
     ): ValidationResult {
         val backupString =
             sourceStream
                 .source()
-                .run {
+                .gzip()
-                    if (!isSync) gzip() else this
+                .buffer()
-                }.buffer()
                 .use { it.readByteArray() }
         val backup = parser.decodeFromByteArray(Backup.serializer(), backupString)
 
@@ -244,17 +235,6 @@ object ProtoBackupImport : ProtoBackupBase() {
             """.trimIndent()
         }
 
-        if (isSync) {
-            transaction {
-                MangaTable.update({ MangaTable.isSyncing eq true }) {
-                    it[isSyncing] = false
-                }
-                ChapterTable.update({ ChapterTable.isSyncing eq true }) {
-                    it[isSyncing] = false
-                }
-            }
-        }
-
         updateRestoreState(id, BackupRestoreState.Success)
 
         return validationResult

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupValidator.kt

@@ -11,9 +11,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore
 import okio.buffer
 import okio.gzip
 import okio.source
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.manga.impl.backup.proto.models.Backup
 import suwayomi.tachidesk.manga.impl.track.tracker.TrackerManager
 import suwayomi.tachidesk.manga.model.table.SourceTable

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/handlers/BackupCategoryHandler.kt

@@ -7,12 +7,8 @@ package suwayomi.tachidesk.manga.impl.backup.proto.handlers
  * 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.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.insertAndGetId
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.manga.impl.Category
 import suwayomi.tachidesk.manga.impl.Category.modifyCategoriesMetas
 import suwayomi.tachidesk.manga.impl.backup.BackupFlags
@@ -42,9 +38,6 @@ object BackupCategoryHandler {
                     it.name,
                     it.order,
                     0, // not supported in Tachidesk
-                    it.version,
-                    it.uid,
-                    it.lastModifiedAt,
                 ).apply {
                     this.meta = categoryToMeta[it.id] ?: emptyMap()
                 }
@@ -52,56 +45,7 @@ object BackupCategoryHandler {
         }
 
     fun restore(backupCategories: List<BackupCategory>): Map<Int, Int> {
-        val dbCategories = Category.getCategoryList()
+        val categoryIds = Category.createCategories(backupCategories.map { it.name })
-        val dbCategoriesByName = dbCategories.associateBy { it.name }
-        val dbCategoriesByUid = dbCategories.associateBy { it.uid }
-
-        var nextOrder = dbCategories.maxOfOrNull { it.order }?.plus(1) ?: 0
-
-        val categoryIds =
-            transaction {
-                backupCategories
-                    .map { backupCategory ->
-                        var dbCategory =
-                            if (backupCategory.uid != 0L) {
-                                dbCategoriesByUid[backupCategory.uid]
-                            } else {
-                                null
-                            }
-
-                        if (dbCategory == null) {
-                            dbCategory = dbCategoriesByName[backupCategory.name]
-                        }
-
-                        if (dbCategory != null) {
-                            CategoryTable.update({ CategoryTable.id eq dbCategory.id }) {
-                                it[name] = backupCategory.name
-                                it[order] = backupCategory.order
-                                it[version] = backupCategory.version
-                                it[uid] = if (backupCategory.uid != 0L) backupCategory.uid else dbCategory.uid
-                                it[lastModifiedAt] = backupCategory.lastModifiedAt
-                                it[isSyncing] = true
-                            }
-                            return@map dbCategory.id
-                        }
-
-                        val currentOrder = nextOrder++
-                        CategoryTable
-                            .insertAndGetId {
-                                it[name] = backupCategory.name
-                                it[order] = currentOrder
-                                it[version] = backupCategory.version
-                                it[uid] = backupCategory.uid
-                                it[lastModifiedAt] = backupCategory.lastModifiedAt
-                            }.value
-                    }
-            }
-
-        transaction {
-            CategoryTable.update({ CategoryTable.isSyncing eq true }) {
-                it[isSyncing] = false
-            }
-        }
 
         val metaEntryByCategoryId =
             categoryIds

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/handlers/BackupMangaHandler.kt

@@ -8,18 +8,16 @@ package suwayomi.tachidesk.manga.impl.backup.proto.handlers
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.ResultRow
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.batchInsert
-import org.jetbrains.exposed.v1.core.statements.BatchUpdateStatement
+import org.jetbrains.exposed.sql.insertAndGetId
-import org.jetbrains.exposed.v1.jdbc.batchInsert
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.insertAndGetId
+import org.jetbrains.exposed.sql.statements.BatchUpdateStatement
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
+import org.jetbrains.exposed.sql.update
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.manga.impl.CategoryManga
 import suwayomi.tachidesk.manga.impl.Chapter
 import suwayomi.tachidesk.manga.impl.Chapter.modifyChaptersMetas
@@ -38,6 +36,7 @@ import suwayomi.tachidesk.manga.model.dataclass.TrackRecordDataClass
 import suwayomi.tachidesk.manga.model.table.ChapterTable
 import suwayomi.tachidesk.manga.model.table.MangaStatus
 import suwayomi.tachidesk.manga.model.table.MangaTable
+import suwayomi.tachidesk.manga.model.table.toDataClass
 import suwayomi.tachidesk.server.database.dbTransaction
 import java.util.Date
 import kotlin.math.max
@@ -74,8 +73,6 @@ object BackupMangaHandler {
                         dateAdded = mangaRow[MangaTable.inLibraryAt].seconds.inWholeMilliseconds,
                         viewer = 0, // not supported in Tachidesk
                         updateStrategy = UpdateStrategy.valueOf(mangaRow[MangaTable.updateStrategy]),
-                        lastModifiedAt = mangaRow[MangaTable.lastModifiedAt],
-                        version = mangaRow[MangaTable.version],
                     )
 
                 val mangaId = mangaRow[MangaTable.id].value
@@ -91,31 +88,29 @@ object BackupMangaHandler {
                                 .selectAll()
                                 .where { ChapterTable.manga eq mangaId }
                                 .orderBy(ChapterTable.sourceOrder to SortOrder.DESC)
-                                .toList()
+                                .map {
+                                    ChapterTable.toDataClass(it)
+                                }
                         }
-
                     if (flags.includeChapters) {
-                        val chapterToMeta =
+                        val chapterToMeta = Chapter.getChaptersMetaMaps(chapters.map { it.id })
-                            Chapter.getChaptersMetaMaps(chapters.map { it[ChapterTable.id].value })
 
                         backupManga.chapters =
                             chapters.map {
                                 BackupChapter(
-                                    url = it[ChapterTable.url],
+                                    it.url,
-                                    name = it[ChapterTable.name],
+                                    it.name,
-                                    scanlator = it[ChapterTable.scanlator],
+                                    it.scanlator,
-                                    read = it[ChapterTable.isRead],
+                                    it.read,
-                                    bookmark = it[ChapterTable.isBookmarked],
+                                    it.bookmarked,
-                                    lastPageRead = it[ChapterTable.lastPageRead],
+                                    it.lastPageRead,
-                                    dateFetch = it[ChapterTable.fetchedAt].seconds.inWholeMilliseconds,
+                                    it.fetchedAt.seconds.inWholeMilliseconds,
-                                    dateUpload = it[ChapterTable.date_upload],
+                                    it.uploadDate,
-                                    chapterNumber = it[ChapterTable.chapter_number],
+                                    it.chapterNumber,
-                                    sourceOrder = chapters.size - it[ChapterTable.sourceOrder],
+                                    chapters.size - it.index,
-                                    lastModifiedAt = it[ChapterTable.lastModifiedAt],
-                                    version = it[ChapterTable.version],
                                 ).apply {
                                     if (flags.includeClientData) {
-                                        this.meta = chapterToMeta[it[ChapterTable.id].value] ?: emptyMap()
+                                        this.meta = chapterToMeta[it.id] ?: emptyMap()
                                     }
                                 }
                             }
@@ -123,10 +118,10 @@ object BackupMangaHandler {
                     if (flags.includeHistory) {
                         backupManga.history =
                             chapters.mapNotNull {
-                                if (it[ChapterTable.lastReadAt] > 0) {
+                                if (it.lastReadAt > 0) {
                                     BackupHistory(
-                                        url = it[ChapterTable.url],
+                                        url = it.url,
-                                        lastRead = it[ChapterTable.lastReadAt].seconds.inWholeMilliseconds,
+                                        lastRead = it.lastReadAt.seconds.inWholeMilliseconds,
                                     )
                                 } else {
                                     null
@@ -235,9 +230,6 @@ object BackupMangaHandler {
                                 it[inLibrary] = manga.favorite
 
                                 it[inLibraryAt] = manga.dateAdded.milliseconds.inWholeSeconds
-
-                                it[lastModifiedAt] = manga.lastModifiedAt
-                                it[version] = manga.version
                             }.value
                     } else {
                         val dbMangaId = dbManga[MangaTable.id].value
@@ -257,9 +249,6 @@ object BackupMangaHandler {
                             it[inLibrary] = manga.favorite || dbManga[inLibrary]
 
                             it[inLibraryAt] = manga.dateAdded.milliseconds.inWholeSeconds
-
-                            it[lastModifiedAt] = manga.lastModifiedAt
-                            it[version] = manga.version
                         }
 
                         dbMangaId
@@ -277,7 +266,7 @@ object BackupMangaHandler {
                     restoreMangaChapterData(mangaId, restoreMode, chapters, history, flags)
                 }
 
-                // update categories
+                // merge categories
                 if (flags.includeCategories) {
                     restoreMangaCategoryData(mangaId, categoryIds)
                 }
@@ -348,17 +337,13 @@ object BackupMangaHandler {
                             this[ChapterTable.lastReadAt] =
                                 historyByChapter[chapter.url]?.maxOrNull()?.milliseconds?.inWholeSeconds ?: 0
                         }
-
-                        this[ChapterTable.lastModifiedAt] = chapter.lastModifiedAt
-                        this[ChapterTable.version] = chapter.version
                     }.map { it[ChapterTable.id].value }
             } else {
                 emptyList()
             }
 
         if (chaptersToUpdateToDbChapter.isNotEmpty()) {
-            BatchUpdateStatement(ChapterTable)
+            BatchUpdateStatement(ChapterTable).apply {
-                .apply {
                 chaptersToUpdateToDbChapter.forEach { (backupChapter, dbChapter) ->
                     addBatch(EntityID(dbChapter[ChapterTable.id].value, ChapterTable))
                     if (flags.includeChapters) {
@@ -374,8 +359,8 @@ object BackupMangaHandler {
                                 .coerceAtLeast(dbChapter[ChapterTable.lastReadAt])
                     }
                 }
-                }.toExecutable()
+                execute(this@dbTransaction)
-                .execute(this@dbTransaction)
+            }
         }
 
         if (flags.includeClientData) {
@@ -399,7 +384,6 @@ object BackupMangaHandler {
         mangaId: Int,
         categoryIds: List<Int>,
     ) {
-        CategoryManga.removeMangaFromAllCategories(mangaId)
         CategoryManga.addMangaToCategories(mangaId, categoryIds)
     }
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/handlers/BackupSourceHandler.kt

@@ -7,8 +7,7 @@ package suwayomi.tachidesk.manga.impl.backup.proto.handlers
  * 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.inList
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.selectAll
 import suwayomi.tachidesk.manga.impl.Source
 import suwayomi.tachidesk.manga.impl.Source.modifySourceMetas
 import suwayomi.tachidesk.manga.impl.backup.BackupFlags

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupCategory.kt

@@ -10,10 +10,6 @@ class BackupCategory(
     // @ProtoNumber(3) val updateInterval: Int = 0, 1.x value not used in 0.x
     // Bump by 100 to specify this is a 0.x value
     @ProtoNumber(100) var flags: Int = 0,
-    // syncyomi
-    @ProtoNumber(601) var version: Long = 0,
-    @ProtoNumber(602) var uid: Long = 0,
-    @ProtoNumber(603) var lastModifiedAt: Long = 0,
     // suwayomi
     @ProtoNumber(9000) var meta: Map<String, String> = emptyMap(),
 )

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupChapter.kt

@@ -19,9 +19,6 @@ data class BackupChapter(
     // chapterNumber is called number is 1.x
     @ProtoNumber(9) var chapterNumber: Float = 0F,
     @ProtoNumber(10) var sourceOrder: Int = 0,
-    // syncyomi
-    @ProtoNumber(11) var lastModifiedAt: Long = 0,
-    @ProtoNumber(12) var version: Long = 0,
     // suwayomi
     @ProtoNumber(9000) var meta: Map<String, String> = emptyMap(),
 )

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupManga.kt

@@ -34,9 +34,6 @@ data class BackupManga(
     @ProtoNumber(103) var viewer_flags: Int? = null,
     @ProtoNumber(104) var history: List<BackupHistory> = emptyList(),
     @ProtoNumber(105) var updateStrategy: UpdateStrategy = UpdateStrategy.ALWAYS_UPDATE,
-    // syncyomi
-    @ProtoNumber(106) var lastModifiedAt: Long = 0,
-    @ProtoNumber(109) var version: Long = 0,
     // suwayomi
     @ProtoNumber(9000) var meta: Map<String, String> = emptyMap(),
 )

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/chapter/ChapterForDownload.kt

@@ -14,14 +14,14 @@ import io.github.oshai.kotlinlogging.KotlinLogging
 import io.github.reactivecircus.cache4k.Cache
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.jdbc.batchInsert
+import org.jetbrains.exposed.sql.batchInsert
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
+import org.jetbrains.exposed.sql.update
 import suwayomi.tachidesk.manga.impl.ChapterDownloadHelper
 import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub
 import suwayomi.tachidesk.manga.model.dataclass.ChapterDataClass
@@ -31,88 +31,6 @@ import suwayomi.tachidesk.manga.model.table.PageTable
 import suwayomi.tachidesk.manga.model.table.toDataClass
 import kotlin.time.Duration.Companion.minutes
 
-/**
- * Updates chapter download status and page count in the database if they differ from the file system.
- */
-fun updateChapterPersistence(
-    chapterId: Int,
-    isMarkedAsDownloaded: Boolean,
-    dbPageCount: Int,
-    downloadPageCount: Int,
-    lastPageRead: Int,
-    logger: KLogger,
-): Boolean {
-    if (isMarkedAsDownloaded && dbPageCount == downloadPageCount) {
-        return false
-    }
-
-    return transaction {
-        var needsUpdate = false
-        if (!isMarkedAsDownloaded) {
-            logger.debug { "mark as downloaded" }
-            ChapterTable.update({ ChapterTable.id eq chapterId }) {
-                it[isDownloaded] = true
-            }
-            needsUpdate = true
-        }
-
-        if (dbPageCount != downloadPageCount) {
-            logger.debug { "use page count of downloaded chapter" }
-            ChapterTable.update({ ChapterTable.id eq chapterId }) {
-                it[pageCount] = downloadPageCount
-                it[ChapterTable.lastPageRead] = lastPageRead.coerceAtMost(downloadPageCount - 1).coerceAtLeast(0)
-            }
-            needsUpdate = true
-        }
-        needsUpdate
-    }
-}
-
-suspend fun refreshChapterPageList(
-    mangaId: Int,
-    chapterId: Int,
-    existingChapterEntry: ResultRow? = null,
-): Int {
-    val mutex = mutexByChapterId.get(chapterId) { Mutex() }
-    return mutex.withLock {
-        val chapterEntry = existingChapterEntry ?: transaction { ChapterTable.selectAll().where { ChapterTable.id eq chapterId }.first() }
-        val mangaEntry = transaction { MangaTable.selectAll().where { MangaTable.id eq mangaId }.first() }
-        val source = getCatalogueSourceOrStub(mangaEntry[MangaTable.sourceReference])
-
-        val pageList =
-            source
-                .getPageList(
-                    SChapter.create().apply {
-                        url = chapterEntry[ChapterTable.url]
-                        name = chapterEntry[ChapterTable.name]
-                        scanlator = chapterEntry[ChapterTable.scanlator]
-                        chapter_number = chapterEntry[ChapterTable.chapter_number]
-                        date_upload = chapterEntry[ChapterTable.date_upload]
-                    },
-                ).mapIndexed { index, page -> Page(index, page.url, page.imageUrl, page.uri) }
-
-        transaction {
-            ChapterTable.update({ ChapterTable.id eq chapterId }) {
-                it[isDownloaded] = false
-            }
-
-            PageTable.deleteWhere { PageTable.chapter eq chapterId }
-            PageTable.batchInsert(pageList) { page ->
-                this[PageTable.index] = page.index
-                this[PageTable.url] = page.url
-                this[PageTable.imageUrl] = page.imageUrl
-                this[PageTable.chapter] = chapterId
-            }
-
-            ChapterTable.update({ ChapterTable.id eq chapterId }) {
-                it[pageCount] = pageList.size
-                it[lastPageRead] = chapterEntry[ChapterTable.lastPageRead].coerceAtMost(pageList.size - 1).coerceAtLeast(0)
-            }
-        }
-        pageList.size
-    }
-}
-
 suspend fun getChapterDownloadReady(
     chapterId: Int? = null,
     chapterIndex: Int? = null,
@@ -150,31 +68,56 @@ private class ChapterForDownload(
     suspend fun asDownloadReady(): ChapterDataClass {
         val log = KotlinLogging.logger("${logger.name}::asDownloadReady")
 
-        val downloadPageCount = runCatching { ChapterDownloadHelper.getImageCount(mangaId, chapterId) }.getOrDefault(0)
+        val downloadPageCount =
+            try {
+                ChapterDownloadHelper.getImageCount(mangaId, chapterId)
+            } catch (_: Exception) {
+                0
+            }
         val isMarkedAsDownloaded = chapterEntry[ChapterTable.isDownloaded]
         val dbPageCount = chapterEntry[ChapterTable.pageCount]
         val doesDownloadExist = downloadPageCount != 0
+        val doPageCountsMatch = dbPageCount == downloadPageCount
 
         log.debug { "isMarkedAsDownloaded= $isMarkedAsDownloaded, dbPageCount= $dbPageCount, downloadPageCount= $downloadPageCount" }
 
         return if (!doesDownloadExist) {
             log.debug { "reset download status and fetch page list" }
-            refreshChapterPageList(mangaId, chapterId, chapterEntry)
+            updateDownloadStatusAndPageList(false)
-            chapterEntry = freshChapterEntry(optChapterId = chapterId)
-            ChapterTable.toDataClass(chapterEntry)
         } else {
-            if (updateChapterPersistence(
+            transaction {
-                    chapterId,
+                var needsUpdate = false
-                    isMarkedAsDownloaded,
+
-                    dbPageCount,
+                if (!isMarkedAsDownloaded) {
-                    downloadPageCount,
+                    log.debug { "mark as downloaded" }
-                    chapterEntry[ChapterTable.lastPageRead],
+                    ChapterTable.update({ ChapterTable.id eq chapterId }) {
-                    log,
+                        it[isDownloaded] = true
-                )
+                    }
-            ) {
+                    needsUpdate = true
-                chapterEntry = freshChapterEntry(optChapterId = chapterId)
+                }
+
+                if (!doPageCountsMatch) {
+                    log.debug { "use page count of downloaded chapter" }
+                    ChapterTable.update({ ChapterTable.id eq chapterId }) {
+                        it[pageCount] = downloadPageCount
+                        it[lastPageRead] = chapterEntry[ChapterTable.lastPageRead].coerceAtMost(downloadPageCount - 1).coerceAtLeast(0)
+                    }
+                    needsUpdate = true
+                }
+
+                // Return updated chapter data
+                val updatedRow =
+                    ChapterTable
+                        .selectAll()
+                        .where { ChapterTable.id eq chapterId }
+                        .first()
+
+                if (needsUpdate) {
+                    chapterEntry = updatedRow
+                }
+
+                ChapterTable.toDataClass(updatedRow)
             }
-            ChapterTable.toDataClass(chapterEntry)
         }
     }
 
@@ -207,4 +150,59 @@ private class ChapterForDownload(
                 }
             }.first()
     }
+
+    private suspend fun updateDownloadStatusAndPageList(downloaded: Boolean): ChapterDataClass {
+        val mutex = mutexByChapterId.get(chapterId) { Mutex() }
+        return mutex.withLock {
+            val pageList = fetchPageList()
+
+            transaction {
+                // Update download status
+                ChapterTable.update({ ChapterTable.id eq chapterId }) {
+                    it[isDownloaded] = downloaded
+                }
+
+                // Clear existing pages and insert new ones
+                PageTable.deleteWhere { PageTable.chapter eq chapterId }
+                PageTable.batchInsert(pageList) { page ->
+                    this[PageTable.index] = page.index
+                    this[PageTable.url] = page.url
+                    this[PageTable.imageUrl] = page.imageUrl
+                    this[PageTable.chapter] = chapterId
+                }
+
+                // Update page count
+                ChapterTable.update({ ChapterTable.id eq chapterId }) {
+                    it[pageCount] = pageList.size
+                    it[lastPageRead] = chapterEntry[ChapterTable.lastPageRead].coerceAtMost(pageList.size - 1).coerceAtLeast(0)
+                }
+
+                // Get updated chapter data
+                val updatedRow =
+                    ChapterTable
+                        .selectAll()
+                        .where { ChapterTable.id eq chapterId }
+                        .first()
+
+                chapterEntry = updatedRow
+                ChapterTable.toDataClass(updatedRow)
+            }
+        }
+    }
+
+    private suspend fun fetchPageList(): List<Page> {
+        val mangaEntry = transaction { MangaTable.selectAll().where { MangaTable.id eq mangaId }.first() }
+        val source = getCatalogueSourceOrStub(mangaEntry[MangaTable.sourceReference])
+
+        return source
+            .getPageList(
+                SChapter.create().apply {
+                    url = chapterEntry[ChapterTable.url]
+                    name = chapterEntry[ChapterTable.name]
+                    scanlator = chapterEntry[ChapterTable.scanlator]
+                    chapter_number = chapterEntry[ChapterTable.chapter_number]
+                    date_upload = chapterEntry[ChapterTable.date_upload]
+                },
+            ).mapIndexed { index, page -> Page(index, page.url, page.imageUrl, page.uri) }
+    }
 }

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/DownloadManager.kt

@@ -27,12 +27,9 @@ import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.select
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.manga.impl.download.model.DownloadChapter
 import suwayomi.tachidesk.manga.impl.download.model.DownloadQueueItem
 import suwayomi.tachidesk.manga.impl.download.model.DownloadState.Error
@@ -346,7 +343,7 @@ object DownloadManager {
             transaction {
                 ChapterTable
                     .select(ChapterTable.id)
-                    .where { (ChapterTable.manga eq mangaId) and (ChapterTable.sourceOrder eq chapterIndex) }
+                    .where { ChapterTable.manga.eq(mangaId) and ChapterTable.sourceOrder.eq(chapterIndex) }
                     .first()
             }
         enqueue(EnqueueInput(chapterIds = listOf(chapter[ChapterTable.id].value)))

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/Downloader.kt

@@ -17,9 +17,8 @@ import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.update
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.manga.impl.ChapterDownloadHelper
 import suwayomi.tachidesk.manga.impl.chapter.getChapterDownloadReadyById
 import suwayomi.tachidesk.manga.impl.download.model.DownloadQueueItem