Add categories for readmanga/mintmanga (#1607)
* Add categories for readmanga/mintmanga * Fix pages with site static resources
This commit is contained in:
parent
7afd224aff
commit
6b26859983
@ -4,6 +4,7 @@ import eu.kanade.tachiyomi.network.GET
|
|||||||
import eu.kanade.tachiyomi.source.model.*
|
import eu.kanade.tachiyomi.source.model.*
|
||||||
import eu.kanade.tachiyomi.source.online.ParsedHttpSource
|
import eu.kanade.tachiyomi.source.online.ParsedHttpSource
|
||||||
import okhttp3.Headers
|
import okhttp3.Headers
|
||||||
|
import okhttp3.HttpUrl
|
||||||
import okhttp3.Request
|
import okhttp3.Request
|
||||||
import okhttp3.Response
|
import okhttp3.Response
|
||||||
import org.jsoup.nodes.Document
|
import org.jsoup.nodes.Document
|
||||||
@ -52,8 +53,25 @@ class Mintmanga : ParsedHttpSource() {
|
|||||||
override fun latestUpdatesNextPageSelector() = "a.nextLink"
|
override fun latestUpdatesNextPageSelector() = "a.nextLink"
|
||||||
|
|
||||||
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
|
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
|
||||||
val genres = filters.filterIsInstance<Genre>().joinToString("&") { it.id + arrayOf("=", "=in", "=ex")[it.state] }
|
val url = HttpUrl.parse("$baseUrl/search/advanced")!!.newBuilder()
|
||||||
return GET("$baseUrl/search/advanced?q=$query&$genres", headers)
|
(if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
|
||||||
|
when (filter) {
|
||||||
|
is GenreList -> filter.state.forEach { genre ->
|
||||||
|
if (genre.state != Filter.TriState.STATE_IGNORE) {
|
||||||
|
url.addQueryParameter(genre.id, arrayOf("=", "=in", "=ex")[genre.state])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
is Category -> filter.state.forEach { category ->
|
||||||
|
if (category.state != Filter.TriState.STATE_IGNORE) {
|
||||||
|
url.addQueryParameter(category.id, arrayOf("=", "=in", "=ex")[category.state])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!query.isEmpty()) {
|
||||||
|
url.addQueryParameter("q", query)
|
||||||
|
}
|
||||||
|
return GET(url.toString().replace("=%3D", "="), headers)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun searchMangaSelector() = popularMangaSelector()
|
override fun searchMangaSelector() = popularMangaSelector()
|
||||||
@ -61,7 +79,7 @@ class Mintmanga : ParsedHttpSource() {
|
|||||||
override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element)
|
override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element)
|
||||||
|
|
||||||
// max 200 results
|
// max 200 results
|
||||||
override fun searchMangaNextPageSelector() = null
|
override fun searchMangaNextPageSelector(): Nothing? = null
|
||||||
|
|
||||||
override fun mangaDetailsParse(document: Document): SManga {
|
override fun mangaDetailsParse(document: Document): SManga {
|
||||||
val infoElement = document.select("div.leftContent").first()
|
val infoElement = document.select("div.leftContent").first()
|
||||||
@ -133,7 +151,12 @@ class Mintmanga : ParsedHttpSource() {
|
|||||||
var i = 0
|
var i = 0
|
||||||
while (m.find()) {
|
while (m.find()) {
|
||||||
val urlParts = m.group().replace("[\"\']+".toRegex(), "").split(',')
|
val urlParts = m.group().replace("[\"\']+".toRegex(), "").split(',')
|
||||||
pages.add(Page(i++, "", urlParts[1] + urlParts[0] + urlParts[2]))
|
val url = if (urlParts[1].isEmpty() && urlParts[2].startsWith("/static/")) {
|
||||||
|
baseUrl + urlParts[2]
|
||||||
|
} else {
|
||||||
|
urlParts[1] + urlParts[0] + urlParts[2]
|
||||||
|
}
|
||||||
|
pages.add(Page(i++, "", url))
|
||||||
}
|
}
|
||||||
return pages
|
return pages
|
||||||
}
|
}
|
||||||
@ -153,13 +176,34 @@ class Mintmanga : ParsedHttpSource() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private class Genre(name: String, val id: String) : Filter.TriState(name)
|
private class Genre(name: String, val id: String) : Filter.TriState(name)
|
||||||
|
private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Genres", genres)
|
||||||
|
private class Category(categories: List<Genre>) : Filter.Group<Genre>("Category", categories)
|
||||||
|
|
||||||
/* [...document.querySelectorAll("tr.advanced_option:nth-child(1) > td:nth-child(3) span.js-link")]
|
/* [...document.querySelectorAll("tr.advanced_option:nth-child(1) > td:nth-child(3) span.js-link")]
|
||||||
* .map(el => `Genre("${el.textContent.trim()}", $"{el.getAttribute('onclick')
|
* .map(el => `Genre("${el.textContent.trim()}", "${el.getAttribute('onclick')
|
||||||
* .substr(31,el.getAttribute('onclick').length-33)"})`).join(',\n')
|
* .substr(31,el.getAttribute('onclick').length-33)"})`).join(',\n')
|
||||||
* on http://mintmanga.com/search/advanced
|
* on http://mintmanga.com/search/advanced
|
||||||
*/
|
*/
|
||||||
override fun getFilterList() = FilterList(
|
override fun getFilterList() = FilterList(
|
||||||
|
Category(getCategoryList()),
|
||||||
|
GenreList(getGenreList())
|
||||||
|
)
|
||||||
|
|
||||||
|
private fun getCategoryList() = listOf(
|
||||||
|
Genre("В цвете", "el_4614"),
|
||||||
|
Genre("Веб", "el_1355"),
|
||||||
|
Genre("Выпуск приостановлен", "el_5232"),
|
||||||
|
Genre("Ёнкома", "el_2741"),
|
||||||
|
Genre("Комикс западный", "el_1903"),
|
||||||
|
Genre("Комикс русский", "el_2173"),
|
||||||
|
Genre("Манхва", "el_1873"),
|
||||||
|
Genre("Маньхуа", "el_1875"),
|
||||||
|
Genre("Не Яой", "el_1874"),
|
||||||
|
Genre("Ранобэ", "el_5688"),
|
||||||
|
Genre("Сборник", "el_1348")
|
||||||
|
)
|
||||||
|
|
||||||
|
private fun getGenreList() = listOf(
|
||||||
Genre("арт", "el_2220"),
|
Genre("арт", "el_2220"),
|
||||||
Genre("бара", "el_1353"),
|
Genre("бара", "el_1353"),
|
||||||
Genre("боевик", "el_1346"),
|
Genre("боевик", "el_1346"),
|
||||||
|
@ -4,6 +4,7 @@ import eu.kanade.tachiyomi.network.GET
|
|||||||
import eu.kanade.tachiyomi.source.model.*
|
import eu.kanade.tachiyomi.source.model.*
|
||||||
import eu.kanade.tachiyomi.source.online.ParsedHttpSource
|
import eu.kanade.tachiyomi.source.online.ParsedHttpSource
|
||||||
import okhttp3.Headers
|
import okhttp3.Headers
|
||||||
|
import okhttp3.HttpUrl
|
||||||
import okhttp3.Request
|
import okhttp3.Request
|
||||||
import okhttp3.Response
|
import okhttp3.Response
|
||||||
import org.jsoup.nodes.Document
|
import org.jsoup.nodes.Document
|
||||||
@ -52,8 +53,25 @@ class Readmanga : ParsedHttpSource() {
|
|||||||
override fun latestUpdatesNextPageSelector() = "a.nextLink"
|
override fun latestUpdatesNextPageSelector() = "a.nextLink"
|
||||||
|
|
||||||
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
|
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
|
||||||
val genres = filters.filterIsInstance<Genre>().joinToString("&") { it.id + arrayOf("=", "=in", "=ex")[it.state] }
|
val url = HttpUrl.parse("$baseUrl/search/advanced")!!.newBuilder()
|
||||||
return GET("$baseUrl/search/advanced?q=$query&$genres", headers)
|
(if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
|
||||||
|
when (filter) {
|
||||||
|
is GenreList -> filter.state.forEach { genre ->
|
||||||
|
if (genre.state != Filter.TriState.STATE_IGNORE) {
|
||||||
|
url.addQueryParameter(genre.id, arrayOf("=", "=in", "=ex")[genre.state])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
is Category -> filter.state.forEach { category ->
|
||||||
|
if (category.state != Filter.TriState.STATE_IGNORE) {
|
||||||
|
url.addQueryParameter(category.id, arrayOf("=", "=in", "=ex")[category.state])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!query.isEmpty()) {
|
||||||
|
url.addQueryParameter("q", query)
|
||||||
|
}
|
||||||
|
return GET(url.toString().replace("=%3D", "="), headers)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun searchMangaSelector() = popularMangaSelector()
|
override fun searchMangaSelector() = popularMangaSelector()
|
||||||
@ -61,7 +79,7 @@ class Readmanga : ParsedHttpSource() {
|
|||||||
override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element)
|
override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element)
|
||||||
|
|
||||||
// max 200 results
|
// max 200 results
|
||||||
override fun searchMangaNextPageSelector() = null
|
override fun searchMangaNextPageSelector(): Nothing? = null
|
||||||
|
|
||||||
override fun mangaDetailsParse(document: Document): SManga {
|
override fun mangaDetailsParse(document: Document): SManga {
|
||||||
val infoElement = document.select("div.leftContent").first()
|
val infoElement = document.select("div.leftContent").first()
|
||||||
@ -133,7 +151,12 @@ class Readmanga : ParsedHttpSource() {
|
|||||||
var i = 0
|
var i = 0
|
||||||
while (m.find()) {
|
while (m.find()) {
|
||||||
val urlParts = m.group().replace("[\"\']+".toRegex(), "").split(',')
|
val urlParts = m.group().replace("[\"\']+".toRegex(), "").split(',')
|
||||||
pages.add(Page(i++, "", urlParts[1] + urlParts[0] + urlParts[2]))
|
val url = if (urlParts[1].isEmpty() && urlParts[2].startsWith("/static/")) {
|
||||||
|
baseUrl + urlParts[2]
|
||||||
|
} else {
|
||||||
|
urlParts[1] + urlParts[0] + urlParts[2]
|
||||||
|
}
|
||||||
|
pages.add(Page(i++, "", url))
|
||||||
}
|
}
|
||||||
return pages
|
return pages
|
||||||
}
|
}
|
||||||
@ -153,6 +176,8 @@ class Readmanga : ParsedHttpSource() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private class Genre(name: String, val id: String) : Filter.TriState(name)
|
private class Genre(name: String, val id: String) : Filter.TriState(name)
|
||||||
|
private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Genres", genres)
|
||||||
|
private class Category(categories: List<Genre>) : Filter.Group<Genre>("Category", categories)
|
||||||
|
|
||||||
/* [...document.querySelectorAll("tr.advanced_option:nth-child(1) > td:nth-child(3) span.js-link")]
|
/* [...document.querySelectorAll("tr.advanced_option:nth-child(1) > td:nth-child(3) span.js-link")]
|
||||||
* .map(el => `Genre("${el.textContent.trim()}", $"{el.getAttribute('onclick')
|
* .map(el => `Genre("${el.textContent.trim()}", $"{el.getAttribute('onclick')
|
||||||
@ -160,6 +185,23 @@ class Readmanga : ParsedHttpSource() {
|
|||||||
* on http://readmanga.me/search/advanced
|
* on http://readmanga.me/search/advanced
|
||||||
*/
|
*/
|
||||||
override fun getFilterList() = FilterList(
|
override fun getFilterList() = FilterList(
|
||||||
|
Category(getCategoryList()),
|
||||||
|
GenreList(getGenreList())
|
||||||
|
)
|
||||||
|
|
||||||
|
private fun getCategoryList() = listOf(
|
||||||
|
Genre("В цвете", "el_7290"),
|
||||||
|
Genre("Веб", "el_2160"),
|
||||||
|
Genre("Выпуск приостановлен", "el_8033"),
|
||||||
|
Genre("Ёнкома", "el_2161"),
|
||||||
|
Genre("Комикс западный", "el_3515"),
|
||||||
|
Genre("Манхва", "el_3001"),
|
||||||
|
Genre("Маньхуа", "el_3002"),
|
||||||
|
Genre("Ранобэ", "el_8575"),
|
||||||
|
Genre("Сборник", "el_2157")
|
||||||
|
)
|
||||||
|
|
||||||
|
private fun getGenreList() = listOf(
|
||||||
Genre("арт", "el_5685"),
|
Genre("арт", "el_5685"),
|
||||||
Genre("боевик", "el_2155"),
|
Genre("боевик", "el_2155"),
|
||||||
Genre("боевые искусства", "el_2143"),
|
Genre("боевые искусства", "el_2143"),
|
||||||
|
Loading…
Reference in New Issue
Block a user