MadTheme: rework CDN logic (#14969)
* MadTheme: rework CDN logic * fix unused import
This commit is contained in:
Vetle Ledaal
GitHub
parent
bd4ab2a925
commit
3e0a6dcaca
|
|
@ -1,55 +0,0 @@
|
|||
package eu.kanade.tachiyomi.extension.en.mangabuddy
|
||||
|
||||
import android.app.Application
|
||||
import android.content.SharedPreferences
|
||||
import androidx.preference.ListPreference
|
||||
import androidx.preference.PreferenceScreen
|
||||
import eu.kanade.tachiyomi.multisrc.madtheme.MadTheme
|
||||
import eu.kanade.tachiyomi.source.ConfigurableSource
|
||||
import uy.kohesive.injekt.Injekt
|
||||
import uy.kohesive.injekt.api.get
|
||||
|
||||
class MangaBuddy :
|
||||
MadTheme(
|
||||
"MangaBuddy",
|
||||
"https://mangabuddy.com",
|
||||
"en"
|
||||
),
|
||||
ConfigurableSource {
|
||||
private val preferences: SharedPreferences by lazy {
|
||||
Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
|
||||
}
|
||||
|
||||
override fun setupPreferenceScreen(screen: PreferenceScreen) {
|
||||
val imageServerPref = ListPreference(screen.context).apply {
|
||||
key = "${IMAGE_SERVER_PREF_KEY}_$lang"
|
||||
title = IMAGE_SERVER_PREF_TITLE
|
||||
entries = IMAGE_SERVER_PREF_ENTRIES
|
||||
entryValues = IMAGE_SERVER_PREF_ENTRY_VALUES
|
||||
setDefaultValue(IMAGE_SERVER_PREF_DEFAULT_VALUE)
|
||||
summary = "%s"
|
||||
|
||||
setOnPreferenceChangeListener { _, newValue ->
|
||||
val selected = newValue as String
|
||||
val index = findIndexOfValue(selected)
|
||||
val entry = entryValues[index] as String
|
||||
preferences.edit().putString("${IMAGE_SERVER_PREF_KEY}_$lang", entry).commit()
|
||||
}
|
||||
}
|
||||
screen.addPreference(imageServerPref)
|
||||
}
|
||||
|
||||
override var CDN_URL: String? = IMAGE_SERVER_PREF_DEFAULT_VALUE
|
||||
get() = preferences.getString("${IMAGE_SERVER_PREF_KEY}_$lang", IMAGE_SERVER_PREF_DEFAULT_VALUE)
|
||||
|
||||
companion object {
|
||||
/*
|
||||
* On the site Server 1 load balances between 5 hosts, and Server 2 uses the last host.
|
||||
*/
|
||||
private const val IMAGE_SERVER_PREF_KEY = "IMAGE_SERVER"
|
||||
private const val IMAGE_SERVER_PREF_TITLE = "Image server"
|
||||
private val IMAGE_SERVER_PREF_ENTRIES = arrayOf("Server 1", "Server 2")
|
||||
private val IMAGE_SERVER_PREF_ENTRY_VALUES = arrayOf("https://s1.mbcdnv1.xyz", "https://s1.mbcdnv5.xyz")
|
||||
private val IMAGE_SERVER_PREF_DEFAULT_VALUE = IMAGE_SERVER_PREF_ENTRY_VALUES[0]
|
||||
}
|
||||
}
|
||||
|
|
@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.multisrc.madtheme
|
|||
import eu.kanade.tachiyomi.network.GET
|
||||
import eu.kanade.tachiyomi.network.asObservable
|
||||
import eu.kanade.tachiyomi.network.interceptor.rateLimit
|
||||
import eu.kanade.tachiyomi.network.interceptor.rateLimitHost
|
||||
import eu.kanade.tachiyomi.source.model.Filter
|
||||
import eu.kanade.tachiyomi.source.model.FilterList
|
||||
import eu.kanade.tachiyomi.source.model.MangasPage
|
||||
|
|
@ -41,11 +40,7 @@ abstract class MadTheme(
|
|||
override val supportsLatest = true
|
||||
|
||||
override val client: OkHttpClient = network.cloudflareClient.newBuilder()
|
||||
.rateLimitHost("https://s1.mbcdnv1.xyz".toHttpUrl(), 1, 1)
|
||||
.rateLimitHost("https://s1.mbcdnv2.xyz".toHttpUrl(), 1, 1)
|
||||
.rateLimitHost("https://s1.mbcdnv3.xyz".toHttpUrl(), 1, 1)
|
||||
.rateLimitHost("https://s1.mbcdnv4.xyz".toHttpUrl(), 1, 1)
|
||||
.rateLimitHost("https://s1.mbcdnv5.xyz".toHttpUrl(), 1, 1)
|
||||
.rateLimit(1, 1)
|
||||
.build()
|
||||
|
||||
// TODO: better cookie sharing
|
||||
|
|
@ -180,7 +175,7 @@ abstract class MadTheme(
|
|||
return super.chapterListParse(response)
|
||||
}
|
||||
|
||||
// Try to use message from site
|
||||
// Try to show message/error from site
|
||||
response.body?.let { body ->
|
||||
json.decodeFromString<JsonObject>(body.string())["message"]
|
||||
?.jsonPrimitive
|
||||
|
|
@ -219,43 +214,25 @@ abstract class MadTheme(
|
|||
val html = document.html()!!
|
||||
|
||||
if (!html.contains("var mainServer = \"")) {
|
||||
// No fancy CDN
|
||||
// No fancy CDN, all images are available directly in <img> tags
|
||||
return document.select("#chapter-images img").mapIndexed { index, element ->
|
||||
Page(index, "", element.attr("abs:data-src"))
|
||||
Page(index, imageUrl = element.attr("abs:data-src"))
|
||||
}
|
||||
}
|
||||
|
||||
val scheme = baseUrl.toHttpUrl().scheme + "://"
|
||||
|
||||
val mainCdn = html
|
||||
// While the site may support multiple CDN hosts, we have opted to ignore those
|
||||
val mainServer = html
|
||||
.substringAfter("var mainServer = \"")
|
||||
.substringBefore("\"")
|
||||
val schemePrefix = if (mainServer.startsWith("//")) "https:" else ""
|
||||
|
||||
val mainCdnHttp = (scheme + mainCdn).toHttpUrl()
|
||||
CDN_URL = scheme + mainCdnHttp.host
|
||||
CDN_PATH = mainCdnHttp.encodedPath
|
||||
|
||||
val chImages = html
|
||||
val chapImages = html
|
||||
.substringAfter("var chapImages = '")
|
||||
.substringBefore("'")
|
||||
.split(',')
|
||||
|
||||
if (html.contains("var multiServers = true")) {
|
||||
val altCDNs = json.decodeFromString<List<String>>(
|
||||
html
|
||||
.substringAfter("var imageServers = ")
|
||||
.substringBefore("\n")
|
||||
)
|
||||
CDN_URL_ALT = altCDNs.mapNotNull {
|
||||
val url = scheme + it
|
||||
if (!(CDN_URL!!).contains(url)) url else null
|
||||
}
|
||||
}
|
||||
|
||||
// Disabling alt CDNs until fallback can be implemented
|
||||
val allCDN = listOf(CDN_URL) // + CDN_URL_ALT
|
||||
return chImages.mapIndexed { index, img ->
|
||||
Page(index, "", allCDN.random() + CDN_PATH + img)
|
||||
return chapImages.mapIndexed { index, path ->
|
||||
Page(index, imageUrl = "$schemePrefix$mainServer$path")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -358,11 +335,4 @@ abstract class MadTheme(
|
|||
Filter.Select<String>(displayName, vals.map { it.first }.toTypedArray(), state) {
|
||||
fun toUriPart() = vals[state].second
|
||||
}
|
||||
|
||||
open var CDN_URL: String? = null
|
||||
|
||||
companion object {
|
||||
private var CDN_URL_ALT: List<String> = listOf()
|
||||
private var CDN_PATH: String? = null
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ class MadThemeGenerator : ThemeSourceGenerator {
|
|||
|
||||
override val themeClass = "MadTheme"
|
||||
|
||||
override val baseVersionCode: Int = 10
|
||||
override val baseVersionCode: Int = 11
|
||||
|
||||
override val sources = listOf(
|
||||
SingleLang("BeeHentai", "https://beehentai.com", "en", isNsfw = true),
|
||||
|
|
|
|||
Loading…
Reference in New Issue