diff --git a/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt b/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt index f13f3227..44672a28 100644 --- a/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt +++ b/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt @@ -19,9 +19,6 @@ import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.util.asJsoup import eu.kanade.tachiyomi.util.parseAs -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.runBlocking -import kotlinx.coroutines.withContext import kotlinx.serialization.json.Json import okhttp3.Headers import okhttp3.Request @@ -67,16 +64,8 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() { * @see episodeListRequest */ override fun animeDetailsRequest(anime: SAnime): Request { - val animeId = anime.getId() - // We're using coroutines here to run it inside another thread and - // 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") + val session = anime.getSession() + return GET("$baseUrl/anime/$session") } override fun animeDetailsParse(response: Response): SAnime { @@ -106,8 +95,8 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() { SAnime.create().apply { title = anime.title thumbnail_url = anime.snapshot - val animeId = anime.id - setUrlWithoutDomain("/anime/?anime_id=$animeId") + val sessionId = anime.anime_session + setUrlWithoutDomain("/anime/?session_id=$sessionId") artist = anime.fansub } } @@ -124,8 +113,8 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() { SAnime.create().apply { title = anime.title thumbnail_url = anime.poster - val animeId = anime.id - setUrlWithoutDomain("/anime/?anime_id=$animeId") + val sessionId = anime.session + setUrlWithoutDomain("/anime/?session_id=$sessionId") } } return AnimesPage(animeList, false) @@ -146,7 +135,7 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() { * @see animeDetailsRequest */ 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") } @@ -310,15 +299,6 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() { } // ============================= 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 { return when (statusString) { "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 { return runCatching { diff --git a/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/dto/AnimePaheDto.kt b/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/dto/AnimePaheDto.kt index 2adcd2f7..c2ab2410 100644 --- a/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/dto/AnimePaheDto.kt +++ b/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/dto/AnimePaheDto.kt @@ -23,6 +23,7 @@ data class LatestAnimeDto( @SerialName("anime_id") val id: Int, val fansub: String, + val anime_session: String, ) @Serializable @@ -30,6 +31,7 @@ data class SearchResultDto( val title: String, val poster: String, val id: Int, + val session: String, ) @Serializable