From df9d22d8c50b1c6e320a94940cf6429892f68d92 Mon Sep 17 00:00:00 2001 From: mobby45 <68152858+mobby45@users.noreply.github.com> Date: Tue, 24 Sep 2024 08:00:47 +0000 Subject: [PATCH 1/5] modified: "src/fr/anisama/src/eu/kanade/tachiyomi/animeextension/fr/anisama/AniSama.kt" --- .../eu/kanade/tachiyomi/animeextension/fr/anisama/AniSama.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fr/anisama/src/eu/kanade/tachiyomi/animeextension/fr/anisama/AniSama.kt b/src/fr/anisama/src/eu/kanade/tachiyomi/animeextension/fr/anisama/AniSama.kt index d0345497..fc3fed67 100644 --- a/src/fr/anisama/src/eu/kanade/tachiyomi/animeextension/fr/anisama/AniSama.kt +++ b/src/fr/anisama/src/eu/kanade/tachiyomi/animeextension/fr/anisama/AniSama.kt @@ -40,7 +40,7 @@ class AniSama : ParsedAnimeHttpSource(), ConfigurableAnimeSource { override val name = "AniSama" - override val baseUrl = "https://animesz.xyz" + override val baseUrl = "https://v1.animesz.xyz" override val lang = "fr" From 1ba2d42c67e4a14b71dcb1f305045b8f42d0ca32 Mon Sep 17 00:00:00 2001 From: mobby45 Date: Wed, 25 Sep 2024 21:08:30 +0200 Subject: [PATCH 2/5] Revert "Merge branch 'Kohi-den:main' into main" This reverts commit 85610e7f46966efef9ddc6b545ead0d3aeddb095, reversing changes made to df9d22d8c50b1c6e320a94940cf6429892f68d92. --- gradle/libs.versions.toml | 4 +- src/all/torrentioanime/build.gradle | 2 +- .../all/torrentioanime/Torrentio.kt | 2 +- src/en/aniplay/build.gradle | 2 +- .../animeextension/en/aniplay/AniPlay.kt | 74 ++------- .../animeextension/en/aniplay/AniPlayDto.kt | 1 - src/en/pinoymoviepedia/build.gradle | 15 -- .../res/mipmap-hdpi/ic_launcher.webp | Bin 6134 -> 0 bytes .../res/mipmap-mdpi/ic_launcher.webp | Bin 3346 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher.webp | Bin 9340 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher.webp | Bin 16890 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher.webp | Bin 25944 -> 0 bytes .../en/pinoymoviepedia/PinoyMoviePedia.kt | 156 ------------------ .../pinoymoviepedia/PinoyMoviePediaFilters.kt | 86 ---------- 14 files changed, 22 insertions(+), 320 deletions(-) delete mode 100644 src/en/pinoymoviepedia/build.gradle delete mode 100644 src/en/pinoymoviepedia/res/mipmap-hdpi/ic_launcher.webp delete mode 100644 src/en/pinoymoviepedia/res/mipmap-mdpi/ic_launcher.webp delete mode 100644 src/en/pinoymoviepedia/res/mipmap-xhdpi/ic_launcher.webp delete mode 100644 src/en/pinoymoviepedia/res/mipmap-xxhdpi/ic_launcher.webp delete mode 100644 src/en/pinoymoviepedia/res/mipmap-xxxhdpi/ic_launcher.webp delete mode 100644 src/en/pinoymoviepedia/src/eu/kanade/tachiyomi/animeextension/en/pinoymoviepedia/PinoyMoviePedia.kt delete mode 100644 src/en/pinoymoviepedia/src/eu/kanade/tachiyomi/animeextension/en/pinoymoviepedia/PinoyMoviePediaFilters.kt diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 90cbe6a2..e51cd920 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,11 +19,11 @@ kotlin-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", ver coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines_version" } coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines_version" } -injekt = "com.github.mihonapp:injekt:91edab2317" +injekt-core = { module = "com.github.inorichi.injekt:injekt-core", version = "65b0440" } 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" } [bundles] -common = ["kotlin-stdlib", "injekt", "rxjava", "kotlin-protobuf", "kotlin-json", "jsoup", "okhttp", "aniyomi-lib", "quickjs", "coroutines-core", "coroutines-android"] +common = ["kotlin-stdlib", "injekt-core", "rxjava", "kotlin-protobuf", "kotlin-json", "jsoup", "okhttp", "aniyomi-lib", "quickjs", "coroutines-core", "coroutines-android"] diff --git a/src/all/torrentioanime/build.gradle b/src/all/torrentioanime/build.gradle index 05d1795d..c7de4b40 100644 --- a/src/all/torrentioanime/build.gradle +++ b/src/all/torrentioanime/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Torrentio Anime (Torrent / Debrid)' extClass = '.Torrentio' - extVersionCode = 9 + extVersionCode = 8 containsNsfw = false } diff --git a/src/all/torrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/Torrentio.kt b/src/all/torrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/Torrentio.kt index d3a2f6f0..dcc8c677 100644 --- a/src/all/torrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/Torrentio.kt +++ b/src/all/torrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/Torrentio.kt @@ -75,7 +75,7 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() { currentPage hasNextPage } - media(type: ANIME, sort: ${"$"}sort, search: ${"$"}search, status_in:[RELEASING,FINISHED,NOT_YET_RELEASED]) { + media(type: ANIME, sort: ${"$"}sort, search: ${"$"}search, status_in:[RELEASING,FINISHED]) { id title { romaji diff --git a/src/en/aniplay/build.gradle b/src/en/aniplay/build.gradle index 33076e1d..64a3a7ab 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 = 3 + overrideVersionCode = 2 } 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 d8ba1518..661201f9 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 @@ -1,7 +1,6 @@ package eu.kanade.tachiyomi.animeextension.en.aniplay import android.app.Application -import android.net.Uri import android.util.Base64 import android.util.Log import android.widget.Toast @@ -15,6 +14,7 @@ import eu.kanade.tachiyomi.animesource.model.Track import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils import eu.kanade.tachiyomi.multisrc.anilist.AniListAnimeHttpSource +import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.util.parallelFlatMapBlocking import eu.kanade.tachiyomi.util.parseAs @@ -73,27 +73,14 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource { val httpUrl = anime.url.toHttpUrl() val animeId = httpUrl.pathSegments[2] - val requestBody = "[\"${animeId}\",true,false]" - .toRequestBody("text/plain;charset=UTF-8".toMediaType()) - - val headersWithAction = - headers.newBuilder() - // next.js stuff I guess - .add("Next-Action", HEADER_NEXT_ACTION_EPISODE_LIST_VALUE) - .build() - - return POST(url = "$baseUrl/anime/info/$animeId", headersWithAction, requestBody) + return GET("$baseUrl/api/anime/episode/$animeId") } override fun episodeListParse(response: Response): List { val isMarkFiller = preferences.getBoolean(PREF_MARK_FILLER_EPISODE_KEY, PREF_MARK_FILLER_EPISODE_DEFAULT) val episodeListUrl = response.request.url - val animeId = episodeListUrl.pathSegments[2] - - val responseString = response.body.string() - val episodesArrayString = responseString.split("1:").last() - - val providers = episodesArrayString.parseAs>() + val animeId = episodeListUrl.pathSegments[3] + val providers = response.parseAs>() val episodes = mutableMapOf() val episodeExtras = mutableMapOf>() @@ -107,7 +94,6 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource { val episodeExtra = EpisodeExtra( source = provider.providerId, episodeId = episode.id, - episodeNum = episode.number, hasDub = episode.hasDub, ) episodeExtras[episodeNumber] = existingEpisodeExtras + listOf(episodeExtra) @@ -156,7 +142,7 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource { override suspend fun getVideoList(episode: SEpisode): List