Fix LectorManga loading pages, add rate limit for new image CDN hosts (#8901)
This commit is contained in:
Edgar Mejía
GitHub
parent
99a432335e
commit
6a12eab8b0
|
|
@ -5,7 +5,7 @@ ext {
|
|||
extName = 'LectorManga'
|
||||
pkgNameSuffix = 'es.lectormanga'
|
||||
extClass = '.LectorManga'
|
||||
extVersionCode = 19
|
||||
extVersionCode = 20
|
||||
libVersion = '1.2'
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ class LectorManga : ConfigurableSource, ParsedHttpSource() {
|
|||
.add("Referer", "$baseUrl/")
|
||||
}
|
||||
|
||||
private val imageCDNUrl = "https://img1.followmanga.com"
|
||||
private val imageCDNUrls = arrayOf("https://img1.followmanga.com", "https://img1.biggestchef.com", "https://img1.indalchef.com")
|
||||
|
||||
private val preferences: SharedPreferences by lazy {
|
||||
Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
|
||||
|
|
@ -54,19 +54,29 @@ class LectorManga : ConfigurableSource, ParsedHttpSource() {
|
|||
|
||||
private val webRateLimitInterceptor = SpecificHostRateLimitInterceptor(
|
||||
baseUrl.toHttpUrlOrNull()!!,
|
||||
preferences.getString(WEB_RATELIMIT_PREF, WEB_RATELIMIT_PREF_DEFAULT_VALUE)!!.toInt(),
|
||||
60
|
||||
preferences.getString(WEB_RATELIMIT_PREF, WEB_RATELIMIT_PREF_DEFAULT_VALUE)!!.toInt(), 60
|
||||
)
|
||||
|
||||
private val imageCDNRateLimitInterceptor = SpecificHostRateLimitInterceptor(
|
||||
imageCDNUrl.toHttpUrlOrNull()!!,
|
||||
preferences.getString(IMAGE_CDN_RATELIMIT_PREF, IMAGE_CDN_RATELIMIT_PREF_DEFAULT_VALUE)!!.toInt(),
|
||||
60
|
||||
imageCDNUrls[0].toHttpUrlOrNull()!!,
|
||||
preferences.getString(IMAGE_CDN_RATELIMIT_PREF, IMAGE_CDN_RATELIMIT_PREF_DEFAULT_VALUE)!!.toInt(), 60
|
||||
)
|
||||
|
||||
private val imageCDNRateLimitInterceptor1 = SpecificHostRateLimitInterceptor(
|
||||
imageCDNUrls[1].toHttpUrlOrNull()!!,
|
||||
preferences.getString(IMAGE_CDN_RATELIMIT_PREF, IMAGE_CDN_RATELIMIT_PREF_DEFAULT_VALUE)!!.toInt(), 60
|
||||
)
|
||||
|
||||
private val imageCDNRateLimitInterceptor2 = SpecificHostRateLimitInterceptor(
|
||||
imageCDNUrls[2].toHttpUrlOrNull()!!,
|
||||
preferences.getString(IMAGE_CDN_RATELIMIT_PREF, IMAGE_CDN_RATELIMIT_PREF_DEFAULT_VALUE)!!.toInt(), 60
|
||||
)
|
||||
|
||||
override val client: OkHttpClient = network.client.newBuilder()
|
||||
.addNetworkInterceptor(webRateLimitInterceptor)
|
||||
.addNetworkInterceptor(imageCDNRateLimitInterceptor)
|
||||
.addNetworkInterceptor(imageCDNRateLimitInterceptor1)
|
||||
.addNetworkInterceptor(imageCDNRateLimitInterceptor2)
|
||||
.build()
|
||||
|
||||
override fun popularMangaRequest(page: Int) = GET("$baseUrl/library?order_item=likes_count&order_dir=desc&type=&filter_by=title&page=$page", headers)
|
||||
|
|
@ -244,25 +254,25 @@ class LectorManga : ConfigurableSource, ParsedHttpSource() {
|
|||
val currentUrl = client.newCall(GET(chapter.url, headers)).execute().asJsoup().body().baseUri()
|
||||
|
||||
// Get /cascade instead of /paginate to get all pages at once
|
||||
val newUrl = if (getPageMethodPref() == "cascade" && currentUrl.contains("paginated")) {
|
||||
currentUrl.substringBefore("paginated") + "cascade"
|
||||
} else if (getPageMethodPref() == "paginated" && currentUrl.contains("cascade")) {
|
||||
currentUrl.substringBefore("cascade") + "paginated"
|
||||
val newUrl = if (getPageMethodPref() == PAGE_METHOD_PREF_CASCADE && currentUrl.contains(PAGE_METHOD_PREF_PAGINATED)) {
|
||||
currentUrl.substringBefore(PAGE_METHOD_PREF_PAGINATED) + PAGE_METHOD_PREF_CASCADE
|
||||
} else if (getPageMethodPref() == PAGE_METHOD_PREF_PAGINATED && currentUrl.contains(PAGE_METHOD_PREF_CASCADE)) {
|
||||
currentUrl.substringBefore(PAGE_METHOD_PREF_CASCADE) + PAGE_METHOD_PREF_PAGINATED
|
||||
} else currentUrl
|
||||
|
||||
return GET(newUrl, headers)
|
||||
}
|
||||
|
||||
override fun pageListParse(document: Document): List<Page> = mutableListOf<Page>().apply {
|
||||
if (getPageMethodPref() == "cascade") {
|
||||
if (getPageMethodPref() == PAGE_METHOD_PREF_CASCADE) {
|
||||
document.select("div.viewer-image-container img").forEach {
|
||||
add(
|
||||
Page(
|
||||
size,
|
||||
"",
|
||||
document.baseUri(),
|
||||
it.let {
|
||||
if (it.hasAttr("data-src"))
|
||||
it.attr("abs:data-src") else it.attr("abs:src")
|
||||
if (it.hasAttr("data-src")) it.attr("abs:data-src")
|
||||
else it.attr("abs:src")
|
||||
}
|
||||
)
|
||||
)
|
||||
|
|
@ -276,10 +286,15 @@ class LectorManga : ConfigurableSource, ParsedHttpSource() {
|
|||
}
|
||||
}
|
||||
|
||||
// Note: At this moment (26/08/2021) it's necessary to make the image request with headers to prevent 403.
|
||||
override fun imageRequest(page: Page) = GET(page.imageUrl!!, headers)
|
||||
override fun imageRequest(page: Page) = GET(
|
||||
url = page.imageUrl!!,
|
||||
headers = headers.newBuilder()
|
||||
.removeAll("Referer")
|
||||
.add("Referer", page.url.substringBefore("news/"))
|
||||
.build()
|
||||
)
|
||||
|
||||
override fun imageUrlParse(document: Document): String = document.select("img.viewer-image").attr("src")
|
||||
override fun imageUrlParse(document: Document): String = document.select("img.viewer-image").attr("data-src")
|
||||
|
||||
private fun searchMangaByIdRequest(id: String) = GET("$baseUrl/$MANGA_URL_CHUNK/$id", headers)
|
||||
|
||||
|
|
@ -373,7 +388,7 @@ class LectorManga : ConfigurableSource, ParsedHttpSource() {
|
|||
// Array.from(document.querySelectorAll('#advancedSearch .custom-checkbox'))
|
||||
// .map(a => `Genre("${a.querySelector('label').innerText}", "${a.querySelector('input').value}")`).join(',\n')
|
||||
// on https://lectormanga.com/library
|
||||
// Last revision 13/07/2020
|
||||
// Last revision 30/08/2021
|
||||
private fun getGenreList() = listOf(
|
||||
Genre("Acción", "1"),
|
||||
Genre("Aventura", "2"),
|
||||
|
|
@ -448,7 +463,7 @@ class LectorManga : ConfigurableSource, ParsedHttpSource() {
|
|||
key = PAGE_METHOD_PREF
|
||||
title = PAGE_METHOD_PREF_TITLE
|
||||
entries = arrayOf("Cascada", "Páginado")
|
||||
entryValues = arrayOf("cascade", "paginated")
|
||||
entryValues = arrayOf(PAGE_METHOD_PREF_CASCADE, PAGE_METHOD_PREF_PAGINATED)
|
||||
summary = PAGE_METHOD_PREF_SUMMARY
|
||||
setDefaultValue(PAGE_METHOD_PREF_DEFAULT_VALUE)
|
||||
|
||||
|
|
@ -521,7 +536,9 @@ class LectorManga : ConfigurableSource, ParsedHttpSource() {
|
|||
private const val PAGE_METHOD_PREF = "pageMethodPref"
|
||||
private const val PAGE_METHOD_PREF_TITLE = "Método para descargar imágenes"
|
||||
private const val PAGE_METHOD_PREF_SUMMARY = "Previene ser banneado por el servidor cuando se usa la configuración \"Cascada\" ya que esta reduce la cantidad de solicitudes.\nPuedes usar \"Páginado\" cuando las imágenes no carguen usando \"Cascada\".\nConfiguración actual: %s"
|
||||
private const val PAGE_METHOD_PREF_DEFAULT_VALUE = "cascade"
|
||||
private const val PAGE_METHOD_PREF_CASCADE = "cascade"
|
||||
private const val PAGE_METHOD_PREF_PAGINATED = "paginated"
|
||||
private const val PAGE_METHOD_PREF_DEFAULT_VALUE = PAGE_METHOD_PREF_CASCADE
|
||||
|
||||
private const val WEB_RATELIMIT_PREF = "webRatelimitPreference"
|
||||
// Ratelimit permits per second for main website
|
||||
|
|
|
|||
Loading…
Reference in New Issue