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

Fix for ExHentai

Browse Source
This commit is contained in:
jobobby04 2024-10-26 18:57:18 +00:00 committed by Jobobby04
parent f3e905513f
commit b48556aa9f
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
View File

@ -449,7 +449,11 @@ class EHentai(
private fun parseChapterPage(response: Element) = with(response) { private fun parseChapterPage(response: Element) = with(response) {
select(".gdtm a").map { select(".gdtm a").map {
Pair(it.child(0).attr("alt").toInt(), it.attr("href")) Pair(it.child(0).attr("alt").toInt(), it.attr("href"))
}.sortedBy(Pair<Int, String>::first).map { it.second } }.plus(
select("#gdt a").map {
Pair(it.child(0).attr("title").removePrefix("Page ").substringBefore(":").toInt(), it.attr("href"))
}
).sortedBy(Pair<Int, String>::first).map { it.second }
} }
private fun chapterPageCall(np: String): Observable<Response> { private fun chapterPageCall(np: String): Observable<Response> {
@ -1214,7 +1218,8 @@ class EHentai(
val body = doc.body() val body = doc.body()
val previews = body val previews = body
.select("#gdt div div") .select("#gdt > div > div")
.plus(body.select("#gdt > a"))
.map { .map {
val preview = parseNormalPreview(it) val preview = parseNormalPreview(it)
PagePreviewInfo(preview.index, imageUrl = preview.toUrl()) PagePreviewInfo(preview.index, imageUrl = preview.toUrl())
@ -1250,8 +1255,15 @@ class EHentai(
* Parse normal previews with regular expressions * Parse normal previews with regular expressions
*/ */
private fun parseNormalPreview(element: Element): EHentaiThumbnailPreview { private fun parseNormalPreview(element: Element): EHentaiThumbnailPreview {
val index = element.selectFirst("img")!!.attr("alt").toInt() val imgElement = element.selectFirst("img")
val styles = element.attr("style").split(";").mapNotNull { it.trimOrNull() } val index = imgElement?.attr("alt")?.toInt()
?: element.child(0).attr("title").removePrefix("Page ").substringBefore(":").toInt()
val styleElement = if (imgElement != null) {
element
} else {
element.child(0)
}
val styles = styleElement.attr("style").split(";").mapNotNull { it.trimOrNull() }
val width = styles.first { it.startsWith("width:") } val width = styles.first { it.startsWith("width:") }
.removePrefix("width:") .removePrefix("width:")
.removeSuffix("px") .removeSuffix("px")
@ -1275,7 +1287,7 @@ class EHentai(
.removeSuffix("px") .removeSuffix("px")
.toInt() .toInt()
return EHentaiThumbnailPreview(url, width, height, widthOffset, index).also(::println) return EHentaiThumbnailPreview(url, width, height, widthOffset, index)
} }
data class EHentaiThumbnailPreview( data class EHentaiThumbnailPreview(
val imageUrl: String, val imageUrl: String,