MDB: prefer WebP images and change library source (#12254)

multisrc/overrides/mdb/manhuadb/src/ManhuaDB.kt

@@ -1,18 +1,24 @@
 package eu.kanade.tachiyomi.extension.zh.manhuadb
 
+import android.app.Application
+import android.content.SharedPreferences
 import android.util.Base64
+import androidx.preference.PreferenceScreen
+import androidx.preference.SwitchPreferenceCompat
 import eu.kanade.tachiyomi.multisrc.mdb.MDB
+import eu.kanade.tachiyomi.source.ConfigurableSource
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.Response
 import org.jsoup.nodes.Element
 import org.jsoup.select.Evaluator
 import org.jsoup.select.QueryParser
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 
-class ManhuaDB : MDB("漫画DB", "https://www.manhuadb.com") {
+class ManhuaDB : MDB("漫画DB", "https://www.manhuadb.com"), ConfigurableSource {
 
     override val supportsLatest = false
 
@@ -36,10 +42,37 @@ class ManhuaDB : MDB("漫画DB", "https://www.manhuadb.com") {
 
     // https://www.manhuadb.com/assets/js/vg-read.js
     override fun parseImages(imgData: String, readerConfig: Element): List<String> {
-        val list: List<JsonObject> = Base64.decode(imgData, Base64.DEFAULT)
+        val list: List<Image> = Base64.decode(imgData, Base64.DEFAULT)
             .let { json.decodeFromString(String(it)) }
         val host = readerConfig.attr("data-host")
         val dir = readerConfig.attr("data-img_pre")
-        return list.map { host + dir + it["img"]!!.jsonPrimitive.content }
+        val useWebp = preferences.getBoolean(WEBP_PREF, true)
+        return list.map {
+            host + dir + if (useWebp && it.img_webp != null) it.img_webp else it.img
+        }
+    }
+
+    @Serializable
+    data class Image(val img: String, val img_webp: String? = null)
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        SwitchPreferenceCompat(screen.context).apply {
+            key = WEBP_PREF
+            title = "优先使用 WebP 图片格式"
+            summary = "默认开启，可以节省网站流量"
+            setDefaultValue(true)
+            setOnPreferenceChangeListener { _, newValue ->
+                preferences.edit().putBoolean(WEBP_PREF, newValue as Boolean).apply()
+                true
+            }
+        }.let { screen.addPreference(it) }
+    }
+
+    companion object {
+        private const val WEBP_PREF = "WEBP"
     }
 }

multisrc/overrides/mdb/maofly/additional.gradle

@@ -1,3 +1,3 @@
 dependencies {
-    implementation 'com.github.softwarevidal:lz-string4java:lz-string4java-1.0.0'
+    implementation 'com.github.wajda:lzstring4java:0.1'
 }

multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mdb/MDBGenerator.kt

@@ -8,7 +8,7 @@ class MDBGenerator : ThemeSourceGenerator {
     override val themePkg = "mdb"
     override val baseVersionCode = 1
     override val sources = listOf(
-        SingleLang("ManhuaDB", "https://www.manhuadb.com", "zh", sourceName = "漫画DB", overrideVersionCode = 3),
+        SingleLang("ManhuaDB", "https://www.manhuadb.com", "zh", sourceName = "漫画DB", overrideVersionCode = 4),
         SingleLang("Maofly", "https://www.maofly.com", "zh", sourceName = "漫画猫", overrideVersionCode = 1),
     )