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

Fix(en/Aniplay): Fixed video list is empty and fixed unresolved host issue (#407)

Browse source 
* en/AniPlay: removed idMal since its no longer needed

* en/AniPlay: wrapped extractFromHls in try catch due to unresolved host error

* en/AniPlay: bumped versionCode
This commit is contained in:
Josef František Straka 2024-12-02 19:42:11 +01:00 • committed by GitHub
parent df43cf2b73
commit 515590ecfe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/en/aniplay/build.gradle
View file

@ -2,7 +2,7 @@ ext {
extName = 'AniPlay' extName = 'AniPlay'
extClass = '.AniPlay' extClass = '.AniPlay'
themePkg = 'anilist' themePkg = 'anilist'
overrideVersionCode = 5 overrideVersionCode = 6
} }
apply from: "$rootDir/common.gradle" apply from: "$rootDir/common.gradle"

51
src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlay.kt
View file

@ -15,7 +15,6 @@ import eu.kanade.tachiyomi.animesource.model.Track
import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.animesource.model.Video
import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
import eu.kanade.tachiyomi.multisrc.anilist.AniListAnimeHttpSource import eu.kanade.tachiyomi.multisrc.anilist.AniListAnimeHttpSource
import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.network.POST
import eu.kanade.tachiyomi.util.parallelFlatMap import eu.kanade.tachiyomi.util.parallelFlatMap
import eu.kanade.tachiyomi.util.parallelMap import eu.kanade.tachiyomi.util.parallelMap
@ -95,22 +94,6 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
val episodeListUrl = response.request.url val episodeListUrl = response.request.url
val animeId = episodeListUrl.pathSegments[2] val animeId = episodeListUrl.pathSegments[2]
val responsePage = client.newCall(GET("$baseUrl/anime/watch/$animeId")).execute()
val responsePageString = responsePage.body.string()
var idMal: Number? = null
val idMalIndex = responsePageString.indexOf("\\\"idMal\\\":")
if (idMalIndex != -1) {
val startIndex = idMalIndex + "\\\"idMal\\\":".length
val endIndex = responsePageString.indexOf(',', startIndex)
if (endIndex != -1) {
idMal = responsePageString.substring(startIndex, endIndex).toIntOrNull()
}
}
if (idMal == null) {
Log.e("AniPlay", "idMal not found - responsePageString: $responsePageString")
throw Exception("idMal not found")
}
val responseString = response.body.string() val responseString = response.body.string()
val episodesArrayString = extractEpisodeList(responseString) val episodesArrayString = extractEpisodeList(responseString)
if (episodesArrayString == null) { if (episodesArrayString == null) {
@ -152,7 +135,6 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
.addQueryParameter("id", animeId) .addQueryParameter("id", animeId)
.addQueryParameter("ep", episodeNumber.toString()) .addQueryParameter("ep", episodeNumber.toString())
.addQueryParameter("extras", episodeExtraString) .addQueryParameter("extras", episodeExtraString)
.addQueryParameter("idMal", idMal.toString())
.build() .build()
val name = parseEpisodeName(episodeNumber.toString(), episode.title) val name = parseEpisodeName(episodeNumber.toString(), episode.title)
@ -182,7 +164,6 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
override suspend fun getVideoList(episode: SEpisode): List<Video> { override suspend fun getVideoList(episode: SEpisode): List<Video> {
val episodeUrl = episode.url.toHttpUrl() val episodeUrl = episode.url.toHttpUrl()
val animeId = episodeUrl.queryParameter("id") ?: return emptyList() val animeId = episodeUrl.queryParameter("id") ?: return emptyList()
val idMal = episodeUrl.queryParameter("idMal") ?: return emptyList()
val extras = episodeUrl.queryParameter("extras") val extras = episodeUrl.queryParameter("extras")
?.let { ?.let {
try { try {
@ -222,7 +203,7 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
extra.episodeNum.toString() // If it has a fractional part, leave it as a float extra.episodeNum.toString() // If it has a fractional part, leave it as a float
} }
val requestBody = "[\"$animeId\",$idMal,\"${extra.source}\",\"${extra.episodeId}\",\"$epNum\",\"$language\"]" val requestBody = "[\"$animeId\",\"${extra.source}\",\"${extra.episodeId}\",\"$epNum\",\"$language\"]"
.toRequestBody("application/json".toMediaType()) .toRequestBody("application/json".toMediaType())
val params = mapOf( val params = mapOf(
@ -275,19 +256,23 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
?.map { Track(it.url, it.lang) } ?.map { Track(it.url, it.lang) }
?: emptyList() ?: emptyList()
playlistUtils.extractFromHls( try {
playlistUrl = defaultSource.url, playlistUtils.extractFromHls(
videoNameGen = { quality -> playlistUrl = defaultSource.url,
val serverName = getServerName(episodeData.source) videoNameGen = { quality ->
val typeName = when { val serverName = getServerName(episodeData.source)
subtitles.isNotEmpty() -> "SoftSub" val typeName = when {
else -> getTypeName(episodeData.language) subtitles.isNotEmpty() -> "SoftSub"
} else -> getTypeName(episodeData.language)
}
"$serverName - $quality - $typeName" "$serverName - $quality - $typeName"
}, },
subtitleList = subtitles, subtitleList = subtitles,
) )
} catch (e: Exception) {
Log.e("AniPlay", "extractFromHls Error: $e")
emptyList()
}
} }
return videos.sort() return videos.sort()