diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 90cbe6a2..61c2c8f7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,6 +24,7 @@ rxjava = { module = "io.reactivex:rxjava", version = "1.3.8" } jsoup = { module = "org.jsoup:jsoup", version = "1.16.1" } okhttp = { module = "com.squareup.okhttp3:okhttp", version = "5.0.0-alpha.11" } quickjs = { module = "app.cash.quickjs:quickjs-android", version = "0.9.2" } +jsunpacker = { module = "dev.datlag.jsunpacker:jsunpacker", version = "1.0.1" } [bundles] common = ["kotlin-stdlib", "injekt", "rxjava", "kotlin-protobuf", "kotlin-json", "jsoup", "okhttp", "aniyomi-lib", "quickjs", "coroutines-core", "coroutines-android"] diff --git a/lib/fastream-extractor/build.gradle.kts b/lib/fastream-extractor/build.gradle.kts index b102264b..07ea72d1 100644 --- a/lib/fastream-extractor/build.gradle.kts +++ b/lib/fastream-extractor/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") { + implementation(libs.jsunpacker) { exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8") } implementation(project(":lib:playlist-utils")) diff --git a/lib/filemoon-extractor/build.gradle.kts b/lib/filemoon-extractor/build.gradle.kts index b102264b..07ea72d1 100644 --- a/lib/filemoon-extractor/build.gradle.kts +++ b/lib/filemoon-extractor/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") { + implementation(libs.jsunpacker) { exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8") } implementation(project(":lib:playlist-utils")) diff --git a/lib/fireplayer-extractor/build.gradle.kts b/lib/fireplayer-extractor/build.gradle.kts index b102264b..07ea72d1 100644 --- a/lib/fireplayer-extractor/build.gradle.kts +++ b/lib/fireplayer-extractor/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") { + implementation(libs.jsunpacker) { exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8") } implementation(project(":lib:playlist-utils")) diff --git a/lib/mp4upload-extractor/build.gradle.kts b/lib/mp4upload-extractor/build.gradle.kts index 7e089728..50e574fa 100644 --- a/lib/mp4upload-extractor/build.gradle.kts +++ b/lib/mp4upload-extractor/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") { + implementation(libs.jsunpacker) { exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8") } } diff --git a/lib/streamhidevid-extractor/build.gradle.kts b/lib/streamhidevid-extractor/build.gradle.kts index 86e567ad..f92964eb 100644 --- a/lib/streamhidevid-extractor/build.gradle.kts +++ b/lib/streamhidevid-extractor/build.gradle.kts @@ -4,7 +4,7 @@ plugins { dependencies { implementation(project(":lib:playlist-utils")) - implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") { + implementation(libs.jsunpacker) { exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8") } } diff --git a/lib/streamvid-extractor/build.gradle.kts b/lib/streamvid-extractor/build.gradle.kts index 86e567ad..f92964eb 100644 --- a/lib/streamvid-extractor/build.gradle.kts +++ b/lib/streamvid-extractor/build.gradle.kts @@ -4,7 +4,7 @@ plugins { dependencies { implementation(project(":lib:playlist-utils")) - implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") { + implementation(libs.jsunpacker) { exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8") } } diff --git a/lib/streamwish-extractor/build.gradle.kts b/lib/streamwish-extractor/build.gradle.kts index b102264b..07ea72d1 100644 --- a/lib/streamwish-extractor/build.gradle.kts +++ b/lib/streamwish-extractor/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") { + implementation(libs.jsunpacker) { exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8") } implementation(project(":lib:playlist-utils")) diff --git a/lib/upstream-extractor/build.gradle.kts b/lib/upstream-extractor/build.gradle.kts index 86e567ad..f92964eb 100644 --- a/lib/upstream-extractor/build.gradle.kts +++ b/lib/upstream-extractor/build.gradle.kts @@ -4,7 +4,7 @@ plugins { dependencies { implementation(project(":lib:playlist-utils")) - implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") { + implementation(libs.jsunpacker) { exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8") } } diff --git a/lib/vido-extractor/build.gradle.kts b/lib/vido-extractor/build.gradle.kts index 86e567ad..f92964eb 100644 --- a/lib/vido-extractor/build.gradle.kts +++ b/lib/vido-extractor/build.gradle.kts @@ -4,7 +4,7 @@ plugins { dependencies { implementation(project(":lib:playlist-utils")) - implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") { + implementation(libs.jsunpacker) { exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8") } } diff --git a/src/all/animexin/build.gradle b/src/all/animexin/build.gradle index e051573e..9d96b3e4 100644 --- a/src/all/animexin/build.gradle +++ b/src/all/animexin/build.gradle @@ -13,5 +13,5 @@ dependencies { implementation(project(':lib:okru-extractor')) implementation(project(':lib:gdriveplayer-extractor')) implementation(project(':lib:dood-extractor')) - implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" + implementation(libs.jsunpacker) } \ No newline at end of file diff --git a/src/all/javguru/build.gradle b/src/all/javguru/build.gradle index ee2b73fa..4740a76f 100644 --- a/src/all/javguru/build.gradle +++ b/src/all/javguru/build.gradle @@ -12,7 +12,7 @@ dependencies { implementation(project(':lib:streamtape-extractor')) implementation(project(':lib:dood-extractor')) implementation(project(':lib:mixdrop-extractor')) - implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" + implementation(libs.jsunpacker) implementation(project(':lib:playlist-utils')) implementation(project(':lib:javcoverfetcher')) } \ No newline at end of file diff --git a/src/ar/anime4up/build.gradle b/src/ar/anime4up/build.gradle index 21301b92..5a3a10ae 100644 --- a/src/ar/anime4up/build.gradle +++ b/src/ar/anime4up/build.gradle @@ -15,5 +15,5 @@ dependencies { implementation(project(':lib:uqload-extractor')) implementation(project(':lib:vidbom-extractor')) implementation(project(':lib:voe-extractor')) - implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" + implementation(libs.jsunpacker) } \ No newline at end of file diff --git a/src/ar/tuktukcinema/build.gradle b/src/ar/tuktukcinema/build.gradle index 65662e88..1c33461d 100644 --- a/src/ar/tuktukcinema/build.gradle +++ b/src/ar/tuktukcinema/build.gradle @@ -13,5 +13,5 @@ dependencies { implementation(project(':lib:streamtape-extractor')) implementation(project(':lib:vidbom-extractor')) implementation(project(':lib:playlist-utils')) - implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" + implementation(libs.jsunpacker) } diff --git a/src/de/animebase/build.gradle b/src/de/animebase/build.gradle index 68b17a18..c4e42d24 100644 --- a/src/de/animebase/build.gradle +++ b/src/de/animebase/build.gradle @@ -12,5 +12,5 @@ dependencies { implementation(project(":lib:streamwish-extractor")) implementation(project(":lib:vidguard-extractor")) implementation(project(":lib:playlist-utils")) - implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") + implementation(libs.jsunpacker) } \ No newline at end of file diff --git a/src/de/cineclix/build.gradle b/src/de/cineclix/build.gradle index f18df74d..4a56ac78 100644 --- a/src/de/cineclix/build.gradle +++ b/src/de/cineclix/build.gradle @@ -12,5 +12,5 @@ dependencies { implementation(project(':lib:dood-extractor')) implementation(project(':lib:voe-extractor')) implementation(project(':lib:playlist-utils')) - implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" + implementation(libs.jsunpacker) } diff --git a/src/de/einfach/build.gradle b/src/de/einfach/build.gradle index b773bddb..2d54b413 100644 --- a/src/de/einfach/build.gradle +++ b/src/de/einfach/build.gradle @@ -14,5 +14,5 @@ dependencies { implementation(project(":lib:streamtape-extractor")) implementation(project(":lib:streamwish-extractor")) implementation(project(":lib:voe-extractor")) - implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") + implementation(libs.jsunpacker) } diff --git a/src/de/moflixstream/build.gradle b/src/de/moflixstream/build.gradle index 7ca010a3..c845536b 100644 --- a/src/de/moflixstream/build.gradle +++ b/src/de/moflixstream/build.gradle @@ -12,5 +12,5 @@ dependencies { implementation(project(':lib:streamtape-extractor')) implementation(project(':lib:vidguard-extractor')) implementation(project(':lib:playlist-utils')) - implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" + implementation(libs.jsunpacker) } diff --git a/src/de/movie2k/build.gradle b/src/de/movie2k/build.gradle index 35037b6f..0c1d0468 100644 --- a/src/de/movie2k/build.gradle +++ b/src/de/movie2k/build.gradle @@ -10,5 +10,5 @@ dependencies { implementation(project(':lib:dood-extractor')) implementation(project(':lib:streamtape-extractor')) implementation(project(':lib:mixdrop-extractor')) - implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" + implementation(libs.jsunpacker) } diff --git a/src/en/allanime/build.gradle b/src/en/allanime/build.gradle index 956ea0a5..237afdb0 100644 --- a/src/en/allanime/build.gradle +++ b/src/en/allanime/build.gradle @@ -14,5 +14,5 @@ dependencies { implementation(project(':lib:gogostream-extractor')) implementation(project(':lib:filemoon-extractor')) implementation(project(':lib:streamwish-extractor')) - implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" + implementation(libs.jsunpacker) } diff --git a/src/en/animekhor/build.gradle b/src/en/animekhor/build.gradle index b3226eca..c3dda15c 100644 --- a/src/en/animekhor/build.gradle +++ b/src/en/animekhor/build.gradle @@ -11,5 +11,5 @@ apply from: "$rootDir/common.gradle" dependencies { implementation(project(':lib:okru-extractor')) implementation(project(':lib:streamwish-extractor')) - implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" + implementation(libs.jsunpacker) } \ No newline at end of file diff --git a/src/en/animenosub/build.gradle b/src/en/animenosub/build.gradle index 44b7f269..56d6349e 100644 --- a/src/en/animenosub/build.gradle +++ b/src/en/animenosub/build.gradle @@ -12,5 +12,5 @@ apply from: "$rootDir/common.gradle" dependencies { implementation(project(':lib:filemoon-extractor')) implementation(project(':lib:streamwish-extractor')) - implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" + implementation(libs.jsunpacker) } \ No newline at end of file diff --git a/src/en/animepahe/build.gradle b/src/en/animepahe/build.gradle index 986c0de4..d2c0f169 100644 --- a/src/en/animepahe/build.gradle +++ b/src/en/animepahe/build.gradle @@ -7,5 +7,5 @@ ext { apply from: "$rootDir/common.gradle" dependencies { - implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" + implementation(libs.jsunpacker) } \ No newline at end of file diff --git a/src/en/aniplay/build.gradle b/src/en/aniplay/build.gradle index e6dc109a..64c01315 100644 --- a/src/en/aniplay/build.gradle +++ b/src/en/aniplay/build.gradle @@ -2,7 +2,7 @@ ext { extName = 'AniPlay' extClass = '.AniPlay' themePkg = 'anilist' - overrideVersionCode = 8 + overrideVersionCode = 7 } apply from: "$rootDir/common.gradle" diff --git a/src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlay.kt b/src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlay.kt index bc6caec3..40302b02 100644 --- a/src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlay.kt +++ b/src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlay.kt @@ -248,29 +248,22 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource { when (extra.source.lowercase()) { "yuki" -> { + val data = sourcesString.parseAs() return processEpisodeDataYuki( EpisodeDataYuki( source = extra.source, language = language, - response = sourcesString.parseAs(), - ), - ) - } - "pahe" -> { - return processEpisodeDataPahe( - EpisodeDataPahe( - source = extra.source, - language = language, - response = sourcesString.parseAs(), + response = data, ), ) } else -> { + val data = sourcesString.parseAs() return processEpisodeData( EpisodeData( source = extra.source, language = language, - response = sourcesString.parseAs(), + response = data, ), ) } @@ -308,36 +301,6 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource { return emptyList() } - private fun processEpisodeDataPahe(episodeData: EpisodeDataPahe): List