recloudstream/cloudstream-extensions-hexated
6
2
Fork 0
mirror of https://github.com/hexated/cloudstream-extensions-hexated.git synced 2024-08-15 00:03:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

small fix

Browse source
This commit is contained in:
hexated 2023-04-14 17:17:06 +07:00
parent 0ad1bcbbaa
commit 180b8e77ee
3 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
View file

@ -991,7 +991,7 @@ object SoraExtractor : SoraStream() {
invokeBiliBili(aniId, episode, subtitleCallback, callback) invokeBiliBili(aniId, episode, subtitleCallback, callback)
}, },
{ {
if(season != null) invokeAllanime(aniId, title, episode, callback) if(season != null) invokeAllanime(aniId, title, year, episode, callback)
} }
) )
} }
@ -999,11 +999,11 @@ object SoraExtractor : SoraStream() {
private suspend fun invokeAllanime( private suspend fun invokeAllanime(
aniId: String? = null, aniId: String? = null,
title: String? = null, title: String? = null,
year: Int? = null,
episode: Int? = null, episode: Int? = null,
callback: (ExtractorLink) -> Unit callback: (ExtractorLink) -> Unit
) { ) {
val searchHash = "b645a686b1988327795e1203867ed24f27c6338b41e5e3412fc1478a8ab6774e" val searchHash = "b645a686b1988327795e1203867ed24f27c6338b41e5e3412fc1478a8ab6774e"
val detailHash = "d6069285a58a25defe4a217b82140c6da891605c20e510d4683ae73190831ab0"
val serverHash = "0ac09728ee9d556967c1a60bbcf55a9f58b4112006d09a258356aeafe1c33889" val serverHash = "0ac09728ee9d556967c1a60bbcf55a9f58b4112006d09a258356aeafe1c33889"
val aniDetail = app.get("$consumetAnilistAPI/info/$aniId").parsedSafe<ConsumetDetails>() val aniDetail = app.get("$consumetAnilistAPI/info/$aniId").parsedSafe<ConsumetDetails>()
@ -1013,23 +1013,26 @@ object SoraExtractor : SoraStream() {
val id = app.get(searchQuaery) val id = app.get(searchQuaery)
.parsedSafe<AllanimeResponses>()?.data?.shows?.edges?.let { media -> .parsedSafe<AllanimeResponses>()?.data?.shows?.edges?.let { media ->
media.find { it.thumbnail == aniDetail?.cover || it.thumbnail == aniDetail?.image } media.find { it.thumbnail == aniDetail?.cover || it.thumbnail == aniDetail?.image }
?: media.find { it.name.equals(title, true) || it.englishName.equals(title,true) } ?: media.find {
(it.name?.contains(
"$title",
true
) == true || it.englishName?.contains("$title", true) == true) && it.airedStart?.year == year
}
}?._id }?._id
val detailQuery = listOf(
"""$allanimeAPI/allanimeapi?variables={"_id":"${id ?: return}"}&extensions={"persistedQuery":{"version":1,"sha256Hash":"$detailHash"}}""" "sub",
val episodes = app.get(detailQuery) "dub"
.parsedSafe<AllanimeResponses>()?.data?.show?.availableEpisodesDetail ).apmap { tl ->
listOfNotNull(
episodes?.sub?.find { it.toInt() == episode } to "sub",
episodes?.dub?.find { it.toInt() == episode } to "dub"
).apmap { (eps, tl) ->
val serverQuery = val serverQuery =
"""$allanimeAPI/allanimeapi?variables={"showId":"$id","translationType":"$tl","episodeString":"$eps"}&extensions={"persistedQuery":{"version":1,"sha256Hash":"$serverHash"}}""" """$allanimeAPI/allanimeapi?variables={"showId":"${id ?: return@apmap}","translationType":"$tl","episodeString":"$episode"}&extensions={"persistedQuery":{"version":1,"sha256Hash":"$serverHash"}}"""
val server = app.get(serverQuery) val server = app.get(serverQuery)
.parsedSafe<AllanimeResponses>()?.data?.episode?.sourceUrls?.find { it.sourceName == "Ac" } .parsedSafe<AllanimeResponses>()?.data?.episode?.sourceUrls?.find { it.sourceName == "Ac" }
val serverUrl = fixUrl(server?.sourceUrl?.replace("/clock", "/clock.json") ?: return@apmap, "https://allanimenews.com") val serverUrl = fixUrl(
server?.sourceUrl?.replace("/clock", "/clock.json") ?: return@apmap,
"https://allanimenews.com"
)
app.get(serverUrl) app.get(serverUrl)
.parsedSafe<AllanimeLinks>()?.links?.forEach { link -> .parsedSafe<AllanimeLinks>()?.links?.forEach { link ->
link.portData?.streams?.filter { link.portData?.streams?.filter {
@ -3418,12 +3421,17 @@ data class AllanimeDetailShow(
@JsonProperty("availableEpisodesDetail") val availableEpisodesDetail: AllanimeAvailableEpisodesDetail? = null, @JsonProperty("availableEpisodesDetail") val availableEpisodesDetail: AllanimeAvailableEpisodesDetail? = null,
) )
data class AllanimeAiredStart(
@JsonProperty("year") val year: Int? = null,
)
data class AllanimeEdges( data class AllanimeEdges(
@JsonProperty("_id") val _id: String? = null, @JsonProperty("_id") val _id: String? = null,
@JsonProperty("name") val name: String? = null, @JsonProperty("name") val name: String? = null,
@JsonProperty("englishName") val englishName: String? = null, @JsonProperty("englishName") val englishName: String? = null,
@JsonProperty("thumbnail") val thumbnail: String? = null, @JsonProperty("thumbnail") val thumbnail: String? = null,
@JsonProperty("type") val type: String? = null, @JsonProperty("type") val type: String? = null,
@JsonProperty("airedStart") val airedStart: AllanimeAiredStart? = null,
) )
data class AllanimeShows( data class AllanimeShows(

2
SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
View file

@ -411,7 +411,7 @@ open class SoraStream : TmdbProvider() {
res.id, res.id,
res.title, res.title,
res.epsTitle, res.epsTitle,
res.year, res.airedYear ?: res.year,
res.season, res.season,
res.episode, res.episode,
subtitleCallback, subtitleCallback,

2
SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
View file

@ -119,7 +119,7 @@ class SoraStreamLite : SoraStream() {
res.id, res.id,
res.title, res.title,
res.epsTitle, res.epsTitle,
res.year, res.airedYear ?: res.year,
res.season, res.season,
res.episode, res.episode,
subtitleCallback, subtitleCallback,