animeon: Fix posters and player

This commit is contained in:
CakesTwix 2024-05-19 12:06:52 +03:00
parent d2baf99a12
commit c9aa727f5b
Signed by: CakesTwix
GPG key ID: 7B11051D5CE19825
4 changed files with 15 additions and 74 deletions

View file

@ -72,7 +72,7 @@ class AnimeONProvider : MainAPI() {
val homeList = val homeList =
parsedJSON.results.map { parsedJSON.results.map {
newAnimeSearchResponse(it.titleUa, "anime/${it.id}", TvType.Anime) { newAnimeSearchResponse(it.titleUa, "anime/${it.id}", TvType.Anime) {
this.posterUrl = posterApi.format(it.poster) this.posterUrl = posterApi.format(it.image.preview)
} }
} }
// Log.d("CakesTwix-Debug", "$cdnUrl${parsedJSON.data[1].posterId}") // Log.d("CakesTwix-Debug", "$cdnUrl${parsedJSON.data[1].posterId}")
@ -82,7 +82,7 @@ class AnimeONProvider : MainAPI() {
val homeList = val homeList =
parsedJSON.map { parsedJSON.map {
newAnimeSearchResponse(it.titleUa, "anime/${it.id}", TvType.Anime) { newAnimeSearchResponse(it.titleUa, "anime/${it.id}", TvType.Anime) {
this.posterUrl = posterApi.format(it.poster) this.posterUrl = posterApi.format(it.image.preview)
} }
} }
// Log.d("CakesTwix-Debug", "$cdnUrl${parsedJSON.data[1].posterId}") // Log.d("CakesTwix-Debug", "$cdnUrl${parsedJSON.data[1].posterId}")
@ -136,7 +136,7 @@ class AnimeONProvider : MainAPI() {
val episodes = mutableListOf<Episode>() val episodes = mutableListOf<Episode>()
val playerRawJson = app.get(animeJSON.player.url).document.select("script").html() val playerRawJson = app.get(animeJSON.player[0].url).document.select("script").html()
.substringAfterLast("file:\'") .substringAfterLast("file:\'")
.substringBefore("\',") .substringBefore("\',")
@ -145,7 +145,7 @@ class AnimeONProvider : MainAPI() {
for (episode in season.folder) { // Episodes for (episode in season.folder) { // Episodes
episodes.add( episodes.add(
Episode( Episode(
"${season.title}, ${episode.title}, ${animeJSON.player.url}", "${season.title}, ${episode.title}, ${animeJSON.player[0].url}",
episode.title, episode.title,
season.title.replace(" Сезон ", "").toIntOrNull(), season.title.replace(" Сезон ", "").toIntOrNull(),
episode.title.replace("Серія ", "").toIntOrNull(), episode.title.replace("Серія ", "").toIntOrNull(),
@ -176,7 +176,7 @@ class AnimeONProvider : MainAPI() {
addMalId(animeJSON.malId) addMalId(animeJSON.malId)
} }
} else { } else {
newMovieLoadResponse(animeJSON.titleUa, "$mainUrl/anime/${animeJSON.id}", tvType, "${animeJSON.titleUa}, ${animeJSON.player.url}") { newMovieLoadResponse(animeJSON.titleUa, "$mainUrl/anime/${animeJSON.id}", tvType, "${animeJSON.titleUa}, ${animeJSON.player[0].url}") {
this.posterUrl = posterApi.format(animeJSON.poster) this.posterUrl = posterApi.format(animeJSON.poster)
this.tags = animeJSON.genres.map { it.name } this.tags = animeJSON.genres.map { it.name }
this.plot = animeJSON.description this.plot = animeJSON.description

View file

@ -9,94 +9,39 @@ class AnimeInfoModel (
@SerializedName("titleEn") val titleEn : String, @SerializedName("titleEn") val titleEn : String,
@SerializedName("description") val description : String, @SerializedName("description") val description : String,
@SerializedName("releaseDate") val releaseDate : Int, @SerializedName("releaseDate") val releaseDate : Int,
@SerializedName("producer") val producer : String,
@SerializedName("views") val views : Int,
@SerializedName("episodes") val episodes : Int,
@SerializedName("episodeTime") val episodeTime : String, @SerializedName("episodeTime") val episodeTime : String,
@SerializedName("poster") val poster : String, @SerializedName("poster") val poster : String,
@SerializedName("backgroundImage") val backgroundImage : String, @SerializedName("backgroundImage") val backgroundImage : String,
@SerializedName("episodesAired") val episodesAired : Int,
@SerializedName("createdAt") val createdAt : String,
@SerializedName("updatedAt") val updatedAt : String,
@SerializedName("trailer") val trailer : String, @SerializedName("trailer") val trailer : String,
@SerializedName("ashdiId") val ashdiId : String,
@SerializedName("malId") val malId : Int, @SerializedName("malId") val malId : Int,
@SerializedName("pl") val pl : String,
@SerializedName("season") val season : Int,
@SerializedName("rating") val rating : Double, @SerializedName("rating") val rating : Double,
@SerializedName("genres") val genres : List<Genres>, @SerializedName("genres") val genres : List<Genres>,
@SerializedName("tags") val tags : List<Tags>,
@SerializedName("studio") val studio : Studio,
@SerializedName("status") val status : Status, @SerializedName("status") val status : Status,
@SerializedName("age") val age : Age,
@SerializedName("fundups") val fundups : List<Fundups>,
@SerializedName("type") val type : Type, @SerializedName("type") val type : Type,
@SerializedName("schedule") val schedule : Schedule, @SerializedName("player") val player : List<Player>,
@SerializedName("franchise") val franchise : Franchise,
@SerializedName("player") val player : Player,
@SerializedName("screenshots") val screenshots : List<Screenshots>,
@SerializedName("rank") val rank : Int,
@SerializedName("votes") val votes : Int
) )
data class Schedule ( data class Genres (
@SerializedName("id") val id : Int, @SerializedName("id") val id : Int,
@SerializedName("date") val name : String, @SerializedName("name") val name : String,
@SerializedName("episode") val episode : String, @SerializedName("malId") val malId : String,
)
data class Age (
@SerializedName("id") val id : Int,
@SerializedName("name") val name : String
)
data class Franchise (
@SerializedName("id") val id : Int,
@SerializedName("weight") val weight : Int
)
data class Fundups (
@SerializedName("id") val id : Int,
@SerializedName("name") val name : String
) )
data class Player ( data class Player (
@SerializedName("id") val id : Int, @SerializedName("id") val id : Long,
@SerializedName("url") val url : String, @SerializedName("url") val url : String,
@SerializedName("numEpisodeFrom") val numEpisodeFrom : String, @SerializedName("numEpisodeFrom") val numEpisodeFrom : String,
@SerializedName("numEpisodeTo") val numEpisodeTo : String @SerializedName("numEpisodeTo") val numEpisodeTo : String
) )
data class Screenshots (
@SerializedName("id") val id : Int,
@SerializedName("original") val original : String,
@SerializedName("preview") val preview : String
)
data class Status ( data class Status (
@SerializedName("id") val id : Int, @SerializedName("id") val id : Int,
@SerializedName("name") val name : String @SerializedName("name") val name : String
) )
data class Studio (
@SerializedName("id") val id : Int,
@SerializedName("name") val name : String
)
data class Tags (
@SerializedName("id") val id : Int,
@SerializedName("name") val name : String
)
data class Type ( data class Type (
@SerializedName("id") val id : Int, @SerializedName("id") val id : Int,

View file

@ -5,16 +5,12 @@ import com.google.gson.annotations.SerializedName
class AnimeModel ( class AnimeModel (
@SerializedName("id") val id : Int, @SerializedName("id") val id : Int,
@SerializedName("titleUa") val titleUa : String, @SerializedName("titleUa") val titleUa : String,
@SerializedName("description") val description : String, @SerializedName("image") val image : Image,
@SerializedName("poster") val poster : String,
@SerializedName("backgroundImage") val backgroundImage : String,
@SerializedName("rating") val rating : Double,
@SerializedName("genres") val genres : List<Genres>
) )
data class Genres ( data class Image (
@SerializedName("id") val id : Int, @SerializedName("id") val id : Int,
@SerializedName("name") val name : String, @SerializedName("original") val original : String,
@SerializedName("malId") val malId : Int @SerializedName("preview") val preview : String
) )

View file

@ -16,7 +16,7 @@ data class Results (
@SerializedName("releaseDate") val releaseDate : Int, @SerializedName("releaseDate") val releaseDate : Int,
@SerializedName("views") val views : Int, @SerializedName("views") val views : Int,
@SerializedName("episodes") val episodes : Int, @SerializedName("episodes") val episodes : Int,
@SerializedName("poster") val poster : String, @SerializedName("image") val image : Image,
@SerializedName("episodesAired") val episodesAired : Int, @SerializedName("episodesAired") val episodesAired : Int,
@SerializedName("createdAt") val createdAt : String, @SerializedName("createdAt") val createdAt : String,
@SerializedName("malId") val malId : Int, @SerializedName("malId") val malId : Int,