From cbf9410e48bb7775b23d5f8d47a57a42a3539362 Mon Sep 17 00:00:00 2001
From: bapeey <90949336+bapeey@users.noreply.github.com>
Date: Wed, 10 Jan 2024 01:27:51 -0500
Subject: [PATCH] TMO and LectorManga: Fix occasionally "No pages found"
(again) (#64)
---
src/es/lectormanga/build.gradle | 2 +-
.../extension/es/lectormanga/LectorManga.kt | 65 ++++++++++++++-----
src/es/tumangaonline/build.gradle | 2 +-
.../es/tumangaonline/TuMangaOnline.kt | 65 ++++++++++++++-----
4 files changed, 100 insertions(+), 34 deletions(-)
diff --git a/src/es/lectormanga/build.gradle b/src/es/lectormanga/build.gradle
index 0707aa860..0b78f9865 100755
--- a/src/es/lectormanga/build.gradle
+++ b/src/es/lectormanga/build.gradle
@@ -5,7 +5,7 @@ ext {
extName = 'LectorManga'
pkgNameSuffix = 'es.lectormanga'
extClass = '.LectorManga'
- extVersionCode = 32
+ extVersionCode = 33
isNsfw = true
}
diff --git a/src/es/lectormanga/src/eu/kanade/tachiyomi/extension/es/lectormanga/LectorManga.kt b/src/es/lectormanga/src/eu/kanade/tachiyomi/extension/es/lectormanga/LectorManga.kt
index f308a342e..0a1e52cba 100755
--- a/src/es/lectormanga/src/eu/kanade/tachiyomi/extension/es/lectormanga/LectorManga.kt
+++ b/src/es/lectormanga/src/eu/kanade/tachiyomi/extension/es/lectormanga/LectorManga.kt
@@ -303,7 +303,10 @@ class LectorManga : ConfigurableSource, ParsedHttpSource() {
}
if (currentUrl != newUrl) {
- doc = client.newCall(GET(newUrl, headers)).execute().asJsoup()
+ val redirectHeaders = super.headersBuilder()
+ .set("Referer", doc.location())
+ .build()
+ doc = client.newCall(GET(newUrl, redirectHeaders)).execute().asJsoup()
}
doc.select("div.viewer-container img:not(noscript img)").forEach {
@@ -323,50 +326,80 @@ class LectorManga : ConfigurableSource, ParsedHttpSource() {
}
}
- // Some chapters uses JavaScript to redirect to read page
private fun redirectToReadPage(document: Document): Document {
val script1 = document.selectFirst("script:containsData(uniqid)")
val script2 = document.selectFirst("script:containsData(window.location.replace)")
val script3 = document.selectFirst("script:containsData(redirectUrl)")
+ val script4 = document.selectFirst("input#redir")
+ val script5 = document.selectFirst("script:containsData(window.opener):containsData(location.replace)")
- val redirectHeaders = Headers.Builder()
- .add("Referer", document.baseUri())
+ val redirectHeaders = super.headersBuilder()
+ .set("Referer", document.location())
.build()
if (script1 != null) {
val data = script1.data()
val regexParams = """\{uniqid:'(.+)',cascade:(.+)\}""".toRegex()
val regexAction = """form\.action\s?=\s?'(.+)'""".toRegex()
- val params = regexParams.find(data)!!
- val action = regexAction.find(data)!!.groupValues[1]
+ val params = regexParams.find(data)
+ val action = regexAction.find(data)?.groupValues?.get(1)?.unescapeUrl()
- val formBody = FormBody.Builder()
- .add("uniqid", params.groupValues[1])
- .add("cascade", params.groupValues[2])
- .build()
-
- return redirectToReadPage(client.newCall(POST(action, redirectHeaders, formBody)).execute().asJsoup())
+ if (params != null && action != null) {
+ val formBody = FormBody.Builder()
+ .add("uniqid", params.groupValues[1])
+ .add("cascade", params.groupValues[2])
+ .build()
+ return redirectToReadPage(client.newCall(POST(action, redirectHeaders, formBody)).execute().asJsoup())
+ }
}
if (script2 != null) {
val data = script2.data()
- val regexRedirect = """window\.location\.replace\('(.+)'\)""".toRegex()
- val url = regexRedirect.find(data)!!.groupValues[1]
+ val regexRedirect = """window\.location\.replace\(['"](.+)['"]\)""".toRegex()
+ val url = regexRedirect.find(data)?.groupValues?.get(1)?.unescapeUrl()
- return redirectToReadPage(client.newCall(GET(url, redirectHeaders)).execute().asJsoup())
+ if (url != null) {
+ return redirectToReadPage(client.newCall(GET(url, redirectHeaders)).execute().asJsoup())
+ }
}
if (script3 != null) {
val data = script3.data()
val regexRedirect = """redirectUrl\s?=\s?'(.+)'""".toRegex()
- val url = regexRedirect.find(data)!!.groupValues[1]
+ val url = regexRedirect.find(data)?.groupValues?.get(1)?.unescapeUrl()
+
+ if (url != null) {
+ return redirectToReadPage(client.newCall(GET(url, redirectHeaders)).execute().asJsoup())
+ }
+ }
+
+ if (script4 != null) {
+ val url = script4.attr("value").unescapeUrl()
return redirectToReadPage(client.newCall(GET(url, redirectHeaders)).execute().asJsoup())
}
+ if (script5 != null) {
+ val data = script5.data()
+ val regexRedirect = """;[^.]location\.replace\(['"](.+)['"]\)""".toRegex()
+ val url = regexRedirect.find(data)?.groupValues?.get(1)?.unescapeUrl()
+
+ if (url != null) {
+ return redirectToReadPage(client.newCall(GET(url, redirectHeaders)).execute().asJsoup())
+ }
+ }
+
return document
}
+ private fun String.unescapeUrl(): String {
+ return if (this.startsWith("http:\\/\\/") || this.startsWith("https:\\/\\/")) {
+ this.replace("\\/", "/")
+ } else {
+ this
+ }
+ }
+
override fun imageRequest(page: Page) = GET(
url = page.imageUrl!!,
headers = headers.newBuilder()
diff --git a/src/es/tumangaonline/build.gradle b/src/es/tumangaonline/build.gradle
index 29ea5d1d0..49e6f6537 100644
--- a/src/es/tumangaonline/build.gradle
+++ b/src/es/tumangaonline/build.gradle
@@ -5,7 +5,7 @@ ext {
extName = 'TuMangaOnline'
pkgNameSuffix = 'es.tumangaonline'
extClass = '.TuMangaOnline'
- extVersionCode = 47
+ extVersionCode = 48
isNsfw = true
}
diff --git a/src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt b/src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt
index 27ca28ecd..b85d50d8d 100644
--- a/src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt
+++ b/src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt
@@ -279,7 +279,10 @@ class TuMangaOnline : ConfigurableSource, ParsedHttpSource() {
}
if (currentUrl != newUrl) {
- doc = client.newCall(GET(newUrl, headers)).execute().asJsoup()
+ val redirectHeaders = super.headersBuilder()
+ .set("Referer", doc.location())
+ .build()
+ doc = client.newCall(GET(newUrl, redirectHeaders)).execute().asJsoup()
}
doc.select("div.viewer-container img:not(noscript img)").forEach {
@@ -299,50 +302,80 @@ class TuMangaOnline : ConfigurableSource, ParsedHttpSource() {
}
}
- // Some chapters uses JavaScript to redirect to read page
private fun redirectToReadPage(document: Document): Document {
val script1 = document.selectFirst("script:containsData(uniqid)")
val script2 = document.selectFirst("script:containsData(window.location.replace)")
val script3 = document.selectFirst("script:containsData(redirectUrl)")
+ val script4 = document.selectFirst("input#redir")
+ val script5 = document.selectFirst("script:containsData(window.opener):containsData(location.replace)")
- val redirectHeaders = Headers.Builder()
- .add("Referer", document.baseUri())
+ val redirectHeaders = super.headersBuilder()
+ .set("Referer", document.location())
.build()
if (script1 != null) {
val data = script1.data()
val regexParams = """\{uniqid:'(.+)',cascade:(.+)\}""".toRegex()
val regexAction = """form\.action\s?=\s?'(.+)'""".toRegex()
- val params = regexParams.find(data)!!
- val action = regexAction.find(data)!!.groupValues[1]
+ val params = regexParams.find(data)
+ val action = regexAction.find(data)?.groupValues?.get(1)?.unescapeUrl()
- val formBody = FormBody.Builder()
- .add("uniqid", params.groupValues[1])
- .add("cascade", params.groupValues[2])
- .build()
-
- return redirectToReadPage(client.newCall(POST(action, redirectHeaders, formBody)).execute().asJsoup())
+ if (params != null && action != null) {
+ val formBody = FormBody.Builder()
+ .add("uniqid", params.groupValues[1])
+ .add("cascade", params.groupValues[2])
+ .build()
+ return redirectToReadPage(client.newCall(POST(action, redirectHeaders, formBody)).execute().asJsoup())
+ }
}
if (script2 != null) {
val data = script2.data()
- val regexRedirect = """window\.location\.replace\('(.+)'\)""".toRegex()
- val url = regexRedirect.find(data)!!.groupValues[1]
+ val regexRedirect = """window\.location\.replace\(['"](.+)['"]\)""".toRegex()
+ val url = regexRedirect.find(data)?.groupValues?.get(1)?.unescapeUrl()
- return redirectToReadPage(client.newCall(GET(url, redirectHeaders)).execute().asJsoup())
+ if (url != null) {
+ return redirectToReadPage(client.newCall(GET(url, redirectHeaders)).execute().asJsoup())
+ }
}
if (script3 != null) {
val data = script3.data()
val regexRedirect = """redirectUrl\s?=\s?'(.+)'""".toRegex()
- val url = regexRedirect.find(data)!!.groupValues[1]
+ val url = regexRedirect.find(data)?.groupValues?.get(1)?.unescapeUrl()
+
+ if (url != null) {
+ return redirectToReadPage(client.newCall(GET(url, redirectHeaders)).execute().asJsoup())
+ }
+ }
+
+ if (script4 != null) {
+ val url = script4.attr("value").unescapeUrl()
return redirectToReadPage(client.newCall(GET(url, redirectHeaders)).execute().asJsoup())
}
+ if (script5 != null) {
+ val data = script5.data()
+ val regexRedirect = """;[^.]location\.replace\(['"](.+)['"]\)""".toRegex()
+ val url = regexRedirect.find(data)?.groupValues?.get(1)?.unescapeUrl()
+
+ if (url != null) {
+ return redirectToReadPage(client.newCall(GET(url, redirectHeaders)).execute().asJsoup())
+ }
+ }
+
return document
}
+ private fun String.unescapeUrl(): String {
+ return if (this.startsWith("http:\\/\\/") || this.startsWith("https:\\/\\/")) {
+ this.replace("\\/", "/")
+ } else {
+ this
+ }
+ }
+
// Note: At this moment (05/04/2023) it's necessary to make the image request with headers to prevent 403.
override fun imageRequest(page: Page): Request {
val imageHeaders = Headers.Builder()