Mangasee - parse thumbnails on browse (#2629)

Mangasee - parse thumbnails on browse
This commit is contained in:
Mike 2020-04-09 19:05:55 -04:00 committed by GitHub
parent 2154393ca7
commit d4f1185c53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 9 deletions

View File

@ -5,7 +5,7 @@ ext {
appName = 'Tachiyomi: Mangasee' appName = 'Tachiyomi: Mangasee'
pkgNameSuffix = 'en.mangasee' pkgNameSuffix = 'en.mangasee'
extClass = '.Mangasee' extClass = '.Mangasee'
extVersionCode = 5 extVersionCode = 6
libVersion = '1.2' libVersion = '1.2'
} }

View File

@ -14,6 +14,7 @@ import org.jsoup.nodes.Document
import org.jsoup.nodes.Element import org.jsoup.nodes.Element
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.regex.Pattern import java.util.regex.Pattern
import java.util.Locale
class Mangasee : ParsedHttpSource() { class Mangasee : ParsedHttpSource() {
@ -44,6 +45,7 @@ class Mangasee : ParsedHttpSource() {
manga.setUrlWithoutDomain(it.attr("href")) manga.setUrlWithoutDomain(it.attr("href"))
manga.title = it.text() manga.title = it.text()
} }
manga.thumbnail_url = element.select("img").attr("abs:src")
return manga return manga
} }
@ -65,7 +67,7 @@ class Mangasee : ParsedHttpSource() {
url.addQueryParameter("sortOrder", "descending") url.addQueryParameter("sortOrder", "descending")
} }
is SelectField -> if (filter.state != 0) url.addQueryParameter(filter.key, filter.values[filter.state]) is SelectField -> if (filter.state != 0) url.addQueryParameter(filter.key, filter.values[filter.state])
is TextField -> if (!filter.state.isEmpty()) url.addQueryParameter(filter.key, filter.state) is TextField -> if (filter.state.isNotEmpty()) url.addQueryParameter(filter.key, filter.state)
is GenreList -> filter.state.forEach { genre -> is GenreList -> filter.state.forEach { genre ->
when (genre.state) { when (genre.state) {
Filter.TriState.STATE_INCLUDE -> genres.add(genre.name) Filter.TriState.STATE_INCLUDE -> genres.add(genre.name)
@ -81,8 +83,8 @@ class Mangasee : ParsedHttpSource() {
return POST(requestUrl, headers, body.build()) return POST(requestUrl, headers, body.build())
} }
private fun convertQueryToPost(page: Int, url: String): Pair<FormBody.Builder, String> { private fun convertQueryToPost(page: Int, urlString: String): Pair<FormBody.Builder, String> {
val url = HttpUrl.parse(url)!! val url = HttpUrl.parse(urlString)!!
val body = FormBody.Builder().add("page", page.toString()) val body = FormBody.Builder().add("page", page.toString())
for (i in 0 until url.querySize()) { for (i in 0 until url.querySize()) {
body.add(url.queryParameterName(i), url.queryParameterValue(i)) body.add(url.queryParameterName(i), url.queryParameterValue(i))
@ -97,6 +99,7 @@ class Mangasee : ParsedHttpSource() {
manga.setUrlWithoutDomain(it.attr("href")) manga.setUrlWithoutDomain(it.attr("href"))
manga.title = it.text() manga.title = it.text()
} }
manga.thumbnail_url = element.select("img").attr("abs:src")
return manga return manga
} }
@ -107,7 +110,7 @@ class Mangasee : ParsedHttpSource() {
val manga = SManga.create() val manga = SManga.create()
manga.author = detailElement.select("a[href^=/search/?author=]").first()?.text() manga.author = detailElement.select("a[href^=/search/?author=]").first()?.text()
manga.genre = detailElement.select("span.details > div.row > div:has(b:contains(Genre(s))) > a").map { it.text() }.joinToString() manga.genre = detailElement.select("span.details > div.row > div:has(b:contains(Genre(s))) > a").joinToString { it.text() }
manga.description = detailElement.select("strong:contains(Description:) + div").first()?.text() manga.description = detailElement.select("strong:contains(Description:) + div").first()?.text()
manga.status = detailElement.select("a[href^=/search/?status=]").first()?.text().orEmpty().let { parseStatus(it) } manga.status = detailElement.select("a[href^=/search/?status=]").first()?.text().orEmpty().let { parseStatus(it) }
manga.thumbnail_url = detailElement.select("div > img").first()?.absUrl("src") manga.thumbnail_url = detailElement.select("div > img").first()?.absUrl("src")
@ -127,13 +130,13 @@ class Mangasee : ParsedHttpSource() {
val chapter = SChapter.create() val chapter = SChapter.create()
chapter.setUrlWithoutDomain(urlElement.attr("href")) chapter.setUrlWithoutDomain(urlElement.attr("href"))
chapter.name = element.select("span.chapterLabel").first().text()?.let { it } ?: "" chapter.name = element.select("span.chapterLabel").firstOrNull()?.text() ?: ""
chapter.date_upload = element.select("time").first()?.attr("datetime")?.let { parseChapterDate(it) } ?: 0 chapter.date_upload = element.select("time").first()?.attr("datetime")?.let { parseChapterDate(it) } ?: 0
return chapter return chapter
} }
private fun parseChapterDate(dateAsString: String): Long { private fun parseChapterDate(dateAsString: String): Long {
return SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").parse(dateAsString).time return SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.US).parse(dateAsString).time
} }
override fun pageListParse(document: Document): List<Page> { override fun pageListParse(document: Document): List<Page> {
@ -152,7 +155,7 @@ class Mangasee : ParsedHttpSource() {
index = "-index-$indexNumber" index = "-index-$indexNumber"
} }
document.select("div.ContainerNav").first().select("select.PageSelect > option").forEach { document.select("div.ContainerNav").first().select("select.PageSelect > option").forEach { _ ->
pages.add(Page(pages.size, "$url/$series-chapter-$chapter$index-page-${pages.size + 1}.html")) pages.add(Page(pages.size, "$url/$series-chapter-$chapter$index-page-${pages.size + 1}.html"))
} }
pages.getOrNull(0)?.imageUrl = imageUrlParse(document) pages.getOrNull(0)?.imageUrl = imageUrlParse(document)
@ -184,10 +187,11 @@ class Mangasee : ParsedHttpSource() {
manga.setUrlWithoutDomain("/manga$mangaUrl") manga.setUrlWithoutDomain("/manga$mangaUrl")
manga.title = title manga.title = title
} }
manga.thumbnail_url = element.select("img").attr("abs:src")
return manga return manga
} }
private class Sort : Filter.Sort("Sort", arrayOf("Alphabetically", "Date updated", "Popularity"), Filter.Sort.Selection(2, false)) private class Sort : Filter.Sort("Sort", arrayOf("Alphabetically", "Date updated", "Popularity"), Selection(2, false))
private class Genre(name: String) : Filter.TriState(name) private class Genre(name: String) : Filter.TriState(name)
private class TextField(name: String, val key: String) : Filter.Text(name) private class TextField(name: String, val key: String) : Filter.Text(name)
private class SelectField(name: String, val key: String, values: Array<String>, state: Int = 0) : Filter.Select<String>(name, values, state) private class SelectField(name: String, val key: String, values: Array<String>, state: Int = 0) : Filter.Select<String>(name, values, state)