From f8b7e8b6ba025fcff31ebf0caabe8c72f25c4700 Mon Sep 17 00:00:00 2001 From: Samfun75 <38332931+Samfun75@users.noreply.github.com> Date: Tue, 7 Feb 2023 04:51:09 +0300 Subject: [PATCH] KickAssAnime: fix pink bird (#1249) --- src/en/kickassanime/build.gradle | 2 +- .../en/kickassanime/KickAssAnime.kt | 75 +++++++--------- .../kickassanime/MasterPlaylistInterceptor.kt | 87 ------------------- .../en/kickassanime/extractors/PinkBird.kt | 45 ++++++++++ 4 files changed, 75 insertions(+), 134 deletions(-) delete mode 100644 src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/MasterPlaylistInterceptor.kt create mode 100644 src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/extractors/PinkBird.kt diff --git a/src/en/kickassanime/build.gradle b/src/en/kickassanime/build.gradle index 053b5dabb..f3a248235 100644 --- a/src/en/kickassanime/build.gradle +++ b/src/en/kickassanime/build.gradle @@ -6,7 +6,7 @@ ext { extName = 'KickAssAnime' pkgNameSuffix = 'en.kickassanime' extClass = '.KickAssAnime' - extVersionCode = 14 + extVersionCode = 15 libVersion = '13' } diff --git a/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt b/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt index 24da2229b..0616ebafb 100644 --- a/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt +++ b/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt @@ -7,6 +7,7 @@ import android.util.Base64 import androidx.preference.ListPreference import androidx.preference.PreferenceScreen import eu.kanade.tachiyomi.animeextension.en.kickassanime.extractors.GogoCdnExtractor +import eu.kanade.tachiyomi.animeextension.en.kickassanime.extractors.PinkBird import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource import eu.kanade.tachiyomi.animesource.model.AnimeFilterList import eu.kanade.tachiyomi.animesource.model.AnimesPage @@ -170,38 +171,29 @@ class KickAssAnime : ConfigurableAnimeSource, AnimeHttpSource() { videoList.addAll( sources.parallelMap { source -> runCatching { - when (source.jsonObject["name"]!!.jsonPrimitive.content) { + val src = source.jsonObject["src"]!!.jsonPrimitive.content + val name = source.jsonObject["name"]!!.jsonPrimitive.content + when (name) { in deadServers -> { null } "SAPPHIRE-DUCK" -> { - extractSapphireVideo( - source.jsonObject["src"]!!.jsonPrimitive.content, - source.jsonObject["name"]!!.jsonPrimitive.content - ) + extractSapphireVideo(src, name) + } + "PINK-BIRD" -> { + PinkBird(client, json).videosFromUrl(src, name) } "BETAPLAYER" -> { - extractBetaVideo( - source.jsonObject["src"]!!.jsonPrimitive.content, - source.jsonObject["name"]!!.jsonPrimitive.content - ) + extractBetaVideo(src, name) } "KICKASSANIMEV2", "ORIGINAL-QUALITY-V2", "BETA-SERVER" -> { - extractKickasssVideo( - source.jsonObject["src"]!!.jsonPrimitive.content, - source.jsonObject["name"]!!.jsonPrimitive.content - ) + extractKickasssVideo(src, name) } "DAILYMOTION" -> { - extractDailymotion( - source.jsonObject["src"]!!.jsonPrimitive.content, - source.jsonObject["name"]!!.jsonPrimitive.content - ) + extractDailymotion(src, name) } - else -> { - extractVideo( - source.jsonObject["src"]!!.jsonPrimitive.content, - source.jsonObject["name"]!!.jsonPrimitive.content - ) + "MAVERICKKI" -> { + extractMavrick(src, name) } + else -> null } }.getOrNull() }.filterNotNull().flatten() @@ -211,31 +203,23 @@ class KickAssAnime : ConfigurableAnimeSource, AnimeHttpSource() { return videoList } - private fun extractVideo(serverLink: String, server: String): List