Update JCEF + JetBrains Runtime

add reportSyncEvent for SyncYomi service (#2110 )
* add reportSyncEvent * Update SyncYomiSyncService.kt
2026-07-04 11:24:35 -05:00 · 2026-06-23 11:41:03 +00:00 · 2026-06-17 22:46:21 -04:00 · 2026-06-17 22:41:31 -04:00 · 2026-06-17 22:39:37 -04:00 · 2026-06-17 22:39:30 -04:00
47 changed files with 1666 additions and 920 deletions
--- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/CefHelper.kt
+++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/CefHelper.kt
@@ -21,7 +21,7 @@ object CefHelper {
    }

    fun waitForInit() =
-        callbackFlow<CefApp> {
+        callbackFlow {
            val app = cefApp.first { it.isFailure || it.getOrThrow() != null }.getOrThrow()!!
            app.onInitialization {
                logger.debug { "CEF: Initialization state $it" }
--- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/KcefWebViewProvider.kt
+++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/KcefWebViewProvider.kt
@@ -68,6 +68,7 @@ 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
@@ -82,10 +83,13 @@ 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.math.min
 import kotlin.reflect.KFunction
 import kotlin.reflect.full.declaredMemberFunctions
@@ -97,6 +101,7 @@ 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
@@ -522,6 +527,21 @@ class KcefWebViewProvider(
        }
    }

+    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,
@@ -617,7 +637,7 @@ class KcefWebViewProvider(
            kcefClient!!
                .createBrowser(
                    loadUrl,
-                    CefRendering.OFFSCREEN,
+                    CefRendering.CefRenderingWithHandler(renderHandler, JPanel()),
                    false,
                ).apply {
                    // NOTE: Without this, we don't seem to be receiving any events
@@ -642,7 +662,7 @@ class KcefWebViewProvider(
            kcefClient!!
                .createBrowser(
                    url,
-                    CefRendering.OFFSCREEN,
+                    CefRendering.CefRenderingWithHandler(renderHandler, JPanel()),
                    false,
                ).apply {
                    // NOTE: Without this, we don't seem to be receiving any events
@@ -676,7 +696,7 @@ class KcefWebViewProvider(
            kcefClient!!
                .createBrowser(
                    url,
-                    CefRendering.OFFSCREEN,
+                    CefRendering.CefRenderingWithHandler(renderHandler, JPanel()),
                    false,
                ).apply {
                    // NOTE: Without this, we don't seem to be receiving any events
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

 ### 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
@@ -29,6 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - (**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

--- a/README.md
+++ b/README.md
@@ -110,18 +110,13 @@ Download the latest `linux-x64`(x86_64) release from [the releases section](http
 WebView support is implemented via [JCEF](https://github.com/JetBrains/jcef).
 This is optional, and is only necessary to support some extensions.

-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`).
-Note that on some systems (e.g. Ubuntu), the JNI libraries are not automatically found, see below.
+To have a functional WebView, some X11 dependencies are required for rendering Chromium.
+These include `libxrender`, `libxcomposite` `libxdamage`, `libxkbcommon` and `libxtst`.

 A CEF 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.

-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.
-
 Refer to the [Dockerfile](https://github.com/Suwayomi/Suwayomi-Server-docker/blob/main/Dockerfile) for more details.

 Note that it is required to have an X session active and available to Suwayomi (i.e. `DISPLAY` is set).
--- a/buildSrc/src/main/kotlin/Constants.kt
+++ b/buildSrc/src/main/kotlin/Constants.kt
@@ -14,7 +14,7 @@ val getTachideskVersion = { "v2.2.${getCommitCount()}" }

 val webUIRevisionTag = "r3136"

-val webviewJbrRelease = "jbr-release-25.0.3b496.62"
+val webviewJbrRelease = "jbr-release-25.0.3b508.16"

 private val getCommitCount = {
    runCatching {
--- a/docs/Configuring-Suwayomi‐Server.md
+++ b/docs/Configuring-Suwayomi‐Server.md
@@ -232,6 +232,7 @@ 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.
@@ -241,6 +242,7 @@ server.opdsCbzMimetype = "MODERN"
 - `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
 ```
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,19 +3,19 @@ kotlin = "2.4.0"
 coroutines = "1.11.0"
 serialization = "1.11.0"
 jvmTarget = "21"
-okhttp = "5.3.2" # Major version is locked by Tachiyomi extensions
+okhttp = "5.4.0" # Major version is locked by Tachiyomi extensions
 javalin = "7.2.2"
 jte = "3.2.4"
-jackson = "3.1.4" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
+jackson = "3.2.0" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
 exposed = "1.2.0"
-dex2jar = "2.4.36"
+dex2jar = "2.4.37"
 polyglot = "25.0.3"
 settings = "1.3.0"
 twelvemonkeys = "3.13.1"
 graphqlkotlin = "10.0.0"
 xmlserialization = "0.91.3"
 ktlint = "1.8.0"
-koin = "4.2.1"
+koin = "4.2.2"
 moko = "0.26.4"
 jcef = "144.0.15-g72717cf-chromium-144.0.7559.172-api-1.21-262-b37"

@@ -72,7 +72,7 @@ exposed-javatime = { module = "org.jetbrains.exposed:exposed-java-time", version
 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"
-hikaricp = "com.zaxxer:HikariCP:7.0.2"
+hikaricp = "com.zaxxer:HikariCP:7.1.0"

 # Exposed Migrations
 exposed-migrations = "com.github.Suwayomi:exposed-migrations:3.10.1"
@@ -145,7 +145,7 @@ 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.10.2"
+imageio-webp = "com.github.usefulness:webp-imageio:0.11.0"

 # Testing
 mockk = "io.mockk:mockk:1.14.11"
@@ -158,8 +158,6 @@ cronUtils = "com.cronutils:cron-utils:9.2.1"

 # Webview
 jcef = { module = "org.jetbrains.intellij.deps.jcef:jcef", version.ref = "jcef" }
-gluegen = "org.jogamp.gluegen:gluegen-rt:2.5.0"
-jogl = "org.jogamp.jogl:jogl-all:2.5.0"

 # User
 jwt = "com.auth0:java-jwt:4.5.2"
--- a/server/build.gradle.kts
+++ b/server/build.gradle.kts
@@ -37,10 +37,6 @@ dependencies {
    implementation(libs.bundles.shared)
    testImplementation(libs.bundles.sharedTest)

-    // WebView
-    implementation(libs.gluegen)
-    implementation(libs.jogl)
-
    // OkHttp
    implementation(libs.bundles.okhttp)
    implementation(libs.okio)
--- a/server/i18n/src/commonMain/moko-resources/values/base/strings.xml
+++ b/server/i18n/src/commonMain/moko-resources/values/base/strings.xml
@@ -50,6 +50,7 @@
    <!-- 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>
@@ -153,4 +154,7 @@
    <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>
--- a/server/i18n/src/commonMain/moko-resources/values/el/strings.xml
+++ b/server/i18n/src/commonMain/moko-resources/values/el/strings.xml
@@ -0,0 +1,125 @@
+<?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>
--- a/server/server-config/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt
+++ b/server/server-config/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt
@@ -15,16 +15,13 @@ 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 suwayomi.tachidesk.graphql.types.AuthMode
@@ -1101,6 +1098,15 @@ class ServerConfig(
        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)."
+
+    )
+
    /** ****************************************************************** **/
    /**                                                                    **/
    /**                          Renamed settings                          **/
--- a/server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncYomiSyncService.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncYomiSyncService.kt
@@ -4,11 +4,15 @@ 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.POST
 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.coroutines.CancellationException
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.SerializationException
+import kotlinx.serialization.json.Json
 import kotlinx.serialization.protobuf.ProtoBuf
 import okhttp3.Headers
 import okhttp3.MediaType.Companion.toMediaType
@@ -36,31 +40,66 @@ object SyncYomiSyncService {
        message: String?,
    ) : Exception(message)

+    @Serializable
+    private data class SyncEvent(
+        val event: SyncEventStatus,
+        val device_Name: String? = null,
+        val message: String? = null,
+    )
+
+    @Serializable
+    private enum class SyncEventStatus {
+        SYNC_STARTED,
+        SYNC_SUCCESS,
+        SYNC_FAILED,
+        SYNC_ERROR,
+        SYNC_CANCELLED,
+    }
+
    suspend fun doSync(
        syncData: SyncData,
        startDate: Instant,
        setSyncState: (SyncManager.SyncState) -> Unit,
    ): Backup? {
+        reportSyncEvent(SyncEventStatus.SYNC_STARTED)
        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
+        return try {
+            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))
            }

-        if (finalSyncData.backup != null) {
-            setSyncState(SyncManager.SyncState.Uploading(startDate))
+            val success = pushSyncData(finalSyncData, etag)
+            if (success) {
+                reportSyncEvent(SyncEventStatus.SYNC_SUCCESS)
+            } else {
+                reportSyncEvent(SyncEventStatus.SYNC_FAILED, "Failed to push sync data")
+            }
+
+            finalSyncData.backup
+        } catch (e: Exception) {
+            if (e is CancellationException) {
+                reportSyncEvent(SyncEventStatus.SYNC_CANCELLED, e.message)
+                throw e
+            }
+            logger.error { "Error syncing: ${e.message}" }
+            reportSyncEvent(SyncEventStatus.SYNC_ERROR, e.message)
+            throw e
        }
-        pushSyncData(finalSyncData, etag)
-        return finalSyncData.backup
    }

    private suspend fun pullSyncData(): Pair<SyncData?, String> {
@@ -122,8 +161,8 @@ object SyncYomiSyncService {
    private suspend fun pushSyncData(
        syncData: SyncData,
        eTag: String,
-    ) {
-        val backup = syncData.backup ?: return
+    ): Boolean {
+        val backup = syncData.backup ?: return true

        val host = serverConfig.syncYomiHost.value
        val apiKey = serverConfig.syncYomiApiKey.value
@@ -160,7 +199,7 @@ object SyncYomiSyncService {

        val response = client.newCall(uploadRequest).await()

-        if (response.isSuccessful) {
+        return if (response.isSuccessful) {
            val newETag =
                response.headers["ETag"]
                    ?.takeIf { it.isNotEmpty() } ?: throw SyncYomiException("Missing ETag")
@@ -169,12 +208,53 @@ object SyncYomiSyncService {
                .putString("last_sync_etag", newETag)
                .apply()
            logger.debug { "SyncYomi sync completed" }
+            true
        } else if (response.code == HttpStatus.PRECONDITION_FAILED.code) {
            // other clients updated remote data, will try next time
            logger.debug { "SyncYomi sync failed with 412" }
+            false
        } else {
            val responseBody = response.body.string()
            logger.error { "SyncError: $responseBody" }
+            false
+        }
+    }
+
+    private suspend fun reportSyncEvent(
+        event: SyncEventStatus,
+        message: String? = null,
+    ) {
+        try {
+            val host = serverConfig.syncYomiHost.value
+            val apiKey = serverConfig.syncYomiApiKey.value
+            val url = "$host/api/sync/event"
+
+            val headers = Headers.Builder().add("X-API-Token", apiKey).build()
+
+            // Use a fixed server name.
+            val bodyObj =
+                SyncEvent(
+                    event = event,
+                    device_Name = "Suwayomi Server",
+                    message = message,
+                )
+
+            val jsonBody = Json.encodeToString(SyncEvent.serializer(), bodyObj)
+            val requestBody = jsonBody.toRequestBody("application/json; charset=utf-8".toMediaType())
+
+            val request =
+                POST(
+                    url = url,
+                    headers = headers,
+                    body = requestBody,
+                )
+
+            network.client
+                .newCall(request)
+                .await()
+                .close()
+        } catch (e: Exception) {
+            logger.error { "Failed to report sync event: ${e.message}" }
        }
    }

@@ -377,7 +457,7 @@ object SyncYomiSyncService {
                        // Use version number to decide which chapter to keep
                        val chosenChapter =
                            if (localChapter.version >= remoteChapter.version) {
-                                // If there mare more chapter on remote, local sourceOrder will need to be updated to maintain correct source order.
+                                // 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 {
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt
@@ -117,12 +117,14 @@ object CategoryManga {

        val transform: (ResultRow) -> MangaDataClass = {
            // Map the data from the result row to the MangaDataClass
-            val dataClass = MangaTable.toDataClass(it)
-            dataClass.lastReadAt = it[lastReadAt]
-            dataClass.unreadCount = it[unreadCount]
-            dataClass.downloadCount = it[downloadedCount]
-            dataClass.chapterCount = it[chapterCount]
-            dataClass
+            MangaTable
+                .toDataClass(it)
+                .copy(
+                    lastReadAt = it[lastReadAt],
+                    unreadCount = it[unreadCount],
+                    downloadCount = it[downloadedCount],
+                    chapterCount = it[chapterCount],
+                )
        }

        return transaction {
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Chapter.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Chapter.kt
@@ -104,9 +104,6 @@ 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)
@@ -128,10 +125,8 @@ object Chapter {
                realUrl = dbChapter[ChapterTable.realUrl],
                downloaded = dbChapter[ChapterTable.isDownloaded],
                pageCount = dbChapter[ChapterTable.pageCount],
-                chapterCount = chapterList.size,
                lastModifiedAt = dbChapter[ChapterTable.lastModifiedAt],
                version = dbChapter[ChapterTable.version],
-                meta = chapterMetas.getValue(dbChapter[ChapterTable.id].value),
            )
        }
    }
@@ -194,7 +189,7 @@ object Chapter {
                    }

                // new chapters after they have been added to the database for auto downloads
-                val insertedChapters = mutableListOf<ChapterDataClass>()
+                val insertedChapterIds = mutableListOf<Int>()

                val chaptersToInsert = mutableListOf<ChapterDataClass>() // do not yet have an ID from the database
                val chaptersToUpdate = mutableListOf<ChapterDataClass>()
@@ -309,7 +304,7 @@ object Chapter {
                                        }
                                    }
                                }
-                            }.forEach { insertedChapters.add(ChapterTable.toDataClass(it)) }
+                            }.forEach { insertedChapterIds.add(it[ChapterTable.id].value) }
                    }

                    if (chaptersToUpdate.isNotEmpty()) {
@@ -354,6 +349,13 @@ 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)
                }

@@ -611,7 +613,7 @@ object Chapter {
                .withDefault { emptyMap() }
        }

-    fun getChapterMetaMap(chapter: EntityID<Int>): Map<String, String> =
+    fun getChapterMetaMap(chapter: Int): Map<String, String> =
        transaction {
            ChapterMetaTable
                .selectAll()
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/ChapterDownloadHelper.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/ChapterDownloadHelper.kt
@@ -16,6 +16,7 @@ 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 xyz.nulldev.androidcompat.util.SafePath
 import java.io.File
 import java.io.InputStream

@@ -64,6 +65,11 @@ 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 =
@@ -71,13 +77,46 @@ object ChapterDownloadHelper {
                    .select(ChapterTable.columns + MangaTable.columns)
                    .where { ChapterTable.id eq chapterId }
                    .firstOrNull() ?: throw IllegalArgumentException("ChapterId $chapterId not found")
+
            val chapter = ChapterTable.toDataClass(row)
-            val mangaTitle = row[MangaTable.title]
+            val mangaTitle = row[MangaTable.title].trim()

-            val scanlatorPart = chapter.scanlator?.let { "[$it] " } ?: ""
-            val fileName = "$mangaTitle - $scanlatorPart${chapter.name}.cbz"
+            val scanlatorName = chapter.scanlator?.trim()?.takeIf { it.isNotEmpty() }
+            val chapterName = chapter.name.trim().takeIf { it.isNotEmpty() }

-            Pair(chapter, fileName)
+            val fileName =
+                buildString {
+                    append(mangaTitle)
+                    append(" - ")
+
+                    if (chapterName != null) {
+                        append(chapterName)
+                    } else if (chapter.chapterNumber >= 0f) {
+                        // chapterNumber is stored as Float, drop .0 for whole numbers.
+                        val formatNumber =
+                            if (chapter.chapterNumber % 1 == 0f) {
+                                chapter.chapterNumber.toInt().toString()
+                            } else {
+                                chapter.chapterNumber.toString()
+                            }
+                        append("#$formatNumber")
+                    } else {
+                        // Fallback when neither name nor valid chapter number exists
+                        append("#${chapter.index}")
+                    }
+
+                    if (scanlatorName != null) {
+                        append(" [")
+                        append(scanlatorName)
+                        append("]")
+                    }
+                    append(".cbz")
+                }
+
+            // Sanitize filename for OS compatibility
+            val safeFileName = SafePath.buildValidFilename(fileName)
+
+            Pair(chapter, safeFileName)
        }

    fun getCbzForDownload(
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt
@@ -92,7 +92,6 @@ 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],
@@ -213,12 +212,12 @@ object Manga {
                    .orderBy(ChapterTable.sourceOrder to SortOrder.DESC)
                    .firstOrNull { it[ChapterTable.isRead] }

-            mangaDaaClass.unreadCount = unreadCount
-            mangaDaaClass.downloadCount = downloadCount
-            mangaDaaClass.chapterCount = chapterCount
-            mangaDaaClass.lastChapterRead = lastChapterRead?.let { ChapterTable.toDataClass(it) }
-
-            mangaDaaClass
+            mangaDaaClass.copy(
+                unreadCount = unreadCount,
+                downloadCount = downloadCount,
+                chapterCount = chapterCount,
+                lastChapterRead = lastChapterRead?.let { ChapterTable.toDataClass(it) },
+            )
        }
    }

@@ -241,7 +240,6 @@ 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],
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt
@@ -148,13 +148,11 @@ 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(
-                    BackupMangaHandler.backup(flags),
+                    backupMangas,
                    BackupCategoryHandler.backup(flags),
                    BackupSourceHandler.backup(backupMangas, flags),
                    BackupGlobalMetaHandler.backup(flags),
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/handlers/BackupMangaHandler.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/handlers/BackupMangaHandler.kt
@@ -38,7 +38,6 @@ 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
@@ -92,31 +91,31 @@ object BackupMangaHandler {
                                .selectAll()
                                .where { ChapterTable.manga eq mangaId }
                                .orderBy(ChapterTable.sourceOrder to SortOrder.DESC)
-                                .map {
-                                    ChapterTable.toDataClass(it)
-                                }
+                                .toList()
                        }
+
                    if (flags.includeChapters) {
-                        val chapterToMeta = Chapter.getChaptersMetaMaps(chapters.map { it.id })
+                        val chapterToMeta =
+                            Chapter.getChaptersMetaMaps(chapters.map { it[ChapterTable.id].value })

                        backupManga.chapters =
                            chapters.map {
                                BackupChapter(
-                                    it.url,
-                                    it.name,
-                                    it.scanlator,
-                                    it.read,
-                                    it.bookmarked,
-                                    it.lastPageRead,
-                                    it.fetchedAt.seconds.inWholeMilliseconds,
-                                    it.uploadDate,
-                                    it.chapterNumber,
-                                    chapters.size - it.index,
-                                    it.lastModifiedAt,
-                                    it.version,
+                                    url = it[ChapterTable.url],
+                                    name = it[ChapterTable.name],
+                                    scanlator = it[ChapterTable.scanlator],
+                                    read = it[ChapterTable.isRead],
+                                    bookmark = it[ChapterTable.isBookmarked],
+                                    lastPageRead = it[ChapterTable.lastPageRead],
+                                    dateFetch = it[ChapterTable.fetchedAt].seconds.inWholeMilliseconds,
+                                    dateUpload = it[ChapterTable.date_upload],
+                                    chapterNumber = it[ChapterTable.chapter_number],
+                                    sourceOrder = chapters.size - it[ChapterTable.sourceOrder],
+                                    lastModifiedAt = it[ChapterTable.lastModifiedAt],
+                                    version = it[ChapterTable.version],
                                ).apply {
                                    if (flags.includeClientData) {
-                                        this.meta = chapterToMeta[it.id] ?: emptyMap()
+                                        this.meta = chapterToMeta[it[ChapterTable.id].value] ?: emptyMap()
                                    }
                                }
                            }
@@ -124,10 +123,10 @@ object BackupMangaHandler {
                    if (flags.includeHistory) {
                        backupManga.history =
                            chapters.mapNotNull {
-                                if (it.lastReadAt > 0) {
+                                if (it[ChapterTable.lastReadAt] > 0) {
                                    BackupHistory(
-                                        url = it.url,
-                                        lastRead = it.lastReadAt.seconds.inWholeMilliseconds,
+                                        url = it[ChapterTable.url],
+                                        lastRead = it[ChapterTable.lastReadAt].seconds.inWholeMilliseconds,
                                    )
                                } else {
                                    null
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/chapter/ChapterForDownload.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/chapter/ChapterForDownload.kt
@@ -31,6 +31,88 @@ 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,
@@ -68,56 +150,31 @@ private class ChapterForDownload(
    suspend fun asDownloadReady(): ChapterDataClass {
        val log = KotlinLogging.logger("${logger.name}::asDownloadReady")

-        val downloadPageCount =
-            try {
-                ChapterDownloadHelper.getImageCount(mangaId, chapterId)
-            } catch (_: Exception) {
-                0
-            }
+        val downloadPageCount = runCatching { ChapterDownloadHelper.getImageCount(mangaId, chapterId) }.getOrDefault(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" }
-            updateDownloadStatusAndPageList(false)
+            refreshChapterPageList(mangaId, chapterId, chapterEntry)
+            chapterEntry = freshChapterEntry(optChapterId = chapterId)
+            ChapterTable.toDataClass(chapterEntry)
        } else {
-            transaction {
-                var needsUpdate = false
-
-                if (!isMarkedAsDownloaded) {
-                    log.debug { "mark as downloaded" }
-                    ChapterTable.update({ ChapterTable.id eq chapterId }) {
-                        it[isDownloaded] = true
-                    }
-                    needsUpdate = true
-                }
-
-                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)
+            if (updateChapterPersistence(
+                    chapterId,
+                    isMarkedAsDownloaded,
+                    dbPageCount,
+                    downloadPageCount,
+                    chapterEntry[ChapterTable.lastPageRead],
+                    log,
+                )
+            ) {
+                chapterEntry = freshChapterEntry(optChapterId = chapterId)
            }
+            ChapterTable.toDataClass(chapterEntry)
        }
    }

@@ -150,59 +207,4 @@ 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) }
-    }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/sync/KoreaderSyncService.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/sync/KoreaderSyncService.kt
@@ -127,29 +127,36 @@ object KoreaderSyncService {
            }

            val mangaId = chapterRow[ChapterTable.manga].value
+            val isDownloaded = chapterRow[ChapterTable.isDownloaded]
            val checksumMethod = serverConfig.koreaderSyncChecksumMethod.value

            val newHash =
                when (checksumMethod) {
                    KoreaderSyncChecksumMethod.BINARY -> {
-                        logger.debug { "[KOSYNC HASH] No hash for chapterId=$chapterId. Generating from downloaded content." }
-                        try {
-                            // Always create a CBZ in memory if it doesn't exist
-                            val (stream, _) = ChapterDownloadHelper.getArchiveStreamWithSize(mangaId, chapterId)
-                            // Write the stream to a temp file for partial hashing
-                            val tempFile = File.createTempFile("kosync-hash-", ".cbz")
+                        // Only generate binary hash if the chapter is downloaded to avoid fetching missing files
+                        if (isDownloaded) {
+                            logger.debug { "[KOSYNC HASH] No hash for chapterId=$chapterId. Generating from downloaded content." }
                            try {
-                                tempFile.outputStream().use { fos ->
-                                    stream.use { it.copyTo(fos) }
+                                // Always create a CBZ in memory if it doesn't exist
+                                val (stream, _) = ChapterDownloadHelper.getArchiveStreamWithSize(mangaId, chapterId)
+                                // Write the stream to a temp file for partial hashing
+                                val tempFile = File.createTempFile("kosync-hash-", ".cbz")
+                                try {
+                                    tempFile.outputStream().use { fos ->
+                                        stream.use { it.copyTo(fos) }
+                                    }
+                                    // Use the same hashing method as for downloads
+                                    KoreaderHelper.hashContents(tempFile)
+                                } finally {
+                                    // Always delete the temp file
+                                    tempFile.delete()
                                }
-                                // Use the same hashing method as for downloads
-                                KoreaderHelper.hashContents(tempFile)
-                            } finally {
-                                // Always delete the temp file
-                                tempFile.delete()
+                            } catch (e: Exception) {
+                                logger.warn(e) { "[KOSYNC HASH] Failed to generate archive stream for chapterId=$chapterId." }
+                                null
                            }
-                        } catch (e: Exception) {
-                            logger.warn(e) { "[KOSYNC HASH] Failed to generate archive stream for chapterId=$chapterId." }
+                        } else {
+                            logger.debug { "[KOSYNC HASH] Skipping binary hash for chapterId=$chapterId because it is not downloaded." }
                            null
                        }
                    }
@@ -175,7 +182,7 @@ object KoreaderSyncService {
                }
                logger.info { "[KOSYNC HASH] Generated and saved new hash for chapterId=$chapterId" }
            } else {
-                logger.warn { "[KOSYNC HASH] Hashing failed for chapterId=$chapterId." }
+                logger.warn { "[KOSYNC HASH] Hashing failed or skipped for chapterId=$chapterId." }
            }
            newHash
        }
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/CategoryDataClass.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/CategoryDataClass.kt
@@ -1,6 +1,7 @@
 package suwayomi.tachidesk.manga.model.dataclass

 import com.fasterxml.jackson.annotation.JsonValue
+import suwayomi.tachidesk.manga.impl.Category

 /*
 * Copyright (C) Contributors to the Suwayomi project
@@ -18,7 +19,7 @@ enum class IncludeOrExclude(
    ;

    companion object {
-        fun fromValue(value: Int) = IncludeOrExclude.values().find { it.value == value } ?: UNSET
+        fun fromValue(value: Int) = entries.find { it.value == value } ?: UNSET
    }
 }

@@ -27,11 +28,19 @@ data class CategoryDataClass(
    val order: Int,
    val name: String,
    val default: Boolean,
-    val size: Int,
    val includeInUpdate: IncludeOrExclude,
    val includeInDownload: IncludeOrExclude,
    val version: Long,
    val uid: Long,
    val lastModifiedAt: Long,
-    val meta: Map<String, String> = emptyMap(),
-)
+) {
+    @Deprecated("Remove with V1 Api")
+    val size: Int by lazy {
+        Category.getCategorySize(id)
+    }
+
+    @Deprecated("Remove with V1 Api")
+    val meta: Map<String, String> by lazy {
+        Category.getCategoryMetaMap(id)
+    }
+}
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/ChapterDataClass.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/ChapterDataClass.kt
@@ -1,6 +1,11 @@
 package suwayomi.tachidesk.manga.model.dataclass

 import eu.kanade.tachiyomi.source.model.SChapter
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import suwayomi.tachidesk.manga.impl.Chapter.getChapterMetaMap
+import suwayomi.tachidesk.manga.model.table.ChapterTable

 /*
 * Copyright (C) Contributors to the Suwayomi project
@@ -36,12 +41,8 @@ data class ChapterDataClass(
    val downloaded: Boolean,
    /** used to construct pages in the front-end */
    val pageCount: Int = -1,
-    /** total chapter count, used to calculate if there's a next and prev chapter */
-    val chapterCount: Int? = null,
    val lastModifiedAt: Long = 0,
    val version: Long = 0,
-    /** used to store client specific values */
-    val meta: Map<String, String> = emptyMap(),
 ) {
    companion object {
        fun fromSChapter(
@@ -70,4 +71,20 @@ data class ChapterDataClass(
                downloaded = false,
            )
    }
+
+    @Deprecated("Remove with V1 Api")
+    val chapterCount: Int by lazy {
+        transaction {
+            ChapterTable
+                .selectAll()
+                .where { ChapterTable.manga eq mangaId }
+                .count()
+                .toInt()
+        }
+    }
+
+    @Deprecated("Remove with V1 Api")
+    val meta: Map<String, String> by lazy {
+        getChapterMetaMap(id)
+    }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/MangaDataClass.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/MangaDataClass.kt
@@ -8,6 +8,7 @@ package suwayomi.tachidesk.manga.model.dataclass
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */

 import eu.kanade.tachiyomi.source.model.UpdateStrategy
+import suwayomi.tachidesk.manga.impl.Manga.getMangaMetaMap
 import suwayomi.tachidesk.manga.impl.util.lang.trimAll
 import suwayomi.tachidesk.manga.model.table.MangaStatus
 import java.time.Instant
@@ -28,18 +29,16 @@ data class MangaDataClass(
    val inLibrary: Boolean = false,
    val inLibraryAt: Long = 0,
    val source: SourceDataClass? = null,
-    /** meta data for clients */
-    val meta: Map<String, String> = emptyMap(),
    val realUrl: String? = null,
-    var lastFetchedAt: Long? = 0,
-    var chaptersLastFetchedAt: Long? = 0,
-    var updateStrategy: UpdateStrategy = UpdateStrategy.ALWAYS_UPDATE,
+    val lastFetchedAt: Long? = 0,
+    val chaptersLastFetchedAt: Long? = 0,
+    val updateStrategy: UpdateStrategy = UpdateStrategy.ALWAYS_UPDATE,
    val freshData: Boolean = false,
-    var unreadCount: Long? = null,
-    var downloadCount: Long? = null,
-    var chapterCount: Long? = null,
-    var lastReadAt: Long? = null,
-    var lastChapterRead: ChapterDataClass? = null,
+    val unreadCount: Long? = null,
+    val downloadCount: Long? = null,
+    val chapterCount: Long? = null,
+    val lastReadAt: Long? = null,
+    val lastChapterRead: ChapterDataClass? = null,
    val age: Long? = if (lastFetchedAt == null) 0 else Instant.now().epochSecond.minus(lastFetchedAt),
    val chaptersAge: Long? = if (chaptersLastFetchedAt == null) null else Instant.now().epochSecond.minus(chaptersLastFetchedAt),
    val trackers: List<MangaTrackerDataClass>? = null,
@@ -47,6 +46,11 @@ data class MangaDataClass(
    val version: Long = 0,
 ) {
    override fun toString(): String = "\"$title\" (id= $id) (sourceId= $sourceId)"
+
+    @Deprecated("Remove with V1 Api")
+    val meta: Map<String, String> by lazy {
+        getMangaMetaMap(id)
+    }
 }

 data class PagedMangaListDataClass(
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/CategoryTable.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/CategoryTable.kt
@@ -9,7 +9,6 @@ package suwayomi.tachidesk.manga.model.table

 import org.jetbrains.exposed.v1.core.ResultRow
 import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
-import suwayomi.tachidesk.manga.impl.Category
 import suwayomi.tachidesk.manga.model.dataclass.CategoryDataClass
 import suwayomi.tachidesk.manga.model.dataclass.IncludeOrExclude

@@ -28,15 +27,13 @@ object CategoryTable : IntIdTable() {

 fun CategoryTable.toDataClass(categoryEntry: ResultRow) =
    CategoryDataClass(
-        categoryEntry[id].value,
-        categoryEntry[order],
-        categoryEntry[name],
-        categoryEntry[isDefault],
-        Category.getCategorySize(categoryEntry[id].value),
-        IncludeOrExclude.fromValue(categoryEntry[includeInUpdate]),
-        IncludeOrExclude.fromValue(categoryEntry[includeInDownload]),
-        categoryEntry[version],
-        categoryEntry[uid],
-        categoryEntry[lastModifiedAt],
-        Category.getCategoryMetaMap(categoryEntry[id].value),
+        id = categoryEntry[id].value,
+        order = categoryEntry[order],
+        name = categoryEntry[name],
+        default = categoryEntry[isDefault],
+        includeInUpdate = IncludeOrExclude.fromValue(categoryEntry[includeInUpdate]),
+        includeInDownload = IncludeOrExclude.fromValue(categoryEntry[includeInDownload]),
+        version = categoryEntry[version],
+        uid = categoryEntry[uid],
+        lastModifiedAt = categoryEntry[lastModifiedAt],
    )
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/ChapterTable.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/ChapterTable.kt
@@ -10,10 +10,6 @@ package suwayomi.tachidesk.manga.model.table
 import org.jetbrains.exposed.v1.core.ReferenceOption
 import org.jetbrains.exposed.v1.core.ResultRow
 import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import suwayomi.tachidesk.manga.impl.Chapter.getChapterMetaMap
 import suwayomi.tachidesk.manga.model.dataclass.ChapterDataClass
 import suwayomi.tachidesk.manga.model.table.columns.truncatingVarchar

@@ -48,45 +44,24 @@ object ChapterTable : IntIdTable() {
    val isSyncing = bool("is_syncing").default(false)
 }

-fun ChapterTable.toDataClass(
-    chapterEntry: ResultRow,
-    includeChapterCount: Boolean = true,
-    includeChapterMeta: Boolean = true,
-) = ChapterDataClass(
-    id = chapterEntry[id].value,
-    url = chapterEntry[url],
-    name = chapterEntry[name],
-    uploadDate = chapterEntry[date_upload],
-    chapterNumber = chapterEntry[chapter_number],
-    scanlator = chapterEntry[scanlator],
-    mangaId = chapterEntry[manga].value,
-    read = chapterEntry[isRead],
-    bookmarked = chapterEntry[isBookmarked],
-    lastPageRead = chapterEntry[lastPageRead],
-    lastReadAt = chapterEntry[lastReadAt],
-    index = chapterEntry[sourceOrder],
-    fetchedAt = chapterEntry[fetchedAt],
-    realUrl = chapterEntry[realUrl],
-    downloaded = chapterEntry[isDownloaded],
-    pageCount = chapterEntry[pageCount],
-    chapterCount =
-        if (includeChapterCount) {
-            transaction {
-                ChapterTable
-                    .selectAll()
-                    .where { manga eq chapterEntry[manga].value }
-                    .count()
-                    .toInt()
-            }
-        } else {
-            null
-        },
-    meta =
-        if (includeChapterMeta) {
-            getChapterMetaMap(chapterEntry[id])
-        } else {
-            emptyMap()
-        },
-    lastModifiedAt = chapterEntry[lastModifiedAt],
-    version = chapterEntry[version],
-)
+fun ChapterTable.toDataClass(chapterEntry: ResultRow) =
+    ChapterDataClass(
+        id = chapterEntry[id].value,
+        url = chapterEntry[url],
+        name = chapterEntry[name],
+        uploadDate = chapterEntry[date_upload],
+        chapterNumber = chapterEntry[chapter_number],
+        scanlator = chapterEntry[scanlator],
+        mangaId = chapterEntry[manga].value,
+        read = chapterEntry[isRead],
+        bookmarked = chapterEntry[isBookmarked],
+        lastPageRead = chapterEntry[lastPageRead],
+        lastReadAt = chapterEntry[lastReadAt],
+        index = chapterEntry[sourceOrder],
+        fetchedAt = chapterEntry[fetchedAt],
+        realUrl = chapterEntry[realUrl],
+        downloaded = chapterEntry[isDownloaded],
+        pageCount = chapterEntry[pageCount],
+        lastModifiedAt = chapterEntry[lastModifiedAt],
+        version = chapterEntry[version],
+    )
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/MangaTable.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/MangaTable.kt
@@ -11,11 +11,9 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import org.jetbrains.exposed.v1.core.ResultRow
 import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
-import suwayomi.tachidesk.manga.impl.Manga.getMangaMetaMap
 import suwayomi.tachidesk.manga.impl.MangaList.proxyThumbnailUrl
 import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
 import suwayomi.tachidesk.manga.model.dataclass.toGenreList
-import suwayomi.tachidesk.manga.model.table.MangaStatus.Companion
 import suwayomi.tachidesk.manga.model.table.columns.truncatingVarchar
 import suwayomi.tachidesk.manga.model.table.columns.unlimitedVarchar

@@ -52,37 +50,29 @@ object MangaTable : IntIdTable() {
    val isSyncing = bool("is_syncing").default(false)
 }

-fun MangaTable.toDataClass(
-    mangaEntry: ResultRow,
-    includeMangaMeta: Boolean = true,
-) = MangaDataClass(
-    id = mangaEntry[this.id].value,
-    sourceId = mangaEntry[sourceReference].toString(),
-    url = mangaEntry[url],
-    title = mangaEntry[title],
-    thumbnailUrl = proxyThumbnailUrl(mangaEntry[this.id].value),
-    thumbnailUrlLastFetched = mangaEntry[thumbnailUrlLastFetched],
-    initialized = mangaEntry[initialized],
-    artist = mangaEntry[artist],
-    author = mangaEntry[author],
-    description = mangaEntry[description],
-    genre = mangaEntry[genre].toGenreList(),
-    status = Companion.valueOf(mangaEntry[status]).name,
-    inLibrary = mangaEntry[inLibrary],
-    inLibraryAt = mangaEntry[inLibraryAt],
-    meta =
-        if (includeMangaMeta) {
-            getMangaMetaMap(mangaEntry[id].value)
-        } else {
-            emptyMap()
-        },
-    realUrl = mangaEntry[realUrl],
-    lastFetchedAt = mangaEntry[lastFetchedAt],
-    chaptersLastFetchedAt = mangaEntry[chaptersLastFetchedAt],
-    updateStrategy = UpdateStrategy.valueOf(mangaEntry[updateStrategy]),
-    lastModifiedAt = mangaEntry[lastModifiedAt],
-    version = mangaEntry[version],
-)
+fun MangaTable.toDataClass(mangaEntry: ResultRow) =
+    MangaDataClass(
+        id = mangaEntry[this.id].value,
+        sourceId = mangaEntry[sourceReference].toString(),
+        url = mangaEntry[url],
+        title = mangaEntry[title],
+        thumbnailUrl = proxyThumbnailUrl(mangaEntry[this.id].value),
+        thumbnailUrlLastFetched = mangaEntry[thumbnailUrlLastFetched],
+        initialized = mangaEntry[initialized],
+        artist = mangaEntry[artist],
+        author = mangaEntry[author],
+        description = mangaEntry[description],
+        genre = mangaEntry[genre].toGenreList(),
+        status = MangaStatus.valueOf(mangaEntry[status]).name,
+        inLibrary = mangaEntry[inLibrary],
+        inLibraryAt = mangaEntry[inLibraryAt],
+        realUrl = mangaEntry[realUrl],
+        lastFetchedAt = mangaEntry[lastFetchedAt],
+        chaptersLastFetchedAt = mangaEntry[chaptersLastFetchedAt],
+        updateStrategy = UpdateStrategy.valueOf(mangaEntry[updateStrategy]),
+        lastModifiedAt = mangaEntry[lastModifiedAt],
+        version = mangaEntry[version],
+    )

 enum class MangaStatus(
    val value: Int,
--- a/server/src/main/kotlin/suwayomi/tachidesk/opds/OpdsAPI.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/opds/OpdsAPI.kt
@@ -13,18 +13,22 @@ object OpdsAPI {
            // OPDS Search Description Feed
            get("search", OpdsV1Controller.searchFeed)

-            // --- Main Navigation Feeds ---
-
-            // Explore Navigation Feed
-            get("explore", OpdsV1Controller.exploreSourcesFeed)
-
            // Reading History Acquisition Feed
            get("history", OpdsV1Controller.historyFeed)

            // Library Updates Acquisition Feed
            get("library-updates", OpdsV1Controller.libraryUpdatesFeed)

-            // --- Library-Specific Feeds ---
+            // --- Remote Catalog Exploration ---
+            // List of available online sources
+            get("explore", OpdsV1Controller.exploreSourcesFeed)
+
+            // Browse series from a specific online source
+            path("explore/source/{sourceId}") {
+                get(OpdsV1Controller.exploreSourceFeed)
+            }
+
+            // --- Library Navigation Feeds ---
            path("library") {
                // All Series in Library / Search Results Feed (Acquisition)
                get("series", OpdsV1Controller.seriesFeed)
@@ -32,11 +36,6 @@ object OpdsAPI {
                // Library Sources Navigation Feed
                get("sources", OpdsV1Controller.librarySourcesFeed)

-                // Library Source-Specific Series Acquisition Feed
-                path("source/{sourceId}") {
-                    get(OpdsV1Controller.librarySourceFeed)
-                }
-
                // Library Categories Navigation Feed
                get("categories", OpdsV1Controller.categoriesFeed)

@@ -50,26 +49,10 @@ object OpdsAPI {
                get("languages", OpdsV1Controller.languagesFeed)
            }

-            // --- Explore-Specific Feeds ---
-
-            // All Sources Navigation Feed (Explore)
-            get("sources", OpdsV1Controller.exploreSourcesFeed)
-
-            // Source-Specific Series Acquisition Feed (Explore)
+            // --- Library Series Filters ---
+            // Source-Specific Series Acquisition Feed (Library)
            path("source/{sourceId}") {
-                get(OpdsV1Controller.exploreSourceFeed)
-            }
-
-            // --- Item-Specific Feeds (Apply to both Library and Explore contexts) ---
-
-            // Series Chapters Acquisition Feed
-            path("series/{seriesId}/chapters") {
-                get(OpdsV1Controller.seriesChaptersFeed)
-            }
-
-            // Chapter Metadata Acquisition Feed
-            path("series/{seriesId}/chapter/{chapterIndex}/metadata") {
-                get(OpdsV1Controller.chapterMetadataFeed)
+                get(OpdsV1Controller.librarySourceFeed)
            }

            // Category-Specific Series Acquisition Feed (Library)
@@ -91,6 +74,16 @@ object OpdsAPI {
            path("language/{langCode}") {
                get(OpdsV1Controller.languageFeed)
            }
+
+            // --- Item Specific Feeds ---
+            // Series Chapters Acquisition Feed
+            path("series/{seriesId}/chapters") {
+                get(OpdsV1Controller.seriesChaptersFeed)
+            }
+            // Chapter Metadata Acquisition Feed
+            path("series/{seriesId}/chapter/{chapterIndex}/metadata") {
+                get(OpdsV1Controller.chapterMetadataFeed)
+            }
        }
    }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/opds/controller/OpdsV1Controller.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/opds/controller/OpdsV1Controller.kt
@@ -32,21 +32,21 @@ object OpdsV1Controller {
     */
    private fun getLibraryFeed(
        ctx: Context,
-        pageNum: Int?,
+        locale: Locale,
        criteria: OpdsMangaFilter,
        isSearch: Boolean,
+        pageNum: Int,
    ) {
-        val locale: Locale = LocalizationHelper.ctxToLocale(ctx, ctx.queryParam("lang"))
        ctx.future {
            future {
                OpdsFeedBuilder.getLibraryFeed(
-                    criteria = criteria,
-                    baseUrl = BASE_URL,
-                    pageNum = pageNum ?: 1,
-                    sort = criteria.sort,
-                    filter = criteria.filter,
-                    locale = locale,
-                    isSearch = isSearch,
+                    BASE_URL,
+                    locale,
+                    criteria,
+                    isSearch,
+                    pageNum,
+                    criteria.sort,
+                    criteria.filter,
                )
            }.thenApply { xml ->
                ctx.contentType(OPDS_MIME).result(xml)
@@ -94,7 +94,7 @@ object OpdsV1Controller {
                val locale: Locale = LocalizationHelper.ctxToLocale(ctx, lang)
                ctx.future {
                    future {
-                        OpdsFeedBuilder.getHistoryFeed(BASE_URL, pageNumber ?: 1, locale)
+                        OpdsFeedBuilder.getHistoryFeed(BASE_URL, locale, pageNumber ?: 1)
                    }.thenApply { xml ->
                        ctx.contentType(OPDS_MIME).result(xml)
                    }
@@ -139,6 +139,7 @@ object OpdsV1Controller {
    /**
     * Serves an acquisition feed for all series in the library or search results.
     * This endpoint handles both general library browsing and specific search queries.
+     * This is the ONLY feed that extracts all the cross-filters from the context.
     */
    val seriesFeed =
        handler(
@@ -157,29 +158,14 @@ object OpdsV1Controller {
                    val opdsSearchCriteria = OpdsSearchCriteria(query, author, title)
                    ctx.future {
                        future {
-                            OpdsFeedBuilder.getSearchFeed(opdsSearchCriteria, BASE_URL, pageNumber ?: 1, locale)
+                            OpdsFeedBuilder.getSearchFeed(BASE_URL, locale, opdsSearchCriteria, pageNumber ?: 1)
                        }.thenApply { xml ->
                            ctx.contentType(OPDS_MIME).result(xml)
                        }
                    }
                } else {
-                    val criteria =
-                        OpdsMangaFilter(
-                            sourceId = ctx.queryParam("source_id")?.toLongOrNull(),
-                            categoryId = ctx.queryParam("category_id")?.toIntOrNull(),
-                            statusId = ctx.queryParam("status_id")?.toIntOrNull(),
-                            genre = ctx.queryParam("genre"),
-                            langCode = ctx.queryParam("lang_code"),
-                            sort = ctx.queryParam("sort"),
-                            filter = ctx.queryParam("filter"),
-                            primaryFilter = PrimaryFilterType.NONE,
-                        )
-                    getLibraryFeed(
-                        ctx,
-                        pageNumber,
-                        criteria,
-                        isSearch = false,
-                    )
+                    val criteria = OpdsMangaFilter.fromContext(ctx, PrimaryFilterType.NONE)
+                    getLibraryFeed(ctx, locale, criteria, false, pageNumber ?: 1)
                }
            },
            withResults = { httpCode(HttpStatus.OK) },
@@ -203,7 +189,7 @@ object OpdsV1Controller {
                val locale: Locale = LocalizationHelper.ctxToLocale(ctx, lang)
                ctx.future {
                    future {
-                        OpdsFeedBuilder.getExploreSourcesFeed(BASE_URL, pageNumber ?: 1, locale)
+                        OpdsFeedBuilder.getExploreSourcesFeed(BASE_URL, locale, pageNumber ?: 1)
                    }.thenApply { xml ->
                        ctx.contentType(OPDS_MIME).result(xml)
                    }
@@ -230,7 +216,7 @@ object OpdsV1Controller {
                val locale: Locale = LocalizationHelper.ctxToLocale(ctx, lang)
                ctx.future {
                    future {
-                        OpdsFeedBuilder.getLibrarySourcesFeed(BASE_URL, pageNumber ?: 1, locale)
+                        OpdsFeedBuilder.getLibrarySourcesFeed(BASE_URL, locale, pageNumber ?: 1)
                    }.thenApply { xml ->
                        ctx.contentType(OPDS_MIME).result(xml)
                    }
@@ -257,7 +243,7 @@ object OpdsV1Controller {
                val locale: Locale = LocalizationHelper.ctxToLocale(ctx, lang)
                ctx.future {
                    future {
-                        OpdsFeedBuilder.getCategoriesFeed(BASE_URL, pageNumber ?: 1, locale)
+                        OpdsFeedBuilder.getCategoriesFeed(BASE_URL, locale, pageNumber ?: 1)
                    }.thenApply { xml ->
                        ctx.contentType(OPDS_MIME).result(xml)
                    }
@@ -284,7 +270,7 @@ object OpdsV1Controller {
                val locale: Locale = LocalizationHelper.ctxToLocale(ctx, lang)
                ctx.future {
                    future {
-                        OpdsFeedBuilder.getGenresFeed(BASE_URL, pageNumber ?: 1, locale)
+                        OpdsFeedBuilder.getGenresFeed(BASE_URL, locale, pageNumber ?: 1)
                    }.thenApply { xml ->
                        ctx.contentType(OPDS_MIME).result(xml)
                    }
@@ -298,6 +284,7 @@ object OpdsV1Controller {
     */
    val statusesFeed =
        handler(
+            queryParam<Int?>("pageNumber"),
            queryParam<String?>("lang"),
            documentWith = {
                withOperation {
@@ -305,12 +292,12 @@ object OpdsV1Controller {
                    description("Navigation feed listing series publication statuses for the library.")
                }
            },
-            behaviorOf = { ctx, lang ->
+            behaviorOf = { ctx, pageNumber, lang ->
                ctx.getAttribute(Attribute.TachideskUser).requireUserWithBasicFallback(ctx)
                val locale: Locale = LocalizationHelper.ctxToLocale(ctx, lang)
                ctx.future {
                    future {
-                        OpdsFeedBuilder.getStatusFeed(BASE_URL, 1, locale)
+                        OpdsFeedBuilder.getStatusFeed(BASE_URL, locale, pageNumber ?: 1)
                    }.thenApply { xml ->
                        ctx.contentType(OPDS_MIME).result(xml)
                    }
@@ -324,6 +311,7 @@ object OpdsV1Controller {
     */
    val languagesFeed =
        handler(
+            queryParam<Int?>("pageNumber"),
            queryParam<String?>("lang"),
            documentWith = {
                withOperation {
@@ -331,12 +319,12 @@ object OpdsV1Controller {
                    description("Navigation feed listing available content languages for series in the library.")
                }
            },
-            behaviorOf = { ctx, lang ->
+            behaviorOf = { ctx, pageNumber, lang ->
                ctx.getAttribute(Attribute.TachideskUser).requireUserWithBasicFallback(ctx)
                val locale: Locale = LocalizationHelper.ctxToLocale(ctx, lang)
                ctx.future {
                    future {
-                        OpdsFeedBuilder.getLanguagesFeed(BASE_URL, locale)
+                        OpdsFeedBuilder.getLanguagesFeed(BASE_URL, locale, pageNumber ?: 1)
                    }.thenApply { xml ->
                        ctx.contentType(OPDS_MIME).result(xml)
                    }
@@ -363,7 +351,7 @@ object OpdsV1Controller {
                val locale: Locale = LocalizationHelper.ctxToLocale(ctx, lang)
                ctx.future {
                    future {
-                        OpdsFeedBuilder.getLibraryUpdatesFeed(BASE_URL, pageNumber ?: 1, locale)
+                        OpdsFeedBuilder.getLibraryUpdatesFeed(BASE_URL, locale, pageNumber ?: 1)
                    }.thenApply { xml ->
                        ctx.contentType(OPDS_MIME).result(xml)
                    }
@@ -392,7 +380,7 @@ object OpdsV1Controller {
                val locale: Locale = LocalizationHelper.ctxToLocale(ctx, lang)
                ctx.future {
                    future {
-                        OpdsFeedBuilder.getExploreSourceFeed(sourceId, BASE_URL, pageNumber ?: 1, sort ?: "popular", locale)
+                        OpdsFeedBuilder.getExploreSourceFeed(BASE_URL, locale, sourceId, pageNumber ?: 1, sort ?: "popular")
                    }.thenApply { xml ->
                        ctx.contentType(OPDS_MIME).result(xml)
                    }
@@ -425,8 +413,9 @@ object OpdsV1Controller {
            documentWith = { withOperation { summary("OPDS Library Source Specific Series Feed") } },
            behaviorOf = { ctx, sourceId ->
                ctx.getAttribute(Attribute.TachideskUser).requireUserWithBasicFallback(ctx)
+                val locale: Locale = LocalizationHelper.ctxToLocale(ctx, ctx.queryParam("lang"))
                val criteria = buildCriteriaFromContext(ctx, OpdsMangaFilter(sourceId = sourceId, primaryFilter = PrimaryFilterType.SOURCE))
-                getLibraryFeed(ctx, ctx.queryParam("pageNumber")?.toIntOrNull(), criteria, isSearch = false)
+                getLibraryFeed(ctx, locale, criteria, false, ctx.queryParam("pageNumber")?.toIntOrNull() ?: 1)
            },
            withResults = {
                httpCode(HttpStatus.OK)
@@ -443,9 +432,10 @@ object OpdsV1Controller {
            documentWith = { withOperation { summary("OPDS Category Specific Series Feed") } },
            behaviorOf = { ctx, categoryId ->
                ctx.getAttribute(Attribute.TachideskUser).requireUserWithBasicFallback(ctx)
+                val locale: Locale = LocalizationHelper.ctxToLocale(ctx, ctx.queryParam("lang"))
                val criteria =
                    buildCriteriaFromContext(ctx, OpdsMangaFilter(categoryId = categoryId, primaryFilter = PrimaryFilterType.CATEGORY))
-                getLibraryFeed(ctx, ctx.queryParam("pageNumber")?.toIntOrNull(), criteria, isSearch = false)
+                getLibraryFeed(ctx, locale, criteria, false, ctx.queryParam("pageNumber")?.toIntOrNull() ?: 1)
            },
            withResults = {
                httpCode(HttpStatus.OK)
@@ -462,8 +452,9 @@ object OpdsV1Controller {
            documentWith = { withOperation { summary("OPDS Genre Specific Series Feed") } },
            behaviorOf = { ctx, genre ->
                ctx.getAttribute(Attribute.TachideskUser).requireUserWithBasicFallback(ctx)
+                val locale: Locale = LocalizationHelper.ctxToLocale(ctx, ctx.queryParam("lang"))
                val criteria = buildCriteriaFromContext(ctx, OpdsMangaFilter(genre = genre, primaryFilter = PrimaryFilterType.GENRE))
-                getLibraryFeed(ctx, ctx.queryParam("pageNumber")?.toIntOrNull(), criteria, isSearch = false)
+                getLibraryFeed(ctx, locale, criteria, false, ctx.queryParam("pageNumber")?.toIntOrNull() ?: 1)
            },
            withResults = {
                httpCode(HttpStatus.OK)
@@ -480,8 +471,9 @@ object OpdsV1Controller {
            documentWith = { withOperation { summary("OPDS Status Specific Series Feed") } },
            behaviorOf = { ctx, statusId ->
                ctx.getAttribute(Attribute.TachideskUser).requireUserWithBasicFallback(ctx)
+                val locale: Locale = LocalizationHelper.ctxToLocale(ctx, ctx.queryParam("lang"))
                val criteria = buildCriteriaFromContext(ctx, OpdsMangaFilter(statusId = statusId, primaryFilter = PrimaryFilterType.STATUS))
-                getLibraryFeed(ctx, ctx.queryParam("pageNumber")?.toIntOrNull(), criteria, isSearch = false)
+                getLibraryFeed(ctx, locale, criteria, false, ctx.queryParam("pageNumber")?.toIntOrNull() ?: 1)
            },
            withResults = {
                httpCode(HttpStatus.OK)
@@ -503,9 +495,10 @@ object OpdsV1Controller {
            },
            behaviorOf = { ctx, langCode ->
                ctx.getAttribute(Attribute.TachideskUser).requireUserWithBasicFallback(ctx)
+                val locale: Locale = LocalizationHelper.ctxToLocale(ctx, ctx.queryParam("lang"))
                val criteria =
                    buildCriteriaFromContext(ctx, OpdsMangaFilter(langCode = langCode, primaryFilter = PrimaryFilterType.LANGUAGE))
-                getLibraryFeed(ctx, ctx.queryParam("pageNumber")?.toIntOrNull(), criteria, isSearch = false)
+                getLibraryFeed(ctx, locale, criteria, false, ctx.queryParam("pageNumber")?.toIntOrNull() ?: 1)
            },
            withResults = {
                httpCode(HttpStatus.OK)
@@ -534,7 +527,7 @@ object OpdsV1Controller {
                val locale: Locale = LocalizationHelper.ctxToLocale(ctx, lang)
                ctx.future {
                    future {
-                        OpdsFeedBuilder.getSeriesChaptersFeed(seriesId, BASE_URL, pageNumber ?: 1, sort, filter, locale)
+                        OpdsFeedBuilder.getSeriesChaptersFeed(BASE_URL, locale, seriesId, pageNumber ?: 1, sort, filter)
                    }.thenApply { xml ->
                        ctx.contentType(OPDS_MIME).result(xml)
                    }
@@ -565,7 +558,7 @@ object OpdsV1Controller {
                val locale: Locale = LocalizationHelper.ctxToLocale(ctx, lang)
                ctx.future {
                    future {
-                        OpdsFeedBuilder.getChapterMetadataFeed(seriesId, chapterIndex, BASE_URL, locale)
+                        OpdsFeedBuilder.getChapterMetadataFeed(BASE_URL, locale, seriesId, chapterIndex)
                    }.thenApply { xml ->
                        ctx.contentType(OPDS_MIME).result(xml)
                    }
--- a/server/src/main/kotlin/suwayomi/tachidesk/opds/dto/OpdsChapterListAcqEntry.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/opds/dto/OpdsChapterListAcqEntry.kt
@@ -12,4 +12,6 @@ data class OpdsChapterListAcqEntry(
    val lastReadAt: Long,
    val sourceOrder: Int,
    val pageCount: Int, // Can be -1 if not known
+    val downloaded: Boolean,
+    val cbzFileSize: Long? = null,
 )
--- a/server/src/main/kotlin/suwayomi/tachidesk/opds/dto/OpdsChapterMetadataAcqEntry.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/opds/dto/OpdsChapterMetadataAcqEntry.kt
@@ -5,6 +5,7 @@ data class OpdsChapterMetadataAcqEntry(
    val mangaId: Int,
    val name: String,
    val uploadDate: Long,
+    val chapterNumber: Float, // Added to fallback chapter titles
    val scanlator: String?,
    val read: Boolean,
    val lastPageRead: Int,
@@ -13,4 +14,5 @@ data class OpdsChapterMetadataAcqEntry(
    val downloaded: Boolean,
    val pageCount: Int,
    val url: String?,
+    val cbzFileSize: Long? = null,
 )
--- a/server/src/main/kotlin/suwayomi/tachidesk/opds/dto/OpdsHistoryAcqEntry.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/opds/dto/OpdsHistoryAcqEntry.kt
@@ -5,6 +5,7 @@ data class OpdsHistoryAcqEntry(
    val mangaTitle: String,
    val mangaAuthor: String?,
    val mangaId: Int,
+    val mangaTotalChapters: Long,
    val mangaSourceLang: String?,
    val mangaThumbnailUrl: String?,
 )
--- a/server/src/main/kotlin/suwayomi/tachidesk/opds/dto/OpdsLibraryUpdateAcqEntry.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/opds/dto/OpdsLibraryUpdateAcqEntry.kt
@@ -5,6 +5,7 @@ data class OpdsLibraryUpdateAcqEntry(
    val mangaTitle: String,
    val mangaAuthor: String?,
    val mangaId: Int,
+    val mangaTotalChapters: Long,
    val mangaSourceLang: String?,
    val mangaThumbnailUrl: String?,
 )
--- a/server/src/main/kotlin/suwayomi/tachidesk/opds/dto/OpdsMangaDetails.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/opds/dto/OpdsMangaDetails.kt
@@ -5,4 +5,5 @@ data class OpdsMangaDetails( // Kept name, it's specific enough
    val title: String,
    val thumbnailUrl: String?,
    val author: String?, // Added for chapter entry authors
+    val totalChapters: Long, // Added to determine if it's a oneshot
 )
--- a/server/src/main/kotlin/suwayomi/tachidesk/opds/dto/OpdsMangaFilter.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/opds/dto/OpdsMangaFilter.kt
@@ -1,5 +1,6 @@
 package suwayomi.tachidesk.opds.dto

+import io.javalin.http.Context
 import suwayomi.tachidesk.opds.util.OpdsStringUtil.encodeForOpdsURL

 /**
@@ -69,4 +70,24 @@ data class OpdsMangaFilter(
            "genre" -> this.copy(genre = value)
            else -> this
        }
+
+    companion object {
+        /**
+         * Creates an OpdsMangaFilter directly from the Javalin Context, capturing all cross-filters.
+         */
+        fun fromContext(
+            ctx: Context,
+            primaryFilter: PrimaryFilterType = PrimaryFilterType.NONE,
+        ): OpdsMangaFilter =
+            OpdsMangaFilter(
+                sourceId = ctx.queryParam("source_id")?.toLongOrNull(),
+                categoryId = ctx.queryParam("category_id")?.toIntOrNull(),
+                statusId = ctx.queryParam("status_id")?.toIntOrNull(),
+                genre = ctx.queryParam("genre"),
+                langCode = ctx.queryParam("lang_code"),
+                sort = ctx.queryParam("sort"),
+                filter = ctx.queryParam("filter"),
+                primaryFilter = primaryFilter,
+            )
+    }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/opds/impl/FeedBuilderInternal.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/opds/impl/FeedBuilderInternal.kt
@@ -16,145 +16,131 @@ import kotlin.math.ceil
 */
 class FeedBuilderInternal(
    private val baseUrl: String,
+    private val locale: Locale,
    private val idPath: String,
    private val title: String,
-    private val locale: Locale,
    private val feedType: String,
-    private val pageNum: Int? = 1,
+    private val pageNum: Int? = null,
    private val explicitQueryParams: String? = null,
    private val currentSort: String? = null,
    private val currentFilter: String? = null,
    private val isSearchFeed: Boolean = false,
 ) {
-    private val opdsItemsPerPageBounded: Int
-        get() = serverConfig.opdsItemsPerPage.value
-
-    private val feedAuthor = OpdsAuthorXml("Suwayomi", "https://suwayomi.org/")
-    private val feedGeneratedAt: String = OpdsDateUtil.formatCurrentInstantForOpds()
-
    var totalResults: Long = 0
    var icon: String? = null
    val links = mutableListOf<OpdsLinkXml>()
    val entries = mutableListOf<OpdsEntryXml>()

-    private fun buildUrlWithParams(
-        baseHrefPath: String,
-        page: Int?,
-    ): String {
-        val sb = StringBuilder("$baseUrl/$baseHrefPath")
-        val queryParamsList = mutableListOf<String>()
+    private fun buildUrlWithParams(page: Int? = pageNum): String {
+        val queryParams =
+            listOfNotNull(
+                explicitQueryParams?.takeIf(String::isNotBlank),
+                page?.let { "pageNumber=$it" },
+                currentSort?.let { "sort=$it" },
+                currentFilter?.let { "filter=$it" },
+                "lang=${locale.toLanguageTag()}",
+            ).joinToString("&")

-        explicitQueryParams?.takeIf { it.isNotBlank() }?.let { queryParamsList.add(it) }
-        page?.let { queryParamsList.add("pageNumber=$it") }
-        currentSort?.let { queryParamsList.add("sort=$it") }
-        currentFilter?.let { queryParamsList.add("filter=$it") }
-        queryParamsList.add("lang=${locale.toLanguageTag()}")
-
-        if (queryParamsList.isNotEmpty()) {
-            sb.append("?").append(queryParamsList.joinToString("&"))
-        }
-        return sb.toString()
+        return "$baseUrl/$idPath" + if (queryParams.isNotEmpty()) "?$queryParams" else ""
    }

    fun build(): OpdsFeedXml {
-        val selfLinkHref = buildUrlWithParams(idPath, if (pageNum != null) pageNum else null)
-        val feedLinks = mutableListOf<OpdsLinkXml>()
-        feedLinks.addAll(this.links)
-
-        feedLinks.add(
-            OpdsLinkXml(OpdsConstants.LINK_REL_SELF, selfLinkHref, feedType, MR.strings.opds_linktitle_self_feed.localized(locale)),
-        )
-        feedLinks.add(
-            OpdsLinkXml(
-                OpdsConstants.LINK_REL_START,
-                "$baseUrl?lang=${locale.toLanguageTag()}",
-                OpdsConstants.TYPE_ATOM_XML_FEED_NAVIGATION,
-                MR.strings.opds_linktitle_catalog_root.localized(locale),
-            ),
-        )
-        feedLinks.add(
-            OpdsLinkXml(
-                OpdsConstants.LINK_REL_SEARCH,
-                "$baseUrl/search?lang=${locale.toLanguageTag()}",
-                OpdsConstants.TYPE_OPENSEARCH_DESCRIPTION,
-                MR.strings.opds_linktitle_search_catalog.localized(locale),
-            ),
-        )
-
-        // Add pagination links if needed
-        if (pageNum != null) {
-            val totalPages = ceil(totalResults.toDouble() / opdsItemsPerPageBounded).toInt()
-
-            if (totalPages > 1) {
-                val currentPage = pageNum.coerceAtLeast(1)
-
-                // Always add 'first' link when there are multiple pages
-                feedLinks.add(
-                    OpdsLinkXml(
-                        OpdsConstants.LINK_REL_FIRST,
-                        buildUrlWithParams(idPath, 1),
-                        feedType,
-                        MR.strings.opds_linktitle_first_page.localized(locale),
-                    ),
-                )
-
-                // Add 'prev' link if not on first page
-                if (currentPage > 1) {
-                    feedLinks.add(
-                        OpdsLinkXml(
-                            OpdsConstants.LINK_REL_PREV,
-                            buildUrlWithParams(idPath, currentPage - 1),
-                            feedType,
-                            MR.strings.opds_linktitle_previous_page.localized(locale),
-                        ),
-                    )
-                }
-
-                // Add 'next' link if not on last page
-                if (currentPage < totalPages) {
-                    feedLinks.add(
-                        OpdsLinkXml(
-                            OpdsConstants.LINK_REL_NEXT,
-                            buildUrlWithParams(idPath, currentPage + 1),
-                            feedType,
-                            MR.strings.opds_linktitle_next_page.localized(locale),
-                        ),
-                    )
-                }
-
-                // Always add 'last' link when there are multiple pages
-                feedLinks.add(
-                    OpdsLinkXml(
-                        OpdsConstants.LINK_REL_LAST,
-                        buildUrlWithParams(idPath, totalPages),
-                        feedType,
-                        MR.strings.opds_linktitle_last_page.localized(locale),
-                    ),
-                )
-            }
-        }
-
-        val urnParams = mutableListOf<String>()
-        urnParams.add(locale.toLanguageTag())
-        pageNum?.let { urnParams.add("page$it") }
-        explicitQueryParams?.let { urnParams.add(it.replace("&", ":").replace("=", "_")) }
-        currentSort?.let { urnParams.add("sort_$it") }
-        currentFilter?.let { urnParams.add("filter_$it") }
-        val urnSuffix = if (urnParams.isNotEmpty()) ":${urnParams.joinToString(":")}" else ""
-
-        val showOpenSearchFields = isSearchFeed && pageNum != null && totalResults > 0
+        val itemsPerPage = serverConfig.opdsItemsPerPage.value
+        val showOpenSearch = isSearchFeed && pageNum != null && totalResults > 0
+        val urnSuffix =
+            listOfNotNull(
+                locale.toLanguageTag(),
+                pageNum?.let { "page$it" },
+                explicitQueryParams?.replace("&", ":")?.replace("=", "_"),
+                currentSort?.let { "sort_$it" },
+                currentFilter?.let { "filter_$it" },
+            ).joinToString(":")

        return OpdsFeedXml(
-            id = "urn:suwayomi:feed:${idPath.replace('/',':')}$urnSuffix",
+            id = "urn:suwayomi:feed:${idPath.replace('/', ':')}${if (urnSuffix.isNotEmpty()) ":$urnSuffix" else ""}",
            title = title,
-            updated = feedGeneratedAt,
+            updated = OpdsDateUtil.formatCurrentInstantForOpds(),
            icon = icon,
-            author = feedAuthor,
-            links = feedLinks,
+            author = OpdsAuthorXml("Suwayomi", "https://suwayomi.org/"),
+            links =
+                buildList {
+                    addAll(this@FeedBuilderInternal.links)
+                    add(
+                        OpdsLinkXml(
+                            OpdsConstants.LINK_REL_SELF,
+                            buildUrlWithParams(),
+                            feedType,
+                            MR.strings.opds_linktitle_self_feed.localized(locale),
+                        ),
+                    )
+                    add(
+                        OpdsLinkXml(
+                            OpdsConstants.LINK_REL_START,
+                            "$baseUrl?lang=${locale.toLanguageTag()}",
+                            OpdsConstants.TYPE_ATOM_XML_FEED_NAVIGATION,
+                            MR.strings.opds_linktitle_catalog_root.localized(locale),
+                        ),
+                    )
+                    add(
+                        OpdsLinkXml(
+                            OpdsConstants.LINK_REL_SEARCH,
+                            "$baseUrl/search?lang=${locale.toLanguageTag()}",
+                            OpdsConstants.TYPE_OPENSEARCH_DESCRIPTION,
+                            MR.strings.opds_linktitle_search_catalog.localized(locale),
+                        ),
+                    )
+
+                    if (pageNum != null) {
+                        val totalPages = ceil(totalResults.toDouble() / itemsPerPage).toInt()
+                        if (totalPages > 1) {
+                            val currentPage = pageNum.coerceAtLeast(1)
+                            add(
+                                OpdsLinkXml(
+                                    OpdsConstants.LINK_REL_FIRST,
+                                    buildUrlWithParams(1),
+                                    feedType,
+                                    MR.strings.opds_linktitle_first_page.localized(locale),
+                                ),
+                            )
+                            if (currentPage >
+                                1
+                            ) {
+                                add(
+                                    OpdsLinkXml(
+                                        OpdsConstants.LINK_REL_PREV,
+                                        buildUrlWithParams(currentPage - 1),
+                                        feedType,
+                                        MR.strings.opds_linktitle_previous_page.localized(locale),
+                                    ),
+                                )
+                            }
+                            if (currentPage <
+                                totalPages
+                            ) {
+                                add(
+                                    OpdsLinkXml(
+                                        OpdsConstants.LINK_REL_NEXT,
+                                        buildUrlWithParams(currentPage + 1),
+                                        feedType,
+                                        MR.strings.opds_linktitle_next_page.localized(locale),
+                                    ),
+                                )
+                            }
+                            add(
+                                OpdsLinkXml(
+                                    OpdsConstants.LINK_REL_LAST,
+                                    buildUrlWithParams(totalPages),
+                                    feedType,
+                                    MR.strings.opds_linktitle_last_page.localized(locale),
+                                ),
+                            )
+                        }
+                    }
+                },
            entries = entries,
-            totalResults = totalResults.takeIf { showOpenSearchFields },
-            itemsPerPage = if (showOpenSearchFields) opdsItemsPerPageBounded else null,
-            startIndex = if (showOpenSearchFields) ((pageNum - 1) * opdsItemsPerPageBounded) + 1 else null,
+            totalResults = totalResults.takeIf { showOpenSearch },
+            itemsPerPage = itemsPerPage.takeIf { showOpenSearch },
+            startIndex = if (showOpenSearch && pageNum != null) ((pageNum - 1) * itemsPerPage) + 1 else null,
        )
    }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/opds/impl/OpdsEntryBuilder.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/opds/impl/OpdsEntryBuilder.kt
@@ -1,10 +1,7 @@
 package suwayomi.tachidesk.opds.impl

 import dev.icerock.moko.resources.StringResource
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import suwayomi.tachidesk.i18n.MR
-import suwayomi.tachidesk.manga.impl.ChapterDownloadHelper
 import suwayomi.tachidesk.manga.impl.MangaList.proxyThumbnailUrl
 import suwayomi.tachidesk.manga.impl.sync.KoreaderSyncService
 import suwayomi.tachidesk.manga.model.table.MangaStatus
@@ -93,15 +90,15 @@ object OpdsEntryBuilder {

    /**
     * Converts a manga data object into a full OPDS acquisition entry.
-     * @param entry The manga data object.
     * @param baseUrl The base URL for constructing links.
     * @param locale The locale for localization.
+     * @param entry The manga data object.
     * @return An [OpdsEntryXml] object representing the manga.
     */
    fun mangaAcqEntryToEntry(
-        entry: OpdsMangaAcqEntry,
        baseUrl: String,
        locale: Locale,
+        entry: OpdsMangaAcqEntry,
    ): OpdsEntryXml {
        val displayThumbnailUrl = entry.thumbnailUrl?.let { proxyThumbnailUrl(entry.id) }
        val categoryScheme = if (entry.inLibrary) "$baseUrl/library/genres" else "$baseUrl/genres"
@@ -152,40 +149,151 @@ object OpdsEntryBuilder {
        )
    }

+    /**
+     * Resolves the display title for a chapter, ensuring an empty name falls back to
+     * a generic "Chapter X" or "Oneshot" to keep the OPDS feed clean and usable.
+     */
+    private fun resolveChapterTitle(
+        chapterName: String,
+        chapterNumber: Float,
+        sourceOrder: Int,
+        totalChapters: Long,
+        locale: Locale,
+    ): String {
+        val trimmedName = chapterName.trim()
+        if (trimmedName.isNotEmpty()) {
+            return trimmedName
+        }
+        return if (totalChapters <= 1L) {
+            MR.strings.opds_chapter_title_oneshot.localized(locale)
+        } else {
+            val formatNumber =
+                if (chapterNumber >= 0f) {
+                    if (chapterNumber % 1 == 0f) chapterNumber.toInt().toString() else chapterNumber.toString()
+                } else {
+                    sourceOrder.toString()
+                }
+            MR.strings.opds_chapter_title_fallback.localized(locale, formatNumber)
+        }
+    }
+
    /**
     * Creates an OPDS entry for a chapter, including acquisition and streaming links.
+     * @param baseUrl The base URL for constructing links.
+     * @param locale The locale for localization.
     * @param chapter The chapter data object.
     * @param manga The parent manga's details.
-     * @param baseUrl The base URL for constructing links.
     * @param addMangaTitle Whether to prepend the manga title to the entry title.
-     * @param locale The locale for localization.
+     * @param skipMetadataFeed Whether to skip the metadata feed.
     * @return An [OpdsEntryXml] object for the chapter.
     */
    suspend fun createChapterListEntry(
+        baseUrl: String,
+        locale: Locale,
        chapter: OpdsChapterListAcqEntry,
        manga: OpdsMangaDetails,
-        baseUrl: String,
        addMangaTitle: Boolean,
-        locale: Locale,
+        skipMetadataFeed: Boolean,
    ): OpdsEntryXml {
+        var effectiveLastPageRead = chapter.lastPageRead
+        var effectiveLastReadAt = chapter.lastReadAt
+
+        if (skipMetadataFeed) {
+            val syncResult = KoreaderSyncService.checkAndPullProgress(chapter.id)
+
+            // If sync strategy dictates an update (e.g. KEEP_REMOTE), use remote data.
+            // If sync strategy is PROMPT (isConflict=true), we ignore it here (effectively KEEP_LOCAL/DISABLED)
+            // because we cannot show a prompt in the chapter list feed.
+            if (syncResult != null && syncResult.shouldUpdate) {
+                effectiveLastPageRead = syncResult.pageRead
+                effectiveLastReadAt = syncResult.timestamp
+            }
+        }
+
        val statusKey =
            when {
+                chapter.downloaded -> MR.strings.opds_chapter_status_downloaded
                chapter.read -> MR.strings.opds_chapter_status_read
-                chapter.lastPageRead > 0 -> MR.strings.opds_chapter_status_in_progress
+                effectiveLastPageRead > 0 -> MR.strings.opds_chapter_status_in_progress
                else -> MR.strings.opds_chapter_status_unread
            }
        val titlePrefix = statusKey.localized(locale)
-        val entryTitle = titlePrefix + (if (addMangaTitle) " ${manga.title}:" else "") + " ${chapter.name}"
+        val chapterName = resolveChapterTitle(chapter.name, chapter.chapterNumber, chapter.sourceOrder, manga.totalChapters, locale)
+        val entryTitle = titlePrefix + (if (addMangaTitle) " ${manga.title}:" else "") + " $chapterName"
        val details =
            buildString {
-                append(MR.strings.opds_chapter_details_base.localized(locale, manga.title, chapter.name))
+                append(MR.strings.opds_chapter_details_base.localized(locale, manga.title, chapterName))
                chapter.scanlator?.takeIf { it.isNotBlank() }?.let {
                    append(MR.strings.opds_chapter_details_scanlator.localized(locale, it))
                }
                if (chapter.pageCount > 0) {
-                    append(MR.strings.opds_chapter_details_progress.localized(locale, chapter.lastPageRead, chapter.pageCount))
+                    append(MR.strings.opds_chapter_details_progress.localized(locale, effectiveLastPageRead, chapter.pageCount))
                }
            }
+
+        val links = mutableListOf<OpdsLinkXml>()
+
+        if (skipMetadataFeed) {
+            // Provide Acquisition Link (Download CBZ) if downloaded
+            if (chapter.downloaded) {
+                links.add(
+                    OpdsLinkXml(
+                        OpdsConstants.LINK_REL_ACQUISITION_OPEN_ACCESS,
+                        "/api/v1/chapter/${chapter.id}/download?markAsRead=${serverConfig.opdsMarkAsReadOnDownload.value}",
+                        serverConfig.opdsCbzMimetype.value.mediaType,
+                        MR.strings.opds_linktitle_download_cbz.localized(locale),
+                        length = chapter.cbzFileSize,
+                    ),
+                )
+            }
+
+            // Provide Stream Link (OPDS-PSE) if page count is known
+            if (chapter.pageCount > 0) {
+                val basePageHref =
+                    "/api/v1/manga/${manga.id}/chapter/${chapter.sourceOrder}/page/{pageNumber}" +
+                        "?updateProgress=${serverConfig.opdsEnablePageReadProgress.value}&opds=true"
+
+                val titleRes =
+                    if (effectiveLastPageRead > 0) {
+                        MR.strings.opds_linktitle_stream_pages_continue
+                    } else {
+                        MR.strings.opds_linktitle_stream_pages_start
+                    }
+
+                links.add(
+                    OpdsLinkXml(
+                        rel = OpdsConstants.LINK_REL_PSE_STREAM,
+                        href = basePageHref,
+                        type = OpdsConstants.TYPE_IMAGE_JPEG,
+                        title = titleRes.localized(locale),
+                        pseCount = chapter.pageCount,
+                        pseLastRead = effectiveLastPageRead.takeIf { it > 0 },
+                        pseLastReadDate = effectiveLastReadAt.takeIf { it > 0 }?.let { OpdsDateUtil.formatEpochMillisForOpds(it * 1000) },
+                    ),
+                )
+
+                // Page 0 Cover
+                links.add(
+                    OpdsLinkXml(
+                        rel = OpdsConstants.LINK_REL_IMAGE,
+                        href = "/api/v1/manga/${manga.id}/chapter/${chapter.sourceOrder}/page/0",
+                        type = OpdsConstants.TYPE_IMAGE_JPEG,
+                        title = MR.strings.opds_linktitle_chapter_cover.localized(locale),
+                    ),
+                )
+            }
+        } else {
+            // Link to Metadata Feed
+            links.add(
+                OpdsLinkXml(
+                    rel = OpdsConstants.LINK_REL_SUBSECTION,
+                    href = "$baseUrl/series/${manga.id}/chapter/${chapter.sourceOrder}/metadata?lang=${locale.toLanguageTag()}",
+                    type = OpdsConstants.TYPE_ATOM_XML_ENTRY_PROFILE_OPDS,
+                    title = MR.strings.opds_linktitle_view_chapter_details.localized(locale),
+                ),
+            )
+        }
+
        return OpdsEntryXml(
            id = "urn:suwayomi:chapter:${chapter.id}",
            title = entryTitle,
@@ -196,33 +304,25 @@ object OpdsEntryBuilder {
                    chapter.scanlator?.takeIf { it.isNotBlank() }?.let { OpdsAuthorXml(name = it) },
                ),
            summary = OpdsSummaryXml(value = details),
-            link =
-                listOf(
-                    OpdsLinkXml(
-                        rel = OpdsConstants.LINK_REL_SUBSECTION,
-                        href = "$baseUrl/series/${manga.id}/chapter/${chapter.sourceOrder}/metadata?lang=${locale.toLanguageTag()}",
-                        type = OpdsConstants.TYPE_ATOM_XML_ENTRY_PROFILE_OPDS,
-                        title = MR.strings.opds_linktitle_view_chapter_details.localized(locale),
-                    ),
-                ),
+            link = links,
        )
    }

    /**
     * Creates one or two OPDS entries for a chapter, handling synchronization conflicts internally.
     *
-     * @param chapter The chapter metadata object.
-     * @param manga The parent manga's details.
     * @param baseUrl The base URL for constructing links.
     * @param locale The locale for localization.
+     * @param chapter The chapter metadata object.
+     * @param manga The parent manga's details.
     * @return A `Pair` where the first element is the primary entry (always present) and the
     * second is an optional entry representing the remote progress in case of a conflict.
     */
    suspend fun createChapterMetadataEntries(
-        chapter: OpdsChapterMetadataAcqEntry,
-        manga: OpdsMangaDetails,
        baseUrl: String,
        locale: Locale,
+        chapter: OpdsChapterMetadataAcqEntry,
+        manga: OpdsMangaDetails,
    ): Pair<OpdsEntryXml, OpdsEntryXml?> {
        // Check remote progress before building the entry
        val syncResult = KoreaderSyncService.checkAndPullProgress(chapter.id)
@@ -234,20 +334,20 @@ object OpdsEntryBuilder {
            // Generate two entries: one for local progress and another for remote.
            val localEntry =
                buildSingleChapterMetadataEntry(
-                    chapter,
-                    manga,
                    baseUrl,
                    locale,
+                    chapter,
+                    manga,
                    progressSource = ProgressSource.Local(chapter.lastPageRead, chapter.lastReadAt),
                    isConflict = true,
                )

            val remoteEntry =
                buildSingleChapterMetadataEntry(
-                    chapter,
-                    manga,
                    baseUrl,
                    locale,
+                    chapter,
+                    manga,
                    progressSource = ProgressSource.Remote(syncResult!!.pageRead, syncResult.timestamp, syncResult.device),
                    isConflict = true,
                )
@@ -263,10 +363,10 @@ object OpdsEntryBuilder {

            val mainEntry =
                buildSingleChapterMetadataEntry(
-                    chapter,
-                    manga,
                    baseUrl,
                    locale,
+                    chapter,
+                    manga,
                    progressSource = progressSource,
                    isConflict = false,
                )
@@ -297,10 +397,10 @@ object OpdsEntryBuilder {
     * Helper function to build a single OpdsEntryXml for a chapter.
     */
    private suspend fun buildSingleChapterMetadataEntry(
-        chapter: OpdsChapterMetadataAcqEntry,
-        manga: OpdsMangaDetails,
        baseUrl: String,
        locale: Locale,
+        chapter: OpdsChapterMetadataAcqEntry,
+        manga: OpdsMangaDetails,
        progressSource: ProgressSource,
        isConflict: Boolean,
    ): OpdsEntryXml {
@@ -337,14 +437,7 @@ object OpdsEntryBuilder {
            }

        val entryTitle = "$titlePrefix ${chapter.name}"
-        val cbzFileSize =
-            if (chapter.downloaded) {
-                withContext(Dispatchers.IO) {
-                    runCatching { ChapterDownloadHelper.getArchiveStreamWithSize(manga.id, chapter.id).second }.getOrNull()
-                }
-            } else {
-                null
-            }
+        val cbzFileSize = chapter.cbzFileSize

        val links = mutableListOf<OpdsLinkXml>()
        chapter.url?.let {
@@ -449,8 +542,8 @@ object OpdsEntryBuilder {
    fun addSourceSortFacets(
        feedBuilder: FeedBuilderInternal,
        baseUrl: String,
-        currentSort: String,
        locale: Locale,
+        currentSort: String,
    ) {
        val sortGroup = MR.strings.opds_facetgroup_sort_order.localized(locale)
        val addFacet = { href: String, titleKey: StringResource, isActive: Boolean ->
@@ -475,9 +568,9 @@ object OpdsEntryBuilder {
    fun addChapterSortAndFilterFacets(
        feedBuilder: FeedBuilderInternal,
        baseUrl: String,
+        locale: Locale,
        currentSort: String,
        currentFilter: String,
-        locale: Locale,
        filterCounts: Map<String, Long>? = null,
    ) {
        val sortGroup = MR.strings.opds_facetgroup_sort_order.localized(locale)
@@ -554,15 +647,15 @@ object OpdsEntryBuilder {
    fun addLibraryFacets(
        feedBuilder: FeedBuilderInternal,
        baseUrl: String,
-        activeFilters: OpdsMangaFilter,
        locale: Locale,
+        activeFilters: OpdsMangaFilter,
    ) {
        val currentSort = activeFilters.sort ?: "alpha_asc"
        val currentFilter = activeFilters.filter ?: "all"

        val sortGroup = MR.strings.opds_facetgroup_sort_order.localized(locale)
        val filterGroup = MR.strings.opds_facetgroup_filter_content.localized(locale)
-        val filterCounts = MangaRepository.getLibraryFilterCounts()
+        val filterCounts = MangaRepository.getLibraryFilterCounts(activeFilters)

        val buildUrl = { newFilters: OpdsMangaFilter, newSort: String, newFilter: String ->
            val crossFilterParams = newFilters.toCrossFilterQueryParameters()
@@ -667,7 +760,7 @@ object OpdsEntryBuilder {

        // --- Cross-Filter Facets ---
        if (activeFilters.primaryFilter != PrimaryFilterType.SOURCE) {
-            val sources = NavigationRepository.getLibrarySources(1).first
+            val sources = NavigationRepository.getLibrarySources(pageNum = null, activeFilters = activeFilters).first
            addFacet(
                feedBuilder,
                buildUrl(activeFilters.without("source_id"), currentSort, currentFilter),
@@ -688,7 +781,7 @@ object OpdsEntryBuilder {
            }
        }
        if (activeFilters.primaryFilter != PrimaryFilterType.CATEGORY) {
-            val categories = NavigationRepository.getCategories(1).first
+            val categories = NavigationRepository.getCategories(pageNum = null, activeFilters = activeFilters).first
            addFacet(
                feedBuilder,
                buildUrl(activeFilters.without("category_id"), currentSort, currentFilter),
@@ -709,7 +802,7 @@ object OpdsEntryBuilder {
            }
        }
        if (activeFilters.primaryFilter != PrimaryFilterType.STATUS) {
-            val statuses = NavigationRepository.getStatuses(locale)
+            val statuses = NavigationRepository.getStatuses(locale, pageNum = null, activeFilters = activeFilters).first
            addFacet(
                feedBuilder,
                buildUrl(activeFilters.without("status_id"), currentSort, currentFilter),
@@ -730,7 +823,7 @@ object OpdsEntryBuilder {
            }
        }
        if (activeFilters.primaryFilter != PrimaryFilterType.LANGUAGE) {
-            val languages = NavigationRepository.getContentLanguages(locale)
+            val languages = NavigationRepository.getContentLanguages(locale, pageNum = null, activeFilters = activeFilters).first
            addFacet(
                feedBuilder,
                buildUrl(activeFilters.without("lang_code"), currentSort, currentFilter),
@@ -751,7 +844,7 @@ object OpdsEntryBuilder {
            }
        }
        if (activeFilters.primaryFilter != PrimaryFilterType.GENRE) {
-            val genres = NavigationRepository.getGenres(1, locale).first
+            val genres = NavigationRepository.getGenres(locale, pageNum = null, activeFilters = activeFilters).first
            addFacet(
                feedBuilder,
                buildUrl(activeFilters.without("genre"), currentSort, currentFilter),
--- a/server/src/main/kotlin/suwayomi/tachidesk/opds/impl/OpdsFeedBuilder.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/opds/impl/OpdsFeedBuilder.kt
@@ -17,6 +17,7 @@ import suwayomi.tachidesk.opds.repository.ChapterRepository
 import suwayomi.tachidesk.opds.repository.MangaRepository
 import suwayomi.tachidesk.opds.repository.NavigationRepository
 import suwayomi.tachidesk.opds.util.OpdsDateUtil
+import suwayomi.tachidesk.opds.util.OpdsStringUtil
 import suwayomi.tachidesk.opds.util.OpdsXmlUtil
 import suwayomi.tachidesk.server.serverConfig
 import java.util.Locale
@@ -40,12 +41,11 @@ object OpdsFeedBuilder {
        val navItems = NavigationRepository.getRootNavigationItems(locale)
        val builder =
            FeedBuilderInternal(
-                baseUrl,
-                "", // Root path is empty
-                MR.strings.opds_feeds_root.localized(locale),
-                locale,
-                OpdsConstants.TYPE_ATOM_XML_FEED_NAVIGATION,
-                null,
+                baseUrl = baseUrl,
+                locale = locale,
+                idPath = "", // Root path is empty
+                title = MR.strings.opds_feeds_root.localized(locale),
+                feedType = OpdsConstants.TYPE_ATOM_XML_FEED_NAVIGATION,
            )
        builder.totalResults = navItems.size.toLong()
        builder.entries.addAll(
@@ -73,30 +73,39 @@ object OpdsFeedBuilder {
    /**
     * Generates the history feed showing recently read chapters.
     * @param baseUrl The base URL for constructing links.
-     * @param pageNum The page number for pagination.
     * @param locale The locale for localization.
+     * @param pageNum The page number for pagination.
     * @return An XML string representing the history feed.
     */
    suspend fun getHistoryFeed(
        baseUrl: String,
-        pageNum: Int,
        locale: Locale,
+        pageNum: Int,
    ): String {
        val (historyItems, total) = ChapterRepository.getHistory(pageNum)
        val builder =
            FeedBuilderInternal(
-                baseUrl,
-                "history",
-                MR.strings.opds_feeds_history_title.localized(locale),
-                locale,
-                OpdsConstants.TYPE_ATOM_XML_FEED_ACQUISITION,
-                pageNum,
+                baseUrl = baseUrl,
+                locale = locale,
+                idPath = "history",
+                title = MR.strings.opds_feeds_history_title.localized(locale),
+                feedType = OpdsConstants.TYPE_ATOM_XML_FEED_ACQUISITION,
+                pageNum = pageNum,
            )
        builder.totalResults = total
+        val skipMetadata = serverConfig.opdsSkipChapterMetadataFeed.value
        builder.entries.addAll(
            historyItems.map { item ->
-                val mangaDetails = OpdsMangaDetails(item.mangaId, item.mangaTitle, item.mangaThumbnailUrl, item.mangaAuthor)
-                OpdsEntryBuilder.createChapterListEntry(item.chapter, mangaDetails, baseUrl, true, locale)
+                val mangaDetails =
+                    OpdsMangaDetails(item.mangaId, item.mangaTitle, item.mangaThumbnailUrl, item.mangaAuthor, item.mangaTotalChapters)
+                OpdsEntryBuilder.createChapterListEntry(
+                    baseUrl,
+                    locale,
+                    item.chapter,
+                    mangaDetails,
+                    true,
+                    skipMetadata,
+                )
            },
        )
        return OpdsXmlUtil.serializeFeedToString(builder.build())
@@ -104,54 +113,55 @@ object OpdsFeedBuilder {

    /**
     * Generates a feed for search results based on the provided criteria.
-     * @param criteria The search criteria.
     * @param baseUrl The base URL for constructing links.
-     * @param pageNum The page number for pagination.
     * @param locale The locale for localization.
+     * @param criteria The search criteria.
+     * @param pageNum The page number for pagination.
     * @return An XML string representing the search results feed.
     */
    fun getSearchFeed(
-        criteria: OpdsSearchCriteria,
        baseUrl: String,
-        pageNum: Int,
        locale: Locale,
+        criteria: OpdsSearchCriteria,
+        pageNum: Int,
    ): String {
        val (mangaEntries, total) = MangaRepository.findMangaByCriteria(criteria)
        val builder =
            FeedBuilderInternal(
-                baseUrl,
-                "library/series",
-                MR.strings.opds_feeds_search_results_title.localized(locale),
-                locale,
-                OpdsConstants.TYPE_ATOM_XML_FEED_ACQUISITION,
-                pageNum,
+                baseUrl = baseUrl,
+                locale = locale,
+                idPath = "library/series",
+                title = MR.strings.opds_feeds_search_results_title.localized(locale),
+                feedType = OpdsConstants.TYPE_ATOM_XML_FEED_ACQUISITION,
+                pageNum = pageNum,
                isSearchFeed = true,
            )
        builder.totalResults = total
-        builder.entries.addAll(mangaEntries.map { OpdsEntryBuilder.mangaAcqEntryToEntry(it, baseUrl, locale) })
+        builder.entries.addAll(mangaEntries.map { OpdsEntryBuilder.mangaAcqEntryToEntry(baseUrl, locale, it) })
        return OpdsXmlUtil.serializeFeedToString(builder.build())
    }

    /**
     * Generates a generic library feed based on various filtering and sorting criteria.
-     * @param criteria The filtering criteria.
     * @param baseUrl The base URL for constructing links.
+     * @param locale The locale for localization.
+     * @param criteria The filtering criteria.
+     * @param isSearch Indicates if it's a search feed.
     * @param pageNum The page number for pagination.
     * @param sort The sorting parameter.
     * @param filter The filtering parameter.
-     * @param locale The locale for localization.
     * @return An XML string representing the library feed.
     */
    fun getLibraryFeed(
-        criteria: OpdsMangaFilter,
        baseUrl: String,
+        locale: Locale,
+        criteria: OpdsMangaFilter,
+        isSearch: Boolean,
        pageNum: Int,
        sort: String?,
        filter: String?,
-        locale: Locale,
-        isSearch: Boolean,
    ): String {
-        val result = MangaRepository.getLibraryManga(pageNum, sort, filter, criteria)
+        val result = MangaRepository.getLibraryManga(criteria, pageNum, sort, filter)

        val feedTitle =
            when (criteria.primaryFilter) {
@@ -177,7 +187,12 @@ object OpdsFeedBuilder {
                }

                PrimaryFilterType.STATUS -> {
-                    val statusName = NavigationRepository.getStatuses(locale).find { it.id == criteria.statusId }?.title
+                    val statusName =
+                        NavigationRepository
+                            .getStatuses(locale, pageNum = null, activeFilters = criteria)
+                            .first
+                            .find { it.id == criteria.statusId }
+                            ?.title
                    MR.strings.opds_feeds_status_specific_title.localized(locale, statusName ?: criteria.statusId.toString())
                }

@@ -193,7 +208,7 @@ object OpdsFeedBuilder {

        val feedUrl =
            when (criteria.primaryFilter) {
-                PrimaryFilterType.SOURCE -> "library/source/${criteria.sourceId}"
+                PrimaryFilterType.SOURCE -> "source/${criteria.sourceId}"
                PrimaryFilterType.CATEGORY -> "category/${criteria.categoryId}"
                PrimaryFilterType.GENRE -> "genre/${criteria.genre}"
                PrimaryFilterType.STATUS -> "status/${criteria.statusId}"
@@ -203,23 +218,23 @@ object OpdsFeedBuilder {

        val builder =
            FeedBuilderInternal(
-                baseUrl,
-                feedUrl,
-                feedTitle,
-                locale,
-                OpdsConstants.TYPE_ATOM_XML_FEED_ACQUISITION,
-                pageNum,
+                baseUrl = baseUrl,
+                locale = locale,
+                idPath = feedUrl,
+                title = feedTitle,
+                feedType = OpdsConstants.TYPE_ATOM_XML_FEED_ACQUISITION,
+                pageNum = pageNum,
+                explicitQueryParams = criteria.toCrossFilterQueryParameters(),
                currentSort = criteria.sort,
                currentFilter = criteria.filter,
-                explicitQueryParams = criteria.toCrossFilterQueryParameters(),
                isSearchFeed = isSearch,
            )
        builder.totalResults = result.totalCount

        // Add all library facets (sort, filter, and cross-filtering)
-        OpdsEntryBuilder.addLibraryFacets(builder, baseUrl, criteria, locale)
+        OpdsEntryBuilder.addLibraryFacets(builder, baseUrl, locale, criteria)

-        builder.entries.addAll(result.mangaEntries.map { OpdsEntryBuilder.mangaAcqEntryToEntry(it, baseUrl, locale) })
+        builder.entries.addAll(result.mangaEntries.map { OpdsEntryBuilder.mangaAcqEntryToEntry(baseUrl, locale, it) })

        return OpdsXmlUtil.serializeFeedToString(builder.build())
    }
@@ -227,24 +242,24 @@ object OpdsFeedBuilder {
    /**
     * Generates a navigation feed listing all available sources for exploration.
     * @param baseUrl The base URL for constructing links.
-     * @param pageNum The page number for pagination.
     * @param locale The locale for localization.
+     * @param pageNum The page number for pagination.
     * @return An XML string representing the explore sources feed.
     */
    fun getExploreSourcesFeed(
        baseUrl: String,
-        pageNum: Int,
        locale: Locale,
+        pageNum: Int,
    ): String {
        val (sourceNavEntries, total) = NavigationRepository.getExploreSources(pageNum)
        val builder =
            FeedBuilderInternal(
-                baseUrl,
-                "sources",
-                MR.strings.opds_feeds_sources_title.localized(locale),
-                locale,
-                OpdsConstants.TYPE_ATOM_XML_FEED_NAVIGATION,
-                pageNum,
+                baseUrl = baseUrl,
+                locale = locale,
+                idPath = "sources",
+                title = MR.strings.opds_feeds_sources_title.localized(locale),
+                feedType = OpdsConstants.TYPE_ATOM_XML_FEED_NAVIGATION,
+                pageNum = pageNum,
            )
        builder.totalResults = total
        builder.entries.addAll(
@@ -257,7 +272,7 @@ object OpdsFeedBuilder {
                        listOf(
                            OpdsLinkXml(
                                OpdsConstants.LINK_REL_SUBSECTION,
-                                "$baseUrl/source/${entry.id}?sort=popular&lang=${locale.toLanguageTag()}",
+                                "$baseUrl/explore/source/${entry.id}?sort=popular&lang=${locale.toLanguageTag()}",
                                OpdsConstants.TYPE_ATOM_XML_FEED_ACQUISITION,
                            ),
                        ),
@@ -270,24 +285,24 @@ object OpdsFeedBuilder {
    /**
     * Generates a navigation feed listing sources for series present in the library.
     * @param baseUrl The base URL for constructing links.
-     * @param pageNum The page number for pagination.
     * @param locale The locale for localization.
+     * @param pageNum The page number for pagination.
     * @return An XML string representing the library sources feed.
     */
    fun getLibrarySourcesFeed(
        baseUrl: String,
-        pageNum: Int,
        locale: Locale,
+        pageNum: Int,
    ): String {
        val (sourceNavEntries, total) = NavigationRepository.getLibrarySources(pageNum)
        val builder =
            FeedBuilderInternal(
-                baseUrl,
-                "library/sources",
-                MR.strings.opds_feeds_library_sources_title.localized(locale),
-                locale,
-                OpdsConstants.TYPE_ATOM_XML_FEED_NAVIGATION,
-                pageNum,
+                baseUrl = baseUrl,
+                locale = locale,
+                idPath = "library/sources",
+                title = MR.strings.opds_feeds_library_sources_title.localized(locale),
+                feedType = OpdsConstants.TYPE_ATOM_XML_FEED_NAVIGATION,
+                pageNum = pageNum,
            )
        builder.totalResults = total
        builder.entries.addAll(
@@ -300,7 +315,7 @@ object OpdsFeedBuilder {
                        listOf(
                            OpdsLinkXml(
                                OpdsConstants.LINK_REL_SUBSECTION,
-                                "$baseUrl/library/source/${entry.id}?lang=${locale.toLanguageTag()}",
+                                "$baseUrl/source/${entry.id}?lang=${locale.toLanguageTag()}",
                                OpdsConstants.TYPE_ATOM_XML_FEED_ACQUISITION,
                                entry.name,
                                thrCount = entry.mangaCount?.toInt(),
@@ -314,78 +329,75 @@ object OpdsFeedBuilder {

    /**
     * Generates an acquisition feed for manga from a specific source (explore context).
-     * @param sourceId The ID of the source.
     * @param baseUrl The base URL for constructing links.
+     * @param locale The locale for localization.
+     * @param sourceId The ID of the source.
     * @param pageNum The page number for pagination.
     * @param sort The sorting parameter ('popular' or 'latest').
-     * @param locale The locale for localization.
     * @return An XML string representing the source-specific feed.
     */
    suspend fun getExploreSourceFeed(
-        sourceId: Long,
        baseUrl: String,
+        locale: Locale,
+        sourceId: Long,
        pageNum: Int,
        sort: String,
-        locale: Locale,
    ): String {
        val (mangaEntries, hasNextPage) = MangaRepository.getMangaBySource(sourceId, pageNum, sort)
-        val sourceNavEntry = NavigationRepository.getExploreSources(1).first.find { it.id == sourceId }
-        val sourceNameOrId = sourceNavEntry?.name ?: sourceId.toString()
+        val sourceInfo = NavigationRepository.getSourceDetails(sourceId)
+        val sourceName = sourceInfo?.first ?: sourceId.toString()
        val titleRes =
-            if (sort == "latest") {
+            if (sort ==
+                "latest"
+            ) {
                MR.strings.opds_feeds_source_specific_latest_title
            } else {
                MR.strings.opds_feeds_source_specific_popular_title
            }
-        val feedTitle = titleRes.localized(locale, sourceNameOrId)
-        val feedUrl = "source/$sourceId"
+        val feedTitle = titleRes.localized(locale, sourceName)
        val builder =
            FeedBuilderInternal(
-                baseUrl,
-                feedUrl,
-                feedTitle,
-                locale,
-                OpdsConstants.TYPE_ATOM_XML_FEED_ACQUISITION,
-                pageNum,
+                baseUrl = baseUrl,
+                locale = locale,
+                idPath = "explore/source/$sourceId",
+                title = feedTitle,
+                feedType = OpdsConstants.TYPE_ATOM_XML_FEED_ACQUISITION,
+                pageNum = pageNum,
                currentSort = sort,
            )
        builder.totalResults =
            if (hasNextPage) {
                (pageNum * serverConfig.opdsItemsPerPage.value + 1).toLong()
            } else {
-                (
-                    (pageNum - 1) *
-                        serverConfig.opdsItemsPerPage.value +
-                        mangaEntries.size
-                ).toLong()
+                ((pageNum - 1) * serverConfig.opdsItemsPerPage.value + mangaEntries.size).toLong()
            }
-        builder.icon = sourceNavEntry?.iconUrl
-        OpdsEntryBuilder.addSourceSortFacets(builder, "$baseUrl/$feedUrl", sort, locale)
-        builder.entries.addAll(mangaEntries.map { OpdsEntryBuilder.mangaAcqEntryToEntry(it, baseUrl, locale) })
+        builder.icon = sourceInfo?.second
+        OpdsEntryBuilder.addSourceSortFacets(builder, "$baseUrl/explore/source/$sourceId", locale, sort)
+        builder.entries.addAll(mangaEntries.map { OpdsEntryBuilder.mangaAcqEntryToEntry(baseUrl, locale, it) })
        return OpdsXmlUtil.serializeFeedToString(builder.build())
    }

    /**
     * Generates a navigation feed for library categories.
     * @param baseUrl The base URL for constructing links.
-     * @param pageNum The page number for pagination.
     * @param locale The locale for localization.
+     * @param pageNum The page number for pagination.
     * @return An XML string representing the categories navigation feed.
     */
    fun getCategoriesFeed(
        baseUrl: String,
-        pageNum: Int,
        locale: Locale,
+        pageNum: Int,
    ): String {
        val (categoryNavEntries, total) = NavigationRepository.getCategories(pageNum)
        val builder =
            FeedBuilderInternal(
-                baseUrl,
-                "library/categories",
-                MR.strings.opds_feeds_categories_title.localized(locale),
-                locale,
-                OpdsConstants.TYPE_ATOM_XML_FEED_NAVIGATION,
-                pageNum,
+                baseUrl = baseUrl,
+                locale = locale,
+                idPath = "library/categories",
+                title = MR.strings.opds_feeds_categories_title.localized(locale),
+                feedType = OpdsConstants.TYPE_ATOM_XML_FEED_NAVIGATION,
+                pageNum = pageNum,
            )
        builder.totalResults = total
        builder.entries.addAll(
@@ -413,24 +425,24 @@ object OpdsFeedBuilder {
    /**
     * Generates a navigation feed for library genres.
     * @param baseUrl The base URL for constructing links.
-     * @param pageNum The page number for pagination.
     * @param locale The locale for localization.
+     * @param pageNum The page number for pagination.
     * @return An XML string representing the genres navigation feed.
     */
    fun getGenresFeed(
        baseUrl: String,
-        pageNum: Int,
        locale: Locale,
+        pageNum: Int,
    ): String {
-        val (genreNavEntries, total) = NavigationRepository.getGenres(pageNum, locale)
+        val (genreNavEntries, total) = NavigationRepository.getGenres(locale, pageNum)
        val builder =
            FeedBuilderInternal(
-                baseUrl,
-                "library/genres",
-                MR.strings.opds_feeds_genres_title.localized(locale),
-                locale,
-                OpdsConstants.TYPE_ATOM_XML_FEED_NAVIGATION,
-                pageNum,
+                baseUrl = baseUrl,
+                locale = locale,
+                idPath = "library/genres",
+                title = MR.strings.opds_feeds_genres_title.localized(locale),
+                feedType = OpdsConstants.TYPE_ATOM_XML_FEED_NAVIGATION,
+                pageNum = pageNum,
            )
        builder.totalResults = total
        builder.entries.addAll(
@@ -458,26 +470,26 @@ object OpdsFeedBuilder {
    /**
     * Generates a navigation feed for manga publication statuses.
     * @param baseUrl The base URL for constructing links.
-     * @param pageNum The page number (currently unused).
     * @param locale The locale for localization.
+     * @param pageNum The page number (currently unused).
     * @return An XML string representing the status navigation feed.
     */
    fun getStatusFeed(
        baseUrl: String,
-        @Suppress("UNUSED_PARAMETER") pageNum: Int,
        locale: Locale,
+        pageNum: Int,
    ): String {
-        val statuses = NavigationRepository.getStatuses(locale)
+        val (statuses, total) = NavigationRepository.getStatuses(locale, pageNum)
        val builder =
            FeedBuilderInternal(
-                baseUrl,
-                "library/statuses",
-                MR.strings.opds_feeds_status_title.localized(locale),
-                locale,
-                OpdsConstants.TYPE_ATOM_XML_FEED_NAVIGATION,
-                null,
+                baseUrl = baseUrl,
+                locale = locale,
+                idPath = "library/statuses",
+                title = MR.strings.opds_feeds_status_title.localized(locale),
+                feedType = OpdsConstants.TYPE_ATOM_XML_FEED_NAVIGATION,
+                pageNum = pageNum,
            )
-        builder.totalResults = statuses.size.toLong()
+        builder.totalResults = total
        builder.entries.addAll(
            statuses.map { entry ->
                OpdsEntryXml(
@@ -503,24 +515,26 @@ object OpdsFeedBuilder {
    /**
     * Generates a navigation feed for content languages available in the library.
     * @param baseUrl The base URL for constructing links.
-     * @param uiLocale The locale for the user interface.
+     * @param locale The locale for the user interface.
+     * @param pageNum The page number for pagination.
     * @return An XML string representing the languages navigation feed.
     */
    fun getLanguagesFeed(
        baseUrl: String,
-        uiLocale: Locale,
+        locale: Locale,
+        pageNum: Int,
    ): String {
-        val languages = NavigationRepository.getContentLanguages(uiLocale)
+        val (languages, total) = NavigationRepository.getContentLanguages(locale, pageNum)
        val builder =
            FeedBuilderInternal(
-                baseUrl,
-                "library/languages",
-                MR.strings.opds_feeds_languages_title.localized(uiLocale),
-                uiLocale,
-                OpdsConstants.TYPE_ATOM_XML_FEED_NAVIGATION,
-                null,
+                baseUrl = baseUrl,
+                locale = locale,
+                idPath = "library/languages",
+                title = MR.strings.opds_feeds_languages_title.localized(locale),
+                feedType = OpdsConstants.TYPE_ATOM_XML_FEED_NAVIGATION,
+                pageNum = pageNum,
            )
-        builder.totalResults = languages.size.toLong()
+        builder.totalResults = total
        builder.entries.addAll(
            languages.map { entry ->
                OpdsEntryXml(
@@ -531,7 +545,7 @@ object OpdsFeedBuilder {
                        listOf(
                            OpdsLinkXml(
                                OpdsConstants.LINK_REL_SUBSECTION,
-                                "$baseUrl/language/${entry.id}?lang=${uiLocale.toLanguageTag()}",
+                                "$baseUrl/language/${entry.id}?lang=${locale.toLanguageTag()}",
                                OpdsConstants.TYPE_ATOM_XML_FEED_ACQUISITION,
                                entry.title,
                                thrCount = entry.mangaCount.toInt(),
@@ -544,32 +558,41 @@ object OpdsFeedBuilder {
    }

    /**
-     * Generates an acquisition feed for recent chapter updates in the library.
+     * Generates an acquisition feed of recent chapter updates for series in the library.
     * @param baseUrl The base URL for constructing links.
-     * @param pageNum The page number for pagination.
     * @param locale The locale for localization.
+     * @param pageNum The page number for pagination.
     * @return An XML string representing the library updates feed.
     */
    suspend fun getLibraryUpdatesFeed(
        baseUrl: String,
-        pageNum: Int,
        locale: Locale,
+        pageNum: Int,
    ): String {
        val (updateItems, total) = ChapterRepository.getLibraryUpdates(pageNum)
        val builder =
            FeedBuilderInternal(
-                baseUrl,
-                "library-updates",
-                MR.strings.opds_feeds_library_updates_title.localized(locale),
-                locale,
-                OpdsConstants.TYPE_ATOM_XML_FEED_ACQUISITION,
-                pageNum,
+                baseUrl = baseUrl,
+                locale = locale,
+                idPath = "library-updates",
+                title = MR.strings.opds_feeds_library_updates_title.localized(locale),
+                feedType = OpdsConstants.TYPE_ATOM_XML_FEED_ACQUISITION,
+                pageNum = pageNum,
            )
        builder.totalResults = total
+        val skipMetadata = serverConfig.opdsSkipChapterMetadataFeed.value
        builder.entries.addAll(
            updateItems.map { item ->
-                val mangaDetails = OpdsMangaDetails(item.mangaId, item.mangaTitle, item.mangaThumbnailUrl, item.mangaAuthor)
-                OpdsEntryBuilder.createChapterListEntry(item.chapter, mangaDetails, baseUrl, true, locale)
+                val mangaDetails =
+                    OpdsMangaDetails(item.mangaId, item.mangaTitle, item.mangaThumbnailUrl, item.mangaAuthor, item.mangaTotalChapters)
+                OpdsEntryBuilder.createChapterListEntry(
+                    baseUrl,
+                    locale,
+                    item.chapter,
+                    mangaDetails,
+                    true,
+                    skipMetadata,
+                )
            },
        )
        return OpdsXmlUtil.serializeFeedToString(builder.build())
@@ -577,29 +600,29 @@ object OpdsFeedBuilder {

    /**
     * Generates an acquisition feed for all chapters of a specific manga.
-     * @param mangaId The ID of the manga.
     * @param baseUrl The base URL for constructing links.
+     * @param locale The locale for localization.
+     * @param mangaId The ID of the manga.
     * @param pageNum The page number for pagination.
     * @param sortParam The sorting parameter for chapters.
     * @param filterParam The filtering parameter for chapters.
-     * @param locale The locale for localization.
     * @return An XML string representing the series' chapters feed.
     */
    suspend fun getSeriesChaptersFeed(
-        mangaId: Int,
        baseUrl: String,
+        locale: Locale,
+        mangaId: Int,
        pageNum: Int,
        sortParam: String?,
        filterParam: String?,
-        locale: Locale,
    ): String {
        val mangaDetails =
            MangaRepository.getMangaDetails(mangaId)
                ?: return buildNotFoundFeed(
                    baseUrl,
+                    locale,
                    "series/$mangaId/chapters",
                    MR.strings.opds_error_manga_not_found.localized(locale, mangaId),
-                    locale,
                )
        val (sortColumn, currentSortOrder) =
            when (sortParam?.lowercase()) {
@@ -610,15 +633,27 @@ object OpdsFeedBuilder {
                else -> ChapterTable.sourceOrder to (serverConfig.opdsChapterSortOrder.value)
            }
        val currentFilter = filterParam?.lowercase() ?: if (serverConfig.opdsShowOnlyUnreadChapters.value) "unread" else "all"
+        val skipMetadata = serverConfig.opdsSkipChapterMetadataFeed.value
        var (chapterEntries, totalChapters) =
            ChapterRepository.getChaptersForManga(
                mangaId,
-                pageNum,
                sortColumn,
                currentSortOrder,
                currentFilter,
+                pageNum,
+                skipMetadata,
            )

+        // Return a not-found feed if all available chapters are filtered out as unreachable
+        if (skipMetadata && chapterEntries.isEmpty() && totalChapters > 0L) {
+            return buildNotFoundFeed(
+                baseUrl = baseUrl,
+                locale = locale,
+                idPath = "series/$mangaId/chapters",
+                title = MR.strings.opds_error_chapters_not_found.localized(locale, pageNum),
+            )
+        }
+
        // If no chapters are found in the database, attempt to fetch them from the source.
        if (chapterEntries.isEmpty() && totalChapters == 0L) {
            try {
@@ -629,10 +664,11 @@ object OpdsFeedBuilder {
                val (refetchedChapters, refetchedTotal) =
                    ChapterRepository.getChaptersForManga(
                        mangaId,
-                        pageNum,
                        sortColumn,
                        currentSortOrder,
                        currentFilter,
+                        pageNum,
+                        skipMetadata,
                    )
                chapterEntries = refetchedChapters
                totalChapters = refetchedTotal
@@ -651,12 +687,12 @@ object OpdsFeedBuilder {
        val feedUrl = "series/$mangaId/chapters"
        val builder =
            FeedBuilderInternal(
-                baseUrl,
-                feedUrl,
-                MR.strings.opds_feeds_manga_chapters.localized(locale, mangaDetails.title),
-                locale,
-                OpdsConstants.TYPE_ATOM_XML_FEED_ACQUISITION,
-                pageNum,
+                baseUrl = baseUrl,
+                locale = locale,
+                idPath = feedUrl,
+                title = MR.strings.opds_feeds_manga_chapters.localized(locale, mangaDetails.title),
+                feedType = OpdsConstants.TYPE_ATOM_XML_FEED_ACQUISITION,
+                pageNum = pageNum,
                currentSort = actualSortParamForLinks,
                currentFilter = currentFilter,
            )
@@ -669,14 +705,21 @@ object OpdsFeedBuilder {
        OpdsEntryBuilder.addChapterSortAndFilterFacets(
            builder,
            "$baseUrl/$feedUrl",
+            locale,
            actualSortParamForLinks,
            currentFilter,
-            locale,
            filterCounts,
        )
        builder.entries.addAll(
            chapterEntries.map { chapter ->
-                OpdsEntryBuilder.createChapterListEntry(chapter, mangaDetails, baseUrl, false, locale)
+                OpdsEntryBuilder.createChapterListEntry(
+                    baseUrl,
+                    locale,
+                    chapter,
+                    mangaDetails,
+                    false,
+                    skipMetadata,
+                )
            },
        )
        return OpdsXmlUtil.serializeFeedToString(builder.build())
@@ -684,43 +727,43 @@ object OpdsFeedBuilder {

    /**
     * Generates an acquisition feed with detailed metadata for a single chapter.
-     * @param mangaId The ID of the manga.
-     * @param chapterSourceOrder The source order index of the chapter.
     * @param baseUrl The base URL for constructing links.
     * @param locale The locale for localization.
+     * @param mangaId The ID of the manga.
+     * @param chapterSourceOrder The source order index of the chapter.
     * @return An XML string representing the chapter's metadata feed.
     */
    suspend fun getChapterMetadataFeed(
-        mangaId: Int,
-        chapterSourceOrder: Int,
        baseUrl: String,
        locale: Locale,
+        mangaId: Int,
+        chapterSourceOrder: Int,
    ): String {
        val mangaDetails =
            MangaRepository.getMangaDetails(mangaId)
                ?: return buildNotFoundFeed(
                    baseUrl,
+                    locale,
                    "series/$mangaId/chapter/$chapterSourceOrder/metadata",
                    MR.strings.opds_error_manga_not_found.localized(locale, mangaId),
-                    locale,
                )
        val chapterMetadata =
            ChapterRepository.getChapterDetailsForMetadataFeed(mangaId, chapterSourceOrder)
                ?: return buildNotFoundFeed(
                    baseUrl,
+                    locale,
                    "series/$mangaId/chapter/$chapterSourceOrder/metadata",
                    MR.strings.opds_error_chapter_not_found.localized(locale, chapterSourceOrder),
-                    locale,
                )

        val builder =
            FeedBuilderInternal(
-                baseUrl,
-                "series/$mangaId/chapter/${chapterMetadata.sourceOrder}/metadata",
-                MR.strings.opds_feeds_chapter_details.localized(locale, mangaDetails.title, chapterMetadata.name),
-                locale,
-                OpdsConstants.TYPE_ATOM_XML_FEED_ACQUISITION,
-                null,
+                baseUrl = baseUrl,
+                locale = locale,
+                idPath = "series/$mangaId/chapter/${chapterMetadata.sourceOrder}/metadata",
+                title = MR.strings.opds_feeds_chapter_details.localized(locale, mangaDetails.title, chapterMetadata.name),
+                feedType = OpdsConstants.TYPE_ATOM_XML_FEED_ACQUISITION,
+                pageNum = null,
            )

        mangaDetails.thumbnailUrl?.let { proxyThumbnailUrl(mangaDetails.id) }?.also {
@@ -731,10 +774,10 @@ object OpdsFeedBuilder {

        val (primaryEntry, conflictEntry) =
            OpdsEntryBuilder.createChapterMetadataEntries(
-                chapter = chapterMetadata,
-                manga = mangaDetails,
                baseUrl = baseUrl,
                locale = locale,
+                chapter = chapterMetadata,
+                manga = mangaDetails,
            )

        builder.entries.add(primaryEntry)
@@ -751,19 +794,25 @@ object OpdsFeedBuilder {
    /**
     * Builds a simple OPDS feed to indicate that a resource was not found.
     * @param baseUrl The base URL.
+     * @param locale The locale for localization.
     * @param idPath The path that was not found.
     * @param title The title for the feed (e.g., an error message).
-     * @param locale The locale for localization.
     * @return An XML string representing the 'not found' feed.
     */
    fun buildNotFoundFeed(
        baseUrl: String,
+        locale: Locale,
        idPath: String,
        title: String,
-        locale: Locale,
    ): String =
-        FeedBuilderInternal(baseUrl, idPath, title, locale, feedType = OpdsConstants.TYPE_ATOM_XML_FEED_ACQUISITION, pageNum = null)
-            .apply { totalResults = 0L }
+        FeedBuilderInternal(
+            baseUrl = baseUrl,
+            locale = locale,
+            idPath = idPath,
+            title = title,
+            feedType = OpdsConstants.TYPE_ATOM_XML_FEED_ACQUISITION,
+            pageNum = null,
+        ).apply { totalResults = 0L }
            .build()
            .let(OpdsXmlUtil::serializeFeedToString)
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/opds/repository/ChapterRepository.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/opds/repository/ChapterRepository.kt
@@ -1,17 +1,29 @@
 package suwayomi.tachidesk.opds.repository

+import io.github.oshai.kotlinlogging.KotlinLogging
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.withContext
 import org.jetbrains.exposed.v1.core.Column
 import org.jetbrains.exposed.v1.core.JoinType
 import org.jetbrains.exposed.v1.core.Op
 import org.jetbrains.exposed.v1.core.ResultRow
 import org.jetbrains.exposed.v1.core.SortOrder
 import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.v1.core.count
 import org.jetbrains.exposed.v1.core.eq
 import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.v1.core.inList
 import org.jetbrains.exposed.v1.jdbc.andWhere
 import org.jetbrains.exposed.v1.jdbc.select
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.v1.jdbc.update
+import suwayomi.tachidesk.manga.impl.ChapterDownloadHelper
 import suwayomi.tachidesk.manga.impl.chapter.getChapterDownloadReady
+import suwayomi.tachidesk.manga.impl.chapter.refreshChapterPageList
+import suwayomi.tachidesk.manga.impl.chapter.updateChapterPersistence
 import suwayomi.tachidesk.manga.model.table.ChapterTable
 import suwayomi.tachidesk.manga.model.table.MangaTable
 import suwayomi.tachidesk.manga.model.table.SourceTable
@@ -24,6 +36,7 @@ import suwayomi.tachidesk.server.serverConfig
 object ChapterRepository {
    private val opdsItemsPerPageBounded: Int
        get() = serverConfig.opdsItemsPerPage.value
+    private val logger = KotlinLogging.logger {}

    private fun ResultRow.toOpdsChapterListAcqEntry(): OpdsChapterListAcqEntry =
        OpdsChapterListAcqEntry(
@@ -38,69 +51,165 @@ object ChapterRepository {
            lastReadAt = this[ChapterTable.lastReadAt],
            sourceOrder = this[ChapterTable.sourceOrder],
            pageCount = this[ChapterTable.pageCount],
+            downloaded = this[ChapterTable.isDownloaded],
        )

-    fun getChaptersForManga(
+    suspend fun getChaptersForManga(
        mangaId: Int,
-        pageNum: Int,
        sortColumn: Column<*>,
        sortOrder: SortOrder,
        filter: String,
-    ): Pair<List<OpdsChapterListAcqEntry>, Long> =
-        transaction {
-            val conditions = mutableListOf<Op<Boolean>>()
-            conditions.add(ChapterTable.manga eq mangaId)
+        pageNum: Int,
+        skipMetadata: Boolean,
+    ): Pair<List<OpdsChapterListAcqEntry>, Long> {
+        val (rawChapters, totalCount) =
+            transaction {
+                val conditions = mutableListOf<Op<Boolean>>()
+                conditions.add(ChapterTable.manga eq mangaId)

-            when (filter) {
-                "unread" -> conditions.add(ChapterTable.isRead eq false)
-                "read" -> conditions.add(ChapterTable.isRead eq true)
-            }
-            if (serverConfig.opdsShowOnlyDownloadedChapters.value) {
-                conditions.add(ChapterTable.isDownloaded eq true)
+                when (filter) {
+                    "unread" -> conditions.add(ChapterTable.isRead eq false)
+                    "read" -> conditions.add(ChapterTable.isRead eq true)
+                }
+                if (serverConfig.opdsShowOnlyDownloadedChapters.value) {
+                    conditions.add(ChapterTable.isDownloaded eq true)
+                }
+
+                val finalCondition = conditions.reduceOrNull { acc, op -> acc and op } ?: Op.TRUE
+
+                val baseQuery =
+                    ChapterTable
+                        .select(ChapterTable.columns)
+                        .where(finalCondition)
+
+                val totalCount = baseQuery.count()
+
+                val chapters =
+                    baseQuery
+                        .orderBy(sortColumn to sortOrder)
+                        .limit(opdsItemsPerPageBounded)
+                        .offset(((pageNum - 1) * opdsItemsPerPageBounded).toLong())
+                        .map { it.toOpdsChapterListAcqEntry() }
+
+                Pair(chapters, totalCount)
            }

-            val finalCondition = conditions.reduceOrNull { acc, op -> acc and op } ?: Op.TRUE
-
-            val baseQuery =
-                ChapterTable
-                    .select(ChapterTable.columns)
-                    .where(finalCondition)
-
-            val totalCount = baseQuery.count()
-
-            val chapters =
-                baseQuery
-                    .orderBy(sortColumn to sortOrder)
-                    .limit(opdsItemsPerPageBounded)
-                    .offset(((pageNum - 1) * opdsItemsPerPageBounded).toLong())
-                    .map { it.toOpdsChapterListAcqEntry() }
-
-            Pair(chapters, totalCount)
+        // If not skipping metadata, return basic DTOs
+        if (!skipMetadata) {
+            return Pair(rawChapters, totalCount)
        }

+        // If skipping metadata, enrich DTOs with page count and file size
+        val enrichedChapters =
+            coroutineScope {
+                rawChapters.map { entry ->
+                    async(Dispatchers.IO) {
+                        var pageCount = entry.pageCount
+                        var isDownloaded = entry.downloaded
+
+                        // Verify physical files if page count is unknown or the DB marks it as downloaded
+                        if (pageCount <= 0 || isDownloaded) {
+                            val physicalPageCount =
+                                runCatching {
+                                    ChapterDownloadHelper.getImageCount(entry.mangaId, entry.id)
+                                }.getOrDefault(0)
+
+                            if (physicalPageCount > 0) {
+                                // Files exist! Sync DB if needed
+                                if (updateChapterPersistence(
+                                        chapterId = entry.id,
+                                        isMarkedAsDownloaded = isDownloaded,
+                                        dbPageCount = pageCount,
+                                        downloadPageCount = physicalPageCount,
+                                        lastPageRead = entry.lastPageRead,
+                                        logger = logger,
+                                    )
+                                ) {
+                                    pageCount = physicalPageCount
+                                    isDownloaded = true
+                                }
+                            } else {
+                                if (isDownloaded) {
+                                    // Fix DB state if marked as downloaded but physical files are missing
+                                    transaction {
+                                        ChapterTable.update({ ChapterTable.id eq entry.id }) {
+                                            it[ChapterTable.isDownloaded] = false
+                                        }
+                                    }
+                                    isDownloaded = false
+                                }
+
+                                if (pageCount <= 0) {
+                                    // No files, and DB has no page count. Fetch from network
+                                    pageCount =
+                                        runCatching {
+                                            refreshChapterPageList(entry.mangaId, entry.id)
+                                        }.onFailure {
+                                            logger.warn(it) { "Failed to fetch page count for chapter ${entry.id}" }
+                                        }.getOrDefault(0)
+                                }
+                            }
+                        }
+
+                        // Calculate CBZ size if downloaded
+                        val cbzFileSize =
+                            if (isDownloaded) {
+                                runCatching {
+                                    ChapterDownloadHelper.getChapterArchiveSize(entry.mangaId, entry.id)
+                                }.getOrNull()
+                            } else {
+                                null
+                            }
+
+                        entry.copy(
+                            pageCount = pageCount,
+                            downloaded = isDownloaded,
+                            cbzFileSize = cbzFileSize,
+                        )
+                    }
+                }
+            }.awaitAll()
+                // Exclude unreachable chapters that are not downloaded and have no page count
+                .filter { it.downloaded || it.pageCount > 0 }
+
+        return Pair(enrichedChapters, totalCount)
+    }
+
    suspend fun getChapterDetailsForMetadataFeed(
        mangaId: Int,
        chapterSourceOrder: Int,
-    ): OpdsChapterMetadataAcqEntry? =
-        try {
-            val chapterDataClass = getChapterDownloadReady(chapterIndex = chapterSourceOrder, mangaId = mangaId)
-            OpdsChapterMetadataAcqEntry(
-                id = chapterDataClass.id,
-                mangaId = chapterDataClass.mangaId,
-                name = chapterDataClass.name,
-                uploadDate = chapterDataClass.uploadDate,
-                scanlator = chapterDataClass.scanlator,
-                read = chapterDataClass.read,
-                lastPageRead = chapterDataClass.lastPageRead,
-                lastReadAt = chapterDataClass.lastReadAt,
-                sourceOrder = chapterDataClass.index,
-                downloaded = chapterDataClass.downloaded,
-                pageCount = chapterDataClass.pageCount,
-                url = chapterDataClass.realUrl,
-            )
-        } catch (e: Exception) {
-            null
-        }
+    ): OpdsChapterMetadataAcqEntry? {
+        val chapterDataClass =
+            try {
+                getChapterDownloadReady(chapterIndex = chapterSourceOrder, mangaId = mangaId)
+            } catch (e: Exception) {
+                return null
+            }
+
+        return OpdsChapterMetadataAcqEntry(
+            id = chapterDataClass.id,
+            mangaId = chapterDataClass.mangaId,
+            name = chapterDataClass.name,
+            uploadDate = chapterDataClass.uploadDate,
+            chapterNumber = chapterDataClass.chapterNumber,
+            scanlator = chapterDataClass.scanlator,
+            read = chapterDataClass.read,
+            lastPageRead = chapterDataClass.lastPageRead,
+            lastReadAt = chapterDataClass.lastReadAt,
+            sourceOrder = chapterDataClass.index,
+            downloaded = chapterDataClass.downloaded,
+            pageCount = chapterDataClass.pageCount,
+            url = chapterDataClass.realUrl,
+            cbzFileSize =
+                if (chapterDataClass.downloaded) {
+                    withContext(Dispatchers.IO) {
+                        runCatching { ChapterDownloadHelper.getChapterArchiveSize(mangaId, chapterDataClass.id) }.getOrNull()
+                    }
+                } else {
+                    null
+                },
+        )
+    }

    fun getLibraryUpdates(pageNum: Int): Pair<List<OpdsLibraryUpdateAcqEntry>, Long> =
        transaction {
@@ -115,21 +224,38 @@ object ChapterRepository {

            val totalCount = query.count()

-            val items =
+            val rawItems =
                query
                    .orderBy(ChapterTable.fetchedAt to SortOrder.DESC, ChapterTable.sourceOrder to SortOrder.DESC)
                    .limit(opdsItemsPerPageBounded)
                    .offset(((pageNum - 1) * opdsItemsPerPageBounded).toLong())
-                    .map {
-                        OpdsLibraryUpdateAcqEntry(
-                            chapter = it.toOpdsChapterListAcqEntry(),
-                            mangaTitle = it[MangaTable.title],
-                            mangaAuthor = it[MangaTable.author],
-                            mangaId = it[MangaTable.id].value,
-                            mangaSourceLang = it[SourceTable.lang],
-                            mangaThumbnailUrl = it[MangaTable.thumbnail_url],
-                        )
-                    }
+                    .toList()
+
+            val mangaIds = rawItems.map { it[MangaTable.id].value }.distinct()
+            val chapterCounts =
+                if (mangaIds.isNotEmpty()) {
+                    ChapterTable
+                        .select(ChapterTable.manga, ChapterTable.id.count())
+                        .where { ChapterTable.manga inList mangaIds }
+                        .groupBy(ChapterTable.manga)
+                        .associate { it[ChapterTable.manga].value to it[ChapterTable.id.count()] }
+                } else {
+                    emptyMap()
+                }
+
+            val items =
+                rawItems.map {
+                    val mId = it[MangaTable.id].value
+                    OpdsLibraryUpdateAcqEntry(
+                        chapter = it.toOpdsChapterListAcqEntry(),
+                        mangaTitle = it[MangaTable.title],
+                        mangaAuthor = it[MangaTable.author],
+                        mangaId = mId,
+                        mangaSourceLang = it[SourceTable.lang],
+                        mangaThumbnailUrl = it[MangaTable.thumbnail_url],
+                        mangaTotalChapters = chapterCounts[mId] ?: 0L,
+                    )
+                }
            Pair(items, totalCount)
        }

@@ -146,21 +272,38 @@ object ChapterRepository {

            val totalCount = query.count()

-            val items =
+            val rawItems =
                query
                    .orderBy(ChapterTable.lastReadAt to SortOrder.DESC)
                    .limit(opdsItemsPerPageBounded)
                    .offset(((pageNum - 1) * opdsItemsPerPageBounded).toLong())
-                    .map {
-                        OpdsHistoryAcqEntry(
-                            chapter = it.toOpdsChapterListAcqEntry(),
-                            mangaTitle = it[MangaTable.title],
-                            mangaAuthor = it[MangaTable.author],
-                            mangaId = it[MangaTable.id].value,
-                            mangaSourceLang = it[SourceTable.lang],
-                            mangaThumbnailUrl = it[MangaTable.thumbnail_url],
-                        )
-                    }
+                    .toList()
+
+            val mangaIds = rawItems.map { it[MangaTable.id].value }.distinct()
+            val chapterCounts =
+                if (mangaIds.isNotEmpty()) {
+                    ChapterTable
+                        .select(ChapterTable.manga, ChapterTable.id.count())
+                        .where { ChapterTable.manga inList mangaIds }
+                        .groupBy(ChapterTable.manga)
+                        .associate { it[ChapterTable.manga].value to it[ChapterTable.id.count()] }
+                } else {
+                    emptyMap()
+                }
+
+            val items =
+                rawItems.map {
+                    val mId = it[MangaTable.id].value
+                    OpdsHistoryAcqEntry(
+                        chapter = it.toOpdsChapterListAcqEntry(),
+                        mangaTitle = it[MangaTable.title],
+                        mangaAuthor = it[MangaTable.author],
+                        mangaId = mId,
+                        mangaSourceLang = it[SourceTable.lang],
+                        mangaThumbnailUrl = it[MangaTable.thumbnail_url],
+                        mangaTotalChapters = chapterCounts[mId] ?: 0L,
+                    )
+                }
            Pair(items, totalCount)
        }

--- a/server/src/main/kotlin/suwayomi/tachidesk/opds/repository/MangaRepository.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/opds/repository/MangaRepository.kt
@@ -11,6 +11,7 @@ import org.jetbrains.exposed.v1.core.and
 import org.jetbrains.exposed.v1.core.eq
 import org.jetbrains.exposed.v1.core.greater
 import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.v1.core.inSubQuery
 import org.jetbrains.exposed.v1.core.intLiteral
 import org.jetbrains.exposed.v1.core.like
 import org.jetbrains.exposed.v1.core.lowerCase
@@ -36,8 +37,72 @@ import suwayomi.tachidesk.opds.dto.OpdsMangaDetails
 import suwayomi.tachidesk.opds.dto.OpdsMangaFilter
 import suwayomi.tachidesk.opds.dto.OpdsSearchCriteria
 import suwayomi.tachidesk.opds.dto.PrimaryFilterType
+import suwayomi.tachidesk.opds.util.OpdsStringUtil.formatSourceName
 import suwayomi.tachidesk.server.serverConfig

+/**
+ * Applies dynamic filters based on the current user configuration and cross-filters.
+ * Allows excluding a specific field to calculate mutual exclusion facet counts efficiently.
+ *
+ * @param criteria The filtering criteria.
+ * @param excludeField The field to exclude from filtering.
+ */
+fun Query.applyOpdsMangaFilter(
+    criteria: OpdsMangaFilter,
+    excludeField: String? = null,
+) {
+    if (excludeField != "source_id") {
+        criteria.sourceId?.let { andWhere { MangaTable.sourceReference eq it } }
+    }
+    if (excludeField != "category_id") {
+        criteria.categoryId?.let { andWhere { CategoryMangaTable.category eq it } }
+    }
+    if (excludeField != "status_id") {
+        criteria.statusId?.let { andWhere { MangaTable.status eq it } }
+    }
+    if (excludeField != "lang_code") {
+        criteria.langCode?.let { andWhere { SourceTable.lang eq it } }
+    }
+    if (excludeField != "genre") {
+        criteria.genre?.let { genre ->
+            val genreTrimmed = genre.trim()
+            andWhere {
+                (MangaTable.genre like "%, $genreTrimmed, %") or
+                    (MangaTable.genre like "$genreTrimmed, %") or
+                    (MangaTable.genre like "%, $genreTrimmed") or
+                    (MangaTable.genre eq genreTrimmed)
+            }
+        }
+    }
+    if (excludeField != "filter") {
+        criteria.filter?.let { filterVal ->
+            when (filterVal) {
+                "unread" -> {
+                    andWhere {
+                        MangaTable.id inSubQuery
+                            ChapterTable.select(ChapterTable.manga).where { ChapterTable.isRead eq false }
+                    }
+                }
+
+                "downloaded" -> {
+                    andWhere {
+                        MangaTable.id inSubQuery
+                            ChapterTable.select(ChapterTable.manga).where { ChapterTable.isDownloaded eq true }
+                    }
+                }
+
+                "ongoing" -> {
+                    andWhere { MangaTable.status eq MangaStatus.ONGOING.value }
+                }
+
+                "completed" -> {
+                    andWhere { MangaTable.status eq MangaStatus.COMPLETED.value }
+                }
+            }
+        }
+    }
+}
+
 /**
 * Repository for fetching manga data tailored for OPDS feeds.
 */
@@ -60,53 +125,48 @@ object MangaRepository {
            sourceLang = this[SourceTable.lang],
            inLibrary = this[MangaTable.inLibrary],
            status = this[MangaTable.status],
-            sourceName = this[SourceTable.name],
+            sourceName = formatSourceName(this[SourceTable.name], this[SourceTable.lang]),
            lastFetchedAt = this[MangaTable.lastFetchedAt],
            url = this[MangaTable.realUrl],
        )

    /**
     * Centralized function to retrieve paginated, sorted, and filtered manga from the library.
+     * @param criteria Additional filtering criteria for categories, sources, etc.
     * @param pageNum The page number for pagination.
     * @param sort The sorting parameter.
     * @param filter The filtering parameter.
-     * @param criteria Additional filtering criteria for categories, sources, etc.
     * @return An [OpdsLibraryFeedResult] containing the list of manga, total count, and the specific filter name.
     */
    fun getLibraryManga(
+        criteria: OpdsMangaFilter,
        pageNum: Int,
        sort: String?,
        filter: String?,
-        criteria: OpdsMangaFilter,
    ): OpdsLibraryFeedResult =
        transaction {
            val unreadCountExpr = Case().When(ChapterTable.isRead eq false, intLiteral(1)).Else(intLiteral(0)).sum()
            val unreadCount = unreadCountExpr.alias("unread_count")

            // Base query with necessary joins for filtering and sorting
-            val query =
+            var baseJoin =
                MangaTable
                    .join(SourceTable, JoinType.INNER, MangaTable.sourceReference, SourceTable.id)
                    .join(ChapterTable, JoinType.LEFT, MangaTable.id, ChapterTable.manga)
-                    .join(CategoryMangaTable, JoinType.LEFT, MangaTable.id, CategoryMangaTable.manga)
+
+            if (criteria.categoryId != null) {
+                baseJoin = baseJoin.join(CategoryMangaTable, JoinType.LEFT, MangaTable.id, CategoryMangaTable.manga)
+            }
+
+            val query =
+                baseJoin
                    .select(MangaTable.columns + SourceTable.lang + SourceTable.name + unreadCount)
                    .where { MangaTable.inLibrary eq true }
-                    .groupBy(MangaTable.id, SourceTable.lang, SourceTable.name)

-            // Apply specific filters from criteria
-            criteria.sourceId?.let { query.andWhere { MangaTable.sourceReference eq it } }
-            criteria.categoryId?.let { query.andWhere { CategoryMangaTable.category eq it } }
-            criteria.statusId?.let { query.andWhere { MangaTable.status eq it } }
-            criteria.langCode?.let { query.andWhere { SourceTable.lang eq it } }
-            criteria.genre?.let { genre ->
-                val genreTrimmed = genre.trim()
-                val genreCondition =
-                    (MangaTable.genre like "%, $genreTrimmed, %") or
-                        (MangaTable.genre like "$genreTrimmed, %") or
-                        (MangaTable.genre like "%, $genreTrimmed") or
-                        (MangaTable.genre eq genreTrimmed)
-                query.andWhere { genreCondition }
-            }
+            query.applyOpdsMangaFilter(criteria)
+            applyMangaLibrarySort(query, sort)
+
+            query.groupBy(MangaTable.id, SourceTable.lang, SourceTable.name)

            // Efficiently get the name of the primary filter item
            val specificFilterName =
@@ -114,10 +174,10 @@ object MangaRepository {
                    PrimaryFilterType.SOURCE -> {
                        criteria.sourceId?.let {
                            SourceTable
-                                .select(SourceTable.name)
+                                .select(SourceTable.name, SourceTable.lang)
                                .where { SourceTable.id eq it }
                                .firstOrNull()
-                                ?.get(SourceTable.name)
+                                ?.let { formatSourceName(it[SourceTable.name], it[SourceTable.lang]) }
                        }
                    }

@@ -150,8 +210,6 @@ object MangaRepository {
                    }
                }

-            applyMangaLibrarySortAndFilter(query, sort, filter)
-
            val totalCount = query.count()
            val mangas =
                query
@@ -245,6 +303,7 @@ object MangaRepository {
     */
    fun getMangaDetails(mangaId: Int): OpdsMangaDetails? =
        transaction {
+            val chapterCount = ChapterTable.select(ChapterTable.id).where { ChapterTable.manga eq mangaId }.count()
            MangaTable
                .select(MangaTable.id, MangaTable.title, MangaTable.thumbnail_url, MangaTable.author)
                .where { MangaTable.id eq mangaId }
@@ -255,6 +314,7 @@ object MangaRepository {
                        title = it[MangaTable.title],
                        thumbnailUrl = it[MangaTable.thumbnail_url],
                        author = it[MangaTable.author],
+                        totalChapters = chapterCount,
                    )
                }
        }
@@ -263,26 +323,15 @@ object MangaRepository {
     * Applies sorting and filtering logic to a manga library query.
     * @param query The Exposed SQL query to modify.
     * @param sort The sorting parameter.
-     * @param filter The filtering parameter.
     */
-    private fun applyMangaLibrarySortAndFilter(
+    private fun applyMangaLibrarySort(
        query: Query,
        sort: String?,
-        filter: String?,
    ) {
        val unreadCountExpr = Case().When(ChapterTable.isRead eq false, intLiteral(1)).Else(intLiteral(0)).sum()
-        val downloadedCountExpr = Case().When(ChapterTable.isDownloaded eq true, intLiteral(1)).Else(intLiteral(0)).sum()
        val lastReadAtExpr = ChapterTable.lastReadAt.max()
        val latestChapterDateExpr = ChapterTable.date_upload.max()

-        // Apply filtering using HAVING for aggregate functions or WHERE for direct columns
-        when (filter) {
-            "unread" -> query.having { unreadCountExpr greater 0 }
-            "downloaded" -> query.having { downloadedCountExpr greater 0 }
-            "ongoing" -> query.andWhere { MangaTable.status eq MangaStatus.ONGOING.value }
-            "completed" -> query.andWhere { MangaTable.status eq MangaStatus.COMPLETED.value }
-        }
-
        // Apply sorting
        when (sort) {
            "alpha_asc" -> query.orderBy(MangaTable.title to SortOrder.ASC)
@@ -296,27 +345,44 @@ object MangaRepository {
    }

    /**
-     * Calculates the count of manga for various library filter facets.
+     * Calculates the count of manga for various library filter facets, respecting other active cross-filters.
+     * @param activeFilters The currently active filters to respect during count calculation.
     * @return A map where keys are filter names and values are the counts.
     */
-    fun getLibraryFilterCounts(): Map<String, Long> =
+    fun getLibraryFilterCounts(activeFilters: OpdsMangaFilter): Map<String, Long> =
        transaction {
-            val unreadCountExpr = Case().When(ChapterTable.isRead eq false, intLiteral(1)).Else(intLiteral(0)).sum()
-            val downloadedCountExpr = Case().When(ChapterTable.isDownloaded eq true, intLiteral(1)).Else(intLiteral(0)).sum()
+            var baseJoin =
+                MangaTable
+                    .join(SourceTable, JoinType.INNER, MangaTable.sourceReference, SourceTable.id)
+
+            if (activeFilters.categoryId != null) {
+                baseJoin = baseJoin.join(CategoryMangaTable, JoinType.LEFT, MangaTable.id, CategoryMangaTable.manga)
+            }

            val baseQuery =
-                MangaTable
-                    .join(ChapterTable, JoinType.LEFT, MangaTable.id, ChapterTable.manga)
+                baseJoin
                    .select(MangaTable.id)
                    .where { MangaTable.inLibrary eq true }
-                    .groupBy(MangaTable.id)
+                    .withDistinct()

-            val unreadCount = baseQuery.copy().having { unreadCountExpr greater 0 }.count()
-            val downloadedCount = baseQuery.copy().having { downloadedCountExpr greater 0 }.count()
+            baseQuery.applyOpdsMangaFilter(activeFilters, excludeField = "filter")

-            val statusBaseQuery = MangaTable.select(MangaTable.id).where { MangaTable.inLibrary eq true }
-            val ongoingCount = statusBaseQuery.copy().andWhere { MangaTable.status eq MangaStatus.ONGOING.value }.count()
-            val completedCount = statusBaseQuery.copy().andWhere { MangaTable.status eq MangaStatus.COMPLETED.value }.count()
+            val unreadCount =
+                baseQuery
+                    .copy()
+                    .andWhere {
+                        MangaTable.id inSubQuery
+                            ChapterTable.select(ChapterTable.manga).where { ChapterTable.isRead eq false }
+                    }.count()
+            val downloadedCount =
+                baseQuery
+                    .copy()
+                    .andWhere {
+                        MangaTable.id inSubQuery
+                            ChapterTable.select(ChapterTable.manga).where { ChapterTable.isDownloaded eq true }
+                    }.count()
+            val ongoingCount = baseQuery.copy().andWhere { MangaTable.status eq MangaStatus.ONGOING.value }.count()
+            val completedCount = baseQuery.copy().andWhere { MangaTable.status eq MangaStatus.COMPLETED.value }.count()

            mapOf(
                "unread" to unreadCount,
--- a/server/src/main/kotlin/suwayomi/tachidesk/opds/repository/NavigationRepository.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/opds/repository/NavigationRepository.kt
@@ -21,10 +21,12 @@ import suwayomi.tachidesk.opds.constants.OpdsConstants
 import suwayomi.tachidesk.opds.dto.OpdsCategoryNavEntry
 import suwayomi.tachidesk.opds.dto.OpdsGenreNavEntry
 import suwayomi.tachidesk.opds.dto.OpdsLanguageNavEntry
+import suwayomi.tachidesk.opds.dto.OpdsMangaFilter
 import suwayomi.tachidesk.opds.dto.OpdsRootNavEntry
 import suwayomi.tachidesk.opds.dto.OpdsSourceNavEntry
 import suwayomi.tachidesk.opds.dto.OpdsStatusNavEntry
 import suwayomi.tachidesk.opds.util.OpdsStringUtil.encodeForOpdsURL
+import suwayomi.tachidesk.opds.util.OpdsStringUtil.formatSourceName
 import suwayomi.tachidesk.server.serverConfig
 import java.util.Locale

@@ -131,15 +133,14 @@ object NavigationRepository {
            )
        }

-    // ... (El resto del archivo permanece sin cambios)
    fun getExploreSources(pageNum: Int): Pair<List<OpdsSourceNavEntry>, Long> =
        transaction {
            val query =
                SourceTable
                    .join(ExtensionTable, JoinType.LEFT, onColumn = SourceTable.extension, otherColumn = ExtensionTable.id)
-                    .select(SourceTable.id, SourceTable.name, ExtensionTable.apkName)
+                    .select(SourceTable.id, SourceTable.name, SourceTable.lang, ExtensionTable.apkName)
                    .where { ExtensionTable.isInstalled eq true }
-                    .groupBy(SourceTable.id, SourceTable.name, ExtensionTable.apkName)
+                    .groupBy(SourceTable.id, SourceTable.name, SourceTable.lang, ExtensionTable.apkName)
                    .orderBy(SourceTable.name to SortOrder.ASC)

            val totalCount = query.count()
@@ -150,7 +151,7 @@ object NavigationRepository {
                    .map {
                        OpdsSourceNavEntry(
                            id = it[SourceTable.id].value,
-                            name = it[SourceTable.name],
+                            name = formatSourceName(it[SourceTable.name], it[SourceTable.lang]),
                            iconUrl = it[ExtensionTable.apkName].let { apkName -> Extension.getExtensionIconUrl(apkName) },
                            mangaCount = null,
                        )
@@ -158,36 +159,71 @@ object NavigationRepository {
            Pair(sources, totalCount)
        }

-    fun getLibrarySources(pageNum: Int): Pair<List<OpdsSourceNavEntry>, Long> =
+    fun getLibrarySources(
+        pageNum: Int? = null,
+        activeFilters: OpdsMangaFilter = OpdsMangaFilter(),
+    ): Pair<List<OpdsSourceNavEntry>, Long> =
        transaction {
            val mangaCount = MangaTable.id.countDistinct().alias("manga_count")

-            val query =
+            var baseJoin =
                SourceTable
                    .join(MangaTable, JoinType.INNER, SourceTable.id, MangaTable.sourceReference)
                    .join(ExtensionTable, JoinType.LEFT, onColumn = SourceTable.extension, otherColumn = ExtensionTable.id)
-                    .select(SourceTable.id, SourceTable.name, ExtensionTable.apkName, mangaCount)
+
+            if (activeFilters.categoryId != null) {
+                baseJoin = baseJoin.join(CategoryMangaTable, JoinType.LEFT, MangaTable.id, CategoryMangaTable.manga)
+            }
+
+            val query =
+                baseJoin
+                    .select(SourceTable.id, SourceTable.name, SourceTable.lang, ExtensionTable.apkName, mangaCount)
                    .where { MangaTable.inLibrary eq true }
-                    .groupBy(SourceTable.id, SourceTable.name, ExtensionTable.apkName)
-                    .orderBy(SourceTable.name to SortOrder.ASC)
+
+            query.applyOpdsMangaFilter(activeFilters, excludeField = "source_id")
+
+            query
+                .groupBy(SourceTable.id, SourceTable.name, SourceTable.lang, ExtensionTable.apkName)
+                .orderBy(SourceTable.name to SortOrder.ASC)

            val totalCount = query.count()
-            val sources =
+
+            if (pageNum != null) {
                query
                    .limit(opdsItemsPerPageBounded)
                    .offset(((pageNum - 1) * opdsItemsPerPageBounded).toLong())
-                    .map {
-                        OpdsSourceNavEntry(
-                            id = it[SourceTable.id].value,
-                            name = it[SourceTable.name],
-                            iconUrl = it[ExtensionTable.apkName].let { apkName -> Extension.getExtensionIconUrl(apkName) },
-                            mangaCount = it[mangaCount],
-                        )
-                    }
+            }
+
+            val sources =
+                query.map {
+                    OpdsSourceNavEntry(
+                        id = it[SourceTable.id].value,
+                        name = formatSourceName(it[SourceTable.name], it[SourceTable.lang]),
+                        iconUrl = it[ExtensionTable.apkName].let { apkName -> Extension.getExtensionIconUrl(apkName) },
+                        mangaCount = it[mangaCount],
+                    )
+                }
            Pair(sources, totalCount)
        }

-    fun getCategories(pageNum: Int): Pair<List<OpdsCategoryNavEntry>, Long> =
+    fun getSourceDetails(sourceId: Long): Pair<String, String?>? =
+        transaction {
+            SourceTable
+                .join(ExtensionTable, JoinType.LEFT, onColumn = SourceTable.extension, otherColumn = ExtensionTable.id)
+                .select(SourceTable.name, SourceTable.lang, ExtensionTable.apkName)
+                .where { SourceTable.id eq sourceId }
+                .firstOrNull()
+                ?.let {
+                    val name = formatSourceName(it[SourceTable.name], it[SourceTable.lang])
+                    val icon = Extension.getExtensionIconUrl(it[ExtensionTable.apkName])
+                    Pair(name, icon)
+                }
+        }
+
+    fun getCategories(
+        pageNum: Int? = null,
+        activeFilters: OpdsMangaFilter = OpdsMangaFilter(),
+    ): Pair<List<OpdsCategoryNavEntry>, Long> =
        transaction {
            val mangaCount = MangaTable.id.countDistinct().alias("manga_count")

@@ -195,35 +231,57 @@ object NavigationRepository {
                CategoryTable
                    .join(CategoryMangaTable, JoinType.INNER, CategoryTable.id, CategoryMangaTable.category)
                    .join(MangaTable, JoinType.INNER, CategoryMangaTable.manga, MangaTable.id)
+                    .join(SourceTable, JoinType.INNER, MangaTable.sourceReference, SourceTable.id)
                    .select(CategoryTable.id, CategoryTable.name, mangaCount)
                    .where { MangaTable.inLibrary eq true }
-                    .groupBy(CategoryTable.id, CategoryTable.name)
-                    .orderBy(CategoryTable.order to SortOrder.ASC)
+
+            query.applyOpdsMangaFilter(activeFilters, excludeField = "category_id")
+
+            query
+                .groupBy(CategoryTable.id, CategoryTable.name)
+                .orderBy(CategoryTable.order to SortOrder.ASC)

            val totalCount = query.count()
-            val categories =
+
+            if (pageNum != null) {
                query
                    .limit(opdsItemsPerPageBounded)
                    .offset(((pageNum - 1) * opdsItemsPerPageBounded).toLong())
-                    .map {
-                        OpdsCategoryNavEntry(
-                            id = it[CategoryTable.id].value,
-                            name = it[CategoryTable.name],
-                            mangaCount = it[mangaCount],
-                        )
-                    }
+            }
+
+            val categories =
+                query.map {
+                    OpdsCategoryNavEntry(
+                        id = it[CategoryTable.id].value,
+                        name = it[CategoryTable.name],
+                        mangaCount = it[mangaCount],
+                    )
+                }
            Pair(categories, totalCount)
        }

    fun getGenres(
-        pageNum: Int,
        locale: Locale,
+        pageNum: Int? = null,
+        activeFilters: OpdsMangaFilter = OpdsMangaFilter(),
    ): Pair<List<OpdsGenreNavEntry>, Long> =
        transaction {
-            val allGenres =
+            var baseJoin =
                MangaTable
+                    .join(SourceTable, JoinType.INNER, MangaTable.sourceReference, SourceTable.id)
+            if (activeFilters.categoryId != null) {
+                baseJoin = baseJoin.join(CategoryMangaTable, JoinType.LEFT, MangaTable.id, CategoryMangaTable.manga)
+            }
+
+            val query =
+                baseJoin
                    .select(MangaTable.genre)
                    .where { MangaTable.inLibrary eq true }
+
+            query.applyOpdsMangaFilter(activeFilters, excludeField = "genre")
+
+            val allGenres =
+                query
                    .mapNotNull { it[MangaTable.genre] }
                    .flatMap { it.split(",").map(String::trim).filterNot(String::isBlank) }

@@ -231,21 +289,32 @@ object NavigationRepository {
            val distinctGenres = genreCounts.keys.sorted()

            val totalCount = distinctGenres.size.toLong()
-            val fromIndex = ((pageNum - 1) * opdsItemsPerPageBounded)
-            val toIndex = minOf(fromIndex + opdsItemsPerPageBounded, distinctGenres.size)
+
+            val finalGenres =
+                if (pageNum != null) {
+                    val fromIndex = ((pageNum - 1) * opdsItemsPerPageBounded)
+                    val toIndex = minOf(fromIndex + opdsItemsPerPageBounded, distinctGenres.size)
+                    if (fromIndex < distinctGenres.size) distinctGenres.subList(fromIndex, toIndex) else emptyList()
+                } else {
+                    distinctGenres
+                }
+
            val paginatedGenres =
-                (if (fromIndex < distinctGenres.size) distinctGenres.subList(fromIndex, toIndex) else emptyList())
-                    .map { genreName ->
-                        OpdsGenreNavEntry(
-                            id = genreName.encodeForOpdsURL(),
-                            title = genreName,
-                            mangaCount = genreCounts[genreName]?.toLong() ?: 0L,
-                        )
-                    }
+                finalGenres.map { genreName ->
+                    OpdsGenreNavEntry(
+                        id = genreName.encodeForOpdsURL(),
+                        title = genreName,
+                        mangaCount = genreCounts[genreName]?.toLong() ?: 0L,
+                    )
+                }
            Pair(paginatedGenres, totalCount)
        }

-    fun getStatuses(locale: Locale): List<OpdsStatusNavEntry> {
+    fun getStatuses(
+        locale: Locale,
+        pageNum: Int? = null,
+        activeFilters: OpdsMangaFilter = OpdsMangaFilter(),
+    ): Pair<List<OpdsStatusNavEntry>, Long> {
        val statusStringResources: Map<MangaStatus, StringResource> =
            mapOf(
                MangaStatus.UNKNOWN to MR.strings.manga_status_unknown,
@@ -259,43 +328,98 @@ object NavigationRepository {

        val statusCounts =
            transaction {
-                MangaTable
-                    .select(MangaTable.status, MangaTable.id.count())
-                    .where { MangaTable.inLibrary eq true }
+                val countExpr = MangaTable.id.countDistinct().alias("manga_count")
+
+                var baseJoin =
+                    MangaTable
+                        .join(SourceTable, JoinType.INNER, MangaTable.sourceReference, SourceTable.id)
+                if (activeFilters.categoryId != null) {
+                    baseJoin = baseJoin.join(CategoryMangaTable, JoinType.LEFT, MangaTable.id, CategoryMangaTable.manga)
+                }
+
+                val query =
+                    baseJoin
+                        .select(MangaTable.status, countExpr)
+                        .where { MangaTable.inLibrary eq true }
+
+                query.applyOpdsMangaFilter(activeFilters, excludeField = "status_id")
+
+                query
                    .groupBy(MangaTable.status)
-                    .associate { it[MangaTable.status] to it[MangaTable.id.count()] }
+                    .associate { it[MangaTable.status] to it[countExpr] }
            }

-        return MangaStatus.entries
-            .map { mangaStatus ->
-                val titleRes = statusStringResources[mangaStatus] ?: MR.strings.manga_status_unknown
-                OpdsStatusNavEntry(
-                    id = mangaStatus.value,
-                    title = titleRes.localized(locale),
-                    mangaCount = statusCounts[mangaStatus.value] ?: 0L,
-                )
-            }.sortedBy { it.id }
+        val allStatuses =
+            MangaStatus.entries
+                .map { mangaStatus ->
+                    val titleRes = statusStringResources[mangaStatus] ?: MR.strings.manga_status_unknown
+                    OpdsStatusNavEntry(
+                        id = mangaStatus.value,
+                        title = titleRes.localized(locale),
+                        mangaCount = statusCounts[mangaStatus.value] ?: 0L,
+                    )
+                }.sortedBy { it.id }
+
+        val totalCount = allStatuses.size.toLong()
+
+        val paginatedStatuses =
+            if (pageNum != null) {
+                val fromIndex = ((pageNum - 1) * opdsItemsPerPageBounded)
+                val toIndex = minOf(fromIndex + opdsItemsPerPageBounded, allStatuses.size)
+                if (fromIndex < allStatuses.size) allStatuses.subList(fromIndex, toIndex) else emptyList()
+            } else {
+                allStatuses
+            }
+
+        return Pair(paginatedStatuses, totalCount)
    }

-    fun getContentLanguages(uiLocale: Locale): List<OpdsLanguageNavEntry> =
+    fun getContentLanguages(
+        locale: Locale,
+        pageNum: Int? = null,
+        activeFilters: OpdsMangaFilter = OpdsMangaFilter(),
+    ): Pair<List<OpdsLanguageNavEntry>, Long> =
        transaction {
            val mangaCount = MangaTable.id.countDistinct().alias("manga_count")
-            SourceTable
-                .join(MangaTable, JoinType.INNER, SourceTable.id, MangaTable.sourceReference)
-                .select(SourceTable.lang, mangaCount)
-                .where { MangaTable.inLibrary eq true }
+
+            var baseJoin =
+                SourceTable
+                    .join(MangaTable, JoinType.INNER, SourceTable.id, MangaTable.sourceReference)
+            if (activeFilters.categoryId != null) {
+                baseJoin = baseJoin.join(CategoryMangaTable, JoinType.LEFT, MangaTable.id, CategoryMangaTable.manga)
+            }
+
+            val query =
+                baseJoin
+                    .select(SourceTable.lang, mangaCount)
+                    .where { MangaTable.inLibrary eq true }
+
+            query.applyOpdsMangaFilter(activeFilters, excludeField = "lang_code")
+
+            query
                .groupBy(SourceTable.lang)
                .orderBy(SourceTable.lang to SortOrder.ASC)
-                .map {
+
+            val totalCount = query.count()
+
+            if (pageNum != null) {
+                query
+                    .limit(opdsItemsPerPageBounded)
+                    .offset(((pageNum - 1) * opdsItemsPerPageBounded).toLong())
+            }
+
+            val languages =
+                query.map {
                    val langCode = it[SourceTable.lang]
                    OpdsLanguageNavEntry(
                        id = langCode,
                        title =
-                            Locale.forLanguageTag(langCode).getDisplayName(uiLocale).replaceFirstChar { char ->
-                                if (char.isLowerCase()) char.titlecase(uiLocale) else char.toString()
+                            Locale.forLanguageTag(langCode).getDisplayName(locale).replaceFirstChar { char ->
+                                if (char.isLowerCase()) char.titlecase(locale) else char.toString()
                            },
                        mangaCount = it[mangaCount],
                    )
                }
+            Pair(languages, totalCount)
        }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/opds/util/OpdsStringUtil.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/opds/util/OpdsStringUtil.kt
@@ -33,6 +33,19 @@ object OpdsStringUtil {
        return slug
    }

+    /**
+     * Formats the source name appending the language code if applicable.
+     */
+    fun formatSourceName(
+        name: String,
+        lang: String?,
+    ): String =
+        if (lang.isNullOrBlank() || lang == "all") {
+            name
+        } else {
+            "$name (${lang.uppercase()})"
+        }
+
    /**
     * Formats a size in bytes to a human-readable representation.
     * Uses binary (KiB, MiB, GiB, TiB) or decimal (KB, MB, GB, TB) units based on server configuration.
--- a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt
@@ -71,11 +71,6 @@ import java.net.Authenticator
 import java.net.PasswordAuthentication
 import java.security.Security
 import java.util.Locale
-import kotlin.concurrent.thread
-import kotlin.io.path.Path
-import kotlin.io.path.createDirectories
-import kotlin.io.path.div
-import kotlin.math.roundToInt

 private val logger = KotlinLogging.logger {}

--- a/server/src/main/kotlin/suwayomi/tachidesk/server/util/CEFManager.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/server/util/CEFManager.kt
@@ -11,9 +11,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.subscribe
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
--- a/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt
@@ -136,7 +136,7 @@ object WebInterfaceManager {
    fun getAboutInfo(): AboutWebUI {
        val currentVersion = getLocalVersion()

-        val failedToGetVersion = currentVersion === "r-1"
+        val failedToGetVersion = currentVersion == "r-1"
        if (failedToGetVersion) {
            throw Exception("Failed to get current version")
        }
--- a/server/src/test/kotlin/suwayomi/tachidesk/LooperTest.kt
+++ b/server/src/test/kotlin/suwayomi/tachidesk/LooperTest.kt
@@ -2,14 +2,12 @@ package suwayomi.tachidesk

 import android.os.Handler
 import android.os.Looper
-import android.os.Message
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotEquals
 import kotlin.test.assertTrue
-import kotlin.text.StringBuilder

 class LooperThread : Thread() {
    var mHandler: Handler? = null
--- a/server/src/test/kotlin/suwayomi/tachidesk/manga/impl/update/TestUpdater.kt
+++ b/server/src/test/kotlin/suwayomi/tachidesk/manga/impl/update/TestUpdater.kt
@@ -46,6 +46,7 @@ class TestUpdater : IUpdater {
        TODO("Not yet implemented")
    }

+    @Deprecated("Replaced with updates", replaceWith = ReplaceWith("updates"))
    override val status: Flow<UpdateStatus>
        get() = TODO("Not yet implemented")
    override val updates: Flow<UpdateUpdates>
--- a/server/src/test/kotlin/suwayomi/tachidesk/test/ApplicationTest.kt
+++ b/server/src/test/kotlin/suwayomi/tachidesk/test/ApplicationTest.kt
@@ -28,7 +28,6 @@ import suwayomi.tachidesk.server.serverModule
 import suwayomi.tachidesk.server.settings.SettingsRegistry
 import suwayomi.tachidesk.server.util.AppMutex.handleAppMutex
 import suwayomi.tachidesk.server.util.ConfigTypeRegistration
-import suwayomi.tachidesk.server.util.SystemTray
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import xyz.nulldev.androidcompat.AndroidCompatInitializer
Author	SHA1	Message	Date
renovate[bot]	5fa74cd877	Update JCEF + JetBrains Runtime	2026-06-23 11:41:03 +00:00
herowinb	c8f5d83e9c	add reportSyncEvent for SyncYomi service (#2110 ) * add reportSyncEvent * Update SyncYomiSyncService.kt	2026-06-17 22:46:21 -04:00
Zeedif	be5e3f022e	feat(download): improve chapter download filenames (#2100 ) * feat(download): improve chapter download filenames * refactor(download): use SafePath helper for filename sanitization	2026-06-17 22:41:31 -04:00
renovate[bot]	40a21fabca	Update dex2jar to v2.4.37 (#2122 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-06-17 22:39:37 -04:00
Zeedif	b33069f107	fix(opds): resolve sql group by syntax error when filtering library (#2118 )	2026-06-17 22:39:30 -04:00
Zeedif	14ab3aa9f4	fix(opds): handle dead sources and prevent kosync binary hash crashes (#2116 )	2026-06-17 22:39:22 -04:00
Weblate (bot)	bfa0038f53	Weblate translations (#1903 ) Translate-URL: https://hosted.weblate.org/projects/suwayomi/suwayomi-server/el/ Translate-URL: https://hosted.weblate.org/projects/suwayomi/suwayomi-server/ja/ Translate-URL: https://hosted.weblate.org/projects/suwayomi/suwayomi-server/pl/ Translate-URL: https://hosted.weblate.org/projects/suwayomi/suwayomi-server/ru/ Translation: Suwayomi/Suwayomi-Server Co-authored-by: Micka149 <dr.mischutckin2017@yandex.ru> Co-authored-by: Philip Prescott-Decie <presdec@gmail.com> Co-authored-by: Roland Vezsenyi <miscogd5yf2paqvxvc@farvoid.com> Co-authored-by: Syer10 <Mitchellptbo@gmail.com> Co-authored-by: TheRay82 <raycoc1382@gmail.com> Co-authored-by: UnknownSkyrimPasserby <f7022961@opayq.com> Co-authored-by: 圭紫 <kaceykoo@gmail.com>	2026-06-17 22:39:15 -04:00
Mitchell Syer	934459f15f	Dataclass cleanup and minor fixes (#2115 )	2026-06-15 14:32:09 -04:00
Mitchell Syer	bab58daecc	Fix Postgres Backups (#2113 ) * Fix Postgres Backups * Changelog * Import * More accurate changelog	2026-06-15 14:31:58 -04:00
renovate[bot]	61eb0630cb	Update dependency com.github.usefulness:webp-imageio to v0.11.0 (#2114 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-06-15 14:31:05 -04:00
renovate[bot]	0d3afadfa3	Update koin to v4.2.2 (#2111 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-06-15 14:30:44 -04:00
renovate[bot]	f9e81c75b6	Update dependency com.zaxxer:HikariCP to v7.1.0 (#2108 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-06-15 14:30:28 -04:00
renovate[bot]	e123857399	Update JCEF + JetBrains Runtime to jbr-release-25.0.3b508.4 (#2104 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-06-15 14:30:19 -04:00
renovate[bot]	31817639bd	Update jackson monorepo to v3.2.0 (#2102 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-06-15 14:28:51 -04:00
renovate[bot]	2b91ab755d	Update okhttp monorepo to v5.4.0 (#2101 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-06-15 14:27:00 -04:00
Zeedif	98576c6e62	feat(opds): Add option to skip metadata feed for direct access (#1879 ) * feat(opds): add option to skip chapter metadata feed Introduces a new server configuration `server.opdsSkipChapterMetadataFeed` (default: false). When enabled, the OPDS chapter feed generates direct acquisition (CBZ download) and streaming (OPDS-PSE) links within the chapter list entries, bypassing the intermediate metadata subsection. This streamlines the user experience and improves compatibility with OPDS clients like KOReader that rely on direct links for automated downloading features. * fix: lint * fix(opds): enrich chapter data and refine sync logic for skip-metadata mode Refines the `opdsSkipChapterMetadataFeed` implementation to ensure necessary data is available for direct links and handles synchronization logic appropriate for a list view. - Refactor ChapterForDownload: Extract `refreshChapterPageList` and `updateChapterPersistence` to allow reusing page count verification logic outside the download flow. - Enrich Chapter Repository: When skipping metadata, asynchronously verify page counts and calculate CBZ file sizes for chapters in the list. This ensures direct stream/download links are valid even if the chapter wasn't previously fully indexed. - KoSync Logic: Implement synchronization logic in `OpdsEntryBuilder`. Since the user cannot be prompted in the chapter list view, `PROMPT` conflicts are explicitly ignored (prioritizing local progress), while updates are applied if non-conflicting. - OPDS Attributes: Add `length` (file size) to acquisition links and ensure download links only appear for actually downloaded chapters. - Documentation: Update `server.conf` description to clarify KoSync behavior in this mode. * feat(download): improve chapter download filenames * feat(opds): append language to source names * feat(opds): handle empty chapter titles * fix import org.jetbrains.exposed.v1.core.inList * refactor(opds): reorganize API routes and update facet count calculations based on active filters - API Routing & Controllers: Reorganize OPDS v1.2 route paths into logical groups in `OpdsAPI`. Centralize request filter extraction into `OpdsMangaFilter.fromContext`. - Facet Counting: Extract `Query.applyOpdsMangaFilter` to apply active filters to facet and navigation queries. Pass the active filters to `NavigationRepository` and `MangaRepository` count queries (using `excludeField` to calculate sibling counts). This ensures category, source, language, status, and genre counts (`thr:count`) are accurately computed based on active selections. - Pagination: Add pagination support to computed navigation feeds in `NavigationRepository` ( statuses and content languages). - Builders: Standardize parameter ordering in `FeedBuilderInternal` and `OpdsEntryBuilder` constructors. Simplify pagination and facet link URL generation. * fix(opds): remove redundant filter logic to avoid duplicate HAVING clauses Resolve IllegalStateException crash caused by applying content filters twice in MangaRepository. Filtering is now handled exclusively by `applyOpdsMangaFilter`, allowing `applyMangaLibrarySort` to focus solely on ordering operations. * revert(download): restore original CBZ filename scheme * refactor(opds): simplify persistence updates and clean up chapter mapping - Simplify page count and download checks in ChapterForDownload - Clean up enriched chapter mapping in ChapterRepository to improve readability * fix(opds): retrieve chapter archive size without leaving stream open * perf(opds): avoid redundant DB query when refreshing chapter page list	2026-06-15 14:26:16 -04:00
schroda	8fbc8fd3d4	Fix automatic chapter downloads (#2098 ) The returned result rows of the inserted chapters did not have the up-to-date "last_modified_at". This caused "downloadNewChapters" to not be able to correctly detect unread chapters. it included the newly inserted ones, leading to exiting early due to having unread chapters. Regression `811e15162b` fixes #2097	2026-06-08 14:21:57 -04:00
Constantin Piber	c81020dbb1	CEF: Remove jogl and jogamp deps by implementing a no-op renderer (#2095 ) * CEF: Remove jogl and jogamp deps by implementing a no-op renderer * Update readme	2026-06-08 14:21:47 -04:00