Add MangaTerra (#2300)
* Add MangaTerra * Cleanup * Add search * Cleanup * Remove override unneeed * Remove override fetchSearchManga * Fix search query * Add fetch manga by slug * Add method modifies * Cleanup * Add srcAttr * Move filters to file * Improved pageListParse * Cleanup Co-authored-by: Vetle Ledaal <vetle.ledaal@gmail.com> * Removes the client instance from the loop * Fix search by slug * Fix page index * Remove custom client * Fix redirect last page by default and fix last page * Remove parser type Co-authored-by: AwkwardPeak7 <48650614+AwkwardPeak7@users.noreply.github.com> * Maintains the positions of the method declarations of the ParsedHttpSource class * Move noRedirectClient to class properties * Add warning when GenreFiltrs is empty * Cleanup * Remove spaces * Use cloudflareClient --------- Co-authored-by: Vetle Ledaal <vetle.ledaal@gmail.com> Co-authored-by: AwkwardPeak7 <48650614+AwkwardPeak7@users.noreply.github.com>
This commit is contained in:
Chopper
parent
40619db2b2
commit
e79e16f7d9
|
|
@ -0,0 +1,22 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<application>
|
||||
<activity
|
||||
android:name=".pt.mangaterra.MangaTerraUrlActivity"
|
||||
android:excludeFromRecents="true"
|
||||
android:exported="true"
|
||||
android:theme="@android:style/Theme.NoDisplay">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
|
||||
<data
|
||||
android:scheme="https"
|
||||
android:host="manga-terra.com"
|
||||
android:pathPattern="/manga/..*" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
</application>
|
||||
</manifest>
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
ext {
|
||||
extName = 'Manga Terra'
|
||||
extClass = '.MangaTerra'
|
||||
extVersionCode = 1
|
||||
isNsfw = true
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 4.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 7.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 22 KiB |
|
|
@ -0,0 +1,242 @@
|
|||
package eu.kanade.tachiyomi.extension.pt.mangaterra
|
||||
|
||||
import eu.kanade.tachiyomi.network.GET
|
||||
import eu.kanade.tachiyomi.network.asObservableSuccess
|
||||
import eu.kanade.tachiyomi.network.interceptor.rateLimit
|
||||
import eu.kanade.tachiyomi.source.model.Filter
|
||||
import eu.kanade.tachiyomi.source.model.FilterList
|
||||
import eu.kanade.tachiyomi.source.model.MangasPage
|
||||
import eu.kanade.tachiyomi.source.model.Page
|
||||
import eu.kanade.tachiyomi.source.model.SChapter
|
||||
import eu.kanade.tachiyomi.source.model.SManga
|
||||
import eu.kanade.tachiyomi.source.online.ParsedHttpSource
|
||||
import eu.kanade.tachiyomi.util.asJsoup
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.serialization.decodeFromString
|
||||
import kotlinx.serialization.json.Json
|
||||
import okhttp3.HttpUrl.Companion.toHttpUrl
|
||||
import okhttp3.Request
|
||||
import okhttp3.Response
|
||||
import org.jsoup.Jsoup
|
||||
import org.jsoup.nodes.Document
|
||||
import org.jsoup.nodes.Element
|
||||
import rx.Observable
|
||||
import uy.kohesive.injekt.injectLazy
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.Locale
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
class MangaTerra : ParsedHttpSource() {
|
||||
override val lang: String = "pt-BR"
|
||||
override val supportsLatest: Boolean = true
|
||||
override val name: String = "Manga Terra"
|
||||
override val baseUrl: String = "https://manga-terra.com"
|
||||
|
||||
override val client = network.cloudflareClient.newBuilder()
|
||||
.rateLimit(5, 2, TimeUnit.SECONDS)
|
||||
.build()
|
||||
|
||||
private val noRedirectClient = network.cloudflareClient.newBuilder()
|
||||
.followRedirects(false)
|
||||
.build()
|
||||
|
||||
private val json: Json by injectLazy()
|
||||
|
||||
private var fetchGenresAttempts: Int = 0
|
||||
|
||||
private var genresList: List<Genre> = emptyList()
|
||||
|
||||
override fun chapterFromElement(element: Element) = SChapter.create().apply {
|
||||
name = element.selectFirst("h5")!!.ownText()
|
||||
date_upload = element.selectFirst("h5 > div")!!.ownText().toDate()
|
||||
setUrlWithoutDomain(element.absUrl("href"))
|
||||
}
|
||||
|
||||
override fun chapterListSelector() = ".card-list-chapter a"
|
||||
|
||||
override fun imageUrlParse(document: Document) = document.selectFirst("img")!!.srcAttr()
|
||||
|
||||
override fun latestUpdatesFromElement(element: Element) = popularMangaFromElement(element)
|
||||
|
||||
override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector()
|
||||
|
||||
override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/manga?q=u&page=$page", headers)
|
||||
|
||||
override fun latestUpdatesSelector() = popularMangaSelector()
|
||||
|
||||
override fun mangaDetailsParse(document: Document) = SManga.create().apply {
|
||||
title = document.selectFirst(".card-body h1")!!.ownText()
|
||||
description = document.selectFirst(".card-body p")?.ownText()
|
||||
thumbnail_url = document.selectFirst(".card-body img")?.srcAttr()
|
||||
genre = document.select(".card-series-about a").joinToString { it.ownText() }
|
||||
setUrlWithoutDomain(document.location())
|
||||
}
|
||||
|
||||
override fun pageListParse(document: Document): List<Page> {
|
||||
val mangaChapterUrl = document.location()
|
||||
val maxPage = findPageCount(mangaChapterUrl)
|
||||
return (1..maxPage).map { page -> Page(page - 1, "$mangaChapterUrl/$page") }
|
||||
}
|
||||
|
||||
override fun popularMangaFromElement(element: Element) = SManga.create().apply {
|
||||
title = element.selectFirst("p")!!.ownText()
|
||||
thumbnail_url = element.selectFirst("img")?.srcAttr()
|
||||
setUrlWithoutDomain(element.selectFirst("a")!!.absUrl("href"))
|
||||
}
|
||||
|
||||
override fun popularMangaNextPageSelector() = ".pagination > .page-item:not(.disabled):last-child"
|
||||
|
||||
override fun popularMangaRequest(page: Int) = GET("$baseUrl/manga?q=p&page=$page", headers)
|
||||
|
||||
override fun popularMangaSelector(): String = ".card-body .row > div"
|
||||
|
||||
override fun searchMangaFromElement(element: Element) = popularMangaFromElement(element)
|
||||
|
||||
override fun searchMangaParse(response: Response): MangasPage {
|
||||
if (response.request.url.pathSegments.contains("search")) {
|
||||
return searchByQueryMangaParse(response)
|
||||
}
|
||||
return super.searchMangaParse(response)
|
||||
}
|
||||
|
||||
override fun searchMangaNextPageSelector() = popularMangaNextPageSelector()
|
||||
|
||||
override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable<MangasPage> {
|
||||
if (query.startsWith(slugPrefix)) {
|
||||
val slug = query.substringAfter(slugPrefix)
|
||||
return client.newCall(GET("$baseUrl/manga/$slug", headers))
|
||||
.asObservableSuccess().map { response ->
|
||||
MangasPage(listOf(mangaDetailsParse(response)), false)
|
||||
}
|
||||
}
|
||||
return super.fetchSearchManga(page, query, filters)
|
||||
}
|
||||
|
||||
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
|
||||
val url = baseUrl.toHttpUrl().newBuilder()
|
||||
|
||||
if (query.isNotBlank()) {
|
||||
url.addPathSegment("search")
|
||||
.addQueryParameter("q", query)
|
||||
return GET(url.build(), headers)
|
||||
}
|
||||
|
||||
url.addPathSegment("manga")
|
||||
|
||||
filters.forEach { filter ->
|
||||
when (filter) {
|
||||
is GenreFilter -> {
|
||||
filter.state.forEach {
|
||||
if (it.state) {
|
||||
url.addQueryParameter(it.query, it.value)
|
||||
}
|
||||
}
|
||||
}
|
||||
else -> {}
|
||||
}
|
||||
}
|
||||
|
||||
url.addQueryParameter("page", "$page")
|
||||
|
||||
return GET(url.build(), headers)
|
||||
}
|
||||
|
||||
override fun searchMangaSelector() = popularMangaSelector()
|
||||
|
||||
override fun getFilterList(): FilterList {
|
||||
CoroutineScope(Dispatchers.IO).launch { fetchGenres() }
|
||||
val filters = mutableListOf<Filter<out Any>>()
|
||||
|
||||
if (genresList.isNotEmpty()) {
|
||||
filters += GenreFilter(
|
||||
title = "Gêneros",
|
||||
genres = genresList,
|
||||
)
|
||||
} else {
|
||||
filters += listOf(
|
||||
Filter.Separator(),
|
||||
Filter.Header("Aperte 'Redefinir' mostrar os gêneros disponíveis"),
|
||||
)
|
||||
}
|
||||
return FilterList(filters)
|
||||
}
|
||||
|
||||
private fun searchByQueryMangaParse(response: Response): MangasPage {
|
||||
val fragment = Jsoup.parseBodyFragment(
|
||||
json.decodeFromString<String>(response.body.string()),
|
||||
baseUrl,
|
||||
)
|
||||
|
||||
return MangasPage(
|
||||
mangas = fragment.select("div.grid-item-series").map(::searchMangaFromElement),
|
||||
hasNextPage = false,
|
||||
)
|
||||
}
|
||||
|
||||
private fun findPageCount(pageUrl: String): Int {
|
||||
var lowerBound = 1
|
||||
var upperBound = 100
|
||||
|
||||
while (lowerBound <= upperBound) {
|
||||
val midpoint = lowerBound + (upperBound - lowerBound) / 2
|
||||
|
||||
val request = Request.Builder().apply {
|
||||
url("$pageUrl/$midpoint")
|
||||
headers(headers)
|
||||
head()
|
||||
}.build()
|
||||
|
||||
val response = try {
|
||||
noRedirectClient.newCall(request).execute()
|
||||
} catch (e: Exception) {
|
||||
throw Exception("Failed to fetch $pageUrl")
|
||||
}
|
||||
|
||||
if (response.code == 302) {
|
||||
upperBound = midpoint - 1
|
||||
} else {
|
||||
lowerBound = midpoint + 1
|
||||
}
|
||||
}
|
||||
|
||||
return lowerBound
|
||||
}
|
||||
|
||||
private fun Element.srcAttr(): String = when {
|
||||
hasAttr("data-src") -> absUrl("data-src")
|
||||
else -> absUrl("src")
|
||||
}
|
||||
|
||||
private fun String.toDate() = try { dateFormat.parse(trim())!!.time } catch (_: Exception) { 0L }
|
||||
|
||||
private fun fetchGenres() {
|
||||
if (fetchGenresAttempts < 3 && genresList.isEmpty()) {
|
||||
try {
|
||||
genresList = client.newCall(GET("$baseUrl/manga")).execute()
|
||||
.use { parseGenres(it.asJsoup()) }
|
||||
} catch (_: Exception) {
|
||||
} finally {
|
||||
fetchGenresAttempts++
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun parseGenres(document: Document): List<Genre> {
|
||||
return document.select(".form-filters .custom-checkbox")
|
||||
.map { element ->
|
||||
val input = element.selectFirst("input")!!
|
||||
Genre(
|
||||
name = element.selectFirst("label")!!.ownText(),
|
||||
query = input.attr("name"),
|
||||
value = input.attr("value"),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
val dateFormat = SimpleDateFormat("dd-MM-yyyy", Locale("pt", "BR"))
|
||||
val slugPrefix = "slug:"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
package eu.kanade.tachiyomi.extension.pt.mangaterra
|
||||
|
||||
import eu.kanade.tachiyomi.source.model.Filter
|
||||
|
||||
class Genre(name: String, val query: String, val value: String) : Filter.CheckBox(name)
|
||||
|
||||
class GenreFilter(title: String, genres: List<Genre>) : Filter.Group<Genre>(title, genres)
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
package eu.kanade.tachiyomi.extension.pt.mangaterra
|
||||
|
||||
import android.app.Activity
|
||||
import android.content.ActivityNotFoundException
|
||||
import android.content.Intent
|
||||
import android.os.Bundle
|
||||
import android.util.Log
|
||||
import kotlin.system.exitProcess
|
||||
|
||||
class MangaTerraUrlActivity : Activity() {
|
||||
|
||||
private val tag = javaClass.simpleName
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
val pathSegments = intent?.data?.pathSegments
|
||||
if (pathSegments != null && pathSegments.size > 1) {
|
||||
val mainIntent = Intent().apply {
|
||||
action = "eu.kanade.tachiyomi.SEARCH"
|
||||
putExtra("query", slug(pathSegments))
|
||||
putExtra("filter", packageName)
|
||||
}
|
||||
|
||||
try {
|
||||
startActivity(mainIntent)
|
||||
} catch (e: ActivityNotFoundException) {
|
||||
Log.e(tag, e.toString())
|
||||
}
|
||||
} else {
|
||||
Log.e(tag, "could not parse uri from intent $intent")
|
||||
}
|
||||
|
||||
finish()
|
||||
exitProcess(0)
|
||||
}
|
||||
|
||||
private fun slug(pathSegments: List<String>) = "${MangaTerra.slugPrefix}${pathSegments.last()}"
|
||||
}
|
||||
Loading…
Reference in New Issue