Skip to content

Commit

Permalink
fix(pt/betteranime): Fix http 405 on search + add automatic login (#2839
Browse files Browse the repository at this point in the history 
)
  • Loading branch information
@Claudemirovsky
Claudemirovsky authored Jan 29, 2024
1 parent 44a284a commit 388b221
Show file tree
Hide file tree
Showing 6 changed files with 325 additions and 169 deletions.
2 changes: 1 addition & 1 deletion src/pt/betteranime/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ext {
extName = 'Better Anime'
extClass = '.BetterAnime'
extVersionCode = 8
extVersionCode = 9
}

apply from: "$rootDir/common.gradle"
6 changes: 2 additions & 4 deletions src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/BAFilters.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,10 @@ object BAFilters {
internal fun getSearchParameters(filters: AnimeFilterList): FilterSearchParams {
if (filters.isEmpty()) return FilterSearchParams()

val genres = listOf(" ") + filters.parseCheckbox<GenresFilter>(BAFiltersData.GENRES)

return FilterSearchParams(
filters.asQueryPart<LanguageFilter>(),
filters.asQueryPart<YearFilter>(),
genres,
filters.parseCheckbox<GenresFilter>(BAFiltersData.GENRES),
)
}

Expand All @@ -73,7 +71,7 @@ object BAFilters {
Pair("Dublado", "dublado"),
)

val YEARS = arrayOf(EVERY) + (2023 downTo 1976).map {
val YEARS = arrayOf(EVERY) + (2024 downTo 1976).map {
Pair(it.toString(), it.toString())
}.toTypedArray()

Expand Down
238 changes: 111 additions & 127 deletions src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/BetterAnime.kt
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package eu.kanade.tachiyomi.animeextension.pt.betteranime

import android.app.Application
import android.content.SharedPreferences
import androidx.preference.ListPreference
import androidx.preference.PreferenceScreen
import eu.kanade.tachiyomi.animeextension.pt.betteranime.dto.LivewireResponseDto
import eu.kanade.tachiyomi.animeextension.pt.betteranime.dto.ComponentsDto
import eu.kanade.tachiyomi.animeextension.pt.betteranime.dto.PayloadData
import eu.kanade.tachiyomi.animeextension.pt.betteranime.dto.PayloadItem
import eu.kanade.tachiyomi.animeextension.pt.betteranime.extractors.BetterAnimeExtractor
import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
Expand All @@ -19,10 +17,14 @@ import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.POST
import eu.kanade.tachiyomi.network.awaitSuccess
import eu.kanade.tachiyomi.util.asJsoup
import kotlinx.serialization.encodeToString
import kotlinx.serialization.builtins.serializer
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.JsonPrimitive
import okhttp3.Interceptor
import kotlinx.serialization.json.buildJsonArray
import kotlinx.serialization.json.buildJsonObject
import kotlinx.serialization.json.put
import kotlinx.serialization.json.putJsonArray
import okhttp3.MediaType.Companion.toMediaType
import okhttp3.Request
import okhttp3.RequestBody.Companion.toRequestBody
Expand All @@ -33,7 +35,6 @@ import org.jsoup.nodes.Element
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import uy.kohesive.injekt.injectLazy
import java.io.IOException

class BetterAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {

Expand All @@ -46,12 +47,12 @@ class BetterAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
override val supportsLatest = true

override val client = network.client.newBuilder()
.addInterceptor(::loginInterceptor)
.addInterceptor(LoginInterceptor(network.client, baseUrl, headers))
.build()

private val json: Json by injectLazy()

private val preferences: SharedPreferences by lazy {
private val preferences by lazy {
Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
}

Expand All @@ -64,58 +65,34 @@ class BetterAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
// so we use the latest added anime page instead.
override fun popularAnimeParse(response: Response) = latestUpdatesParse(response)

override fun popularAnimeRequest(page: Int): Request =
GET("$baseUrl/ultimosAdicionados?page=$page")
override fun popularAnimeRequest(page: Int) = GET("$baseUrl/ultimosAdicionados?page=$page", headers)

override fun popularAnimeSelector() = TODO()
override fun popularAnimeFromElement(element: Element) = TODO()
override fun popularAnimeNextPageSelector() = TODO()

// ============================== Episodes ==============================
override fun episodeListSelector(): String = "ul#episodesList > li.list-group-item-action > a"

override fun episodeListParse(response: Response) =
super.episodeListParse(response).reversed()
// =============================== Latest ===============================
override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/ultimosLancamentos?page=$page", headers)

override fun episodeFromElement(element: Element) = SEpisode.create().apply {
val episodeName = element.text()
setUrlWithoutDomain(element.attr("href"))
name = episodeName
episode_number = episodeName.substringAfterLast(" ").toFloatOrNull() ?: 0F
}
override fun latestUpdatesSelector() = "div.list-animes article"

// ============================ Video Links =============================
override fun videoListParse(response: Response): List<Video> {
val html = response.body.string()
val extractor = BetterAnimeExtractor(client, baseUrl, json)
return extractor.videoListFromHtml(html)
override fun latestUpdatesFromElement(element: Element) = SAnime.create().apply {
val img = element.selectFirst("img")!!
val url = element.selectFirst("a")?.attr("href")!!
setUrlWithoutDomain(url)
title = element.selectFirst("h3")?.text()!!
thumbnail_url = "https:" + img.attr("src")
}

override fun videoListSelector() = throw UnsupportedOperationException()
override fun videoFromElement(element: Element) = throw UnsupportedOperationException()
override fun videoUrlParse(document: Document) = throw UnsupportedOperationException()
override fun latestUpdatesNextPageSelector() = "ul.pagination li.page-item:contains(›):not(.disabled)"

// =============================== Search ===============================
override fun searchAnimeFromElement(element: Element) = latestUpdatesFromElement(element)
override fun searchAnimeSelector() = latestUpdatesSelector()
override fun searchAnimeNextPageSelector() = latestUpdatesNextPageSelector()

override fun searchAnimeParse(response: Response): AnimesPage {
val body = response.body.string()
val data = json.decodeFromString<LivewireResponseDto>(body)
val html = data.effects.html?.unescape().orEmpty()
val document = Jsoup.parse(html)
val animes = document.select(searchAnimeSelector()).map { element ->
searchAnimeFromElement(element)
}
val hasNext = document.selectFirst(searchAnimeNextPageSelector()) != null
return AnimesPage(animes, hasNext)
}
override fun getFilterList() = BAFilters.FILTER_LIST

override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
return if (query.startsWith(PREFIX_SEARCH_PATH)) {
val path = query.removePrefix(PREFIX_SEARCH_PATH)
client.newCall(GET("$baseUrl/$path"))
client.newCall(GET("$baseUrl/$path", headers))
.awaitSuccess()
.use(::searchAnimeByPathParse)
} else {
Expand All @@ -129,38 +106,88 @@ class BetterAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
}

override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
val searchParams = buildList {
add(PayloadItem(PayloadData(method = "search"), "callMethod"))
val calls = buildJsonArray {
val payloadSerializer = PayloadData.serializer()
add(json.encodeToJsonElement(payloadSerializer, PayloadData(method = "search")))
add(
PayloadItem(
json.encodeToJsonElement(
payloadSerializer,
PayloadData(
method = "gotoPage",
params = listOf(
JsonPrimitive(page),
JsonPrimitive("page"),
),
),
"callMethod",
),
)
}

val params = BAFilters.getSearchParameters(filters)
val data = buildList {
if (params.genres.size > 1) {
add(PayloadData(name = "byGenres", value = params.genres))
val params = BAFilters.getSearchParameters(filters)
val updates = buildJsonObject {
if (params.genres.isNotEmpty()) {
putJsonArray("byGenres") {
params.genres.forEach { add(JsonPrimitive(it)) }
}
listOf(
params.year to "byYear",
params.language to "byLanguage",
query to "searchTerm",
).forEach { it.first.toPayloadData(it.second)?.let(::add) }
}
listOf(
params.year to "byYear",
params.language to "byLanguage",
query to "searchTerm",
).forEach { if (it.first.isNotEmpty()) put(it.second, it.first) }
}

addAll(data.map { PayloadItem(it, "syncInput") })
if (wireToken.isBlank()) {
updateSnapshot(GET("$baseUrl/pesquisa", headers))
}
return wireRequest("anime-search", searchParams)

val data = buildJsonObject {
put("_token", wireToken)
putJsonArray("components") {
add(
buildJsonObject {
put("calls", calls)
put("snapshot", snapshot)
put("updates", updates)
},
)
}
}
val reqBody = json.encodeToString(JsonObject.serializer(), data).toRequestBody("application/json".toMediaType())

val headers = headersBuilder()
.add("x-livewire", "true")
.add("x-csrf-token", wireToken)
.build()
return POST("$baseUrl/livewire/update", headers, reqBody)
}

private var snapshot = ""
private var wireToken = ""

private fun updateSnapshot(request: Request) {
val document = client.newCall(request).execute().asJsoup()
val wireElement = document.selectFirst("[wire:snapshot]")!!
snapshot = wireElement.attr("wire:snapshot")
wireToken = document.selectFirst("script[data-csrf]")!!.attr("data-csrf")
}

override fun searchAnimeParse(response: Response): AnimesPage {
val body = response.body.string()
val data = json.decodeFromString<ComponentsDto>(body)
val html = data.components.firstOrNull()?.effects?.html?.unescape().orEmpty()
val document = Jsoup.parse(html)
val animes = document.select(searchAnimeSelector()).map(::searchAnimeFromElement)
val hasNext = document.selectFirst(searchAnimeNextPageSelector()) != null
return AnimesPage(animes, hasNext)
}

override fun searchAnimeSelector() = latestUpdatesSelector()

override fun searchAnimeFromElement(element: Element) = latestUpdatesFromElement(element)

override fun searchAnimeNextPageSelector() = latestUpdatesNextPageSelector()

// =========================== Anime Details ============================
override fun animeDetailsParse(document: Document) = SAnime.create().apply {
val doc = getRealDoc(document)
Expand All @@ -182,24 +209,34 @@ class BetterAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
}
}

// =============================== Latest ===============================
override fun latestUpdatesNextPageSelector() = "ul.pagination li.page-item:contains(›):not(.disabled)"
override fun latestUpdatesSelector() = "div.list-animes article"
// ============================== Episodes ==============================
override fun episodeListSelector() = "ul#episodesList > li.list-group-item-action > a"

override fun latestUpdatesRequest(page: Int): Request =
GET("$baseUrl/ultimosLancamentos?page=$page")
override fun episodeListParse(response: Response) =
super.episodeListParse(response).reversed()

override fun latestUpdatesFromElement(element: Element) = SAnime.create().apply {
val img = element.selectFirst("img")!!
val url = element.selectFirst("a")?.attr("href")!!
setUrlWithoutDomain(url)
title = element.selectFirst("h3")?.text()!!
thumbnail_url = "https:" + img.attr("src")
override fun episodeFromElement(element: Element) = SEpisode.create().apply {
val episodeName = element.text()
setUrlWithoutDomain(element.attr("href"))
name = episodeName
episode_number = episodeName.substringAfterLast(" ").toFloatOrNull() ?: 0F
}

// ============================ Video Links =============================
private val extractor by lazy { BetterAnimeExtractor(client, baseUrl, json) }

override fun videoListParse(response: Response): List<Video> {
val html = response.body.string()
return extractor.videoListFromHtml(html)
}

override fun videoListSelector() = throw UnsupportedOperationException()
override fun videoFromElement(element: Element) = throw UnsupportedOperationException()
override fun videoUrlParse(document: Document) = throw UnsupportedOperationException()

// ============================== Settings ==============================
override fun setupPreferenceScreen(screen: PreferenceScreen) {
val videoQualityPref = ListPreference(screen.context).apply {
ListPreference(screen.context).apply {
key = PREF_QUALITY_KEY
title = PREF_QUALITY_TITLE
entries = PREF_QUALITY_ENTRIES
Expand All @@ -212,26 +249,13 @@ class BetterAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
val entry = entryValues[index] as String
preferences.edit().putString(key, entry).commit()
}
}
screen.addPreference(videoQualityPref)
}.also(screen::addPreference)
}

override fun getFilterList(): AnimeFilterList = BAFilters.FILTER_LIST

// ============================= Utilities ==============================
private fun loginInterceptor(chain: Interceptor.Chain): Response {
val response = chain.proceed(chain.request())

if ("/dmca" in response.request.url.toString()) {
response.close()
throw IOException(ERROR_LOGIN_MISSING)
}

return response
}
private fun getRealDoc(document: Document): Document {
return document.selectFirst("div.anime-title a")?.let { link ->
client.newCall(GET(link.attr("href")))
client.newCall(GET(link.attr("href"), headers))
.execute()
.asJsoup()
} ?: document
Expand All @@ -244,49 +268,12 @@ class BetterAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
}
}

private var initialData: String = ""
private var wireToken: String = ""

private fun updateInitialData(request: Request) {
val document = client.newCall(request).execute().asJsoup()
val wireElement = document.selectFirst("[wire:id]")
wireToken = document.html()
.substringAfter("livewire_token")
.substringAfter("'")
.substringBefore("'")
initialData = wireElement!!.attr("wire:initial-data").dropLast(1)
}

private fun wireRequest(path: String, updates: List<PayloadItem>): Request {
if (wireToken.isBlank()) {
updateInitialData(GET("$baseUrl/pesquisa"))
}

val url = "$baseUrl/livewire/message/$path"
val items = updates.joinToString(",") { json.encodeToString(it) }
val data = "$initialData, \"updates\": [$items]}"
val reqBody = data.toRequestBody("application/json".toMediaType())

val headers = headersBuilder()
.add("x-livewire", "true")
.add("x-csrf-token", wireToken)
.build()
return POST(url, headers, reqBody)
}

private fun Element.getInfo(key: String): String? {
return selectFirst("p:containsOwn($key) > span")
?.text()
?.trim()
}

private fun String.toPayloadData(name: String): PayloadData? {
return when {
isNotBlank() -> PayloadData(name = name, value = listOf(this))
else -> null
}
}

override fun List<Video>.sort(): List<Video> {
val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
return sortedWith(
Expand All @@ -298,9 +285,6 @@ class BetterAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
private const val ACCEPT_LANGUAGE = "pt-BR,pt;q=0.9,en-US;q=0.8,en;q=0.7"
const val PREFIX_SEARCH_PATH = "path:"

private const val ERROR_LOGIN_MISSING = "Login necessário. " +
"Abra a WebView, insira os dados de sua conta e realize o login."

private const val PREF_QUALITY_KEY = "preferred_quality"
private const val PREF_QUALITY_TITLE = "Qualidade preferida"
private const val PREF_QUALITY_DEFAULT = "720p"
Expand Down
Loading

0 comments on commit 388b221

Please sign in to comment.