Draff/Tachiyomi-Extensions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mangahere - fix pages (#2696)

Browse Source 
Mangahere - fix pages
This commit is contained in:
Mike 2020-04-17 16:57:52 -04:00 committed by GitHub
parent f6c0ebe2cf
commit 52da22ba09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/en/mangahere/build.gradle
View File

@ -5,7 +5,7 @@ ext {
appName = 'Tachiyomi: Mangahere' appName = 'Tachiyomi: Mangahere'
pkgNameSuffix = 'en.mangahere' pkgNameSuffix = 'en.mangahere'
extClass = '.Mangahere' extClass = '.Mangahere'
extVersionCode = 13 extVersionCode = 14
libVersion = '1.2' libVersion = '1.2'
} }

42
src/en/mangahere/src/eu/kanade/tachiyomi/extension/en/mangahere/Mangahere.kt
View File

@ -197,6 +197,25 @@ class Mangahere : ParsedHttpSource() {
val bar = document.select("script[src*=chapter_bar]") val bar = document.select("script[src*=chapter_bar]")
val duktape = Duktape.create() val duktape = Duktape.create()
/*
function to drop last imageUrl if it's broken/unneccesary, working imageUrls are incremental (e.g. t001, t002, etc); if the difference between
the last two isn't 1 or doesn't have an Int at the end of the last imageUrl's filename, drop last Page
*/
fun List<Page>.dropLastIfBroken(): List<Page> {
val list = this.takeLast(2).map { page ->
try {
page.imageUrl!!.substringBeforeLast(".").substringAfterLast("/").takeLast(2).toInt()
} catch (_: NumberFormatException) {
return this.dropLast(1)
}
}
return when {
list[0] == 0 && 100 - list[1] == 1 -> this
list[1] - list[0] == 1 -> this
else -> this.dropLast(1)
}
}
// if-branch is for webtoon reader, else is for page-by-page // if-branch is for webtoon reader, else is for page-by-page
return if (bar.isNotEmpty()) { return if (bar.isNotEmpty()) {
val script = document.select("script:containsData(function(p,a,c,k,e,d))").html().removePrefix("eval") val script = document.select("script:containsData(function(p,a,c,k,e,d))").html().removePrefix("eval")
@ -204,24 +223,7 @@ class Mangahere : ParsedHttpSource() {
val urls = deobfuscatedScript.substringAfter("newImgs=['").substringBefore("'];").split("','") val urls = deobfuscatedScript.substringAfter("newImgs=['").substringBefore("'];").split("','")
duktape.close() duktape.close()
/* urls.mapIndexed { index, s -> Page(index, "", "https:$s") }
last webtoon imageUrl is usually broken, working imageUrls are incremental (e.g. t001, t002, etc); if the difference between
the last two isn't 1 or doesn't have an Int at the end of the last imageUrl's filename, drop last Page
*/
urls.mapIndexed { index, s -> Page(index, "", "https:$s") }.let { pages ->
val list = pages.takeLast(2).map { page ->
try {
page.imageUrl!!.substringBeforeLast(".").substringAfterLast("/").takeLast(2).toInt()
} catch (_: NumberFormatException) {
return pages.dropLast(1)
}
}
when {
list[0] == 0 && 100 - list[1] == 1 -> pages
list[1] - list[0] == 1 -> pages
else -> pages.dropLast(1)
}
}
} else { } else {
val html = document.html() val html = document.html()
val link = document.location() val link = document.location()
@ -281,7 +283,9 @@ class Mangahere : ParsedHttpSource() {
Page(i - 1, "", "https:$baseLink$imageLink") Page(i - 1, "", "https:$baseLink$imageLink")
} }
}.also { duktape.close() } }
.dropLastIfBroken()
.also { duktape.close() }
} }
private fun extractSecretKey(html: String, duktape: Duktape): String { private fun extractSecretKey(html: String, duktape: Duktape): String {