From a7eea4d64fb31556433103279b218a0237ace0b9 Mon Sep 17 00:00:00 2001 From: jmir1 Date: Tue, 26 Jul 2022 21:00:57 +0200 Subject: [PATCH] bump extensions-lib version * also update all the `Video` constructors --- common-dependencies.gradle | 2 +- src/all/onepace/build.gradle | 4 ++-- .../tachiyomi/animeextension/all/onepace/Onepace.kt | 2 +- src/ar/akwam/build.gradle | 4 ++-- .../kanade/tachiyomi/animeextension/ar/akwam/Akwam.kt | 2 +- src/ar/akwams/build.gradle | 4 ++-- .../tachiyomi/animeextension/ar/akwams/AkwamS.kt | 2 +- src/ar/anime4up/build.gradle | 4 ++-- .../tachiyomi/animeextension/ar/anime4up/Anime4Up.kt | 2 +- src/ar/animeblkom/build.gradle | 4 ++-- .../animeextension/ar/animeblkom/AnimeBlkom.kt | 2 +- src/ar/animelek/build.gradle | 4 ++-- .../tachiyomi/animeextension/ar/animelek/AnimeLek.kt | 2 +- .../ar/animelek/extractors/DoodExtractor.kt | 2 +- .../ar/animelek/extractors/OkruExtractor.kt | 2 +- .../ar/animelek/extractors/SharedExtractor.kt | 4 ++-- .../ar/animelek/extractors/StreamSBExtractor.kt | 2 +- .../ar/animelek/extractors/StreamTapeExtractor.kt | 4 ++-- .../ar/animelek/extractors/VidBomExtractor.kt | 8 ++++---- src/ar/animerco/build.gradle | 4 ++-- .../tachiyomi/animeextension/ar/animerco/Animerco.kt | 2 +- .../ar/animerco/extractors/DoodExtractor.kt | 2 +- .../ar/animerco/extractors/FembedExtractor.kt | 6 +++--- .../ar/animerco/extractors/MpforuploadExtractor.kt | 4 ++-- .../ar/animerco/extractors/OkruExtractor.kt | 2 +- .../ar/animerco/extractors/SharedExtractor.kt | 4 ++-- .../ar/animerco/extractors/StreamSBExtractor.kt | 2 +- .../ar/animerco/extractors/StreamTapeExtractor.kt | 4 ++-- .../ar/animerco/extractors/UQLoadExtractor.kt | 4 ++-- .../ar/animerco/extractors/VidBomExtractor.kt | 8 ++++---- src/ar/arabseed/build.gradle | 4 ++-- .../tachiyomi/animeextension/ar/arabseed/ArabSeed.kt | 2 +- src/ar/asia2tv/build.gradle | 4 ++-- .../tachiyomi/animeextension/ar/asia2tv/Asia2TV.kt | 10 +++++----- src/ar/cartoons4u/build.gradle | 4 ++-- .../animeextension/ar/cartoons4u/Cartoons4U.kt | 2 +- src/ar/faselhd/build.gradle | 4 ++-- .../tachiyomi/animeextension/ar/faselhd/FASELHD.kt | 2 +- src/ar/faselhdmovies/build.gradle | 4 ++-- .../animeextension/ar/faselhdmovies/FASELHDMOVIES.kt | 2 +- src/ar/movies4u/build.gradle | 4 ++-- .../tachiyomi/animeextension/ar/movies4u/Movies4U.kt | 2 +- src/ar/mycima/build.gradle | 4 ++-- .../tachiyomi/animeextension/ar/mycima/MyCima.kt | 4 ++-- src/ar/mycimamovie/build.gradle | 4 ++-- .../animeextension/ar/mycimamovie/MyCimaMovie.kt | 4 ++-- src/ar/witanime/build.gradle | 4 ++-- .../tachiyomi/animeextension/ar/witanime/WitAnime.kt | 2 +- .../ar/witanime/extractors/DoodExtractor.kt | 2 +- .../ar/witanime/extractors/FembedExtractor.kt | 4 ++-- .../ar/witanime/extractors/OkruExtractor.kt | 2 +- .../ar/witanime/extractors/SharedExtractor.kt | 4 ++-- .../ar/witanime/extractors/SoraPlayExtractor.kt | 2 +- .../ar/witanime/extractors/StreamSBExtractor.kt | 2 +- src/ar/xsanime/build.gradle | 4 ++-- .../tachiyomi/animeextension/ar/xsanime/XsAnime.kt | 2 +- src/ar/xsmovie/build.gradle | 4 ++-- .../tachiyomi/animeextension/ar/xsmovie/XsMovie.kt | 2 +- src/de/aniflix/build.gradle | 4 ++-- .../de/aniflix/extractors/DoodExtractor.kt | 2 +- .../de/aniflix/extractors/StreamTapeExtractor.kt | 2 +- .../de/aniflix/extractors/StreamlareExtractor.kt | 2 +- .../de/aniflix/extractors/VoeExtractor.kt | 2 +- src/de/animeshitai/build.gradle | 4 ++-- .../de/animeshitai/extractors/DoodExtractor.kt | 2 +- .../de/animeshitai/extractors/StreamTapeExtractor.kt | 2 +- src/de/filmpalast/build.gradle | 4 ++-- .../animeextension/de/filmpalast/FilmPalast.kt | 9 +++------ .../de/filmpalast/extractors/EvoloadExtractor.kt | 4 ++-- .../de/filmpalast/extractors/VoeExtractor.kt | 2 +- src/de/fireanime/build.gradle | 4 ++-- .../de/fireanime/extractors/DoodExtractor.kt | 2 +- .../de/fireanime/extractors/FireCdnExtractor.kt | 2 +- src/de/xcine/build.gradle | 4 ++-- .../de/xcine/extractors/HDFilmExtractor.kt | 2 +- src/en/allmovies/build.gradle | 4 ++-- .../tachiyomi/animeextension/en/allmovies/AllMovies.kt | 4 ++-- src/en/animekisa/build.gradle | 4 ++-- .../tachiyomi/animeextension/en/animekisa/AnimeKisa.kt | 2 +- src/en/animepahe/build.gradle | 4 ++-- .../tachiyomi/animeextension/en/animepahe/AnimePahe.kt | 2 +- src/en/animixplay/build.gradle | 4 ++-- .../animeextension/en/animixplay/Animixplay.kt | 4 ++-- .../en/animixplay/extractors/GogoCdnExtractor.kt | 4 ++-- src/en/asianload/build.gradle | 4 ++-- .../tachiyomi/animeextension/en/asianload/AsianLoad.kt | 2 +- .../en/asianload/extractors/DoodExtractor.kt | 2 +- .../en/asianload/extractors/FembedExtractor.kt | 4 ++-- .../en/asianload/extractors/StreamSBExtractor.kt | 2 +- .../en/asianload/extractors/StreamTapeExtractor.kt | 2 +- src/en/dopebox/build.gradle | 4 ++-- .../tachiyomi/animeextension/en/dopebox/DopeBox.kt | 4 ++-- src/en/dramacool/build.gradle | 4 ++-- .../tachiyomi/animeextension/en/dramacool/DramaCool.kt | 2 +- .../en/dramacool/extractors/DoodExtractor.kt | 2 +- .../en/dramacool/extractors/FembedExtractor.kt | 4 ++-- .../en/dramacool/extractors/StreamSBExtractor.kt | 2 +- .../en/dramacool/extractors/StreamTapeExtractor.kt | 2 +- src/en/genoanime/build.gradle | 4 ++-- .../tachiyomi/animeextension/en/genoanime/GenoAnime.kt | 2 +- .../en/genoanime/extractors/DoodExtractor.kt | 2 +- .../en/genoanime/extractors/FembedExtractor.kt | 4 ++-- .../en/genoanime/extractors/StreamSBExtractor.kt | 2 +- .../en/genoanime/extractors/StreamTapeExtractor.kt | 2 +- src/en/gogoanime/build.gradle | 4 ++-- .../en/gogoanime/extractors/DoodExtractor.kt | 2 +- .../en/gogoanime/extractors/GogoCdnExtractor.kt | 4 ++-- .../en/gogoanime/extractors/StreamSBExtractor.kt | 2 +- src/en/hahomoe/build.gradle | 4 ++-- .../tachiyomi/animeextension/en/hahomoe/HahoMoe.kt | 2 +- src/en/hanime/build.gradle | 4 ++-- src/en/hentaimama/build.gradle | 4 ++-- .../animeextension/en/hentaimama/HentaiMama.kt | 4 ++-- src/en/nineanime/build.gradle | 4 ++-- .../tachiyomi/animeextension/en/nineanime/NineAnime.kt | 2 +- src/en/sflix/build.gradle | 4 ++-- .../kanade/tachiyomi/animeextension/en/sflix/SFlix.kt | 4 ++-- src/en/tenshimoe/build.gradle | 4 ++-- src/en/twistmoe/build.gradle | 4 ++-- .../tachiyomi/animeextension/en/twistmoe/TwistMoe.kt | 2 +- src/en/vidembed/build.gradle | 4 ++-- .../tachiyomi/animeextension/en/vidembed/Vidembed.kt | 6 +++--- .../en/vidembed/extractors/StreamSBExtractor.kt | 2 +- src/en/wcofun/build.gradle | 4 ++-- .../tachiyomi/animeextension/en/wcofun/Wcofun.kt | 4 ++-- src/en/wcostream/build.gradle | 4 ++-- .../tachiyomi/animeextension/en/wcostream/WCOStream.kt | 4 ++-- src/en/zoro/build.gradle | 4 ++-- .../eu/kanade/tachiyomi/animeextension/en/zoro/Zoro.kt | 2 +- src/es/animefenix/build.gradle | 4 ++-- .../animeextension/es/animefenix/Animefenix.kt | 4 ++-- .../es/animefenix/extractors/FembedExtractor.kt | 4 ++-- .../es/animefenix/extractors/OkruExtractor.kt | 2 +- .../es/animefenix/extractors/SolidFilesExtractor.kt | 2 +- .../es/animefenix/extractors/StreamTapeExtractor.kt | 2 +- src/es/animeflv/build.gradle | 4 ++-- .../es/animeflv/extractors/DoodExtractor.kt | 2 +- .../es/animeflv/extractors/FembedExtractor.kt | 4 ++-- .../es/animeflv/extractors/OkruExtractor.kt | 2 +- .../es/animeflv/extractors/StreamSBExtractor.kt | 2 +- .../es/animeflv/extractors/StreamTapeExtractor.kt | 2 +- .../es/animeflv/extractors/YourUploadExtractor.kt | 2 +- src/es/animeid/build.gradle | 4 ++-- .../es/animeid/extractors/StreamTapeExtractor.kt | 2 +- src/es/animelatinohd/build.gradle | 4 ++-- .../animeextension/es/animelatinohd/AnimeLatinoHD.kt | 4 ++-- .../es/animelatinohd/extractors/DoodExtractor.kt | 2 +- .../es/animelatinohd/extractors/FembedExtractor.kt | 4 ++-- .../es/animelatinohd/extractors/OkruExtractor.kt | 2 +- .../es/animelatinohd/extractors/SolidFilesExtractor.kt | 2 +- .../es/animelatinohd/extractors/StreamSBExtractor.kt | 2 +- .../es/animelatinohd/extractors/StreamTapeExtractor.kt | 2 +- src/es/animeonlineninja/build.gradle | 4 ++-- .../es/animeonlineninja/AnimeonlineNinja.kt | 4 ++-- .../es/animeonlineninja/extractors/DoodExtractor.kt | 2 +- .../es/animeonlineninja/extractors/FembedExtractor.kt | 4 ++-- .../es/animeonlineninja/extractors/OkruExtractor.kt | 2 +- .../animeonlineninja/extractors/SolidFilesExtractor.kt | 2 +- .../animeonlineninja/extractors/StreamSBExtractor.kt | 2 +- .../animeonlineninja/extractors/StreamTapeExtractor.kt | 2 +- .../es/animeonlineninja/extractors/uploadExtractor.kt | 2 +- src/es/animeyt/build.gradle | 4 ++-- .../es/animeyt/extractors/FastreamExtractor.kt | 2 +- src/es/asialiveaction/build.gradle | 4 ++-- .../es/asialiveaction/extractors/FembedExtractor.kt | 4 ++-- .../es/asialiveaction/extractors/OkruExtractor.kt | 2 +- .../es/asialiveaction/extractors/StreamSBExtractor.kt | 2 +- src/es/doramasyt/build.gradle | 4 ++-- .../es/doramasyt/extractors/FembedExtractor.kt | 4 ++-- .../es/doramasyt/extractors/OkruExtractor.kt | 2 +- .../es/doramasyt/extractors/SolidFilesExtractor.kt | 2 +- .../es/doramasyt/extractors/StreamTapeExtractor.kt | 2 +- src/es/hentaijk/build.gradle | 4 ++-- .../tachiyomi/animeextension/es/hentaijk/Hentaijk.kt | 6 +++--- .../es/hentaijk/extractors/FembedExtractor.kt | 4 ++-- .../es/hentaijk/extractors/OkruExtractor.kt | 2 +- src/es/hentaila/build.gradle | 4 ++-- .../tachiyomi/animeextension/es/hentaila/Hentaila.kt | 2 +- .../es/hentaila/extractors/FembedExtractor.kt | 4 ++-- .../es/hentaila/extractors/OkruExtractor.kt | 2 +- src/es/jkanime/build.gradle | 4 ++-- .../tachiyomi/animeextension/es/jkanime/Jkanime.kt | 6 +++--- .../es/jkanime/extractors/FembedExtractor.kt | 4 ++-- .../es/jkanime/extractors/OkruExtractor.kt | 2 +- src/es/jkhentai/build.gradle | 4 ++-- .../es/jkhentai/extractors/FembedExtractor.kt | 4 ++-- .../es/jkhentai/extractors/OkruExtractor.kt | 2 +- .../es/jkhentai/extractors/SolidFilesExtractor.kt | 2 +- .../es/jkhentai/extractors/StreamTapeExtractor.kt | 2 +- src/es/monoschinos/build.gradle | 4 ++-- .../es/monoschinos/extractors/FembedExtractor.kt | 4 ++-- .../es/monoschinos/extractors/OkruExtractor.kt | 2 +- .../es/monoschinos/extractors/SolidFilesExtractor.kt | 2 +- .../es/monoschinos/extractors/uploadExtractor.kt | 2 +- src/es/mundodonghua/build.gradle | 4 ++-- .../es/mundodonghua/extractors/FembedExtractor.kt | 4 ++-- src/es/pelisplushd/build.gradle | 4 ++-- .../animeextension/es/pelisplushd/Pelisplushd.kt | 6 +++--- .../es/pelisplushd/extractors/DoodExtractor.kt | 2 +- .../es/pelisplushd/extractors/FembedExtractor.kt | 2 +- .../es/pelisplushd/extractors/StreamSBExtractor.kt | 2 +- .../es/pelisplushd/extractors/StreamTapeExtractor.kt | 2 +- src/es/tioanime/build.gradle | 4 ++-- .../tachiyomi/animeextension/es/tioanimeh/TioanimeH.kt | 1 - .../animeextension/es/tioanimeh/TioanimeHFactory.kt | 1 - .../es/tioanimeh/extractors/fembedExtractor.kt | 4 ++-- .../es/tioanimeh/extractors/okruExtractor.kt | 2 +- .../es/tioanimeh/extractors/yourUploadExtractor.kt | 2 +- src/fr/vostfree/build.gradle | 4 ++-- .../fr/vostfree/extractors/DoodExtractor.kt | 2 +- .../fr/vostfree/extractors/FembedExtractor.kt | 4 ++-- .../fr/vostfree/extractors/MytvExtractor.kt | 4 ++-- .../fr/vostfree/extractors/OkruExtractor.kt | 2 +- .../fr/vostfree/extractors/VudeoExtractor.kt | 2 +- src/hi/animeWorld/build.gradle | 4 ++-- .../animeextension/hi/animeWorld/AnimeWorld.kt | 2 +- .../hi/animeWorld/extractors/StreamSBExtractor.kt | 2 +- src/id/kuramanime/build.gradle | 4 ++-- .../animeextension/id/kuramanime/Kuramanime.kt | 2 +- src/id/kuronime/build.gradle | 4 ++-- .../tachiyomi/animeextension/id/kuronime/Kuronime.kt | 2 +- src/id/minioppai/build.gradle | 4 ++-- .../tachiyomi/animeextension/id/minioppai/MiniOppai.kt | 2 +- src/id/neonime/build.gradle | 4 ++-- .../tachiyomi/animeextension/id/neonime/NeoNime.kt | 2 +- src/id/oploverz/build.gradle | 4 ++-- .../tachiyomi/animeextension/id/oploverz/Oploverz.kt | 4 ++-- src/id/otakudesu/build.gradle | 4 ++-- .../tachiyomi/animeextension/id/otakudesu/OtakuDesu.kt | 2 +- src/it/animesaturn/build.gradle | 4 ++-- .../animeextension/it/animesaturn/AnimeSaturn.kt | 3 +-- src/it/animeworld/build.gradle | 4 ++-- .../animeextension/it/animeworld/ANIMEWORLD.kt | 2 +- .../it/animeworld/extractors/DoodExtractor.kt | 2 +- .../it/animeworld/extractors/StreamSBExtractor.kt | 2 +- .../it/animeworld/extractors/StreamTapeExtractor.kt | 2 +- src/it/hentaisaturn/build.gradle | 4 ++-- .../animeextension/it/hentaisaturn/HentaiSaturn.kt | 4 +--- src/pt/animefire/build.gradle | 4 ++-- .../pt/animefire/extractors/AnimeFireExtractor.kt | 2 +- .../pt/animefire/extractors/IframeExtractor.kt | 2 +- src/pt/animesvision/build.gradle | 4 ++-- .../pt/animesvision/extractors/DoodExtractor.kt | 2 +- .../animesvision/extractors/GlobalVisionExtractor.kt | 2 +- .../pt/animesvision/extractors/StreamTapeExtractor.kt | 2 +- .../pt/animesvision/extractors/VoeExtractor.kt | 2 +- src/pt/animeyabu/build.gradle | 4 ++-- .../pt/animeyabu/extractors/PlayerOneExtractor.kt | 2 +- .../pt/animeyabu/extractors/PlayerTwoExtractor.kt | 2 +- src/pt/anitube/build.gradle | 4 ++-- .../pt/anitube/extractors/AnitubeExtractor.kt | 2 +- src/pt/betteranime/build.gradle | 4 ++-- .../pt/betteranime/extractors/BetterAnimeExtractor.kt | 2 +- src/pt/goyabu/build.gradle | 4 ++-- .../pt/goyabu/extractors/PlayerOneExtractor.kt | 2 +- .../pt/goyabu/extractors/PlayerTwoExtractor.kt | 2 +- src/pt/hentaiyabu/build.gradle | 4 ++-- .../pt/hentaiyabu/extractors/PlayerOneExtractor.kt | 2 +- src/pt/puraymoe/build.gradle | 4 ++-- .../tachiyomi/animeextension/pt/puraymoe/PurayMoe.kt | 2 +- src/ru/animevost/build.gradle | 4 ++-- .../animeextension/ru/animevost/AnimevostSource.kt | 2 +- src/sr/animesrbija/build.gradle | 4 ++-- .../animeextension/sr/animesrbija/AnimeSrbija.kt | 2 +- 264 files changed, 406 insertions(+), 414 deletions(-) diff --git a/common-dependencies.gradle b/common-dependencies.gradle index 369d4ae42..5aaeecce5 100644 --- a/common-dependencies.gradle +++ b/common-dependencies.gradle @@ -1,7 +1,7 @@ // used both in common.gradle and themesources library dependencies { // Lib 12, but using specific commit so we don't need to bump up the version - compileOnly "com.github.jmir1:extensions-lib:3581001" + compileOnly "com.github.jmir1:extensions-lib:8400462" // These are provided by the app itself compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" diff --git a/src/all/onepace/build.gradle b/src/all/onepace/build.gradle index 3f009cb81..487538a79 100644 --- a/src/all/onepace/build.gradle +++ b/src/all/onepace/build.gradle @@ -5,8 +5,8 @@ ext { extName = 'Onepace' pkgNameSuffix = 'all.onepace' extClass = '.OnepaceFactory' - extVersionCode = 3 - libVersion = '12' + extVersionCode = 4 + libVersion = '13' containsNsfw = false } diff --git a/src/all/onepace/src/eu/kanade/tachiyomi/animeextension/all/onepace/Onepace.kt b/src/all/onepace/src/eu/kanade/tachiyomi/animeextension/all/onepace/Onepace.kt index d6f2ef0cb..66bdec1d9 100644 --- a/src/all/onepace/src/eu/kanade/tachiyomi/animeextension/all/onepace/Onepace.kt +++ b/src/all/onepace/src/eu/kanade/tachiyomi/animeextension/all/onepace/Onepace.kt @@ -133,7 +133,7 @@ open class Onepace(override val lang: String, override val name: String) : Confi val videoId = realUrl.substringAfter("/v/").substringBefore("/file") val videoName = document.selectFirst("div.center div font+font").text() val videoUrl = "$hostUrl/d/$videoId/${(timeId.toInt() % 1000) + 11}/${URLEncoder.encode(videoName)}" - return listOf(Video(videoUrl, "ZippyShare", videoUrl, null)) + return listOf(Video(videoUrl, "ZippyShare", videoUrl)) } override fun videoListSelector() = throw Exception("not used") diff --git a/src/ar/akwam/build.gradle b/src/ar/akwam/build.gradle index b4d27d155..5a84e2330 100644 --- a/src/ar/akwam/build.gradle +++ b/src/ar/akwam/build.gradle @@ -5,8 +5,8 @@ ext { extName = 'أكوام' pkgNameSuffix = 'ar.akwam' extClass = '.Akwam' - extVersionCode = 6 - libVersion = '12' + extVersionCode = 7 + libVersion = '13' } apply from: "$rootDir/common.gradle" diff --git a/src/ar/akwam/src/eu/kanade/tachiyomi/animeextension/ar/akwam/Akwam.kt b/src/ar/akwam/src/eu/kanade/tachiyomi/animeextension/ar/akwam/Akwam.kt index 0753fcaf7..d160f3c86 100644 --- a/src/ar/akwam/src/eu/kanade/tachiyomi/animeextension/ar/akwam/Akwam.kt +++ b/src/ar/akwam/src/eu/kanade/tachiyomi/animeextension/ar/akwam/Akwam.kt @@ -82,7 +82,7 @@ class Akwam : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override fun videoListSelector() = "source" override fun videoFromElement(element: Element): Video { - return Video(element.attr("src").replace("https", "http"), element.attr("size") + "p", element.attr("src").replace("https", "http"), null) + return Video(element.attr("src").replace("https", "http"), element.attr("size") + "p", element.attr("src").replace("https", "http")) } override fun List