AlmightyHak/extensions-source
2
0
Fork 1
Code Issues 296 Pull requests 6 Projects Releases Packages Wiki Activity Actions

Fix issue #550

Browse source
This commit is contained in:
CursedSheep 2025-01-17 17:04:21 +08:00
parent 2b7431c22b
commit 8ba92faf1f
2 changed files with 10 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt
View file

@ -19,9 +19,6 @@ import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.util.asJsoup import eu.kanade.tachiyomi.util.asJsoup
import eu.kanade.tachiyomi.util.parseAs import eu.kanade.tachiyomi.util.parseAs
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import okhttp3.Headers import okhttp3.Headers
import okhttp3.Request import okhttp3.Request
@ -67,16 +64,8 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() {
* @see episodeListRequest * @see episodeListRequest
*/ */
override fun animeDetailsRequest(anime: SAnime): Request { override fun animeDetailsRequest(anime: SAnime): Request {
val animeId = anime.getId() val session = anime.getSession()
// We're using coroutines here to run it inside another thread and return GET("$baseUrl/anime/$session")
// prevent android.os.NetworkOnMainThreadException when trying to open
// webview or share it.
val session = runBlocking {
withContext(Dispatchers.IO) {
fetchSession(anime.title, animeId)
}
}
return GET("$baseUrl/anime/$session?anime_id=$animeId")
} }
override fun animeDetailsParse(response: Response): SAnime { override fun animeDetailsParse(response: Response): SAnime {
@ -106,8 +95,8 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() {
SAnime.create().apply { SAnime.create().apply {
title = anime.title title = anime.title
thumbnail_url = anime.snapshot thumbnail_url = anime.snapshot
val animeId = anime.id val sessionId = anime.anime_session
setUrlWithoutDomain("/anime/?anime_id=$animeId") setUrlWithoutDomain("/anime/?session_id=$sessionId")
artist = anime.fansub artist = anime.fansub
} }
} }
@ -124,8 +113,8 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() {
SAnime.create().apply { SAnime.create().apply {
title = anime.title title = anime.title
thumbnail_url = anime.poster thumbnail_url = anime.poster
val animeId = anime.id val sessionId = anime.session
setUrlWithoutDomain("/anime/?anime_id=$animeId") setUrlWithoutDomain("/anime/?session_id=$sessionId")
} }
} }
return AnimesPage(animeList, false) return AnimesPage(animeList, false)
@ -146,7 +135,7 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() {
* @see animeDetailsRequest * @see animeDetailsRequest
*/ */
override fun episodeListRequest(anime: SAnime): Request { override fun episodeListRequest(anime: SAnime): Request {
val session = fetchSession(anime.title, anime.getId()) val session = anime.getSession()
return GET("$baseUrl/api?m=release&id=$session&sort=episode_desc&page=1") return GET("$baseUrl/api?m=release&id=$session&sort=episode_desc&page=1")
} }
@ -310,15 +299,6 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() {
} }
// ============================= Utilities ============================== // ============================= Utilities ==============================
private fun fetchSession(title: String, animeId: String): String {
return client.newCall(GET("$baseUrl/api?m=search&q=$title"))
.execute()
.body.string()
.substringAfter("\"id\":$animeId")
.substringAfter("\"session\":\"")
.substringBefore("\"")
}
private fun parseStatus(statusString: String): Int { private fun parseStatus(statusString: String): Int {
return when (statusString) { return when (statusString) {
"Currently Airing" -> SAnime.ONGOING "Currently Airing" -> SAnime.ONGOING
@ -327,7 +307,7 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() {
} }
} }
private fun SAnime.getId() = url.substringAfterLast("?anime_id=").substringBefore("\"") private fun SAnime.getSession() = url.substringAfterLast("?session_id=").substringBefore("\"")
private fun String.toDate(): Long { private fun String.toDate(): Long {
return runCatching { return runCatching {

2
src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/dto/AnimePaheDto.kt
View file

@ -23,6 +23,7 @@ data class LatestAnimeDto(
@SerialName("anime_id") @SerialName("anime_id")
val id: Int, val id: Int,
val fansub: String, val fansub: String,
val anime_session: String,
) )
@Serializable @Serializable
@ -30,6 +31,7 @@ data class SearchResultDto(
val title: String, val title: String,
val poster: String, val poster: String,
val id: Int, val id: Int,
val session: String,
) )
@Serializable @Serializable