From 50577ef826d393fb32b56c2c54f187457529f243 Mon Sep 17 00:00:00 2001 From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com> Date: Tue, 16 Jan 2024 11:18:47 -0300 Subject: [PATCH] refactor(global): Adapt to extlib v14 (#2759) --- CONTRIBUTING.md | 6 +- build.gradle.kts | 4 +- .../BurstCloudExtractor.kt | 1 - .../lib/chillxextractor/ChillxExtractor.kt | 3 +- .../DailymotionExtractor.kt | 7 +- .../fastreamextractor/FastreamExtractor.kt | 7 +- .../filemoonextractor/FilemoonExtractor.kt | 2 +- .../fusevideoextractor/FusevideoExtractor.kt | 5 +- .../GogoStreamExtractor.kt | 7 +- .../GogoStreamExtractorDto.kt | 1 - .../GoogleDriveExtractor.kt | 16 +-- .../lib/javcoverfetcher/JavCoverFetcher.kt | 7 +- .../megacloudextractor/MegaCloudExtractor.kt | 11 +- .../lib/mixdropextractor/MixDropExtractor.kt | 2 +- .../mp4uploadextractor/Mp4uploadExtractor.kt | 2 +- .../lib/okruextractor/OkruExtractor.kt | 4 +- .../lib/playlistutils/PlaylistUtils.kt | 40 +++--- .../lib/sibnetextractor/SibnetExtractor.kt | 1 - .../streamhubextractor/StreamHubExtractor.kt | 4 +- .../streamvidextractor/StreamVidExtractor.kt | 2 +- .../StreamWishExtractor.kt | 4 +- .../upstreamextractor/UpstreamExtractor.kt | 4 +- .../lib/vidoextractor/VidoExtractor.kt | 4 +- .../tachiyomi/lib/vkextractor/VkExtractor.kt | 1 - .../desuonline/src/extractors/CDAExtractor.kt | 7 +- .../src/extractors/StreamPlayExtractor.kt | 7 +- .../animestream/lmanime/src/LMAnime.kt | 5 +- .../frenchanime/src/FrenchAnime.kt | 8 +- .../datalifeengine/wiflix/src/Wiflix.kt | 7 +- .../animeonlineninja/src/AnimeOnlineNinja.kt | 4 +- .../dooplay/animeplayer/src/AnimePlayer.kt | 1 - .../dooplay/animesgratis/src/AnimesOnline.kt | 12 +- .../dooplay/animeshouse/src/AnimesHouse.kt | 2 +- .../dooplay/cinemathek/src/Cinemathek.kt | 29 ++--- .../dooplay/goanimes/src/GoAnimes.kt | 32 ++--- .../dooplay/kinoking/src/Kinoking.kt | 2 - .../dooplay/multimovies/src/Multimovies.kt | 1 - .../src/extractors/AutoEmbedExtractor.kt | 81 +++++------- .../src/extractors/BlembedExtractor.kt | 7 +- .../src/extractors/SuperFlixExtractor.kt | 25 +--- .../dooplay/uniquestream/src/UniqueStream.kt | 6 +- .../multisrc/animestream/AnimeStream.kt | 41 +++--- .../multisrc/datalifeengine/DataLifeEngine.kt | 21 +-- .../tachiyomi/multisrc/dooplay/DooPlay.kt | 16 +-- .../tachiyomi/multisrc/dopeflix/DopeFlix.kt | 37 ++---- .../tachiyomi/multisrc/zorotheme/ZoroTheme.kt | 14 +- .../java/generator/ThemeSourceGenerator.kt | 1 - src/all/animeonsen/build.gradle | 1 - .../all/animeonsen/AnimeOnsen.kt | 22 +--- src/all/animeworldindia/build.gradle | 1 - .../all/animeworldindia/AnimeWorldIndia.kt | 2 - src/all/googledrive/build.gradle | 1 - .../all/googledrive/GoogleDrive.kt | 58 ++++----- src/all/googledriveindex/build.gradle | 1 - .../all/googledriveindex/GoogleDriveIndex.kt | 52 +++----- src/all/javguru/build.gradle | 1 - .../animeextension/all/javguru/JavGuru.kt | 120 ++++++++---------- src/all/jellyfin/build.gradle | 1 - .../animeextension/all/jellyfin/Jellyfin.kt | 25 ++-- .../all/jellyfin/JellyfinAuthenticator.kt | 7 +- src/all/kamyroll/build.gradle | 1 - .../animeextension/all/kamyroll/Yomiroll.kt | 45 +++---- .../animeextension/all/missav/MissAV.kt | 17 +-- src/all/supjav/build.gradle | 1 - .../animeextension/all/supjav/SupJav.kt | 33 ++--- src/ar/akwam/build.gradle | 1 - .../animeextension/ar/akwam/Akwam.kt | 3 - src/ar/anime4up/build.gradle | 1 - .../animeextension/ar/anime4up/Anime4Up.kt | 18 +-- src/ar/animeblkom/build.gradle | 1 - .../ar/animeblkom/AnimeBlkom.kt | 2 - src/ar/animeiat/build.gradle | 1 - src/ar/animelek/build.gradle | 1 - .../animeextension/ar/animelek/AnimeLek.kt | 3 - src/ar/animerco/build.gradle | 1 - .../animeextension/ar/animerco/Animerco.kt | 17 +-- src/ar/arabanime/build.gradle | 1 - .../animeextension/ar/arabanime/ArabAnime.kt | 2 - src/ar/arabseed/build.gradle | 1 - .../animeextension/ar/arabseed/ArabSeed.kt | 18 +-- src/ar/asia2tv/build.gradle | 1 - .../animeextension/ar/asia2tv/Asia2TV.kt | 19 +-- src/ar/egydead/build.gradle | 1 - .../animeextension/ar/egydead/EgyDead.kt | 26 ++-- src/ar/faselhd/build.gradle | 1 - .../animeextension/ar/faselhd/FASELHD.kt | 3 - src/ar/movies4u/build.gradle | 1 - .../animeextension/ar/movies4u/Movies4U.kt | 3 - src/ar/mycima/build.gradle | 1 - .../animeextension/ar/mycima/MyCima.kt | 34 ++--- src/ar/okanime/build.gradle | 1 - .../animeextension/ar/okanime/Okanime.kt | 65 ++++------ src/ar/tuktukcinema/build.gradle | 1 - .../ar/tuktukcinema/Tuktukcinema.kt | 17 +-- src/ar/witanime/build.gradle | 1 - .../animeextension/ar/witanime/WitAnime.kt | 18 +-- src/ar/xsanime/build.gradle | 1 - .../animeextension/ar/xsanime/XsAnime.kt | 3 - src/ar/xsmovie/build.gradle | 1 - .../animeextension/ar/xsmovie/XsMovie.kt | 3 - src/de/aniflix/build.gradle | 1 - .../animeextension/de/aniflix/Aniflix.kt | 17 +-- src/de/aniking/build.gradle | 1 - .../animeextension/de/aniking/Aniking.kt | 3 - src/de/animebase/build.gradle | 1 - .../animeextension/de/animebase/AnimeBase.kt | 49 +++---- src/de/animeloads/build.gradle | 1 - .../de/animeloads/AnimeLoads.kt | 11 +- src/de/animestream/build.gradle | 1 - .../de/animestream/AnimeStream.kt | 3 - src/de/animetoast/build.gradle | 1 - .../de/animetoast/AnimeToast.kt | 3 - src/de/aniworld/build.gradle | 1 - .../animeextension/de/aniworld/AniWorld.kt | 2 +- src/de/cineclix/build.gradle | 1 - .../animeextension/de/cineclix/CineClix.kt | 3 - src/de/einfach/build.gradle | 1 - .../animeextension/de/einfach/Einfach.kt | 33 ++--- src/de/filmpalast/build.gradle | 1 - .../de/filmpalast/FilmPalast.kt | 3 - src/de/kool/build.gradle | 1 - .../tachiyomi/animeextension/de/kool/Kool.kt | 3 - src/de/moflixstream/build.gradle | 1 - .../de/moflixstream/MoflixStream.kt | 6 +- src/de/movie2k/build.gradle | 1 - .../animeextension/de/movie2k/Movie2k.kt | 3 - src/de/movie4k/build.gradle | 1 - .../animeextension/de/movie4k/Movie4k.kt | 3 - src/de/serienstream/build.gradle | 1 - .../de/serienstream/Serienstream.kt | 5 +- src/de/streamcloud/build.gradle | 1 - .../de/streamcloud/StreamCloud.kt | 2 - src/en/allanime/build.gradle | 1 - .../animeextension/en/allanime/AllAnime.kt | 8 +- src/en/allanimechi/build.gradle | 1 - .../en/allanimechi/AllAnimeChi.kt | 45 +------ .../extractors/AllAnimeExtractor.kt | 7 +- .../extractors/InternalExtractor.kt | 7 +- src/en/allmovies/build.gradle | 1 - .../animeextension/en/allmovies/AllMovies.kt | 3 - src/en/animeflix/build.gradle | 1 - .../animeextension/en/animeflix/AnimeFlix.kt | 51 +++----- src/en/animension/build.gradle | 1 - src/en/animeowl/build.gradle | 1 - .../animeextension/en/animeowl/AnimeOwl.kt | 16 +-- src/en/animepahe/build.gradle | 1 - .../animeextension/en/animepahe/AnimePahe.kt | 11 +- src/en/animeparadise/build.gradle | 1 - .../en/animeparadise/AnimeParadise.kt | 9 +- .../animeextension/en/animetake/AnimeTake.kt | 55 ++++---- src/en/animeui/build.gradle | 1 - .../animeextension/en/animeui/AnimeUI.kt | 9 +- src/en/aniwave/build.gradle | 1 - .../animeextension/en/nineanime/Aniwave.kt | 31 +---- .../nineanime/extractors/VidsrcExtractor.kt | 7 +- .../animeextension/en/asiaflix/AsiaFlix.kt | 48 ++----- src/en/asianload/build.gradle | 1 - .../animeextension/en/asianload/AsianLoad.kt | 3 - src/en/ask4movie/build.gradle | 1 - .../animeextension/en/ask4movie/Ask4Movie.kt | 8 +- src/en/bestdubbedanime/build.gradle | 1 - .../en/bestdubbedanime/BestDubbedAnime.kt | 16 +-- src/en/dramacool/build.gradle | 1 - .../animeextension/en/dramacool/DramaCool.kt | 2 - src/en/edytjedhgmdhm/build.gradle | 1 - .../en/edytjedhgmdhm/Edytjedhgmdhm.kt | 24 ++-- src/en/fmovies/build.gradle | 1 - .../animeextension/en/fmovies/FMovies.kt | 90 ++++++------- .../en/fmovies/FMoviesHelper.kt | 7 +- .../en/fmovies/extractors/VidsrcExtractor.kt | 7 +- src/en/genoanime/build.gradle | 1 - .../animeextension/en/genoanime/GenoAnime.kt | 2 - src/en/gogoanime/build.gradle | 1 - .../animeextension/en/gogoanime/GogoAnime.kt | 22 +--- src/en/hahomoe/build.gradle | 1 - .../animeextension/en/hahomoe/HahoMoe.kt | 2 - src/en/hanime/build.gradle | 1 - .../animeextension/en/hanime/Hanime.kt | 9 +- src/en/hentaimama/build.gradle | 1 - .../en/hentaimama/HentaiMama.kt | 3 - src/en/hstream/build.gradle | 1 - .../animeextension/en/hstream/Hstream.kt | 16 +-- src/en/kawaiifu/build.gradle | 1 - .../animeextension/en/kawaiifu/Kawaiifu.kt | 18 +-- src/en/kayoanime/build.gradle | 1 - .../animeextension/en/kayoanime/Kayoanime.kt | 14 +- src/en/kickassanime/build.gradle | 1 - .../en/kickassanime/KickAssAnime.kt | 38 ++---- .../extractors/KickAssAnimeExtractor.kt | 5 +- src/en/kimoitv/build.gradle | 1 - .../animeextension/en/kimoitv/KimoiTV.kt | 3 - src/en/kissanime/build.gradle | 1 - .../animeextension/en/kissanime/KissAnime.kt | 80 +++++------- src/en/kisskh/build.gradle | 1 - .../animeextension/en/kisskh/KissKH.kt | 3 - src/en/myanime/build.gradle | 1 - .../animeextension/en/myanime/Myanime.kt | 57 +++------ src/en/myrunningman/build.gradle | 1 - .../en/myrunningman/MyRunningMan.kt | 44 +++---- src/en/noobsubs/build.gradle | 1 - .../animeextension/en/noobsubs/NoobSubs.kt | 33 ++--- src/en/oppaistream/build.gradle | 1 - .../en/oppaistream/OppaiStream.kt | 7 +- src/en/putlocker/build.gradle | 1 - .../animeextension/en/putlocker/PutLocker.kt | 27 +--- src/en/ripcrabbyanime/build.gradle | 1 - .../en/ripcrabbyanime/Ripcrabbyanime.kt | 14 +- src/en/rule34video/build.gradle | 1 - .../en/rule34video/Rule34Video.kt | 15 +-- src/en/seez/build.gradle | 1 - .../tachiyomi/animeextension/en/seez/Seez.kt | 36 ++---- .../animeextension/en/seez/VrfHelper.kt | 7 +- .../en/seez/extractors/VidsrcExtractor.kt | 8 +- src/en/superstream/build.gradle | 1 - .../en/superstream/SuperStream.kt | 30 ++--- src/en/tokuzilla/build.gradle | 1 - src/en/uhdmovies/build.gradle | 1 - .../animeextension/en/uhdmovies/UHDMovies.kt | 19 +-- src/en/wcofun/build.gradle | 1 - .../animeextension/en/wcofun/Wcofun.kt | 8 +- src/en/wcostream/build.gradle | 1 - .../animeextension/en/wcostream/WCOStream.kt | 12 +- src/es/animefenix/build.gradle | 1 - .../es/animefenix/Animefenix.kt | 3 - src/es/animeflv/build.gradle | 1 - .../animeextension/es/animeflv/AnimeFlv.kt | 3 - src/es/animeid/build.gradle | 1 - .../animeextension/es/animeid/AnimeID.kt | 3 - src/es/animelatinohd/build.gradle | 1 - .../es/animelatinohd/AnimeLatinoHD.kt | 3 - src/es/animemovil/build.gradle | 1 - .../es/animemovil/AnimeMovil.kt | 3 - src/es/animeyt/build.gradle | 1 - .../animeextension/es/animeyt/Animeyt.kt | 3 - src/es/asialiveaction/build.gradle | 1 - .../es/asialiveaction/AsiaLiveAction.kt | 3 - src/es/cuevana/build.gradle | 1 - .../animeextension/es/cuevana/CuevanaCh.kt | 3 - .../animeextension/es/cuevana/CuevanaEu.kt | 15 +-- src/es/doramasflix/build.gradle | 1 - src/es/doramasyt/build.gradle | 1 - .../animeextension/es/doramasyt/Doramasyt.kt | 3 - src/es/ennovelas/build.gradle | 1 - .../animeextension/es/ennovelas/EnNovelas.kt | 2 - src/es/fanpelis/build.gradle | 1 - .../animeextension/es/fanpelis/FanPelis.kt | 2 - src/es/gnula/build.gradle | 1 - .../animeextension/es/gnula/Gnula.kt | 3 - src/es/hentaijk/build.gradle | 1 - .../animeextension/es/hentaijk/Hentaijk.kt | 3 - src/es/hentaila/build.gradle | 1 - .../animeextension/es/hentaila/Hentaila.kt | 3 - src/es/jkanime/build.gradle | 1 - .../animeextension/es/jkanime/Jkanime.kt | 3 - src/es/jkhentai/build.gradle | 1 - .../animeextension/es/jkhentai/Jkhentai.kt | 3 - src/es/latanime/build.gradle | 1 - .../animeextension/es/latanime/Latanime.kt | 3 - src/es/legionanime/build.gradle | 1 - .../es/legionanime/LegionAnime.kt | 3 - src/es/locopelis/build.gradle | 1 - .../animeextension/es/locopelis/LocoPelis.kt | 3 - src/es/metroseries/build.gradle | 1 - .../es/metroseries/MetroSeries.kt | 31 ++--- src/es/monoschinos/build.gradle | 1 - .../es/monoschinos/MonosChinos.kt | 3 - src/es/mundodonghua/build.gradle | 1 - .../es/mundodonghua/MundoDonghua.kt | 2 - src/es/pelisflix/build.gradle | 1 - .../animeextension/es/pelisflix/Pelisflix.kt | 3 - src/es/pelisforte/build.gradle | 1 - .../es/pelisforte/PelisForte.kt | 3 - src/es/pelisplushd/build.gradle | 1 - .../es/pelisplushd/Pelisplushd.kt | 3 - src/es/tioanime/build.gradle | 1 - .../animeextension/es/tioanimeh/TioanimeH.kt | 3 - src/fr/animesama/build.gradle | 1 - .../animeextension/fr/animesama/AnimeSama.kt | 32 ++--- src/fr/animevostfr/build.gradle | 1 - .../fr/animevostfr/AnimeVostFr.kt | 8 +- src/fr/empirestreaming/build.gradle | 1 - .../fr/empirestreaming/EmpireStreaming.kt | 45 +++---- src/fr/franime/build.gradle | 1 - .../animeextension/fr/franime/FrAnime.kt | 39 ++---- src/fr/nekosama/build.gradle | 1 - .../animeextension/fr/nekosama/NekoSama.kt | 3 - src/fr/otakufr/build.gradle | 1 - .../animeextension/fr/otakufr/OtakuFR.kt | 18 +-- src/fr/vostfree/build.gradle | 1 - .../animeextension/fr/vostfree/Vostfree.kt | 3 - src/hi/yomovies/build.gradle | 1 - .../animeextension/hi/yomovies/YoMovies.kt | 30 ++--- .../yomovies/extractors/MovembedExtractor.kt | 18 +-- src/id/kuramanime/build.gradle | 1 - .../id/kuramanime/Kuramanime.kt | 2 - src/id/kuronime/build.gradle | 1 - src/id/neonime/build.gradle | 1 - .../animeextension/id/neonime/NeoNime.kt | 11 +- src/id/nimegami/build.gradle | 1 - .../animeextension/id/nimegami/NimeGami.kt | 35 ++--- src/id/oploverz/build.gradle | 1 - .../animeextension/id/oploverz/Oploverz.kt | 20 +-- src/id/otakudesu/build.gradle | 1 - .../animeextension/id/otakudesu/OtakuDesu.kt | 23 +--- src/id/samehadaku/build.gradle | 1 - .../id/samehadaku/Samehadaku.kt | 20 +-- src/it/animesaturn/build.gradle | 1 - .../it/animesaturn/AnimeSaturn.kt | 3 - src/it/animeunity/build.gradle | 1 - .../it/animeunity/AnimeUnity.kt | 24 ++-- src/it/animeworld/build.gradle | 1 - .../it/animeworld/ANIMEWORLD.kt | 65 ++++------ src/it/aniplay/build.gradle | 1 - .../animeextension/it/aniplay/AniPlay.kt | 27 +--- src/it/hentaisaturn/build.gradle | 1 - .../it/hentaisaturn/HentaiSaturn.kt | 3 - src/it/streamingcommunity/build.gradle | 1 - .../streamingcommunity/StreamingCommunity.kt | 3 - src/it/toonitalia/build.gradle | 1 - .../it/toonitalia/Toonitalia.kt | 2 - src/it/vvvvid/build.gradle | 1 - .../animeextension/it/vvvvid/VVVVID.kt | 12 +- src/ko/aniweek/build.gradle | 1 - .../animeextension/ko/aniweek/Aniweek.kt | 3 - src/pl/wbijam/build.gradle | 1 - .../animeextension/pl/wbijam/Wbijam.kt | 87 +++++-------- src/pt/anidong/build.gradle | 1 - .../animeextension/pt/anidong/AniDong.kt | 11 +- src/pt/animefire/build.gradle | 1 - .../animeextension/pt/animefire/AnimeFire.kt | 13 +- src/pt/animesaria/build.gradle | 1 - .../pt/animesaria/AnimesAria.kt | 11 +- src/pt/animesdigital/build.gradle | 1 - .../pt/animesdigital/AnimesDigital.kt | 16 +-- src/pt/animesgames/build.gradle | 1 - .../pt/animesgames/AnimesGames.kt | 15 +-- src/pt/animesorion/build.gradle | 1 - .../pt/animesorion/AnimesOrion.kt | 11 +- src/pt/animesroll/build.gradle | 1 - .../pt/animesroll/AnimesROLL.kt | 20 ++- src/pt/animestc/build.gradle | 1 - .../animeextension/pt/animestc/AnimesTC.kt | 38 ++---- src/pt/animesvision/build.gradle | 1 - .../pt/animesvision/AnimesVision.kt | 30 ++--- src/pt/animeszone/build.gradle | 1 - .../pt/animeszone/AnimesZone.kt | 7 +- src/pt/anitube/build.gradle | 1 - .../animeextension/pt/anitube/Anitube.kt | 2 - src/pt/betteranime/build.gradle | 1 - .../pt/betteranime/BetterAnime.kt | 14 +- .../extractors/BetterAnimeExtractor.kt | 25 ++-- src/pt/donghuanosekai/build.gradle | 1 - .../pt/donghuanosekai/DonghuaNoSekai.kt | 38 ++---- src/pt/flixei/build.gradle | 1 - .../animeextension/pt/flixei/Flixei.kt | 30 ++--- src/pt/hentaistube/build.gradle | 1 - .../pt/hentaistube/HentaisTube.kt | 31 ++--- src/pt/hinatasoul/build.gradle | 1 - .../pt/hinatasoul/HinataSoul.kt | 13 +- src/pt/listadeanimes/build.gradle | 1 - .../pt/listadeanimes/ListaDeAnimes.kt | 5 +- src/pt/megaflix/build.gradle | 1 - .../animeextension/pt/megaflix/Megaflix.kt | 41 +++--- src/pt/muitohentai/build.gradle | 1 - src/pt/vizer/build.gradle | 1 - .../animeextension/pt/vizer/Vizer.kt | 18 +-- src/ru/animevost/build.gradle | 1 - src/sr/animesrbija/build.gradle | 1 - .../sr/animesrbija/AnimeSrbija.kt | 11 +- src/tr/animeler/build.gradle | 1 - .../animeextension/tr/animeler/Animeler.kt | 38 ++---- src/tr/anizm/build.gradle | 1 - .../animeextension/tr/anizm/Anizm.kt | 54 +++----- src/tr/hdfilmcehennemi/build.gradle | 1 - .../tr/hdfilmcehennemi/HDFilmCehennemi.kt | 68 ++++------ .../extractors/XBetExtractor.kt | 7 +- src/tr/hentaizm/build.gradle | 1 - .../animeextension/tr/hentaizm/HentaiZM.kt | 11 +- src/tr/tranimeizle/build.gradle | 1 - .../tr/tranimeizle/TRAnimeIzle.kt | 30 ++--- src/tr/turkanime/build.gradle | 1 - .../animeextension/tr/turkanime/TurkAnime.kt | 28 ++-- src/uk/uakino/build.gradle | 1 - .../animeextension/uk/uakino/UAKino.kt | 8 +- src/uk/ufdub/build.gradle | 1 - .../animeextension/uk/ufdub/UFDub.kt | 8 +- 386 files changed, 1122 insertions(+), 2640 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d8b2472db..362ad066b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -238,10 +238,10 @@ apply from: "$rootDir/common.gradle" | `pkgNameSuffix` | A unique suffix added to `eu.kanade.tachiyomi.animeextension`. The language and the site name should be enough. Remember your extension code implementation must be placed in this package. | | `extClass` | Points to the class that implements `AnimeSource`. You can use a relative path starting with a dot (the package name is the base path). This is used to find and instantiate the source(s). | | `extVersionCode` | The extension version code. This must be a positive integer and incremented with any change to the code. | -| `libVersion` | (Optional, defaults to `13`) The version of the [extensions library](https://github.com/aniyomiorg/extensions-lib) used. | +| `libVersion` | (Optional, defaults to `14`) The version of the [extensions library](https://github.com/aniyomiorg/extensions-lib) used. | | `containsNsfw` | (Optional, defaults to `false`) Flag to indicate that a source contains NSFW content. | -The extension's version name is generated automatically by concatenating `libVersion` and `extVersionCode`. With the example used above, the version would be `13`. +The extension's version name is generated automatically by concatenating `libVersion` and `extVersionCode`. With the example used above, the version would be `14`. ### Core dependencies @@ -680,7 +680,7 @@ class AnimeSource : AnimeTheme( return this } - override val client: OkHttpClient = network.cloudflareClient.newBuilder() + override val client: OkHttpClient = network.client.newBuilder() .ignoreAllSSLErrors() .proxy(Proxy(Proxy.Type.HTTP, InetSocketAddress("10.0.2.2", 8080))) .build() diff --git a/build.gradle.kts b/build.gradle.kts index c4abc2659..939c49821 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { alias(libs.plugins.android.application) apply false - alias(libs.plugins.kotlin.android) apply false - alias(libs.plugins.kotlin.serialization) apply false + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.kotlin.serialization) apply false alias(libs.plugins.kotlinter) apply false } diff --git a/lib/burstcloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/burstcloudextractor/BurstCloudExtractor.kt b/lib/burstcloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/burstcloudextractor/BurstCloudExtractor.kt index f8150169d..e57d5e30f 100644 --- a/lib/burstcloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/burstcloudextractor/BurstCloudExtractor.kt +++ b/lib/burstcloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/burstcloudextractor/BurstCloudExtractor.kt @@ -38,7 +38,6 @@ class BurstCloudExtractor(private val client: OkHttpClient) { } else { null } - }.getOrNull().orEmpty() } } diff --git a/lib/chillx-extractor/src/main/java/eu/kanade/tachiyomi/lib/chillxextractor/ChillxExtractor.kt b/lib/chillx-extractor/src/main/java/eu/kanade/tachiyomi/lib/chillxextractor/ChillxExtractor.kt index f59fbca1a..98c6dd5ac 100644 --- a/lib/chillx-extractor/src/main/java/eu/kanade/tachiyomi/lib/chillxextractor/ChillxExtractor.kt +++ b/lib/chillx-extractor/src/main/java/eu/kanade/tachiyomi/lib/chillxextractor/ChillxExtractor.kt @@ -23,7 +23,7 @@ class ChillxExtractor(private val client: OkHttpClient, private val headers: Hea private val REGEX_EVAL_KEY by lazy { Regex("""eval\(\S+\("(\S+)",\d+,"(\S+)",(\d+),(\d+),""") } private val REGEX_SOURCES by lazy { Regex("""sources:\s*\[\{"file":"([^"]+)""") } private val REGEX_FILE by lazy { Regex("""file: ?"([^"]+)"""") } - private val REGEX_SOURCE by lazy { Regex("""source = ?"([^"]+)"""")} + private val REGEX_SOURCE by lazy { Regex("""source = ?"([^"]+)"""") } // matches "[language]https://...," private val REGEX_SUBS by lazy { Regex("""\[(.*?)\](.*?)"?\,""") } @@ -100,7 +100,6 @@ class ChillxExtractor(private val client: OkHttpClient, private val headers: Hea return bits.joinToString("") { Char(it.toInt(index) - offset).toString() } } - @Serializable data class CryptoInfo( @SerialName("ct") diff --git a/lib/dailymotion-extractor/src/main/java/eu/kanade/tachiyomi/lib/dailymotionextractor/DailymotionExtractor.kt b/lib/dailymotion-extractor/src/main/java/eu/kanade/tachiyomi/lib/dailymotionextractor/DailymotionExtractor.kt index 0ea500b0a..447003d89 100644 --- a/lib/dailymotion-extractor/src/main/java/eu/kanade/tachiyomi/lib/dailymotionextractor/DailymotionExtractor.kt +++ b/lib/dailymotion-extractor/src/main/java/eu/kanade/tachiyomi/lib/dailymotionextractor/DailymotionExtractor.kt @@ -5,7 +5,7 @@ import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST -import kotlinx.serialization.decodeFromString +import eu.kanade.tachiyomi.util.parseAs import kotlinx.serialization.json.Json import okhttp3.FormBody import okhttp3.Headers @@ -13,7 +13,6 @@ import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.MediaType.Companion.toMediaType import okhttp3.OkHttpClient import okhttp3.RequestBody.Companion.toRequestBody -import okhttp3.Response import uy.kohesive.injekt.injectLazy class DailymotionExtractor(private val client: OkHttpClient, private val headers: Headers) { @@ -133,8 +132,4 @@ class DailymotionExtractor(private val client: OkHttpClient, private val headers videoNameGen = { "$prefix$it" }, ) } - - private inline fun Response.parseAs(): T { - return use { it.body.string() }.let(json::decodeFromString) - } } diff --git a/lib/fastream-extractor/src/main/java/eu/kanade/tachiyomi/lib/fastreamextractor/FastreamExtractor.kt b/lib/fastream-extractor/src/main/java/eu/kanade/tachiyomi/lib/fastreamextractor/FastreamExtractor.kt index 7aba71fd3..b90d630fb 100644 --- a/lib/fastream-extractor/src/main/java/eu/kanade/tachiyomi/lib/fastreamextractor/FastreamExtractor.kt +++ b/lib/fastream-extractor/src/main/java/eu/kanade/tachiyomi/lib/fastreamextractor/FastreamExtractor.kt @@ -1,15 +1,15 @@ package eu.kanade.tachiyomi.lib.fastreamextractor +import dev.datlag.jsunpacker.JsUnpacker import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST -import okhttp3.FormBody import eu.kanade.tachiyomi.util.asJsoup +import okhttp3.FormBody import okhttp3.Headers import okhttp3.OkHttpClient import okhttp3.internal.commonEmptyHeaders -import dev.datlag.jsunpacker.JsUnpacker class FastreamExtractor(private val client: OkHttpClient, private val headers: Headers = commonEmptyHeaders) { private val videoHeaders by lazy { @@ -35,8 +35,7 @@ class FastreamExtractor(private val client: OkHttpClient, private val headers: H }.build() val doc = client.newCall(POST(url, videoHeaders, body = form)).execute().use { it.asJsoup() } doc.selectFirst("script:containsData(jwplayer):containsData(vplayer)") ?: return emptyList() - } - else { + } else { firstDoc.selectFirst("script:containsData(jwplayer):containsData(vplayer)") ?: return emptyList() } diff --git a/lib/filemoon-extractor/src/main/java/eu/kanade/tachiyomi/lib/filemoonextractor/FilemoonExtractor.kt b/lib/filemoon-extractor/src/main/java/eu/kanade/tachiyomi/lib/filemoonextractor/FilemoonExtractor.kt index be38d17a5..f8fc201da 100644 --- a/lib/filemoon-extractor/src/main/java/eu/kanade/tachiyomi/lib/filemoonextractor/FilemoonExtractor.kt +++ b/lib/filemoon-extractor/src/main/java/eu/kanade/tachiyomi/lib/filemoonextractor/FilemoonExtractor.kt @@ -3,11 +3,11 @@ package eu.kanade.tachiyomi.lib.filemoonextractor import dev.datlag.jsunpacker.JsUnpacker 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.network.GET import eu.kanade.tachiyomi.util.asJsoup import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json -import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils import okhttp3.Headers import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.OkHttpClient diff --git a/lib/fusevideo-extractor/src/main/java/eu/kanade/tachiyomi/lib/fusevideoextractor/FusevideoExtractor.kt b/lib/fusevideo-extractor/src/main/java/eu/kanade/tachiyomi/lib/fusevideoextractor/FusevideoExtractor.kt index fc3d99a2b..78bbc0c49 100644 --- a/lib/fusevideo-extractor/src/main/java/eu/kanade/tachiyomi/lib/fusevideoextractor/FusevideoExtractor.kt +++ b/lib/fusevideo-extractor/src/main/java/eu/kanade/tachiyomi/lib/fusevideoextractor/FusevideoExtractor.kt @@ -1,10 +1,10 @@ package eu.kanade.tachiyomi.lib.fusevideoextractor +import android.util.Base64 import eu.kanade.tachiyomi.animesource.model.Video +import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.util.asJsoup -import android.util.Base64 -import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils import okhttp3.Headers import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.OkHttpClient @@ -28,5 +28,4 @@ class FusevideoExtractor(private val client: OkHttpClient, private val headers: PlaylistUtils(client, newHeaders).extractFromHls(videoUrl, videoNameGen = { "${prefix}Fusevideo - $it" }) }.getOrDefault(emptyList()) } - } diff --git a/lib/gogostream-extractor/src/main/java/eu/kanade/tachiyomi/lib/gogostreamextractor/GogoStreamExtractor.kt b/lib/gogostream-extractor/src/main/java/eu/kanade/tachiyomi/lib/gogostreamextractor/GogoStreamExtractor.kt index 1fc0f1fb5..4540c58b0 100644 --- a/lib/gogostream-extractor/src/main/java/eu/kanade/tachiyomi/lib/gogostreamextractor/GogoStreamExtractor.kt +++ b/lib/gogostream-extractor/src/main/java/eu/kanade/tachiyomi/lib/gogostreamextractor/GogoStreamExtractor.kt @@ -2,20 +2,19 @@ package eu.kanade.tachiyomi.lib.gogostreamextractor import android.util.Base64 import eu.kanade.tachiyomi.animesource.model.Video +import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.util.asJsoup import kotlinx.serialization.json.Json import okhttp3.Headers -import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.OkHttpClient -import java.lang.Exception -import java.util.Locale import org.jsoup.nodes.Element +import uy.kohesive.injekt.injectLazy +import java.lang.Exception import javax.crypto.Cipher import javax.crypto.spec.IvParameterSpec import javax.crypto.spec.SecretKeySpec -import uy.kohesive.injekt.injectLazy class GogoStreamExtractor(private val client: OkHttpClient) { private val json: Json by injectLazy() diff --git a/lib/gogostream-extractor/src/main/java/eu/kanade/tachiyomi/lib/gogostreamextractor/GogoStreamExtractorDto.kt b/lib/gogostream-extractor/src/main/java/eu/kanade/tachiyomi/lib/gogostreamextractor/GogoStreamExtractorDto.kt index e89305aa7..8d6d8e5b2 100644 --- a/lib/gogostream-extractor/src/main/java/eu/kanade/tachiyomi/lib/gogostreamextractor/GogoStreamExtractorDto.kt +++ b/lib/gogostream-extractor/src/main/java/eu/kanade/tachiyomi/lib/gogostreamextractor/GogoStreamExtractorDto.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.lib.gogostreamextractor -import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @Serializable diff --git a/lib/googledrive-extractor/src/main/java/eu/kanade/tachiyomi/lib/googledriveextractor/GoogleDriveExtractor.kt b/lib/googledrive-extractor/src/main/java/eu/kanade/tachiyomi/lib/googledriveextractor/GoogleDriveExtractor.kt index 56e8e3e6e..7d76dd660 100644 --- a/lib/googledrive-extractor/src/main/java/eu/kanade/tachiyomi/lib/googledriveextractor/GoogleDriveExtractor.kt +++ b/lib/googledrive-extractor/src/main/java/eu/kanade/tachiyomi/lib/googledriveextractor/GoogleDriveExtractor.kt @@ -7,8 +7,8 @@ import eu.kanade.tachiyomi.util.asJsoup import okhttp3.Cookie import okhttp3.CookieJar import okhttp3.Headers -import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.HttpUrl +import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.OkHttpClient import okhttp3.internal.commonEmptyRequestBody @@ -37,7 +37,7 @@ class GoogleDriveExtractor(private val client: OkHttpClient, private val headers }.build() val docResp = noRedirectClient.newCall( - GET(itemUrl, headers = docHeaders) + GET(itemUrl, headers = docHeaders), ).execute() if (docResp.isRedirect) { @@ -60,7 +60,7 @@ class GoogleDriveExtractor(private val client: OkHttpClient, private val headers }.build() val newUrl = noRedirectClient.newCall( - POST(downloadUrl, headers = postHeaders, body = commonEmptyRequestBody) + POST(downloadUrl, headers = postHeaders, body = commonEmptyRequestBody), ).execute().use { it.headers["location"] ?: downloadUrl } return videoFromRedirect(newUrl, videoName, itemSize, cookieJar) @@ -70,7 +70,7 @@ class GoogleDriveExtractor(private val client: OkHttpClient, private val headers downloadUrl: String, videoName: String, itemSize: String, - cookieJar: GDriveCookieJar + cookieJar: GDriveCookieJar, ): List