fix mangashiro dom (#1571)
* add kiryuu.co * add westmanga.info * fix mangashiro * Revert "add kiryuu.co" This reverts commit 68ce28b0edd4199709bc21c6e451a158d25064c4. * Revert "add westmanga.info" This reverts commit a8cf77e6c4e170ebfac144690acaa1f17f67dbcc. * Revert "fix mangashiro" This reverts commit 0b167017939898b1844cb101b91e83bd54008e47. * fix mangashiro dom * upgrade version
This commit is contained in:
Arif Ramadan
arkon
parent
92a35370cf
commit
0be56b4a1e
|
|
@ -5,7 +5,7 @@ ext {
|
|||
appName = 'Tachiyomi: Mangashiro'
|
||||
pkgNameSuffix = 'id.mangashiro'
|
||||
extClass = '.Mangashiro'
|
||||
extVersionCode = 1
|
||||
extVersionCode = 2
|
||||
libVersion = '1.2'
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,34 +13,34 @@ import java.text.ParseException
|
|||
class Mangashiro : ParsedHttpSource() {
|
||||
|
||||
override val name = "Mangashiro"
|
||||
override val baseUrl = "https://mangashiro.net"
|
||||
override val baseUrl = "https://mangashiro.org"
|
||||
override val lang = "id"
|
||||
override val supportsLatest = true
|
||||
override val client: OkHttpClient = network.cloudflareClient
|
||||
|
||||
override fun popularMangaRequest(page: Int): Request {
|
||||
return GET("$baseUrl/adv-search/page/$page/?order=popular", headers)
|
||||
return GET("$baseUrl/manga/page/$page/?order=popular", headers)
|
||||
}
|
||||
|
||||
override fun latestUpdatesRequest(page: Int): Request {
|
||||
return GET("$baseUrl/adv-search/page/$page/?order=update", headers)
|
||||
return GET("$baseUrl/manga/page/$page/?order=latest", headers)
|
||||
}
|
||||
|
||||
override fun popularMangaSelector() = "div.utao"
|
||||
override fun popularMangaSelector() = "div.bs"
|
||||
override fun latestUpdatesSelector() = popularMangaSelector()
|
||||
override fun searchMangaSelector() = popularMangaSelector()
|
||||
|
||||
override fun popularMangaFromElement(element: Element): SManga = searchMangaFromElement(element)
|
||||
override fun latestUpdatesFromElement(element: Element): SManga = searchMangaFromElement(element)
|
||||
|
||||
override fun popularMangaNextPageSelector() = "div.pagination > a.next.page-numbers"
|
||||
override fun popularMangaNextPageSelector() = "a.next.page-numbers"
|
||||
override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector()
|
||||
override fun searchMangaNextPageSelector() = popularMangaNextPageSelector()
|
||||
|
||||
override fun searchMangaFromElement(element: Element): SManga {
|
||||
val manga = SManga.create()
|
||||
manga.thumbnail_url = element.select("a.series > img").attr("src")
|
||||
element.select("div .imgu > a.series").first().let {
|
||||
manga.thumbnail_url = element.select("div.limit img").attr("src")
|
||||
element.select("div.bsx > a").first().let {
|
||||
manga.setUrlWithoutDomain(it.attr("href"))
|
||||
manga.title = it.attr("title")
|
||||
}
|
||||
|
|
@ -48,89 +48,75 @@ class Mangashiro : ParsedHttpSource() {
|
|||
}
|
||||
|
||||
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
|
||||
val url = HttpUrl.parse("$baseUrl/adv-search/page/$page/")!!.newBuilder()
|
||||
|
||||
val pattern = "\\s+".toRegex()
|
||||
val q = query.replace(pattern, "+")
|
||||
if (query.length > 0) {
|
||||
url.addQueryParameter("title", q)
|
||||
} else {
|
||||
url.addQueryParameter("title", "")
|
||||
}
|
||||
var orderBy = ""
|
||||
|
||||
(if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
|
||||
val builtUrl = if (page == 1) "$baseUrl/manga/" else "$baseUrl/manga/page/$page/"
|
||||
val url = HttpUrl.parse(builtUrl)!!.newBuilder()
|
||||
url.addQueryParameter("title", query)
|
||||
url.addQueryParameter("page", page.toString())
|
||||
filters.forEach { filter ->
|
||||
when (filter) {
|
||||
is GenreList -> {
|
||||
val genreInclude = mutableListOf<String>()
|
||||
filter.state.forEach {
|
||||
if (it.state == 1) {
|
||||
genreInclude.add(it.id)
|
||||
}
|
||||
}
|
||||
if (genreInclude.isNotEmpty()) {
|
||||
genreInclude.forEach { genre ->
|
||||
url.addQueryParameter("genre[]", genre)
|
||||
}
|
||||
}
|
||||
is AuthorFilter -> {
|
||||
url.addQueryParameter("author", filter.state)
|
||||
}
|
||||
|
||||
is SortBy -> {
|
||||
orderBy = filter.toUriPart();
|
||||
url.addQueryParameter("order", orderBy)
|
||||
is YearFilter -> {
|
||||
url.addQueryParameter("yearx", filter.state)
|
||||
}
|
||||
is StatusFilter -> {
|
||||
val status = when (filter.state) {
|
||||
Filter.TriState.STATE_INCLUDE -> "completed"
|
||||
Filter.TriState.STATE_EXCLUDE -> "ongoing"
|
||||
else -> ""
|
||||
}
|
||||
url.addQueryParameter("status", status)
|
||||
}
|
||||
is TypeFilter -> {
|
||||
url.addQueryParameter("type", filter.toUriPart())
|
||||
}
|
||||
is SortByFilter -> {
|
||||
url.addQueryParameter("order", filter.toUriPart())
|
||||
}
|
||||
is GenreListFilter -> {
|
||||
filter.state
|
||||
.filter { it.state != Filter.TriState.STATE_IGNORE }
|
||||
.forEach { url.addQueryParameter("genre[]", it.id) }
|
||||
}
|
||||
}
|
||||
}
|
||||
return GET(url.toString(), headers)
|
||||
return GET(url.build().toString(), headers)
|
||||
}
|
||||
|
||||
|
||||
override fun mangaDetailsParse(document: Document): SManga {
|
||||
val infoElement = document.select("div#content").first()
|
||||
val sepName = infoElement.select("div.listinfo > ul > li:nth-child(2)").last()
|
||||
|
||||
val infoElement = document.select("div.spe").first()
|
||||
val descElement = document.select(".infox > div.desc").first()
|
||||
val sepName = infoElement.select(".spe > span:nth-child(3)").last()
|
||||
val manga = SManga.create()
|
||||
manga.author = sepName.ownText().trim()
|
||||
manga.artist = sepName.ownText().trim()
|
||||
|
||||
manga.author = sepName.ownText()
|
||||
manga.artist = sepName.ownText()
|
||||
val genres = mutableListOf<String>()
|
||||
infoElement.select("div.gnr a").forEach { element ->
|
||||
infoElement.select(".spe > span:nth-child(1) > a").forEach { element ->
|
||||
val genre = element.text()
|
||||
genres.add(genre)
|
||||
}
|
||||
|
||||
manga.genre = genres.joinToString(", ")
|
||||
|
||||
manga.status = parseStatus(infoElement.select("div.listinfo > ul > li:nth-child(4)").text())
|
||||
|
||||
manga.description = document.select("span.desc > p")?.text()
|
||||
manga.thumbnail_url = document.select("div.side.infomanga > div > img").attr("src")
|
||||
|
||||
manga.status = parseStatus(infoElement.select(".spe > span:nth-child(2)").text())
|
||||
manga.description = descElement.select("p").text()
|
||||
manga.thumbnail_url = document.select(".thumb > img:nth-child(1)").attr("src")
|
||||
return manga
|
||||
}
|
||||
|
||||
private fun parseStatus(element: String): Int = when {
|
||||
|
||||
element.toLowerCase().contains("ongoing") -> SManga.ONGOING
|
||||
element.toLowerCase().contains("completed") -> SManga.COMPLETED
|
||||
else -> SManga.UNKNOWN
|
||||
}
|
||||
|
||||
override fun chapterListSelector() = "li > div.rg > div.lch"
|
||||
override fun chapterListSelector() = "div.bxcl ul li"
|
||||
|
||||
override fun chapterFromElement(element: Element): SChapter {
|
||||
val urlElement = element.select("a").first()
|
||||
val urlElement = element.select(".lchx > a").first()
|
||||
val chapter = SChapter.create()
|
||||
chapter.setUrlWithoutDomain(urlElement.attr("href"))
|
||||
chapter.name = urlElement.text()
|
||||
chapter.date_upload = element.select("li:nth-child(8) > time:nth-child(2)").last()?.text()?.let {
|
||||
try {
|
||||
SimpleDateFormat("MMMM d, yyyy", Locale.US).parse(it).time
|
||||
} catch (e: ParseException) {
|
||||
SimpleDateFormat("yyyy-MM-dd", Locale.US).parse(it).time
|
||||
}
|
||||
|
||||
} ?: 0
|
||||
chapter.date_upload = 0
|
||||
return chapter
|
||||
}
|
||||
|
||||
|
|
@ -168,27 +154,45 @@ class Mangashiro : ParsedHttpSource() {
|
|||
return GET(page.imageUrl!!, imgHeader)
|
||||
}
|
||||
|
||||
private class TextField(name: String, val key: String) : Filter.Text(name)
|
||||
private class AuthorFilter : Filter.Text("Author")
|
||||
|
||||
private class SortBy : UriPartFilter("Sort by", arrayOf(
|
||||
Pair("A-Z", "title"),
|
||||
Pair("Z-A", "titlereverse"),
|
||||
Pair("Latest Update", "update"),
|
||||
Pair("Latest Added", "latest"),
|
||||
Pair("Popular", "popular")
|
||||
private class YearFilter : Filter.Text("Year")
|
||||
|
||||
private class TypeFilter : UriPartFilter("Type", arrayOf(
|
||||
Pair("Default", ""),
|
||||
Pair("Manga", "Manga"),
|
||||
Pair("Manhwa", "Manhwa"),
|
||||
Pair("Manhua", "Manhua"),
|
||||
Pair("Comic", "Comic")
|
||||
))
|
||||
|
||||
private class SortByFilter : UriPartFilter("Sort By", arrayOf(
|
||||
Pair("Default", ""),
|
||||
Pair("A-Z", "title"),
|
||||
Pair("Z-A", "titlereverse"),
|
||||
Pair("Latest Update", "update"),
|
||||
Pair("Latest Added", "latest"),
|
||||
Pair("Popular", "popular")
|
||||
))
|
||||
|
||||
private class StatusFilter : UriPartFilter("Status", arrayOf(
|
||||
Pair("All", ""),
|
||||
Pair("Ongoing", "ongoing"),
|
||||
Pair("Completed", "completed")
|
||||
))
|
||||
|
||||
private class Genre(name: String, val id: String = name) : Filter.TriState(name)
|
||||
private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Genres", genres)
|
||||
private class Status(name: String, val id: String = name) : Filter.TriState(name)
|
||||
private class StatusList(statuses: List<Status>) : Filter.Group<Status>("Status", statuses)
|
||||
private class GenreListFilter(genres: List<Genre>) : Filter.Group<Genre>("Genre", genres)
|
||||
|
||||
override fun getFilterList() = FilterList(
|
||||
Filter.Separator(),
|
||||
SortBy(),
|
||||
Filter.Separator(),
|
||||
//StatusList(getStatusList()),
|
||||
GenreList(getGenreList())
|
||||
Filter.Header("NOTE: Ignored if using text search!"),
|
||||
Filter.Separator(),
|
||||
AuthorFilter(),
|
||||
YearFilter(),
|
||||
StatusFilter(),
|
||||
TypeFilter(),
|
||||
SortByFilter(),
|
||||
GenreListFilter(getGenreList())
|
||||
)
|
||||
|
||||
private fun getGenreList() = listOf(
|
||||
|
|
|
|||
Loading…
Reference in New Issue