Update Manga1s for new design (#10300)
* Update Manga1s * Update src/en/manga1s/src/eu/kanade/tachiyomi/extension/en/manga1s/manga1s.kt Co-authored-by: Alessandro Jean <alessandrojean@gmail.com> Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
This commit is contained in:
Vetle Ledaal
GitHub
parent
e9423902c2
commit
25127cde10
|
|
@ -5,7 +5,7 @@ ext {
|
||||||
extName = 'Manga1s'
|
extName = 'Manga1s'
|
||||||
pkgNameSuffix = 'en.manga1s'
|
pkgNameSuffix = 'en.manga1s'
|
||||||
extClass = '.manga1s'
|
extClass = '.manga1s'
|
||||||
extVersionCode = 2
|
extVersionCode = 3
|
||||||
isNsfw = true
|
isNsfw = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,11 @@
|
||||||
package eu.kanade.tachiyomi.extension.en.manga1s
|
package eu.kanade.tachiyomi.extension.en.manga1s
|
||||||
|
|
||||||
import eu.kanade.tachiyomi.network.GET
|
import eu.kanade.tachiyomi.network.GET
|
||||||
import eu.kanade.tachiyomi.source.model.Filter
|
|
||||||
import eu.kanade.tachiyomi.source.model.FilterList
|
import eu.kanade.tachiyomi.source.model.FilterList
|
||||||
import eu.kanade.tachiyomi.source.model.Page
|
import eu.kanade.tachiyomi.source.model.Page
|
||||||
import eu.kanade.tachiyomi.source.model.SChapter
|
import eu.kanade.tachiyomi.source.model.SChapter
|
||||||
import eu.kanade.tachiyomi.source.model.SManga
|
import eu.kanade.tachiyomi.source.model.SManga
|
||||||
import eu.kanade.tachiyomi.source.online.ParsedHttpSource
|
import eu.kanade.tachiyomi.source.online.ParsedHttpSource
|
||||||
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
|
|
||||||
import okhttp3.OkHttpClient
|
import okhttp3.OkHttpClient
|
||||||
import okhttp3.Request
|
import okhttp3.Request
|
||||||
import org.jsoup.nodes.Document
|
import org.jsoup.nodes.Document
|
||||||
|
|
@ -26,186 +24,83 @@ class manga1s : ParsedHttpSource() {
|
||||||
override val client: OkHttpClient = network.cloudflareClient
|
override val client: OkHttpClient = network.cloudflareClient
|
||||||
|
|
||||||
// Popular
|
// Popular
|
||||||
override fun popularMangaRequest(page: Int): Request {
|
override fun popularMangaRequest(page: Int): Request =
|
||||||
return GET("$baseUrl/search/?s=rank&compact=1&page=$page#paged", headers)
|
GET("$baseUrl/top-search", headers)
|
||||||
|
|
||||||
|
override fun popularMangaSelector() =
|
||||||
|
".novel-wrap"
|
||||||
|
|
||||||
|
override fun popularMangaFromElement(element: Element): SManga =
|
||||||
|
SManga.create().apply {
|
||||||
|
setUrlWithoutDomain(element.select("h2 > a").attr("href"))
|
||||||
|
title = element.select("h2 > a").text()
|
||||||
|
thumbnail_url = element.select("img").attr("data-src")
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun popularMangaSelector() = searchMangaSelector()
|
override fun popularMangaNextPageSelector() =
|
||||||
|
"ul.pagination > li:last-child > a"
|
||||||
override fun popularMangaFromElement(element: Element): SManga {
|
|
||||||
|
|
||||||
val manga = SManga.create()
|
|
||||||
|
|
||||||
manga.setUrlWithoutDomain(element.select("a").attr("href"))
|
|
||||||
manga.title = element.select("p.manga-list-4-item-title > a").text()
|
|
||||||
manga.thumbnail_url = element.select("a img").attr("data-src")
|
|
||||||
|
|
||||||
return manga
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun popularMangaNextPageSelector() = searchMangaNextPageSelector()
|
|
||||||
|
|
||||||
// Latest
|
// Latest
|
||||||
override fun latestUpdatesRequest(page: Int): Request {
|
override fun latestUpdatesRequest(page: Int): Request =
|
||||||
return GET("$baseUrl/search/?s=news&compact=1&page=$page#paged", headers)
|
GET("$baseUrl/last-update", headers)
|
||||||
}
|
|
||||||
|
|
||||||
override fun latestUpdatesSelector() = searchMangaSelector()
|
override fun latestUpdatesSelector() =
|
||||||
|
popularMangaSelector()
|
||||||
|
|
||||||
override fun latestUpdatesFromElement(element: Element): SManga {
|
override fun latestUpdatesFromElement(element: Element): SManga =
|
||||||
|
popularMangaFromElement(element)
|
||||||
|
|
||||||
val manga = SManga.create()
|
override fun latestUpdatesNextPageSelector() =
|
||||||
|
popularMangaNextPageSelector()
|
||||||
manga.setUrlWithoutDomain(element.select("a").attr("href"))
|
|
||||||
manga.title = element.select("p.manga-list-4-item-title > a").text()
|
|
||||||
manga.thumbnail_url = element.select("a img").attr("data-src")
|
|
||||||
|
|
||||||
return manga
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun latestUpdatesNextPageSelector() = searchMangaNextPageSelector()
|
|
||||||
|
|
||||||
// Search
|
// Search
|
||||||
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
|
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request =
|
||||||
val url = "$baseUrl/search".toHttpUrlOrNull()!!.newBuilder()
|
GET("$baseUrl/search?q=$query", headers)
|
||||||
.addQueryParameter("text", query)
|
|
||||||
filters.forEach { filter ->
|
|
||||||
when (filter) {
|
|
||||||
is GenreList -> {
|
|
||||||
val genreInclude = filter.state.filter { it.isIncluded() }.joinToString { it.id }
|
|
||||||
val genreExclude = filter.state.filter { it.isExcluded() }.joinToString { it.id }
|
|
||||||
url.addQueryParameter("genres", genreInclude)
|
|
||||||
url.addQueryParameter("excludes", genreExclude)
|
|
||||||
}
|
|
||||||
is SortFilter -> url.addQueryParameter("s", filter.toUriPart())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
url.addQueryParameter("compact", "1")
|
|
||||||
url.addQueryParameter("page", page.toString())
|
|
||||||
return GET(url.toString(), headers)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun searchMangaSelector() = "ul > li:nth-child(n)"
|
override fun searchMangaSelector() =
|
||||||
|
popularMangaSelector()
|
||||||
|
|
||||||
override fun searchMangaFromElement(element: Element): SManga {
|
override fun searchMangaFromElement(element: Element): SManga =
|
||||||
val manga = SManga.create()
|
popularMangaFromElement(element)
|
||||||
|
|
||||||
manga.setUrlWithoutDomain(element.select("a").attr("href"))
|
override fun searchMangaNextPageSelector() =
|
||||||
manga.title = element.select("p.manga-list-4-item-title > a").text()
|
popularMangaNextPageSelector()
|
||||||
manga.thumbnail_url = element.select("a img").attr("data-src")
|
|
||||||
|
|
||||||
return manga
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun searchMangaNextPageSelector() = "div.pager-list > div > a:nth-child(8)"
|
|
||||||
|
|
||||||
// Details
|
// Details
|
||||||
override fun mangaDetailsParse(document: Document) = SManga.create().apply {
|
override fun mangaDetailsParse(document: Document) =
|
||||||
title = document.select("div.detail-info-right > h1").text()
|
SManga.create().apply {
|
||||||
description = document.select("div.detail-info-right > p.fullcontent").text()
|
title = document.select(".novel-name > h1").text()
|
||||||
thumbnail_url = document.select("div.detail-info-cover > img").attr("data-src")
|
author = document.select(".novel-authors a").text()
|
||||||
author = document.select("p.detail-info-right-say > a").text()
|
description = document.select("#manga-description").text().trim()
|
||||||
genre = document.select("p.detail-info-right-tag-list > a:nth-child(n)").joinToString { it.text() }
|
genre = document.select(".novel-categories > a").joinToString { it.text() }
|
||||||
status = document.select("span.detail-info-right-title-tip").text().let {
|
status =
|
||||||
when {
|
when (document.select(".novel-info i.fa-flag")[0].parent().parent().select("span")
|
||||||
it.contains("Ongoing") -> SManga.ONGOING
|
.text()) {
|
||||||
it.contains("Completed") -> SManga.COMPLETED
|
"On-going" -> SManga.ONGOING
|
||||||
|
"Completed" -> SManga.COMPLETED
|
||||||
else -> SManga.UNKNOWN
|
else -> SManga.UNKNOWN
|
||||||
}
|
}
|
||||||
}
|
thumbnail_url = document.select(".novel-thumbnail > img").attr("data-src")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Chapters
|
// Chapters
|
||||||
override fun chapterListSelector() = "div.chap-version.version-active #list-2 > ul > li:nth-child(n)"
|
override fun chapterListSelector() =
|
||||||
|
".chapter-name a"
|
||||||
|
|
||||||
override fun chapterFromElement(element: Element): SChapter {
|
override fun chapterFromElement(element: Element): SChapter =
|
||||||
val chapter = SChapter.create()
|
SChapter.create().apply {
|
||||||
|
setUrlWithoutDomain(element.attr("href"))
|
||||||
chapter.setUrlWithoutDomain(element.select("a").attr("href"))
|
name = element.text()
|
||||||
chapter.name = element.select("a").attr("title")
|
chapter_number = element.text()
|
||||||
|
.substringAfter(" ").toFloatOrNull() ?: -1f
|
||||||
return chapter
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Pages
|
// Pages
|
||||||
override fun pageListParse(document: Document): List<Page> = mutableListOf<Page>().apply {
|
override fun pageListParse(document: Document): List<Page> =
|
||||||
document.select("div.reader-main > img:nth-child(n)").forEachIndexed { index, element ->
|
document.select(".chapter-images > img").mapIndexed { index, element ->
|
||||||
add(Page(index, "", element.attr("data-src")))
|
Page(index, "", element.attr("data-src"))
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun imageUrlParse(document: Document) = throw UnsupportedOperationException("Not used")
|
override fun imageUrlParse(document: Document) =
|
||||||
|
throw UnsupportedOperationException("Not used")
|
||||||
// Filter
|
|
||||||
override fun getFilterList() = FilterList(
|
|
||||||
GenreList(genres()),
|
|
||||||
SortFilter()
|
|
||||||
)
|
|
||||||
|
|
||||||
open class UriPartFilter(displayName: String, private val vals: Array<Pair<String, String>>) :
|
|
||||||
Filter.Select<String>(displayName, vals.map { it.second }.toTypedArray()) {
|
|
||||||
fun toUriPart() = vals[state].first
|
|
||||||
}
|
|
||||||
|
|
||||||
private class Genre(name: String, val id: String) : Filter.TriState(name)
|
|
||||||
private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Genres", genres)
|
|
||||||
|
|
||||||
private class SortFilter : UriPartFilter(
|
|
||||||
"Sort By",
|
|
||||||
arrayOf(
|
|
||||||
Pair("popularity", "Popularity"),
|
|
||||||
Pair("alphabetical", "A-Z"),
|
|
||||||
Pair("rating", "Rating"),
|
|
||||||
Pair("chapters", "Chapters"),
|
|
||||||
Pair("news", "Last Update"),
|
|
||||||
Pair("rank", "Rank"),
|
|
||||||
Pair("hourly", "Hourly View"),
|
|
||||||
Pair("daily", "Daily View")
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
private fun genres(): List<Genre> = listOf(
|
|
||||||
Genre("4Koma", "4-Koma"),
|
|
||||||
Genre("Action", "Action"),
|
|
||||||
Genre("Adult", "Adult"),
|
|
||||||
Genre("Adventure", "Adventure"),
|
|
||||||
Genre("Comedy", "Comedy"),
|
|
||||||
Genre("Doujinshi", "Doujinshi"),
|
|
||||||
Genre("Drama", "Drama"),
|
|
||||||
Genre("Ecchi", "Ecchi"),
|
|
||||||
Genre("Fantasy", "Fantasy"),
|
|
||||||
Genre("Full Color", "full-color"),
|
|
||||||
Genre("Gender bender", "Gender-bender"),
|
|
||||||
Genre("Harem", "Harem"),
|
|
||||||
Genre("Hentai", "Hentai"),
|
|
||||||
Genre("Historical", "Historical"),
|
|
||||||
Genre("Horror", "Horror"),
|
|
||||||
Genre("Josei", "Josei"),
|
|
||||||
Genre("Loli", "Loli"),
|
|
||||||
Genre("Long Strip", "Long-strip"),
|
|
||||||
Genre("Magic", "Magic"),
|
|
||||||
Genre("Mature", "Mature"),
|
|
||||||
Genre("Martial arts", "Martial-arts"),
|
|
||||||
Genre("Mecha", "Mecha"),
|
|
||||||
Genre("Mystery", "Mystery"),
|
|
||||||
Genre("One shot", "One-Shot"),
|
|
||||||
Genre("Psychological", "Psychological"),
|
|
||||||
Genre("Romance", "Romance"),
|
|
||||||
Genre("School life", "School-life"),
|
|
||||||
Genre("Shoujo", "Shoujo"),
|
|
||||||
Genre("Slice of life", "Slice-of-life"),
|
|
||||||
Genre("Supernatural", "Supernatural"),
|
|
||||||
Genre("Shounen", "Shounen"),
|
|
||||||
Genre("Seinen", "Seinen"),
|
|
||||||
Genre("Sci-fi", "Sci-fi"),
|
|
||||||
Genre("Shounen ai", "Shounen-ai"),
|
|
||||||
Genre("Smut", "Smut"),
|
|
||||||
Genre("Shoujo ai", "Shoujo-ai"),
|
|
||||||
Genre("Sports", "Sports"),
|
|
||||||
Genre("Tragedy", "Tragedy"),
|
|
||||||
Genre("Web comic", "web-comic"),
|
|
||||||
Genre("Webtoon", "Webtoon"),
|
|
||||||
Genre("Yaoi", "Yaoi"),
|
|
||||||
Genre("Yuri", "Yuri")
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue