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

MMRCMS parsing fix (#1983) 

* MMRCMS parsing fix

* Genres
This commit is contained in:
Mike 2020-01-05 16:43:59 -05:00 committed by arkon
parent 57a03a182e
commit 9c74b76642
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all/mmrcms/build.gradle
View File

@ -5,7 +5,7 @@ ext {
appName = 'Tachiyomi: My Manga Reader CMS (Many sources)' appName = 'Tachiyomi: My Manga Reader CMS (Many sources)'
pkgNameSuffix = 'all.mmrcms' pkgNameSuffix = 'all.mmrcms'
extClass = '.MyMangaReaderCMSSources' extClass = '.MyMangaReaderCMSSources'
extVersionCode = 25 extVersionCode = 26
libVersion = '1.2' libVersion = '1.2'
} }

24
src/all/mmrcms/src/eu/kanade/tachiyomi/extension/all/mmrcms/MyMangaReaderCMSSource.kt
View File

@ -108,8 +108,8 @@ class MyMangaReaderCMSSource(override val lang: String,
} }
// Guess thumbnails on broken websites // Guess thumbnails on broken websites
private fun coverGuess(url: String, mangaUrl: String): String { private fun coverGuess(url: String?, mangaUrl: String): String? {
return if (url.endsWith("no-image.png")) { return if (url?.endsWith("no-image.png") == true) {
"$baseUrl/uploads/manga/${mangaUrl.substringAfterLast('/')}/cover/cover_250x350.jpg" "$baseUrl/uploads/manga/${mangaUrl.substringAfterLast('/')}/cover/cover_250x350.jpg"
} else { } else {
url url
@ -142,7 +142,7 @@ class MyMangaReaderCMSSource(override val lang: String,
override fun mangaDetailsParse(response: Response) = SManga.create().apply { override fun mangaDetailsParse(response: Response) = SManga.create().apply {
val document = response.asJsoup() val document = response.asJsoup()
title = document.getElementsByClass("widget-title").text().trim() title = document.getElementsByClass("widget-title").text().trim()
thumbnail_url = coverGuess(document.select(".row .img-responsive").attr("abs:src"), document.location()) thumbnail_url = coverGuess(document.select(".row [class^=img-responsive]").firstOrNull()?.attr("abs:src"), document.location())
description = document.select(".row .well p").text().trim() description = document.select(".row .well p").text().trim()
val detailAuthor = setOf("author(s)","autor(es)","auteur(s)","著作","yazar(lar)","mangaka(lar)","pengarang/penulis","pengarang","penulis","autor","المؤلف","перевод") val detailAuthor = setOf("author(s)","autor(es)","auteur(s)","著作","yazar(lar)","mangaka(lar)","pengarang/penulis","pengarang","penulis","autor","المؤلف","перевод")
@ -153,25 +153,21 @@ class MyMangaReaderCMSSource(override val lang: String,
val detailStatusOngoing = setOf("ongoing","مستمرة","en cours","em lançamento") val detailStatusOngoing = setOf("ongoing","مستمرة","en cours","em lançamento")
val detailDescription = setOf("description","resumen") val detailDescription = setOf("description","resumen")
var cur: String? = null for (element in document.select(".row .dl-horizontal dt")) {
for (element in document.select(".row .dl-horizontal").select("dt,dd")) { when (element.text().trim().toLowerCase()) {
when (element.tagName()) { in detailAuthor -> author = element.nextElementSibling().text()
"dt" -> cur = element.text().trim().toLowerCase() in detailArtist -> artist = element.nextElementSibling().text()
"dd" -> when (cur) { in detailGenre-> genre = element.nextElementSibling().select("a").joinToString {
in detailAuthor -> author = element.text()
in detailArtist -> artist = element.text()
in detailGenre-> genre = element.getElementsByTag("a").joinToString {
it.text().trim() it.text().trim()
} }
in detailStatus -> status = when (element.text().trim().toLowerCase()) { in detailStatus -> status = when (element.nextElementSibling().text().trim().toLowerCase()) {
in detailStatusComplete -> SManga.COMPLETED in detailStatusComplete -> SManga.COMPLETED
in detailStatusOngoing -> SManga.ONGOING in detailStatusOngoing -> SManga.ONGOING
else -> SManga.UNKNOWN else -> SManga.UNKNOWN
} }
} }
} }
} // When details are in a .panel instead of .row (ES sources)
// When details are in a .panel instead of .row
for (element in document.select("div.panel span.list-group-item")) { for (element in document.select("div.panel span.list-group-item")) {
when (element.select("b").text().toLowerCase().substringBefore(":")) { when (element.select("b").text().toLowerCase().substringBefore(":")) {
in detailAuthor -> author = element.select("b + a").text() in detailAuthor -> author = element.select("b + a").text()