From 42159cc40df0487f9ef7991c415c804d7a1b75b7 Mon Sep 17 00:00:00 2001 From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com> Date: Mon, 4 Mar 2024 07:29:16 -0300 Subject: [PATCH] refactor: Simplify multisrc structure (#2942) --- .github/scripts/bump-versions.sh | 73 +---- .github/workflows/build_pull_request.yml | 95 +----- .github/workflows/build_push.yml | 86 +----- .run/AnimeStreamGenerator.run.xml | 11 - .run/DooPlayGenerator.run.xml | 11 - .run/DopeFlixGenerator.run.xml | 11 - .run/ZoroThemeGenerator.run.xml | 11 - build-plugins/build.gradle.kts | 16 - .../src/main/kotlin/lib-kotlin.gradle.kts | 12 - build.gradle.kts | 21 +- buildSrc/.gitignore | 2 - buildSrc/build.gradle.kts | 7 +- .../settings.gradle.kts | 0 buildSrc/src/main/kotlin/Extensions.kt | 6 + .../src/main/kotlin/lib-android.gradle.kts | 15 +- .../src/main/kotlin/lib-kotlin.gradle.kts | 13 + .../src/main/kotlin/lib-multisrc.gradle.kts | 55 ++++ common.gradle | 25 +- gradle/libs.versions.toml | 10 +- .../animestream}/AndroidManifest.xml | 0 lib-multisrc/animestream/build.gradle.kts | 5 + .../multisrc/animestream/AnimeStream.kt | 0 .../animestream/AnimeStreamFilters.kt | 0 .../animestream/AnimeStreamUrlActivity.kt | 0 lib-multisrc/datalifeengine/build.gradle.kts | 5 + .../multisrc/datalifeengine/DataLifeEngine.kt | 0 .../dooplay}/AndroidManifest.xml | 0 lib-multisrc/dooplay/build.gradle.kts | 5 + .../tachiyomi/multisrc/dooplay/DooPlay.kt | 0 .../multisrc/dooplay/DooPlayUrlActivity.kt | 0 lib-multisrc/dopeflix/build.gradle.kts | 11 + .../tachiyomi/multisrc/dopeflix/DopeFlix.kt | 0 .../multisrc/dopeflix/DopeFlixFilters.kt | 0 .../multisrc/dopeflix/dto/DopeFlixDto.kt | 0 .../dopeflix/extractors/DopeFlixExtractor.kt | 0 lib-multisrc/zorotheme/build.gradle.kts | 10 + .../tachiyomi/multisrc/zorotheme/ZoroTheme.kt | 0 .../multisrc/zorotheme/ZoroThemeFilters.kt | 0 .../multisrc/zorotheme/dto/ZoroThemeDto.kt | 0 multisrc/build.gradle.kts | 86 ------ .../animestream/animebalkan/additional.gradle | 4 - .../animestream/animekhor/additional.gradle | 5 - .../animestream/animenosub/additional.gradle | 5 - .../animestream/animeytes/additional.gradle | 5 - .../chineseanime/additional.gradle | 5 - .../animestream/desuonline/additional.gradle | 5 - .../donghuastream/additional.gradle | 4 - .../animestream/lmanime/additional.gradle | 5 - .../luciferdonghua/additional.gradle | 5 - .../animestream/minioppai/additional.gradle | 4 - .../animestream/rinecloud/additional.gradle | 4 - .../dooplay/animeplayer/additional.gradle | 3 - .../dooplay/animesaga/additional.gradle | 3 - .../dooplay/animeshouse/additional.gradle | 3 - .../dooplay/goanimes/additional.gradle | 5 - .../dooplay/jetanime/additional.gradle | 4 - .../dooplay/kinoking/additional.gradle | 4 - .../dooplay/pifansubs/additional.gradle | 4 - .../dooplay/voircartoon/additional.gradle | 3 - .../dopeflix/default/additional.gradle | 5 - .../zorotheme/default/additional.gradle | 4 - .../animestream/AnimeStreamGenerator.kt | 37 --- .../datalifeengine/DataLifeEngineGenerator.kt | 22 -- .../multisrc/dooplay/DooPlayGenerator.kt | 35 --- .../multisrc/dopeflix/DopeFlixGenerator.kt | 22 -- .../multisrc/zorotheme/ZoroThemeGenerator.kt | 22 -- .../src/main/java/generator/GeneratorMain.kt | 29 -- .../IntelijConfigurationGeneratorMain.kt | 50 --- .../java/generator/ThemeSourceGenerator.kt | 284 ------------------ repositories.gradle.kts | 1 + settings.gradle.kts | 79 ++--- .../all/animexin/build.gradle | 12 +- .../animexin/res/mipmap-hdpi/ic_launcher.png | Bin .../animexin/res/mipmap-mdpi/ic_launcher.png | Bin .../animexin/res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../animeextension/all/animexin}/AnimeXin.kt | 0 .../extractors/VidstreamingExtractor.kt | 0 .../animexin}/extractors/YouTubeExtractor.kt | 0 src/all/chineseanime/build.gradle | 15 + .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../all}/chineseanime/res/web_hi_res_512.png | Bin .../all/chineseanime}/ChineseAnime.kt | 0 .../extractors/VatchusExtractor.kt | 0 src/all/lmanime/build.gradle | 15 + .../lmanime/res/mipmap-hdpi/ic_launcher.png | Bin .../lmanime/res/mipmap-mdpi/ic_launcher.png | Bin .../lmanime/res/mipmap-xhdpi/ic_launcher.png | Bin .../lmanime/res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../animeextension/all/lmanime}/LMAnime.kt | 0 .../de/cinemathek/build.gradle | 13 +- .../res/mipmap-hdpi/ic_launcher.png | Bin .../mipmap-hdpi/ic_launcher_adaptive_back.png | Bin .../mipmap-hdpi/ic_launcher_adaptive_fore.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../mipmap-mdpi/ic_launcher_adaptive_back.png | Bin .../mipmap-mdpi/ic_launcher_adaptive_fore.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../ic_launcher_adaptive_back.png | Bin .../ic_launcher_adaptive_fore.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../ic_launcher_adaptive_back.png | Bin .../ic_launcher_adaptive_fore.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../ic_launcher_adaptive_back.png | Bin .../ic_launcher_adaptive_fore.png | Bin .../de/cinemathek}/Cinemathek.kt | 0 src/de/kinoking/build.gradle | 14 + .../kinoking/res/mipmap-hdpi/ic_launcher.png | Bin .../mipmap-hdpi/ic_launcher_adaptive_back.png | Bin .../mipmap-hdpi/ic_launcher_adaptive_fore.png | Bin .../kinoking/res/mipmap-mdpi/ic_launcher.png | Bin .../mipmap-mdpi/ic_launcher_adaptive_back.png | Bin .../mipmap-mdpi/ic_launcher_adaptive_fore.png | Bin .../kinoking/res/mipmap-xhdpi/ic_launcher.png | Bin .../ic_launcher_adaptive_back.png | Bin .../ic_launcher_adaptive_fore.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../ic_launcher_adaptive_back.png | Bin .../ic_launcher_adaptive_fore.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../ic_launcher_adaptive_back.png | Bin .../ic_launcher_adaptive_fore.png | Bin .../animeextension/de/kinoking}/Kinoking.kt | 0 src/en/animekhor/build.gradle | 15 + .../animekhor/res/mipmap-hdpi/ic_launcher.png | Bin .../animekhor/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../animeextension/en/animekhor}/AnimeKhor.kt | 0 .../extractors/AnimeABCExtractor.kt | 0 .../extractors/StreamHideExtractor.kt | 0 src/en/animenosub/build.gradle | 16 + .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../en/animenosub}/Animenosub.kt | 0 .../extractors/VidMolyExtractor.kt | 0 .../animenosub}/extractors/VtubeExtractor.kt | 0 .../extractors/WolfstreamExtractor.kt | 0 src/en/donghuastream/build.gradle | 14 + .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../en/donghuastream}/DonghuaStream.kt | 0 .../extractors/StreamPlayExtractor.kt | 0 src/en/dopebox/build.gradle | 9 + .../dopebox/res/mipmap-hdpi/ic_launcher.png | Bin .../dopebox/res/mipmap-mdpi/ic_launcher.png | Bin .../dopebox/res/mipmap-xhdpi/ic_launcher.png | Bin .../dopebox/res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../en}/dopebox/res/play_store_512.png | Bin .../animeextension/en/dopebox}/DopeBox.kt | 0 src/en/kaido/build.gradle | 9 + .../en}/kaido/res/mipmap-hdpi/ic_launcher.png | Bin .../en}/kaido/res/mipmap-mdpi/ic_launcher.png | Bin .../kaido/res/mipmap-xhdpi/ic_launcher.png | Bin .../kaido/res/mipmap-xxhdpi/ic_launcher.png | Bin .../kaido/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../en}/kaido/res/play_store_512.png | Bin .../animeextension/en/kaido}/Kaido.kt | 0 src/en/luciferdonghua/build.gradle | 15 + .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../en/luciferdonghua}/LuciferDonghua.kt | 0 .../en/multimovies/build.gradle | 12 +- .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../en/multimovies}/Multimovies.kt | 0 .../en/multimovies}/MultimoviesFilters.kt | 0 .../extractors/AutoEmbedExtractor.kt | 0 .../extractors/MultimoviesCloudExtractor.kt | 0 .../extractors/RabbitStreamExtractor.kt | 0 src/en/sflix/build.gradle | 9 + .../en}/sflix/res/mipmap-hdpi/ic_launcher.png | Bin .../en}/sflix/res/mipmap-mdpi/ic_launcher.png | Bin .../sflix/res/mipmap-xhdpi/ic_launcher.png | Bin .../sflix/res/mipmap-xxhdpi/ic_launcher.png | Bin .../sflix/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../en}/sflix/res/play_store_512.png | Bin .../animeextension/en/sflix}/SFlix.kt | 0 src/en/uniquestream/build.gradle | 9 + .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../en}/uniquestream/res/web_hi_res_512.png | Bin .../en/uniquestream}/UniqueStream.kt | 0 src/en/zoro/build.gradle | 9 + .../en}/zoro/res/mipmap-hdpi/ic_launcher.png | Bin .../en}/zoro/res/mipmap-mdpi/ic_launcher.png | Bin .../en}/zoro/res/mipmap-xhdpi/ic_launcher.png | Bin .../zoro/res/mipmap-xxhdpi/ic_launcher.png | Bin .../zoro/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../en}/zoro/res/play_store_512.png | Bin .../animeextension/en/zoro}/AniWatch.kt | 0 .../es/animeonlineninja/build.gradle | 12 +- .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../es/animeonlineninja}/AnimeOnlineNinja.kt | 0 .../AnimeOnlineNinjaFilters.kt | 0 .../es/animeonlineninja}/VrfInterceptor.kt | 0 src/es/animeytes/build.gradle | 15 + .../animeytes/res/mipmap-hdpi/ic_launcher.png | Bin .../animeytes/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../animeextension/es/animeytes}/AnimeYTES.kt | 0 .../es/tiodonghua/build.gradle | 12 +- .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../es/tiodonghua}/Tiodonghua.kt | 0 .../fr/frenchanime/build.gradle | 10 + .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../fr}/frenchanime/res/web_hi_res_512.png | Bin .../fr/frenchanime}/FrenchAnime.kt | 0 src/fr/jetanime/build.gradle | 14 + .../jetanime/res/mipmap-hdpi/ic_launcher.png | Bin .../jetanime/res/mipmap-mdpi/ic_launcher.png | Bin .../jetanime/res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../fr}/jetanime/res/web_hi_res_512.png | Bin .../animeextension/fr/jetanime}/JetAnime.kt | 0 .../jetanime}/extractors/HdsplayExtractor.kt | 0 .../jetanime}/extractors/SentinelExtractor.kt | 0 .../fr/mykdrama/build.gradle | 10 + .../mykdrama/res/mipmap-hdpi/ic_launcher.png | Bin .../mykdrama/res/mipmap-mdpi/ic_launcher.png | Bin .../mykdrama/res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../fr}/mykdrama/res/web_hi_res_512.png | Bin .../animeextension/fr/mykdrama}/MyKdrama.kt | 0 .../fr/mykdrama}/MyKdramaFilters.kt | 0 src/fr/voircartoon/build.gradle | 14 + .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../fr/voircartoon}/VoirCartoon.kt | 0 .../fr/voircartoon}/VoirCartoonFilters.kt | 0 .../extractors/ComedyShowExtractor.kt | 0 .../fr/wiflix/build.gradle | 10 + .../wiflix/res/mipmap-hdpi/ic_launcher.png | Bin .../wiflix/res/mipmap-mdpi/ic_launcher.png | Bin .../wiflix/res/mipmap-xhdpi/ic_launcher.png | Bin .../wiflix/res/mipmap-xxhdpi/ic_launcher.png | Bin .../wiflix/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../fr}/wiflix/res/web_hi_res_512.png | Bin .../animeextension/fr/wiflix}/Wiflix.kt | 0 src/hi/animesaga/build.gradle | 13 + .../animesaga/res/mipmap-hdpi/ic_launcher.png | Bin .../animesaga/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../animeextension/hi/animesaga}/AnimeSAGA.kt | 0 .../id/animeindo/build.gradle | 12 +- .../animeindo/res/mipmap-hdpi/ic_launcher.png | Bin .../animeindo/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../animeextension/id/animeindo}/AnimeIndo.kt | 0 .../id/animeindo}/AnimeIndoFilters.kt | 0 src/id/minioppai/build.gradle | 15 + .../minioppai/res/mipmap-hdpi/ic_launcher.png | Bin .../minioppai/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../id}/minioppai/res/web_hi_res_512.png | Bin .../animeextension/id/minioppai}/MiniOppai.kt | 0 .../id/minioppai}/MiniOppaiFilters.kt | 0 .../extractors/MiniOppaiExtractor.kt | 0 src/pl/desuonline/build.gradle | 15 + .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../pl}/desuonline/res/web_hi_res_512.png | Bin .../pl/desuonline}/DesuOnline.kt | 0 .../pl/desuonline}/extractors/CDAExtractor.kt | 0 src/pt/animeplayer/build.gradle | 14 + .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../pt/animeplayer}/AnimePlayer.kt | 0 src/pt/animesfoxbr/build.gradle | 9 + .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../pt/animesfoxbr}/AnimesFoxBR.kt | 0 .../pt/animesgratis/build.gradle | 12 +- .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../pt/animesgratis}/AnimesOnline.kt | 0 .../extractors/AnimesOnlinePlayerExtractor.kt | 0 .../extractors/RuplayExtractor.kt | 0 src/pt/animeshouse/build.gradle | 13 + .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../pt/animeshouse}/AnimesHouse.kt | 0 .../extractors/EdifierExtractor.kt | 0 .../animeshouse}/extractors/EmbedExtractor.kt | 0 .../extractors/GenericExtractor.kt | 0 .../pt/animeshouse}/extractors/JsUnpacker.kt | 0 .../animeshouse}/extractors/McpExtractor.kt | 0 .../extractors/MpFourDooExtractor.kt | 0 .../extractors/RedplayBypasser.kt | 0 src/pt/goanimes/build.gradle | 16 + .../goanimes/res/mipmap-hdpi/ic_launcher.png | Bin .../goanimes/res/mipmap-mdpi/ic_launcher.png | Bin .../goanimes/res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../animeextension/pt/goanimes}/GoAnimes.kt | 0 .../extractors/BloggerJWPlayerExtractor.kt | 0 .../goanimes}/extractors/GoAnimesExtractor.kt | 0 .../pt/goanimes}/extractors/JsDecoder.kt | 0 .../goanimes}/extractors/LinkfunBypasser.kt | 0 .../goanimes}/extractors/PlaylistExtractor.kt | 0 src/pt/pifansubs/build.gradle | 14 + .../pifansubs/res/mipmap-hdpi/ic_launcher.png | Bin .../pifansubs/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../pt}/pifansubs/res/web_hi_res_512.png | Bin .../animeextension/pt/pifansubs}/PiFansubs.kt | 0 .../pifansubs}/extractors/BlembedExtractor.kt | 0 .../pt/pobreflix/build.gradle | 13 +- .../pobreflix/res/mipmap-hdpi/ic_launcher.png | Bin .../pobreflix/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../animeextension/pt/pobreflix}/Pobreflix.kt | 0 .../pobreflix}/extractors/EplayerExtractor.kt | 0 .../extractors/MyStreamExtractor.kt | 0 .../extractors/SuperFlixExtractor.kt | 0 src/pt/rinecloud/build.gradle | 14 + .../rinecloud/res/mipmap-hdpi/ic_launcher.png | Bin .../rinecloud/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../animeextension/pt/rinecloud}/RineCloud.kt | 0 .../extractors/RineCloudExtractor.kt | 0 src/sr/animebalkan/build.gradle | 14 + .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../sr/animebalkan}/AnimeBalkan.kt | 0 .../extractors/MailRuExtractor.kt | 0 .../tr/asyaanimeleri/build.gradle | 12 +- .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../tr/asyaanimeleri}/AsyaAnimeleri.kt | 0 .../tr/asyaanimeleri}/AsyaAnimeleriFilters.kt | 0 .../ShittyProtectionInterceptor.kt | 0 src/tr/tranimeci/build.gradle | 9 + .../tranimeci/res/mipmap-hdpi/ic_launcher.png | Bin .../tranimeci/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../tranimeci}/ShittyProtectionInterceptor.kt | 0 .../animeextension/tr/tranimeci}/TRAnimeCI.kt | 0 .../tr/tranimeci}/TRAnimeCIFilters.kt | 0 418 files changed, 672 insertions(+), 1078 deletions(-) delete mode 100644 .run/AnimeStreamGenerator.run.xml delete mode 100644 .run/DooPlayGenerator.run.xml delete mode 100644 .run/DopeFlixGenerator.run.xml delete mode 100644 .run/ZoroThemeGenerator.run.xml delete mode 100644 build-plugins/build.gradle.kts delete mode 100644 build-plugins/src/main/kotlin/lib-kotlin.gradle.kts delete mode 100644 buildSrc/.gitignore rename {build-plugins => buildSrc}/settings.gradle.kts (100%) create mode 100644 buildSrc/src/main/kotlin/Extensions.kt rename {build-plugins => buildSrc}/src/main/kotlin/lib-android.gradle.kts (64%) create mode 100644 buildSrc/src/main/kotlin/lib-kotlin.gradle.kts create mode 100644 buildSrc/src/main/kotlin/lib-multisrc.gradle.kts rename {multisrc/overrides/animestream/default => lib-multisrc/animestream}/AndroidManifest.xml (100%) create mode 100644 lib-multisrc/animestream/build.gradle.kts rename {multisrc/src/main/java => lib-multisrc/animestream/src}/eu/kanade/tachiyomi/multisrc/animestream/AnimeStream.kt (100%) rename {multisrc/src/main/java => lib-multisrc/animestream/src}/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamFilters.kt (100%) rename {multisrc/src/main/java => lib-multisrc/animestream/src}/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamUrlActivity.kt (100%) create mode 100644 lib-multisrc/datalifeengine/build.gradle.kts rename {multisrc/src/main/java => lib-multisrc/datalifeengine/src}/eu/kanade/tachiyomi/multisrc/datalifeengine/DataLifeEngine.kt (100%) rename {multisrc/overrides/dooplay/default => lib-multisrc/dooplay}/AndroidManifest.xml (100%) create mode 100644 lib-multisrc/dooplay/build.gradle.kts rename {multisrc/src/main/java => lib-multisrc/dooplay/src}/eu/kanade/tachiyomi/multisrc/dooplay/DooPlay.kt (100%) rename {multisrc/src/main/java => lib-multisrc/dooplay/src}/eu/kanade/tachiyomi/multisrc/dooplay/DooPlayUrlActivity.kt (100%) create mode 100644 lib-multisrc/dopeflix/build.gradle.kts rename {multisrc/src/main/java => lib-multisrc/dopeflix/src}/eu/kanade/tachiyomi/multisrc/dopeflix/DopeFlix.kt (100%) rename {multisrc/src/main/java => lib-multisrc/dopeflix/src}/eu/kanade/tachiyomi/multisrc/dopeflix/DopeFlixFilters.kt (100%) rename {multisrc/src/main/java => lib-multisrc/dopeflix/src}/eu/kanade/tachiyomi/multisrc/dopeflix/dto/DopeFlixDto.kt (100%) rename {multisrc/src/main/java => lib-multisrc/dopeflix/src}/eu/kanade/tachiyomi/multisrc/dopeflix/extractors/DopeFlixExtractor.kt (100%) create mode 100644 lib-multisrc/zorotheme/build.gradle.kts rename {multisrc/src/main/java => lib-multisrc/zorotheme/src}/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroTheme.kt (100%) rename {multisrc/src/main/java => lib-multisrc/zorotheme/src}/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroThemeFilters.kt (100%) rename {multisrc/src/main/java => lib-multisrc/zorotheme/src}/eu/kanade/tachiyomi/multisrc/zorotheme/dto/ZoroThemeDto.kt (100%) delete mode 100644 multisrc/build.gradle.kts delete mode 100644 multisrc/overrides/animestream/animebalkan/additional.gradle delete mode 100644 multisrc/overrides/animestream/animekhor/additional.gradle delete mode 100644 multisrc/overrides/animestream/animenosub/additional.gradle delete mode 100644 multisrc/overrides/animestream/animeytes/additional.gradle delete mode 100644 multisrc/overrides/animestream/chineseanime/additional.gradle delete mode 100644 multisrc/overrides/animestream/desuonline/additional.gradle delete mode 100644 multisrc/overrides/animestream/donghuastream/additional.gradle delete mode 100644 multisrc/overrides/animestream/lmanime/additional.gradle delete mode 100644 multisrc/overrides/animestream/luciferdonghua/additional.gradle delete mode 100644 multisrc/overrides/animestream/minioppai/additional.gradle delete mode 100644 multisrc/overrides/animestream/rinecloud/additional.gradle delete mode 100644 multisrc/overrides/dooplay/animeplayer/additional.gradle delete mode 100644 multisrc/overrides/dooplay/animesaga/additional.gradle delete mode 100644 multisrc/overrides/dooplay/animeshouse/additional.gradle delete mode 100644 multisrc/overrides/dooplay/goanimes/additional.gradle delete mode 100644 multisrc/overrides/dooplay/jetanime/additional.gradle delete mode 100644 multisrc/overrides/dooplay/kinoking/additional.gradle delete mode 100644 multisrc/overrides/dooplay/pifansubs/additional.gradle delete mode 100644 multisrc/overrides/dooplay/voircartoon/additional.gradle delete mode 100644 multisrc/overrides/dopeflix/default/additional.gradle delete mode 100644 multisrc/overrides/zorotheme/default/additional.gradle delete mode 100644 multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamGenerator.kt delete mode 100644 multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/datalifeengine/DataLifeEngineGenerator.kt delete mode 100644 multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dooplay/DooPlayGenerator.kt delete mode 100644 multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dopeflix/DopeFlixGenerator.kt delete mode 100644 multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroThemeGenerator.kt delete mode 100644 multisrc/src/main/java/generator/GeneratorMain.kt delete mode 100644 multisrc/src/main/java/generator/IntelijConfigurationGeneratorMain.kt delete mode 100644 multisrc/src/main/java/generator/ThemeSourceGenerator.kt rename multisrc/overrides/animestream/animexin/additional.gradle => src/all/animexin/build.gradle (60%) rename {multisrc/overrides/animestream => src/all}/animexin/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/all}/animexin/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/all}/animexin/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/all}/animexin/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/all}/animexin/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream/animexin/src => src/all/animexin/src/eu/kanade/tachiyomi/animeextension/all/animexin}/AnimeXin.kt (100%) rename {multisrc/overrides/animestream/animexin/src => src/all/animexin/src/eu/kanade/tachiyomi/animeextension/all/animexin}/extractors/VidstreamingExtractor.kt (100%) rename {multisrc/overrides/animestream/animexin/src => src/all/animexin/src/eu/kanade/tachiyomi/animeextension/all/animexin}/extractors/YouTubeExtractor.kt (100%) create mode 100644 src/all/chineseanime/build.gradle rename {multisrc/overrides/animestream => src/all}/chineseanime/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/all}/chineseanime/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/all}/chineseanime/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/all}/chineseanime/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/all}/chineseanime/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/all}/chineseanime/res/web_hi_res_512.png (100%) rename {multisrc/overrides/animestream/chineseanime/src => src/all/chineseanime/src/eu/kanade/tachiyomi/animeextension/all/chineseanime}/ChineseAnime.kt (100%) rename {multisrc/overrides/animestream/chineseanime/src => src/all/chineseanime/src/eu/kanade/tachiyomi/animeextension/all/chineseanime}/extractors/VatchusExtractor.kt (100%) create mode 100644 src/all/lmanime/build.gradle rename {multisrc/overrides/animestream => src/all}/lmanime/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/all}/lmanime/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/all}/lmanime/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/all}/lmanime/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/all}/lmanime/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream/lmanime/src => src/all/lmanime/src/eu/kanade/tachiyomi/animeextension/all/lmanime}/LMAnime.kt (100%) rename multisrc/overrides/dooplay/cinemathek/additional.gradle => src/de/cinemathek/build.gradle (57%) rename {multisrc/overrides/dooplay => src/de}/cinemathek/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/de}/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_back.png (100%) rename {multisrc/overrides/dooplay => src/de}/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_fore.png (100%) rename {multisrc/overrides/dooplay => src/de}/cinemathek/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/de}/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_back.png (100%) rename {multisrc/overrides/dooplay => src/de}/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_fore.png (100%) rename {multisrc/overrides/dooplay => src/de}/cinemathek/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/de}/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_back.png (100%) rename {multisrc/overrides/dooplay => src/de}/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png (100%) rename {multisrc/overrides/dooplay => src/de}/cinemathek/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/de}/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png (100%) rename {multisrc/overrides/dooplay => src/de}/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png (100%) rename {multisrc/overrides/dooplay => src/de}/cinemathek/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/de}/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png (100%) rename {multisrc/overrides/dooplay => src/de}/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png (100%) rename {multisrc/overrides/dooplay/cinemathek/src => src/de/cinemathek/src/eu/kanade/tachiyomi/animeextension/de/cinemathek}/Cinemathek.kt (100%) create mode 100644 src/de/kinoking/build.gradle rename {multisrc/overrides/dooplay => src/de}/kinoking/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/de}/kinoking/res/mipmap-hdpi/ic_launcher_adaptive_back.png (100%) rename {multisrc/overrides/dooplay => src/de}/kinoking/res/mipmap-hdpi/ic_launcher_adaptive_fore.png (100%) rename {multisrc/overrides/dooplay => src/de}/kinoking/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/de}/kinoking/res/mipmap-mdpi/ic_launcher_adaptive_back.png (100%) rename {multisrc/overrides/dooplay => src/de}/kinoking/res/mipmap-mdpi/ic_launcher_adaptive_fore.png (100%) rename {multisrc/overrides/dooplay => src/de}/kinoking/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/de}/kinoking/res/mipmap-xhdpi/ic_launcher_adaptive_back.png (100%) rename {multisrc/overrides/dooplay => src/de}/kinoking/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png (100%) rename {multisrc/overrides/dooplay => src/de}/kinoking/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/de}/kinoking/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png (100%) rename {multisrc/overrides/dooplay => src/de}/kinoking/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png (100%) rename {multisrc/overrides/dooplay => src/de}/kinoking/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/de}/kinoking/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png (100%) rename {multisrc/overrides/dooplay => src/de}/kinoking/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png (100%) rename {multisrc/overrides/dooplay/kinoking/src => src/de/kinoking/src/eu/kanade/tachiyomi/animeextension/de/kinoking}/Kinoking.kt (100%) create mode 100644 src/en/animekhor/build.gradle rename {multisrc/overrides/animestream => src/en}/animekhor/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/en}/animekhor/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/en}/animekhor/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/en}/animekhor/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/en}/animekhor/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream/animekhor/src => src/en/animekhor/src/eu/kanade/tachiyomi/animeextension/en/animekhor}/AnimeKhor.kt (100%) rename {multisrc/overrides/animestream/animekhor/src => src/en/animekhor/src/eu/kanade/tachiyomi/animeextension/en/animekhor}/extractors/AnimeABCExtractor.kt (100%) rename {multisrc/overrides/animestream/animekhor/src => src/en/animekhor/src/eu/kanade/tachiyomi/animeextension/en/animekhor}/extractors/StreamHideExtractor.kt (100%) create mode 100644 src/en/animenosub/build.gradle rename {multisrc/overrides/animestream => src/en}/animenosub/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/en}/animenosub/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/en}/animenosub/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/en}/animenosub/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/en}/animenosub/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream/animenosub/src => src/en/animenosub/src/eu/kanade/tachiyomi/animeextension/en/animenosub}/Animenosub.kt (100%) rename {multisrc/overrides/animestream/animenosub/src => src/en/animenosub/src/eu/kanade/tachiyomi/animeextension/en/animenosub}/extractors/VidMolyExtractor.kt (100%) rename {multisrc/overrides/animestream/animenosub/src => src/en/animenosub/src/eu/kanade/tachiyomi/animeextension/en/animenosub}/extractors/VtubeExtractor.kt (100%) rename {multisrc/overrides/animestream/animenosub/src => src/en/animenosub/src/eu/kanade/tachiyomi/animeextension/en/animenosub}/extractors/WolfstreamExtractor.kt (100%) create mode 100644 src/en/donghuastream/build.gradle rename {multisrc/overrides/animestream => src/en}/donghuastream/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/en}/donghuastream/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/en}/donghuastream/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/en}/donghuastream/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/en}/donghuastream/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream/donghuastream/src => src/en/donghuastream/src/eu/kanade/tachiyomi/animeextension/en/donghuastream}/DonghuaStream.kt (100%) rename {multisrc/overrides/animestream/donghuastream/src => src/en/donghuastream/src/eu/kanade/tachiyomi/animeextension/en/donghuastream}/extractors/StreamPlayExtractor.kt (100%) create mode 100644 src/en/dopebox/build.gradle rename {multisrc/overrides/dopeflix => src/en}/dopebox/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/dopeflix => src/en}/dopebox/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/dopeflix => src/en}/dopebox/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dopeflix => src/en}/dopebox/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dopeflix => src/en}/dopebox/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dopeflix => src/en}/dopebox/res/play_store_512.png (100%) rename {multisrc/overrides/dopeflix/dopebox/src => src/en/dopebox/src/eu/kanade/tachiyomi/animeextension/en/dopebox}/DopeBox.kt (100%) create mode 100644 src/en/kaido/build.gradle rename {multisrc/overrides/zorotheme => src/en}/kaido/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/zorotheme => src/en}/kaido/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/zorotheme => src/en}/kaido/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/zorotheme => src/en}/kaido/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/zorotheme => src/en}/kaido/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/zorotheme => src/en}/kaido/res/play_store_512.png (100%) rename {multisrc/overrides/zorotheme/kaido/src => src/en/kaido/src/eu/kanade/tachiyomi/animeextension/en/kaido}/Kaido.kt (100%) create mode 100644 src/en/luciferdonghua/build.gradle rename {multisrc/overrides/animestream => src/en}/luciferdonghua/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/en}/luciferdonghua/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/en}/luciferdonghua/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/en}/luciferdonghua/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/en}/luciferdonghua/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream/luciferdonghua/src => src/en/luciferdonghua/src/eu/kanade/tachiyomi/animeextension/en/luciferdonghua}/LuciferDonghua.kt (100%) rename multisrc/overrides/dooplay/multimovies/additional.gradle => src/en/multimovies/build.gradle (62%) rename {multisrc/overrides/dooplay => src/en}/multimovies/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/en}/multimovies/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/en}/multimovies/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/en}/multimovies/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/en}/multimovies/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay/multimovies/src => src/en/multimovies/src/eu/kanade/tachiyomi/animeextension/en/multimovies}/Multimovies.kt (100%) rename {multisrc/overrides/dooplay/multimovies/src => src/en/multimovies/src/eu/kanade/tachiyomi/animeextension/en/multimovies}/MultimoviesFilters.kt (100%) rename {multisrc/overrides/dooplay/multimovies/src => src/en/multimovies/src/eu/kanade/tachiyomi/animeextension/en/multimovies}/extractors/AutoEmbedExtractor.kt (100%) rename {multisrc/overrides/dooplay/multimovies/src => src/en/multimovies/src/eu/kanade/tachiyomi/animeextension/en/multimovies}/extractors/MultimoviesCloudExtractor.kt (100%) rename {multisrc/overrides/dooplay/multimovies/src => src/en/multimovies/src/eu/kanade/tachiyomi/animeextension/en/multimovies}/extractors/RabbitStreamExtractor.kt (100%) create mode 100644 src/en/sflix/build.gradle rename {multisrc/overrides/dopeflix => src/en}/sflix/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/dopeflix => src/en}/sflix/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/dopeflix => src/en}/sflix/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dopeflix => src/en}/sflix/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dopeflix => src/en}/sflix/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dopeflix => src/en}/sflix/res/play_store_512.png (100%) rename {multisrc/overrides/dopeflix/sflix/src => src/en/sflix/src/eu/kanade/tachiyomi/animeextension/en/sflix}/SFlix.kt (100%) create mode 100644 src/en/uniquestream/build.gradle rename {multisrc/overrides/dooplay => src/en}/uniquestream/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/en}/uniquestream/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/en}/uniquestream/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/en}/uniquestream/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/en}/uniquestream/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/en}/uniquestream/res/web_hi_res_512.png (100%) rename {multisrc/overrides/dooplay/uniquestream/src => src/en/uniquestream/src/eu/kanade/tachiyomi/animeextension/en/uniquestream}/UniqueStream.kt (100%) create mode 100644 src/en/zoro/build.gradle rename {multisrc/overrides/zorotheme => src/en}/zoro/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/zorotheme => src/en}/zoro/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/zorotheme => src/en}/zoro/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/zorotheme => src/en}/zoro/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/zorotheme => src/en}/zoro/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/zorotheme => src/en}/zoro/res/play_store_512.png (100%) rename {multisrc/overrides/zorotheme/zoro/src => src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro}/AniWatch.kt (100%) rename multisrc/overrides/dooplay/animeonlineninja/additional.gradle => src/es/animeonlineninja/build.gradle (57%) rename {multisrc/overrides/dooplay => src/es}/animeonlineninja/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/es}/animeonlineninja/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/es}/animeonlineninja/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/es}/animeonlineninja/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/es}/animeonlineninja/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay/animeonlineninja/src => src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja}/AnimeOnlineNinja.kt (100%) rename {multisrc/overrides/dooplay/animeonlineninja/src => src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja}/AnimeOnlineNinjaFilters.kt (100%) rename {multisrc/overrides/dooplay/animeonlineninja/src => src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja}/VrfInterceptor.kt (100%) create mode 100644 src/es/animeytes/build.gradle rename {multisrc/overrides/animestream => src/es}/animeytes/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/es}/animeytes/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/es}/animeytes/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/es}/animeytes/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/es}/animeytes/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream/animeytes/src => src/es/animeytes/src/eu/kanade/tachiyomi/animeextension/es/animeytes}/AnimeYTES.kt (100%) rename multisrc/overrides/animestream/tiodonghua/additional.gradle => src/es/tiodonghua/build.gradle (52%) rename {multisrc/overrides/animestream => src/es}/tiodonghua/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/es}/tiodonghua/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/es}/tiodonghua/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/es}/tiodonghua/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/es}/tiodonghua/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream/tiodonghua/src => src/es/tiodonghua/src/eu/kanade/tachiyomi/animeextension/es/tiodonghua}/Tiodonghua.kt (100%) rename multisrc/overrides/datalifeengine/frenchanime/additional.gradle => src/fr/frenchanime/build.gradle (72%) rename {multisrc/overrides/datalifeengine => src/fr}/frenchanime/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/datalifeengine => src/fr}/frenchanime/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/datalifeengine => src/fr}/frenchanime/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/datalifeengine => src/fr}/frenchanime/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/datalifeengine => src/fr}/frenchanime/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/datalifeengine => src/fr}/frenchanime/res/web_hi_res_512.png (100%) rename {multisrc/overrides/datalifeengine/frenchanime/src => src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime}/FrenchAnime.kt (100%) create mode 100644 src/fr/jetanime/build.gradle rename {multisrc/overrides/dooplay => src/fr}/jetanime/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/fr}/jetanime/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/fr}/jetanime/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/fr}/jetanime/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/fr}/jetanime/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/fr}/jetanime/res/web_hi_res_512.png (100%) rename {multisrc/overrides/dooplay/jetanime/src => src/fr/jetanime/src/eu/kanade/tachiyomi/animeextension/fr/jetanime}/JetAnime.kt (100%) rename {multisrc/overrides/dooplay/jetanime/src => src/fr/jetanime/src/eu/kanade/tachiyomi/animeextension/fr/jetanime}/extractors/HdsplayExtractor.kt (100%) rename {multisrc/overrides/dooplay/jetanime/src => src/fr/jetanime/src/eu/kanade/tachiyomi/animeextension/fr/jetanime}/extractors/SentinelExtractor.kt (100%) rename multisrc/overrides/animestream/mykdrama/additional.gradle => src/fr/mykdrama/build.gradle (53%) rename {multisrc/overrides/animestream => src/fr}/mykdrama/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/fr}/mykdrama/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/fr}/mykdrama/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/fr}/mykdrama/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/fr}/mykdrama/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/fr}/mykdrama/res/web_hi_res_512.png (100%) rename {multisrc/overrides/animestream/mykdrama/src => src/fr/mykdrama/src/eu/kanade/tachiyomi/animeextension/fr/mykdrama}/MyKdrama.kt (100%) rename {multisrc/overrides/animestream/mykdrama/src => src/fr/mykdrama/src/eu/kanade/tachiyomi/animeextension/fr/mykdrama}/MyKdramaFilters.kt (100%) create mode 100644 src/fr/voircartoon/build.gradle rename {multisrc/overrides/dooplay => src/fr}/voircartoon/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/fr}/voircartoon/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/fr}/voircartoon/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/fr}/voircartoon/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/fr}/voircartoon/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay/voircartoon/src => src/fr/voircartoon/src/eu/kanade/tachiyomi/animeextension/fr/voircartoon}/VoirCartoon.kt (100%) rename {multisrc/overrides/dooplay/voircartoon/src => src/fr/voircartoon/src/eu/kanade/tachiyomi/animeextension/fr/voircartoon}/VoirCartoonFilters.kt (100%) rename {multisrc/overrides/dooplay/voircartoon/src => src/fr/voircartoon/src/eu/kanade/tachiyomi/animeextension/fr/voircartoon}/extractors/ComedyShowExtractor.kt (100%) rename multisrc/overrides/datalifeengine/wiflix/additional.gradle => src/fr/wiflix/build.gradle (72%) rename {multisrc/overrides/datalifeengine => src/fr}/wiflix/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/datalifeengine => src/fr}/wiflix/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/datalifeengine => src/fr}/wiflix/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/datalifeengine => src/fr}/wiflix/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/datalifeengine => src/fr}/wiflix/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/datalifeengine => src/fr}/wiflix/res/web_hi_res_512.png (100%) rename {multisrc/overrides/datalifeengine/wiflix/src => src/fr/wiflix/src/eu/kanade/tachiyomi/animeextension/fr/wiflix}/Wiflix.kt (100%) create mode 100644 src/hi/animesaga/build.gradle rename {multisrc/overrides/dooplay => src/hi}/animesaga/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/hi}/animesaga/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/hi}/animesaga/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/hi}/animesaga/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/hi}/animesaga/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay/animesaga/src => src/hi/animesaga/src/eu/kanade/tachiyomi/animeextension/hi/animesaga}/AnimeSAGA.kt (100%) rename multisrc/overrides/animestream/animeindo/additional.gradle => src/id/animeindo/build.gradle (60%) rename {multisrc/overrides/animestream => src/id}/animeindo/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/id}/animeindo/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/id}/animeindo/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/id}/animeindo/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/id}/animeindo/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream/animeindo/src => src/id/animeindo/src/eu/kanade/tachiyomi/animeextension/id/animeindo}/AnimeIndo.kt (100%) rename {multisrc/overrides/animestream/animeindo/src => src/id/animeindo/src/eu/kanade/tachiyomi/animeextension/id/animeindo}/AnimeIndoFilters.kt (100%) create mode 100644 src/id/minioppai/build.gradle rename {multisrc/overrides/animestream => src/id}/minioppai/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/id}/minioppai/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/id}/minioppai/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/id}/minioppai/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/id}/minioppai/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/id}/minioppai/res/web_hi_res_512.png (100%) rename {multisrc/overrides/animestream/minioppai/src => src/id/minioppai/src/eu/kanade/tachiyomi/animeextension/id/minioppai}/MiniOppai.kt (100%) rename {multisrc/overrides/animestream/minioppai/src => src/id/minioppai/src/eu/kanade/tachiyomi/animeextension/id/minioppai}/MiniOppaiFilters.kt (100%) rename {multisrc/overrides/animestream/minioppai/src => src/id/minioppai/src/eu/kanade/tachiyomi/animeextension/id/minioppai}/extractors/MiniOppaiExtractor.kt (100%) create mode 100644 src/pl/desuonline/build.gradle rename {multisrc/overrides/animestream => src/pl}/desuonline/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/pl}/desuonline/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/pl}/desuonline/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/pl}/desuonline/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/pl}/desuonline/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/pl}/desuonline/res/web_hi_res_512.png (100%) rename {multisrc/overrides/animestream/desuonline/src => src/pl/desuonline/src/eu/kanade/tachiyomi/animeextension/pl/desuonline}/DesuOnline.kt (100%) rename {multisrc/overrides/animestream/desuonline/src => src/pl/desuonline/src/eu/kanade/tachiyomi/animeextension/pl/desuonline}/extractors/CDAExtractor.kt (100%) create mode 100644 src/pt/animeplayer/build.gradle rename {multisrc/overrides/dooplay => src/pt}/animeplayer/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/animeplayer/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/animeplayer/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/animeplayer/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/animeplayer/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay/animeplayer/src => src/pt/animeplayer/src/eu/kanade/tachiyomi/animeextension/pt/animeplayer}/AnimePlayer.kt (100%) create mode 100644 src/pt/animesfoxbr/build.gradle rename {multisrc/overrides/dooplay => src/pt}/animesfoxbr/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/animesfoxbr/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/animesfoxbr/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/animesfoxbr/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/animesfoxbr/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay/animesfoxbr/src => src/pt/animesfoxbr/src/eu/kanade/tachiyomi/animeextension/pt/animesfoxbr}/AnimesFoxBR.kt (100%) rename multisrc/overrides/dooplay/animesgratis/additional.gradle => src/pt/animesgratis/build.gradle (59%) rename {multisrc/overrides/dooplay => src/pt}/animesgratis/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/animesgratis/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/animesgratis/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/animesgratis/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/animesgratis/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay/animesgratis/src => src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis}/AnimesOnline.kt (100%) rename {multisrc/overrides/dooplay/animesgratis/src => src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis}/extractors/AnimesOnlinePlayerExtractor.kt (100%) rename {multisrc/overrides/dooplay/animesgratis/src => src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis}/extractors/RuplayExtractor.kt (100%) create mode 100644 src/pt/animeshouse/build.gradle rename {multisrc/overrides/dooplay => src/pt}/animeshouse/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/animeshouse/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/animeshouse/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/animeshouse/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/animeshouse/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay/animeshouse/src => src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse}/AnimesHouse.kt (100%) rename {multisrc/overrides/dooplay/animeshouse/src => src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse}/extractors/EdifierExtractor.kt (100%) rename {multisrc/overrides/dooplay/animeshouse/src => src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse}/extractors/EmbedExtractor.kt (100%) rename {multisrc/overrides/dooplay/animeshouse/src => src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse}/extractors/GenericExtractor.kt (100%) rename {multisrc/overrides/dooplay/animeshouse/src => src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse}/extractors/JsUnpacker.kt (100%) rename {multisrc/overrides/dooplay/animeshouse/src => src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse}/extractors/McpExtractor.kt (100%) rename {multisrc/overrides/dooplay/animeshouse/src => src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse}/extractors/MpFourDooExtractor.kt (100%) rename {multisrc/overrides/dooplay/animeshouse/src => src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse}/extractors/RedplayBypasser.kt (100%) create mode 100644 src/pt/goanimes/build.gradle rename {multisrc/overrides/dooplay => src/pt}/goanimes/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/goanimes/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/goanimes/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/goanimes/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/goanimes/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay/goanimes/src => src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes}/GoAnimes.kt (100%) rename {multisrc/overrides/dooplay/goanimes/src => src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes}/extractors/BloggerJWPlayerExtractor.kt (100%) rename {multisrc/overrides/dooplay/goanimes/src => src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes}/extractors/GoAnimesExtractor.kt (100%) rename {multisrc/overrides/dooplay/goanimes/src => src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes}/extractors/JsDecoder.kt (100%) rename {multisrc/overrides/dooplay/goanimes/src => src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes}/extractors/LinkfunBypasser.kt (100%) rename {multisrc/overrides/dooplay/goanimes/src => src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes}/extractors/PlaylistExtractor.kt (100%) create mode 100644 src/pt/pifansubs/build.gradle rename {multisrc/overrides/dooplay => src/pt}/pifansubs/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/pifansubs/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/pifansubs/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/pifansubs/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/pifansubs/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/pifansubs/res/web_hi_res_512.png (100%) rename {multisrc/overrides/dooplay/pifansubs/src => src/pt/pifansubs/src/eu/kanade/tachiyomi/animeextension/pt/pifansubs}/PiFansubs.kt (100%) rename {multisrc/overrides/dooplay/pifansubs/src => src/pt/pifansubs/src/eu/kanade/tachiyomi/animeextension/pt/pifansubs}/extractors/BlembedExtractor.kt (100%) rename multisrc/overrides/dooplay/pobreflix/additional.gradle => src/pt/pobreflix/build.gradle (53%) rename {multisrc/overrides/dooplay => src/pt}/pobreflix/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/pobreflix/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/pobreflix/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/pobreflix/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay => src/pt}/pobreflix/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/dooplay/pobreflix/src => src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix}/Pobreflix.kt (100%) rename {multisrc/overrides/dooplay/pobreflix/src => src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix}/extractors/EplayerExtractor.kt (100%) rename {multisrc/overrides/dooplay/pobreflix/src => src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix}/extractors/MyStreamExtractor.kt (100%) rename {multisrc/overrides/dooplay/pobreflix/src => src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix}/extractors/SuperFlixExtractor.kt (100%) create mode 100644 src/pt/rinecloud/build.gradle rename {multisrc/overrides/animestream => src/pt}/rinecloud/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/pt}/rinecloud/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/pt}/rinecloud/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/pt}/rinecloud/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/pt}/rinecloud/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream/rinecloud/src => src/pt/rinecloud/src/eu/kanade/tachiyomi/animeextension/pt/rinecloud}/RineCloud.kt (100%) rename {multisrc/overrides/animestream/rinecloud/src => src/pt/rinecloud/src/eu/kanade/tachiyomi/animeextension/pt/rinecloud}/extractors/RineCloudExtractor.kt (100%) create mode 100644 src/sr/animebalkan/build.gradle rename {multisrc/overrides/animestream => src/sr}/animebalkan/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/sr}/animebalkan/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/sr}/animebalkan/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/sr}/animebalkan/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/sr}/animebalkan/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream/animebalkan/src => src/sr/animebalkan/src/eu/kanade/tachiyomi/animeextension/sr/animebalkan}/AnimeBalkan.kt (100%) rename {multisrc/overrides/animestream/animebalkan/src => src/sr/animebalkan/src/eu/kanade/tachiyomi/animeextension/sr/animebalkan}/extractors/MailRuExtractor.kt (100%) rename multisrc/overrides/animestream/asyaanimeleri/additional.gradle => src/tr/asyaanimeleri/build.gradle (62%) rename {multisrc/overrides/animestream => src/tr}/asyaanimeleri/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/tr}/asyaanimeleri/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/tr}/asyaanimeleri/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/tr}/asyaanimeleri/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/tr}/asyaanimeleri/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream/asyaanimeleri/src => src/tr/asyaanimeleri/src/eu/kanade/tachiyomi/animeextension/tr/asyaanimeleri}/AsyaAnimeleri.kt (100%) rename {multisrc/overrides/animestream/asyaanimeleri/src => src/tr/asyaanimeleri/src/eu/kanade/tachiyomi/animeextension/tr/asyaanimeleri}/AsyaAnimeleriFilters.kt (100%) rename {multisrc/overrides/animestream/asyaanimeleri/src => src/tr/asyaanimeleri/src/eu/kanade/tachiyomi/animeextension/tr/asyaanimeleri}/ShittyProtectionInterceptor.kt (100%) create mode 100644 src/tr/tranimeci/build.gradle rename {multisrc/overrides/animestream => src/tr}/tranimeci/res/mipmap-hdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/tr}/tranimeci/res/mipmap-mdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/tr}/tranimeci/res/mipmap-xhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/tr}/tranimeci/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream => src/tr}/tranimeci/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {multisrc/overrides/animestream/tranimeci/src => src/tr/tranimeci/src/eu/kanade/tachiyomi/animeextension/tr/tranimeci}/ShittyProtectionInterceptor.kt (100%) rename {multisrc/overrides/animestream/tranimeci/src => src/tr/tranimeci/src/eu/kanade/tachiyomi/animeextension/tr/tranimeci}/TRAnimeCI.kt (100%) rename {multisrc/overrides/animestream/tranimeci/src => src/tr/tranimeci/src/eu/kanade/tachiyomi/animeextension/tr/tranimeci}/TRAnimeCIFilters.kt (100%) diff --git a/.github/scripts/bump-versions.sh b/.github/scripts/bump-versions.sh index d849b07216..c218c74dc5 100755 --- a/.github/scripts/bump-versions.sh +++ b/.github/scripts/bump-versions.sh @@ -1,64 +1,12 @@ #!/bin/bash -versionStr="extVersionCode =" -multisrcVersionStr="overrideVersionCode =" +versionStr="VersionCode =" bumpedFiles="" - # cut -d "=" -f 2 -> string.split("=")[1] # "extVersionCode = 6" -> ["extVersionCode ", " 6"] -> " 6" -> "6" getValue() { cut -d "=" -f 2 | cut -d " " -f 2;} getVersion() { - if [[ $1 =~ ^multisrc/ ]]; then - # We are going to be piped, so no file specified, just read from stdin. - grep -Po "$multisrcVersionStr \d+" | getValue - else - grep "$versionStr" "$1" | getValue - fi -} - -# expected input: multisrc/overrides///.... -# if override is default, then it will bump all overrides. -bumpMultisrcVersion() { - local overridePath=$1 - # Prevents bumping extensions multiple times. - # Ex: When a theme uses a extractor per default, but one extension(override) - # also uses another, so if both libs are modifyed, such extension will be - # bumped only once instead of two times. - if [[ $bumpedFiles =~( |^)$overridePath( |$) ]]; then - return 0 - fi - - bumpedFiles+="$overridePath " - - # Bump all extensions from a multisrc that implements a lib by default - if [[ $overridePath =~ .*/default/.* ]]; then - local themeBase=$(echo $overridePath | cut -d/ -f-3) - for file in $(ls $themeBase | grep -v default); do - bumpMultisrcVersion $themeBase/$file/ - done - else - local theme=$(echo $overridePath | cut -d/ -f3) - local themePath="multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/$theme" - local sourceName=$(echo $overridePath | cut -d/ -f4) - local generator=$(echo $themePath/*Generator.kt) - bumpedFiles+="$generator " # Needed to commit the changes - - local sourceLine=$(grep "Lang(" $generator | grep -i $sourceName) - local oldVersion=$(echo $sourceLine | getVersion $generator) - local newVersionStr="$multisrcVersionStr $((oldVersion + 1))" - - if [[ $sourceLine =~ .*$multisrcVersionStr.* ]]; then - # if the override already have a "overrideVersionCode" param at - # the generator, then just bump it - local newSourceLine=${sourceLine/$multisrcVersionStr $oldVersion/$newVersionStr} - else - # else, add overrideVersionCode param to its line on the generator - local newSourceLine=${sourceLine/)/, $newVersionStr)} - fi - - echo -e "\nmultisrc $sourceName($theme): $oldVersion -> $((oldVersion + 1))\n" - sed -i "s@$sourceLine@$newSourceLine@g" $generator - fi + grep "$versionStr" "$1" | getValue } bumpVersion() { @@ -70,13 +18,24 @@ bumpVersion() { sed -i "s/$versionStr $oldVersion/$versionStr $newVersion/" $file } +bumpLibMultisrcVersion() { + local themeName=$(echo $1 | grep -Eo "lib-multisrc/\w+" | cut -c 14-) + for file in $(grep -l -R "themePkg = '$themeName'" --include build.gradle src/); do + # prevent bumping the same extension multiple times + if [[ ! $bumpedFiles =~ ( |^)$file( |$) ]]; then + bumpedFiles+="$file " + bumpVersion $file + fi + done +} + findAndBump() { for lib in $@; do - for file in $(grep -l -R ":lib:$lib" --include "build.gradle" --include "additional.gradle"); do + for file in $(grep -l -R ":lib:$lib" --include "build.gradle" --include "build.gradle.kts" src/ lib-multisrc/); do # prevent bumping the same extension multiple times if [[ ! $bumpedFiles =~ ( |^)$file( |$) ]]; then - if [[ $file =~ ^multisrc ]]; then - bumpMultisrcVersion ${file/additional.gradle/} + if [[ $file =~ ^lib-multisrc ]]; then + bumpLibMultisrcVersion ${file/build.gradle.kts/} else bumpedFiles+="$file " bumpVersion $file diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index 618cd53018..3aaa544e0e 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -21,65 +21,19 @@ jobs: runs-on: ubuntu-latest outputs: individualMatrix: ${{ steps.generate-matrices.outputs.individualMatrix }} - multisrcMatrix: ${{ steps.generate-matrices.outputs.multisrcMatrix }} - isIndividualChanged: ${{ steps.parse-changed-files.outputs.isIndividualChanged }} - isMultisrcChanged: ${{ steps.parse-changed-files.outputs.isMultisrcChanged }} - env: - CI_MODULE_GEN: true steps: - name: Clone repo uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@27152f6fa06a6b8062ef7195c795692e51fc2c81 # v2 - - - name: Set up JDK - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 - with: - java-version: 17 - distribution: temurin - - - id: get-changed-files - name: Get changed files - uses: Ana06/get-changed-files@e0c398b7065a8d84700c471b6afc4116d1ba4e96 # v2.2.0 - - - id: parse-changed-files - name: Parse changed files - run: | - isIndividualChanged=0 - isMultisrcChanged=0 - for changedFile in ${{ steps.get-changed-files.outputs.all }}; do - if [[ ${changedFile} == src/* ]]; then - isIndividualChanged=1 - elif [[ ${changedFile} == multisrc/* ]]; then - isMultisrcChanged=1 - elif [[ ${changedFile} == .github/workflows/issue_moderator.yml ]]; then - true - elif [[ ${changedFile} == *.md ]]; then - true - else - isIndividualChanged=1 - isMultisrcChanged=1 - break - fi - done - echo "isIndividualChanged=$isIndividualChanged" >> $GITHUB_OUTPUT - echo "isMultisrcChanged=$isMultisrcChanged" >> $GITHUB_OUTPUT - - - name: Set up Gradle - uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3 - - - name: Generate multisrc sources - if: ${{ steps.parse-changed-files.outputs.isMultisrcChanged == '1' }} - run: ./gradlew :multisrc:generateExtensions + uses: gradle/wrapper-validation-action@a494d935f4b56874c4a5a87d19af7afcf3a163d0 # v2 - name: Get number of modules run: | set -x - ./gradlew -q projects | grep '.*extensions\:\(individual\|multisrc\)\:.*\:.*' > projects.txt + projects=(src/*/*) - echo "NUM_INDIVIDUAL_MODULES=$(cat projects.txt | grep '.*\:individual\:.*' | wc -l)" >> $GITHUB_ENV - echo "NUM_MULTISRC_MODULES=$(cat projects.txt | grep '.*\:multisrc\:.*' | wc -l)" >> $GITHUB_ENV + echo "NUM_INDIVIDUAL_MODULES=${#projects[@]}" >> $GITHUB_ENV - id: generate-matrices name: Create output matrices @@ -87,55 +41,17 @@ jobs: with: script: | const numIndividualModules = process.env.NUM_INDIVIDUAL_MODULES; - const numMultisrcModules = process.env.NUM_MULTISRC_MODULES; const chunkSize = process.env.CI_CHUNK_SIZE; const numIndividualChunks = Math.ceil(numIndividualModules / chunkSize); - const numMultisrcChunks = Math.ceil(numMultisrcModules / chunkSize); console.log(`Individual modules: ${numIndividualModules} (${numIndividualChunks} chunks of ${chunkSize})`); - console.log(`Multi-source modules: ${numMultisrcModules} (${numMultisrcChunks} chunks of ${chunkSize})`); core.setOutput('individualMatrix', { 'chunk': [...Array(numIndividualChunks).keys()] }); - core.setOutput('multisrcMatrix', { 'chunk': [...Array(numMultisrcChunks).keys()] }); - - build_multisrc: - name: Build multisrc modules - needs: prepare - if: ${{ needs.prepare.outputs.isMultisrcChanged == '1' }} - runs-on: ubuntu-latest - strategy: - matrix: ${{ fromJSON(needs.prepare.outputs.multisrcMatrix) }} - steps: - - name: Checkout PR - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - - - name: Set up JDK - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 - with: - java-version: 17 - distribution: temurin - - - name: Set up Gradle - uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3 - with: - cache-read-only: true - - - name: Generate sources from the multi-source library - env: - CI_MODULE_GEN: "true" - run: ./gradlew :multisrc:generateExtensions - - - name: Build extensions (chunk ${{ matrix.chunk }}) - env: - CI_MULTISRC: "true" - CI_CHUNK_NUM: ${{ matrix.chunk }} - run: ./gradlew assembleDebug build_individual: name: Build individual modules needs: prepare - if: ${{ needs.prepare.outputs.isIndividualChanged == '1' }} runs-on: ubuntu-latest strategy: matrix: ${{ fromJSON(needs.prepare.outputs.individualMatrix) }} @@ -150,12 +66,11 @@ jobs: distribution: temurin - name: Set up Gradle - uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3 + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3 with: cache-read-only: true - name: Build extensions (chunk ${{ matrix.chunk }}) env: - CI_MULTISRC: "false" CI_CHUNK_NUM: ${{ matrix.chunk }} - run: ./gradlew assembleDebug + run: ./gradlew -p src assembleDebug diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 9b7cde3456..ecb694fc56 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -24,9 +24,6 @@ jobs: runs-on: ubuntu-latest outputs: individualMatrix: ${{ steps.generate-matrices.outputs.individualMatrix }} - multisrcMatrix: ${{ steps.generate-matrices.outputs.multisrcMatrix }} - env: - CI_MODULE_GEN: true steps: - name: Clone repo uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 @@ -58,27 +55,14 @@ jobs: ./.github/scripts/bump-versions.sh ${{ steps.modified-libs.outputs.all_changed_files }} - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@27152f6fa06a6b8062ef7195c795692e51fc2c81 # v2 - - - name: Set up JDK - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 - with: - java-version: 17 - distribution: temurin - - - name: Set up Gradle - uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3 - - - name: Generate multisrc sources - run: ./gradlew :multisrc:generateExtensions + uses: gradle/wrapper-validation-action@a494d935f4b56874c4a5a87d19af7afcf3a163d0 # v2 - name: Get number of modules run: | set -x - ./gradlew -q projects | grep '.*extensions\:\(individual\|multisrc\)\:.*\:.*' > projects.txt + projects=(src/*/*) - echo "NUM_INDIVIDUAL_MODULES=$(cat projects.txt | grep '.*\:individual\:.*' | wc -l)" >> $GITHUB_ENV - echo "NUM_MULTISRC_MODULES=$(cat projects.txt | grep '.*\:multisrc\:.*' | wc -l)" >> $GITHUB_ENV + echo "NUM_INDIVIDUAL_MODULES=${#projects[@]}" >> $GITHUB_ENV - id: generate-matrices name: Create output matrices @@ -86,67 +70,13 @@ jobs: with: script: | const numIndividualModules = process.env.NUM_INDIVIDUAL_MODULES; - const numMultisrcModules = process.env.NUM_MULTISRC_MODULES; const chunkSize = process.env.CI_CHUNK_SIZE; const numIndividualChunks = Math.ceil(numIndividualModules / chunkSize); - const numMultisrcChunks = Math.ceil(numMultisrcModules / chunkSize); console.log(`Individual modules: ${numIndividualModules} (${numIndividualChunks} chunks of ${chunkSize})`); - console.log(`Multi-source modules: ${numMultisrcModules} (${numMultisrcChunks} chunks of ${chunkSize})`); core.setOutput('individualMatrix', { 'chunk': [...Array(numIndividualChunks).keys()] }); - core.setOutput('multisrcMatrix', { 'chunk': [...Array(numMultisrcChunks).keys()] }); - - build_multisrc: - name: Build multisrc modules - needs: prepare - runs-on: ubuntu-latest - strategy: - matrix: ${{ fromJSON(needs.prepare.outputs.multisrcMatrix) }} - steps: - - name: Checkout master branch - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - with: - ref: master - - - name: Set up JDK - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 - with: - java-version: 17 - distribution: temurin - - - name: Prepare signing key - run: | - echo ${{ secrets.SIGNING_KEY }} | base64 -d > signingkey.jks - - - name: Set up Gradle - uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3 - - - name: Generate sources from the multi-source library - env: - CI_MODULE_GEN: "true" - run: ./gradlew :multisrc:generateExtensions - - - name: Build extensions (chunk ${{ matrix.chunk }}) - env: - CI_MULTISRC: "true" - CI_CHUNK_NUM: ${{ matrix.chunk }} - ALIAS: ${{ secrets.ALIAS }} - KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }} - KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - run: ./gradlew assembleRelease - - - name: Upload APKs (chunk ${{ matrix.chunk }}) - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4 - if: "github.repository == 'aniyomiorg/aniyomi-extensions'" - with: - name: "multisrc-apks-${{ matrix.chunk }}" - path: "**/*.apk" - retention-days: 1 - - - name: Clean up CI files - run: rm signingkey.jks build_individual: name: Build individual modules @@ -171,19 +101,18 @@ jobs: echo ${{ secrets.SIGNING_KEY }} | base64 -d > signingkey.jks - name: Set up Gradle - uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3 + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3 - name: Build extensions (chunk ${{ matrix.chunk }}) env: - CI_MULTISRC: "false" CI_CHUNK_NUM: ${{ matrix.chunk }} ALIAS: ${{ secrets.ALIAS }} KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - run: ./gradlew assembleRelease + run: ./gradlew -p src assembleRelease - name: Upload APKs (chunk ${{ matrix.chunk }}) - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4 + uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4 if: "github.repository == 'aniyomiorg/aniyomi-extensions'" with: name: "individual-apks-${{ matrix.chunk }}" @@ -196,13 +125,12 @@ jobs: publish_repo: name: Publish repo needs: - - build_multisrc - build_individual if: "github.repository == 'aniyomiorg/aniyomi-extensions'" runs-on: ubuntu-latest steps: - name: Download APK artifacts - uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4 + uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4 with: path: ~/apk-artifacts diff --git a/.run/AnimeStreamGenerator.run.xml b/.run/AnimeStreamGenerator.run.xml deleted file mode 100644 index 655ae0303a..0000000000 --- a/.run/AnimeStreamGenerator.run.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/.run/DooPlayGenerator.run.xml b/.run/DooPlayGenerator.run.xml deleted file mode 100644 index fb9a23391a..0000000000 --- a/.run/DooPlayGenerator.run.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/.run/DopeFlixGenerator.run.xml b/.run/DopeFlixGenerator.run.xml deleted file mode 100644 index 841cf605b6..0000000000 --- a/.run/DopeFlixGenerator.run.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/.run/ZoroThemeGenerator.run.xml b/.run/ZoroThemeGenerator.run.xml deleted file mode 100644 index f406bf7018..0000000000 --- a/.run/ZoroThemeGenerator.run.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/build-plugins/build.gradle.kts b/build-plugins/build.gradle.kts deleted file mode 100644 index 496c627862..0000000000 --- a/build-plugins/build.gradle.kts +++ /dev/null @@ -1,16 +0,0 @@ -plugins { - `kotlin-dsl` -} - -dependencies { - implementation(libs.gradle.agp) - implementation(libs.gradle.kotlin) - implementation(libs.gradle.kotlin.serialization) - // Workaround: https://github.com/gradle/gradle/issues/15383#issuecomment-779893192 - implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location)) -} - -kotlin { - // To access AndroidConfig - sourceSets.getByName("main").kotlin.srcDir("../buildSrc/src/main/kotlin") -} diff --git a/build-plugins/src/main/kotlin/lib-kotlin.gradle.kts b/build-plugins/src/main/kotlin/lib-kotlin.gradle.kts deleted file mode 100644 index 205fbccbd0..0000000000 --- a/build-plugins/src/main/kotlin/lib-kotlin.gradle.kts +++ /dev/null @@ -1,12 +0,0 @@ -import org.gradle.accessors.dm.LibrariesForLibs - -plugins { - `java-library` - kotlin("jvm") -} - -val libs = the() - -dependencies { - compileOnly(libs.kotlin.stdlib) -} diff --git a/build.gradle.kts b/build.gradle.kts index 939c498211..98a6d7a527 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,12 +1,15 @@ -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.kotlinter) apply false -} - -tasks.register("clean") { - delete(rootProject.layout.buildDirectory.asFile.get()) +buildscript { + repositories { + mavenCentral() + google() + maven(url = "https://plugins.gradle.org/m2/") + } + dependencies { + classpath(libs.gradle.agp) + classpath(libs.gradle.kotlin) + classpath(libs.gradle.kotlin.serialization) + classpath(libs.gradle.kotlinter) + } } allprojects { diff --git a/buildSrc/.gitignore b/buildSrc/.gitignore deleted file mode 100644 index 67bcc2f727..0000000000 --- a/buildSrc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.gradle/ -build/ diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 876c922b22..21d0f6cc2a 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -2,6 +2,9 @@ plugins { `kotlin-dsl` } -repositories { - mavenCentral() +dependencies { + implementation(libs.gradle.agp) + implementation(libs.gradle.kotlin) + implementation(libs.gradle.kotlin.serialization) + implementation(libs.gradle.kotlinter) } diff --git a/build-plugins/settings.gradle.kts b/buildSrc/settings.gradle.kts similarity index 100% rename from build-plugins/settings.gradle.kts rename to buildSrc/settings.gradle.kts diff --git a/buildSrc/src/main/kotlin/Extensions.kt b/buildSrc/src/main/kotlin/Extensions.kt new file mode 100644 index 0000000000..12eff37a63 --- /dev/null +++ b/buildSrc/src/main/kotlin/Extensions.kt @@ -0,0 +1,6 @@ +import org.gradle.api.plugins.ExtensionAware +import org.gradle.kotlin.dsl.extra + +var ExtensionAware.baseVersionCode: Int + get() = extra.get("baseVersionCode") as Int + set(value) = extra.set("baseVersionCode", value) diff --git a/build-plugins/src/main/kotlin/lib-android.gradle.kts b/buildSrc/src/main/kotlin/lib-android.gradle.kts similarity index 64% rename from build-plugins/src/main/kotlin/lib-android.gradle.kts rename to buildSrc/src/main/kotlin/lib-android.gradle.kts index c3cdf5c113..2d9eebc634 100644 --- a/build-plugins/src/main/kotlin/lib-android.gradle.kts +++ b/buildSrc/src/main/kotlin/lib-android.gradle.kts @@ -1,5 +1,3 @@ -import org.gradle.accessors.dm.LibrariesForLibs - plugins { id("com.android.library") kotlin("android") @@ -16,8 +14,11 @@ android { namespace = "eu.kanade.tachiyomi.lib.${name.replace("-", "")}" } -val libs = the() - -dependencies { - compileOnly(libs.bundles.common) -} +versionCatalogs + .named("libs") + .findBundle("common") + .ifPresent { common -> + dependencies { + compileOnly(common) + } + } diff --git a/buildSrc/src/main/kotlin/lib-kotlin.gradle.kts b/buildSrc/src/main/kotlin/lib-kotlin.gradle.kts new file mode 100644 index 0000000000..f800de6e82 --- /dev/null +++ b/buildSrc/src/main/kotlin/lib-kotlin.gradle.kts @@ -0,0 +1,13 @@ +plugins { + `java-library` + kotlin("jvm") +} + +versionCatalogs + .named("libs") + .findLibrary("kotlin-stdlib") + .ifPresent { stdlib -> + dependencies { + compileOnly(stdlib) + } + } diff --git a/buildSrc/src/main/kotlin/lib-multisrc.gradle.kts b/buildSrc/src/main/kotlin/lib-multisrc.gradle.kts new file mode 100644 index 0000000000..57e86f95a1 --- /dev/null +++ b/buildSrc/src/main/kotlin/lib-multisrc.gradle.kts @@ -0,0 +1,55 @@ +plugins { + id("com.android.library") + kotlin("android") + id("kotlinx-serialization") + id("org.jmailen.kotlinter") +} + +android { + compileSdk = AndroidConfig.compileSdk + + defaultConfig { + minSdk = AndroidConfig.minSdk + } + + namespace = "eu.kanade.tachiyomi.multisrc.${project.name}" + + sourceSets { + named("main") { + manifest.srcFile("AndroidManifest.xml") + java.setSrcDirs(listOf("src")) + res.setSrcDirs(listOf("res")) + assets.setSrcDirs(listOf("assets")) + } + } + + buildFeatures { + resValues = false + shaders = false + } + + kotlinOptions { + freeCompilerArgs += "-opt-in=kotlinx.serialization.ExperimentalSerializationApi" + } +} + +versionCatalogs + .named("libs") + .findBundle("common") + .ifPresent { common -> + dependencies { + compileOnly(common) + } + } + +tasks { + preBuild { + dependsOn(lintKotlin) + } + + if (System.getenv("CI") != "true") { + lintKotlin { + dependsOn(formatKotlin) + } + } +} diff --git a/common.gradle b/common.gradle index 77d38ccfb6..fa09e223fa 100644 --- a/common.gradle +++ b/common.gradle @@ -8,6 +8,9 @@ assert !ext.has("libVersion") assert extName.chars().max().asInt < 0x180 : "Extension name should be romanized" +Project theme = ext.has("themePkg") ? project(":lib-multisrc:$themePkg") : null +if (theme != null) evaluationDependsOn(theme.path) + android { compileSdkVersion AndroidConfig.compileSdk namespace AndroidConfig.namespace @@ -30,8 +33,8 @@ android { minSdkVersion AndroidConfig.minSdk targetSdkVersion AndroidConfig.targetSdk applicationIdSuffix project.parent.name + "." + project.name - versionCode extVersionCode - versionName "14.$extVersionCode" + versionCode theme == null ? extVersionCode : theme.baseVersionCode + overrideVersionCode + versionName "14.$versionCode" base { archivesName = "aniyomi-$applicationIdSuffix-v$versionName" } @@ -39,8 +42,19 @@ android { manifestPlaceholders = [ appName : "Aniyomi: $extName", extClass: extClass, - nsfw: project.ext.find("isNsfw") ? 1 : 0, + nsfw : project.ext.find("isNsfw") ? 1 : 0, ] + String baseUrl = project.ext.find("baseUrl") ?: "" + if (theme != null && !baseUrl.isEmpty()) { + def split = baseUrl.split("://") + assert split.length == 2 + def path = split[1].split("/") + manifestPlaceholders += [ + SOURCEHOST : path[0], + SOURCESCHEME: split[0], + ] + } + } signingConfigs { @@ -84,6 +98,7 @@ android { } dependencies { + if (theme != null) implementation(theme) // Overrides core launcher icons implementation(project(":core")) compileOnly(libs.bundles.common) } @@ -113,4 +128,6 @@ tasks.register("writeManifestFile") { } preBuild.dependsOn(writeManifestFile, lintKotlin) -lintKotlin.dependsOn(formatKotlin) +if (System.getenv("CI") != "true") { + lintKotlin.dependsOn(formatKotlin) +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8e107711f7..e51cd920de 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,6 +8,7 @@ serialization_version = "1.5.1" gradle-agp = { module = "com.android.tools.build:gradle", version.ref = "agp_version" } gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin_version" } gradle-kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin_version" } +gradle-kotlinter = { module = "org.jmailen.gradle:kotlinter-gradle", version = "3.15.0" } aniyomi-lib = { module = "com.github.aniyomiorg:extensions-lib", version = "14" } @@ -19,7 +20,6 @@ coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", ve coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines_version" } injekt-core = { module = "com.github.inorichi.injekt:injekt-core", version = "65b0440" } -rxandroid = { module = "io.reactivex:rxandroid", version = "1.2.1" } 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" } @@ -27,11 +27,3 @@ quickjs = { module = "app.cash.quickjs:quickjs-android", version = "0.9.2" } [bundles] common = ["kotlin-stdlib", "injekt-core", "rxjava", "kotlin-protobuf", "kotlin-json", "jsoup", "okhttp", "aniyomi-lib", "quickjs", "coroutines-core", "coroutines-android"] -reactivex = ["rxandroid"] - -[plugins] -android-application = { id = "com.android.application", version.ref = "agp_version" } -android-library = { id = "com.android.library", version.ref = "agp_version" } -kotlinter = { id = "org.jmailen.kotlinter", version = "3.15.0" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin_version" } -kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin_version" } diff --git a/multisrc/overrides/animestream/default/AndroidManifest.xml b/lib-multisrc/animestream/AndroidManifest.xml similarity index 100% rename from multisrc/overrides/animestream/default/AndroidManifest.xml rename to lib-multisrc/animestream/AndroidManifest.xml diff --git a/lib-multisrc/animestream/build.gradle.kts b/lib-multisrc/animestream/build.gradle.kts new file mode 100644 index 0000000000..5e2a19a10a --- /dev/null +++ b/lib-multisrc/animestream/build.gradle.kts @@ -0,0 +1,5 @@ +plugins { + id("lib-multisrc") +} + +baseVersionCode = 2 \ No newline at end of file diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStream.kt b/lib-multisrc/animestream/src/eu/kanade/tachiyomi/multisrc/animestream/AnimeStream.kt similarity index 100% rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStream.kt rename to lib-multisrc/animestream/src/eu/kanade/tachiyomi/multisrc/animestream/AnimeStream.kt diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamFilters.kt b/lib-multisrc/animestream/src/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamFilters.kt similarity index 100% rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamFilters.kt rename to lib-multisrc/animestream/src/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamFilters.kt diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamUrlActivity.kt b/lib-multisrc/animestream/src/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamUrlActivity.kt similarity index 100% rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamUrlActivity.kt rename to lib-multisrc/animestream/src/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamUrlActivity.kt diff --git a/lib-multisrc/datalifeengine/build.gradle.kts b/lib-multisrc/datalifeengine/build.gradle.kts new file mode 100644 index 0000000000..0024039f0a --- /dev/null +++ b/lib-multisrc/datalifeengine/build.gradle.kts @@ -0,0 +1,5 @@ +plugins { + id("lib-multisrc") +} + +baseVersionCode = 1 \ No newline at end of file diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/datalifeengine/DataLifeEngine.kt b/lib-multisrc/datalifeengine/src/eu/kanade/tachiyomi/multisrc/datalifeengine/DataLifeEngine.kt similarity index 100% rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/datalifeengine/DataLifeEngine.kt rename to lib-multisrc/datalifeengine/src/eu/kanade/tachiyomi/multisrc/datalifeengine/DataLifeEngine.kt diff --git a/multisrc/overrides/dooplay/default/AndroidManifest.xml b/lib-multisrc/dooplay/AndroidManifest.xml similarity index 100% rename from multisrc/overrides/dooplay/default/AndroidManifest.xml rename to lib-multisrc/dooplay/AndroidManifest.xml diff --git a/lib-multisrc/dooplay/build.gradle.kts b/lib-multisrc/dooplay/build.gradle.kts new file mode 100644 index 0000000000..0024039f0a --- /dev/null +++ b/lib-multisrc/dooplay/build.gradle.kts @@ -0,0 +1,5 @@ +plugins { + id("lib-multisrc") +} + +baseVersionCode = 1 \ No newline at end of file diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dooplay/DooPlay.kt b/lib-multisrc/dooplay/src/eu/kanade/tachiyomi/multisrc/dooplay/DooPlay.kt similarity index 100% rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dooplay/DooPlay.kt rename to lib-multisrc/dooplay/src/eu/kanade/tachiyomi/multisrc/dooplay/DooPlay.kt diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dooplay/DooPlayUrlActivity.kt b/lib-multisrc/dooplay/src/eu/kanade/tachiyomi/multisrc/dooplay/DooPlayUrlActivity.kt similarity index 100% rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dooplay/DooPlayUrlActivity.kt rename to lib-multisrc/dooplay/src/eu/kanade/tachiyomi/multisrc/dooplay/DooPlayUrlActivity.kt diff --git a/lib-multisrc/dopeflix/build.gradle.kts b/lib-multisrc/dopeflix/build.gradle.kts new file mode 100644 index 0000000000..4de813223c --- /dev/null +++ b/lib-multisrc/dopeflix/build.gradle.kts @@ -0,0 +1,11 @@ +plugins { + id("lib-multisrc") +} + +baseVersionCode = 19 + +dependencies { + api(project(":lib:dood-extractor")) + api(project(":lib:cryptoaes")) + api(project(":lib:playlist-utils")) +} diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dopeflix/DopeFlix.kt b/lib-multisrc/dopeflix/src/eu/kanade/tachiyomi/multisrc/dopeflix/DopeFlix.kt similarity index 100% rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dopeflix/DopeFlix.kt rename to lib-multisrc/dopeflix/src/eu/kanade/tachiyomi/multisrc/dopeflix/DopeFlix.kt diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dopeflix/DopeFlixFilters.kt b/lib-multisrc/dopeflix/src/eu/kanade/tachiyomi/multisrc/dopeflix/DopeFlixFilters.kt similarity index 100% rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dopeflix/DopeFlixFilters.kt rename to lib-multisrc/dopeflix/src/eu/kanade/tachiyomi/multisrc/dopeflix/DopeFlixFilters.kt diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dopeflix/dto/DopeFlixDto.kt b/lib-multisrc/dopeflix/src/eu/kanade/tachiyomi/multisrc/dopeflix/dto/DopeFlixDto.kt similarity index 100% rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dopeflix/dto/DopeFlixDto.kt rename to lib-multisrc/dopeflix/src/eu/kanade/tachiyomi/multisrc/dopeflix/dto/DopeFlixDto.kt diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dopeflix/extractors/DopeFlixExtractor.kt b/lib-multisrc/dopeflix/src/eu/kanade/tachiyomi/multisrc/dopeflix/extractors/DopeFlixExtractor.kt similarity index 100% rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dopeflix/extractors/DopeFlixExtractor.kt rename to lib-multisrc/dopeflix/src/eu/kanade/tachiyomi/multisrc/dopeflix/extractors/DopeFlixExtractor.kt diff --git a/lib-multisrc/zorotheme/build.gradle.kts b/lib-multisrc/zorotheme/build.gradle.kts new file mode 100644 index 0000000000..986a514d96 --- /dev/null +++ b/lib-multisrc/zorotheme/build.gradle.kts @@ -0,0 +1,10 @@ +plugins { + id("lib-multisrc") +} + +baseVersionCode = 1 + +dependencies { + api(project(":lib:megacloud-extractor")) + api(project(":lib:streamtape-extractor")) +} diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroTheme.kt b/lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroTheme.kt similarity index 100% rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroTheme.kt rename to lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroTheme.kt diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroThemeFilters.kt b/lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroThemeFilters.kt similarity index 100% rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroThemeFilters.kt rename to lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroThemeFilters.kt diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zorotheme/dto/ZoroThemeDto.kt b/lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/dto/ZoroThemeDto.kt similarity index 100% rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zorotheme/dto/ZoroThemeDto.kt rename to lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/dto/ZoroThemeDto.kt diff --git a/multisrc/build.gradle.kts b/multisrc/build.gradle.kts deleted file mode 100644 index 79229c6395..0000000000 --- a/multisrc/build.gradle.kts +++ /dev/null @@ -1,86 +0,0 @@ -plugins { - id("com.android.library") - alias(libs.plugins.kotlin.android) - alias(libs.plugins.kotlin.serialization) -} - -android { - compileSdk = AndroidConfig.compileSdk - namespace = AndroidConfig.multisrcNamespace - - defaultConfig { - minSdk = 29 - } - - kotlinOptions { - freeCompilerArgs += "-opt-in=kotlinx.serialization.ExperimentalSerializationApi" - } -} - -configurations { - compileOnly { - isCanBeResolved = true - } -} - -dependencies { - compileOnly(libs.bundles.common) - - // Implements all shared-extractors on the extensions generator - // Note that this does not mean that generated sources are going to - // implement them too; this is just to be able to compile and generate sources. - rootProject.subprojects - .filter { it.path.startsWith(":lib:") } - .forEach(::implementation) -} - -tasks { - register("generateExtensions") { - classpath = configurations.compileOnly.get() + - configurations.androidApis.get() + // android.jar path - layout.buildDirectory.files("intermediates/aar_main_jar/debug/classes.jar") // jar made from this module - - // Default generator class, generates extensions for all themes. - mainClass.set("generator.GeneratorMainKt") - - // Only generate extensions from a specified theme. - if (project.hasProperty("theme")) { - val theme = project.property("theme") - val themeDir = file("src/main/java/eu/kanade/tachiyomi/multisrc/$theme") - if (themeDir.isDirectory) { - val className = themeDir.list()!! - .first { it.endsWith("Generator.kt") } - .removeSuffix(".kt") - mainClass.set("eu.kanade.tachiyomi.multisrc.$theme.$className") - } - } - - workingDir = workingDir.parentFile // project root - - errorOutput = System.out // for GitHub workflow commands - - if (!logger.isInfoEnabled) { - standardOutput = org.gradle.internal.io.NullOutputStream.INSTANCE - } - - dependsOn("ktFormat", "ktLint", "assembleDebug") - } - - register("ktLint") { - if (project.hasProperty("theme")) { - val theme = project.property("theme") - source(files("src/main/java/eu/kanade/tachiyomi/multisrc/$theme", "overrides/$theme")) - return@register - } - source(files("src", "overrides")) - } - - register("ktFormat") { - if (project.hasProperty("theme")) { - val theme = project.property("theme") - source(files("src/main/java/eu/kanade/tachiyomi/multisrc/$theme", "overrides/$theme")) - return@register - } - source(files("src", "overrides")) - } -} diff --git a/multisrc/overrides/animestream/animebalkan/additional.gradle b/multisrc/overrides/animestream/animebalkan/additional.gradle deleted file mode 100644 index bdd9489e34..0000000000 --- a/multisrc/overrides/animestream/animebalkan/additional.gradle +++ /dev/null @@ -1,4 +0,0 @@ -dependencies { - implementation(project(":lib:okru-extractor")) - implementation(project(":lib:googledrive-extractor")) -} diff --git a/multisrc/overrides/animestream/animekhor/additional.gradle b/multisrc/overrides/animestream/animekhor/additional.gradle deleted file mode 100644 index c201827cdd..0000000000 --- a/multisrc/overrides/animestream/animekhor/additional.gradle +++ /dev/null @@ -1,5 +0,0 @@ -dependencies { - implementation(project(':lib:okru-extractor')) - implementation(project(':lib:streamwish-extractor')) - implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" -} diff --git a/multisrc/overrides/animestream/animenosub/additional.gradle b/multisrc/overrides/animestream/animenosub/additional.gradle deleted file mode 100644 index 96e6afb115..0000000000 --- a/multisrc/overrides/animestream/animenosub/additional.gradle +++ /dev/null @@ -1,5 +0,0 @@ -dependencies { - implementation(project(':lib:filemoon-extractor')) - implementation(project(':lib:streamwish-extractor')) - implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" -} diff --git a/multisrc/overrides/animestream/animeytes/additional.gradle b/multisrc/overrides/animestream/animeytes/additional.gradle deleted file mode 100644 index 558c9d8bea..0000000000 --- a/multisrc/overrides/animestream/animeytes/additional.gradle +++ /dev/null @@ -1,5 +0,0 @@ -dependencies { - implementation(project(":lib:okru-extractor")) - implementation(project(":lib:streamtape-extractor")) - implementation(project(":lib:sendvid-extractor")) -} diff --git a/multisrc/overrides/animestream/chineseanime/additional.gradle b/multisrc/overrides/animestream/chineseanime/additional.gradle deleted file mode 100644 index b8580c107f..0000000000 --- a/multisrc/overrides/animestream/chineseanime/additional.gradle +++ /dev/null @@ -1,5 +0,0 @@ -dependencies { - implementation(project(":lib:dailymotion-extractor")) - implementation(project(":lib:streamwish-extractor")) - implementation(project(":lib:playlist-utils")) -} diff --git a/multisrc/overrides/animestream/desuonline/additional.gradle b/multisrc/overrides/animestream/desuonline/additional.gradle deleted file mode 100644 index a9880c4295..0000000000 --- a/multisrc/overrides/animestream/desuonline/additional.gradle +++ /dev/null @@ -1,5 +0,0 @@ -dependencies { - implementation(project(':lib:okru-extractor')) - implementation(project(':lib:googledrive-extractor')) - implementation(project(':lib:sibnet-extractor')) -} diff --git a/multisrc/overrides/animestream/donghuastream/additional.gradle b/multisrc/overrides/animestream/donghuastream/additional.gradle deleted file mode 100644 index 8400a22ee3..0000000000 --- a/multisrc/overrides/animestream/donghuastream/additional.gradle +++ /dev/null @@ -1,4 +0,0 @@ -dependencies { - implementation(project(':lib:dailymotion-extractor')) - implementation(project(':lib:playlist-utils')) -} diff --git a/multisrc/overrides/animestream/lmanime/additional.gradle b/multisrc/overrides/animestream/lmanime/additional.gradle deleted file mode 100644 index 281b21386a..0000000000 --- a/multisrc/overrides/animestream/lmanime/additional.gradle +++ /dev/null @@ -1,5 +0,0 @@ -dependencies { - implementation(project(":lib:dailymotion-extractor")) - implementation(project(":lib:mp4upload-extractor")) - implementation(project(":lib:streamwish-extractor")) -} diff --git a/multisrc/overrides/animestream/luciferdonghua/additional.gradle b/multisrc/overrides/animestream/luciferdonghua/additional.gradle deleted file mode 100644 index e521c7d26a..0000000000 --- a/multisrc/overrides/animestream/luciferdonghua/additional.gradle +++ /dev/null @@ -1,5 +0,0 @@ -dependencies { - implementation(project(':lib:dailymotion-extractor')) - implementation(project(':lib:okru-extractor')) - implementation(project(':lib:streamwish-extractor')) -} diff --git a/multisrc/overrides/animestream/minioppai/additional.gradle b/multisrc/overrides/animestream/minioppai/additional.gradle deleted file mode 100644 index 664bfa09cc..0000000000 --- a/multisrc/overrides/animestream/minioppai/additional.gradle +++ /dev/null @@ -1,4 +0,0 @@ -dependencies { - implementation(project(":lib:gdriveplayer-extractor")) - implementation(project(":lib:unpacker")) -} diff --git a/multisrc/overrides/animestream/rinecloud/additional.gradle b/multisrc/overrides/animestream/rinecloud/additional.gradle deleted file mode 100644 index 53a3b21ee3..0000000000 --- a/multisrc/overrides/animestream/rinecloud/additional.gradle +++ /dev/null @@ -1,4 +0,0 @@ -dependencies { - implementation(project(":lib:unpacker")) - implementation(project(":lib:playlist-utils")) -} diff --git a/multisrc/overrides/dooplay/animeplayer/additional.gradle b/multisrc/overrides/dooplay/animeplayer/additional.gradle deleted file mode 100644 index 5e96939015..0000000000 --- a/multisrc/overrides/dooplay/animeplayer/additional.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - implementation(project(":lib:blogger-extractor")) -} diff --git a/multisrc/overrides/dooplay/animesaga/additional.gradle b/multisrc/overrides/dooplay/animesaga/additional.gradle deleted file mode 100644 index 84d4ec31cf..0000000000 --- a/multisrc/overrides/dooplay/animesaga/additional.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - implementation(project(":lib:chillx-extractor")) -} diff --git a/multisrc/overrides/dooplay/animeshouse/additional.gradle b/multisrc/overrides/dooplay/animeshouse/additional.gradle deleted file mode 100644 index 064521bd5e..0000000000 --- a/multisrc/overrides/dooplay/animeshouse/additional.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - implementation(project(":lib:playlist-utils")) -} diff --git a/multisrc/overrides/dooplay/goanimes/additional.gradle b/multisrc/overrides/dooplay/goanimes/additional.gradle deleted file mode 100644 index 3b457777b3..0000000000 --- a/multisrc/overrides/dooplay/goanimes/additional.gradle +++ /dev/null @@ -1,5 +0,0 @@ -dependencies { - implementation(project(":lib:playlist-utils")) - implementation(project(":lib:blogger-extractor")) - implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") -} diff --git a/multisrc/overrides/dooplay/jetanime/additional.gradle b/multisrc/overrides/dooplay/jetanime/additional.gradle deleted file mode 100644 index dbae327807..0000000000 --- a/multisrc/overrides/dooplay/jetanime/additional.gradle +++ /dev/null @@ -1,4 +0,0 @@ -dependencies { - implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" - implementation(project(':lib:playlist-utils')) -} diff --git a/multisrc/overrides/dooplay/kinoking/additional.gradle b/multisrc/overrides/dooplay/kinoking/additional.gradle deleted file mode 100644 index b8e246bc4a..0000000000 --- a/multisrc/overrides/dooplay/kinoking/additional.gradle +++ /dev/null @@ -1,4 +0,0 @@ -dependencies { - implementation(project(':lib:voe-extractor')) - implementation(project(':lib:dood-extractor')) -} diff --git a/multisrc/overrides/dooplay/pifansubs/additional.gradle b/multisrc/overrides/dooplay/pifansubs/additional.gradle deleted file mode 100644 index c2f0b54bcf..0000000000 --- a/multisrc/overrides/dooplay/pifansubs/additional.gradle +++ /dev/null @@ -1,4 +0,0 @@ -dependencies { - implementation(project(':lib:streamhidevid-extractor')) -} - diff --git a/multisrc/overrides/dooplay/voircartoon/additional.gradle b/multisrc/overrides/dooplay/voircartoon/additional.gradle deleted file mode 100644 index 064521bd5e..0000000000 --- a/multisrc/overrides/dooplay/voircartoon/additional.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - implementation(project(":lib:playlist-utils")) -} diff --git a/multisrc/overrides/dopeflix/default/additional.gradle b/multisrc/overrides/dopeflix/default/additional.gradle deleted file mode 100644 index 23500fe4a8..0000000000 --- a/multisrc/overrides/dopeflix/default/additional.gradle +++ /dev/null @@ -1,5 +0,0 @@ -dependencies { - implementation(project(":lib:dood-extractor")) - implementation(project(":lib:cryptoaes")) - implementation(project(":lib:playlist-utils")) -} diff --git a/multisrc/overrides/zorotheme/default/additional.gradle b/multisrc/overrides/zorotheme/default/additional.gradle deleted file mode 100644 index 28c79479cc..0000000000 --- a/multisrc/overrides/zorotheme/default/additional.gradle +++ /dev/null @@ -1,4 +0,0 @@ -dependencies { - implementation(project(":lib:megacloud-extractor")) - implementation(project(':lib:streamtape-extractor')) -} diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamGenerator.kt deleted file mode 100644 index 8489cad3ac..0000000000 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamGenerator.kt +++ /dev/null @@ -1,37 +0,0 @@ -package eu.kanade.tachiyomi.multisrc.animestream - -import generator.ThemeSourceData.SingleLang -import generator.ThemeSourceGenerator - -class AnimeStreamGenerator : ThemeSourceGenerator { - override val themePkg = "animestream" - - override val themeClass = "AnimeStream" - - override val baseVersionCode = 2 - - override val sources = listOf( - SingleLang("AnimeBalkan", "https://animebalkan.org", "sr", isNsfw = false, overrideVersionCode = 1), - SingleLang("AnimeIndo", "https://animeindo.skin", "id", isNsfw = false, overrideVersionCode = 10), - SingleLang("AnimeKhor", "https://animekhor.xyz", "en", isNsfw = false, overrideVersionCode = 3), - SingleLang("Animenosub", "https://animenosub.com", "en", isNsfw = true, overrideVersionCode = 4), - SingleLang("AnimeXin", "https://animexin.vip", "all", isNsfw = false, overrideVersionCode = 8), - SingleLang("AnimeYT.es", "https://animeyt.es", "es", isNsfw = false, className = "AnimeYTES", pkgName = "animeytes", overrideVersionCode = 3), - SingleLang("Tiodonghua.com", "https://anime.tiodonghua.com", "es", isNsfw = false, className = "Tiodonghua", pkgName = "tiodonghua", overrideVersionCode = 2), - SingleLang("AsyaAnimeleri", "https://asyaanimeleri.com", "tr", isNsfw = false, overrideVersionCode = 3), - SingleLang("ChineseAnime", "https://chineseanime.top", "all", isNsfw = false, overrideVersionCode = 4), - SingleLang("desu-online", "https://desu-online.pl", "pl", className = "DesuOnline", isNsfw = false, overrideVersionCode = 4), - SingleLang("DonghuaStream", "https://donghuastream.co.in", "en", isNsfw = false, overrideVersionCode = 3), - SingleLang("LMAnime", "https://lmanime.com", "all", isNsfw = false, overrideVersionCode = 6), - SingleLang("LuciferDonghua", "https://luciferdonghua.in", "en", isNsfw = false, overrideVersionCode = 4), - SingleLang("MiniOppai", "https://minioppai.org", "id", isNsfw = true, overrideVersionCode = 4), - SingleLang("MyKdrama", "https://mykdrama.co", "fr", isNsfw = false), - SingleLang("RineCloud", "https://rine.cloud", "pt-BR", isNsfw = false, overrideVersionCode = 6), - SingleLang("TRAnimeCI", "https://tranimaci.com", "tr", isNsfw = false, overrideVersionCode = 1), - ) - - companion object { - @JvmStatic - fun main(args: Array) = AnimeStreamGenerator().createAll() - } -} diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/datalifeengine/DataLifeEngineGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/datalifeengine/DataLifeEngineGenerator.kt deleted file mode 100644 index 6009ef528b..0000000000 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/datalifeengine/DataLifeEngineGenerator.kt +++ /dev/null @@ -1,22 +0,0 @@ -package eu.kanade.tachiyomi.multisrc.datalifeengine - -import generator.ThemeSourceData.SingleLang -import generator.ThemeSourceGenerator - -class DataLifeEngineGenerator : ThemeSourceGenerator { - override val themePkg = "datalifeengine" - - override val themeClass = "DataLifeEngine" - - override val baseVersionCode = 1 - - override val sources = listOf( - SingleLang("Wiflix", "https://wiflix.voto", "fr", overrideVersionCode = 4), - SingleLang("French Anime", "https://french-anime.com", "fr", overrideVersionCode = 5), - ) - - companion object { - @JvmStatic - fun main(args: Array) = DataLifeEngineGenerator().createAll() - } -} diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dooplay/DooPlayGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dooplay/DooPlayGenerator.kt deleted file mode 100644 index c1396715a7..0000000000 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dooplay/DooPlayGenerator.kt +++ /dev/null @@ -1,35 +0,0 @@ -package eu.kanade.tachiyomi.multisrc.dooplay - -import generator.ThemeSourceData.SingleLang -import generator.ThemeSourceGenerator - -class DooPlayGenerator : ThemeSourceGenerator { - override val themePkg = "dooplay" - - override val themeClass = "Dooplay" - - override val baseVersionCode = 1 - - override val sources = listOf( - SingleLang("AnimeOnline.Ninja", "https://ww3.animeonline.ninja", "es", className = "AnimeOnlineNinja", isNsfw = false, overrideVersionCode = 36), - SingleLang("AnimesOnline", "https://animesonline.nz", "pt-BR", isNsfw = false, overrideVersionCode = 8, pkgName = "animesgratis"), - SingleLang("AnimePlayer", "https://animeplayer.com.br", "pt-BR", isNsfw = true, overrideVersionCode = 2), - SingleLang("AnimeSAGA", "https://www.animesaga.in", "hi", isNsfw = false, overrideVersionCode = 9), - SingleLang("AnimesFox BR", "https://animesfox.net", "pt-BR", isNsfw = false, overrideVersionCode = 2), - SingleLang("Animes House", "https://animeshouse.net", "pt-BR", isNsfw = false, overrideVersionCode = 9), - SingleLang("Cinemathek", "https://cinemathek.net", "de", isNsfw = true, overrideVersionCode = 19), - SingleLang("GoAnimes", "https://goanimes.net", "pt-BR", isNsfw = true, overrideVersionCode = 9), - SingleLang("JetAnime", "https://ssl.jetanimes.com", "fr", isNsfw = false, overrideVersionCode = 3), - SingleLang("Kinoking", "https://kinoking.cc", "de", isNsfw = false, overrideVersionCode = 20), - SingleLang("Multimovies", "https://multimovies.live", "en", isNsfw = false, overrideVersionCode = 15), - SingleLang("Pi Fansubs", "https://pifansubs.club", "pt-BR", isNsfw = true, overrideVersionCode = 18), - SingleLang("Pobreflix", "https://pobreflix.biz", "pt-BR", isNsfw = true, overrideVersionCode = 5), - SingleLang("UniqueStream", "https://uniquestream.net", "en", isNsfw = false, overrideVersionCode = 2), - SingleLang("VoirCartoon", "https://voircartoon.com", "fr", isNsfw = true, overrideVersionCode = 1), - ) - - companion object { - @JvmStatic - fun main(args: Array) = DooPlayGenerator().createAll() - } -} diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dopeflix/DopeFlixGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dopeflix/DopeFlixGenerator.kt deleted file mode 100644 index dcf3a0013b..0000000000 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dopeflix/DopeFlixGenerator.kt +++ /dev/null @@ -1,22 +0,0 @@ -package eu.kanade.tachiyomi.multisrc.dopeflix - -import generator.ThemeSourceData.SingleLang -import generator.ThemeSourceGenerator - -class DopeFlixGenerator : ThemeSourceGenerator { - override val themePkg = "dopeflix" - - override val themeClass = "DopeFlix" - - override val baseVersionCode = 19 - - override val sources = listOf( - SingleLang("DopeBox", "https://dopebox.to", "en", isNsfw = false, overrideVersionCode = 6), - SingleLang("SFlix", "https://sflix.to", "en", isNsfw = false, overrideVersionCode = 5), - ) - - companion object { - @JvmStatic - fun main(args: Array) = DopeFlixGenerator().createAll() - } -} diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroThemeGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroThemeGenerator.kt deleted file mode 100644 index 85a348fb6f..0000000000 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroThemeGenerator.kt +++ /dev/null @@ -1,22 +0,0 @@ -package eu.kanade.tachiyomi.multisrc.zorotheme - -import generator.ThemeSourceData.SingleLang -import generator.ThemeSourceGenerator - -class ZoroThemeGenerator : ThemeSourceGenerator { - override val themePkg = "zorotheme" - - override val themeClass = "ZoroTheme" - - override val baseVersionCode = 1 - - override val sources = listOf( - SingleLang("AniWatch", "https://aniwatch.to", "en", isNsfw = false, pkgName = "zoro", overrideVersionCode = 39), - SingleLang("Kaido", "https://kaido.to", "en", isNsfw = false, overrideVersionCode = 6), - ) - - companion object { - @JvmStatic - fun main(args: Array) = ZoroThemeGenerator().createAll() - } -} diff --git a/multisrc/src/main/java/generator/GeneratorMain.kt b/multisrc/src/main/java/generator/GeneratorMain.kt deleted file mode 100644 index 1fc231b920..0000000000 --- a/multisrc/src/main/java/generator/GeneratorMain.kt +++ /dev/null @@ -1,29 +0,0 @@ -package generator - -import java.io.File - -/** - * Finds and calls all `ThemeSourceGenerator`s - */ -@Suppress("unused_parameter") -fun main(args: Array) { - val userDir = System.getProperty("user.dir")!! - val sourcesDirPath = "$userDir/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc" - val sourcesDir = File(sourcesDirPath) - - // find all theme packages - sourcesDir.list()!! - .filter { File(sourcesDir, it).isDirectory } - .forEach { themeSource -> - // Find all XxxGenerator.kt files and invoke main from them - File("$sourcesDirPath/$themeSource").list()!! - .filter { it.endsWith("Generator.kt") } - .mapNotNull { generatorClass -> - // Find Java class and extract method lists - Class.forName("eu/kanade/tachiyomi/multisrc/$themeSource/$generatorClass".replace("/", ".").substringBefore(".kt")) - .methods - .find { it.name == "main" } - } - .forEach { it.invoke(null, emptyArray()) } - } -} diff --git a/multisrc/src/main/java/generator/IntelijConfigurationGeneratorMain.kt b/multisrc/src/main/java/generator/IntelijConfigurationGeneratorMain.kt deleted file mode 100644 index d8e435980e..0000000000 --- a/multisrc/src/main/java/generator/IntelijConfigurationGeneratorMain.kt +++ /dev/null @@ -1,50 +0,0 @@ -package generator - -import java.io.File - -/** - * Finds all themes and creates an Intellij Idea run configuration for their generators - * Should be run after creation/deletion of each theme - */ -@Suppress("unused_parameter") -fun main(args: Array) { - val userDir = System.getProperty("user.dir")!! - val sourcesDirPath = "$userDir/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc" - val sourcesDir = File(sourcesDirPath) - - // cleanup from past runs - File("$userDir/.run").apply { - if (exists()) { - deleteRecursively() - } - mkdirs() - } - - // find all theme packages - sourcesDir.list()!! - .filter { File(sourcesDir, it).isDirectory } - .forEach { themeSource -> - // Find all XxxGenerator.kt files - File("$sourcesDirPath/$themeSource").list()!! - .filter { it.endsWith("Generator.kt") } - .map { it.substringBefore(".kt") } - .forEach { generatorClass -> - val file = File("$userDir/.run/$generatorClass.run.xml") - val intellijConfStr = """ - - - - - - """.trimIndent() - file.writeText(intellijConfStr) - file.appendText("\n") - } - } -} diff --git a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt deleted file mode 100644 index 5413024d0c..0000000000 --- a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt +++ /dev/null @@ -1,284 +0,0 @@ -package generator - -import okhttp3.HttpUrl.Companion.toHttpUrlOrNull -import java.io.File -import java.nio.file.Files -import java.nio.file.StandardCopyOption -import java.util.Locale - -/** - * This is meant to be used in place of a factory extension, specifically for what would be a multi-source extension. - * A multi-lang (but not multi-source) extension should still be made as a factory extension. - * Use a generator for initial setup of a theme source or when all of the inheritors need a version bump. - * Source list (val sources) should be kept up to date. - */ -interface ThemeSourceGenerator { - /** - * The class that the sources inherit from. - */ - val themeClass: String - - /** - * The package that contains themeClass. - */ - val themePkg: String - - /** - * Base theme version, starts with 1 and should be increased when based theme class changes - */ - val baseVersionCode: Int - - /** - * The list of sources to be created or updated. - */ - val sources: List - - fun createAll() { - val userDir = System.getProperty("user.dir")!! - sources.forEach { createGradleProject(it, themePkg, themeClass, baseVersionCode, userDir) } - } - - companion object { - private fun pkgNameSuffix(source: ThemeSourceData, separator: String): String { - return if (source is ThemeSourceData.SingleLang) { - listOf(source.lang.substringBefore("-"), source.pkgName).joinToString(separator) - } else { - listOf("all", source.pkgName).joinToString(separator) - } - } - - private fun themeSuffix(themePkg: String, separator: String): String { - return listOf("eu", "kanade", "tachiyomi", "multisrc", themePkg).joinToString(separator) - } - - private fun writeGradle(gradle: File, source: ThemeSourceData, baseVersionCode: Int, defaultAdditionalGradlePath: String, additionalGradleOverridePath: String) { - fun File.readTextOrEmptyString(): String = if (exists()) readText(Charsets.UTF_8) else "" - - val defaultAdditionalGradleText = File(defaultAdditionalGradlePath).readTextOrEmptyString() - val additionalGradleOverrideText = File(additionalGradleOverridePath).readTextOrEmptyString() - val placeholders = mapOf( - "SOURCEHOST" to source.baseUrl.toHttpUrlOrNull()?.host, - "SOURCESCHEME" to source.baseUrl.toHttpUrlOrNull()?.scheme, - ) - - val placeholdersStr = placeholders - .filter { it.value != null } - .map { "${" ".repeat(12)}${it.key}: \"${it.value}\"" } - .joinToString(",\n") - - gradle.writeText( - """ - |// THIS FILE IS AUTO-GENERATED; DO NOT EDIT - |ext { - | extName = '${source.name}' - | extClass = '.${source.className}' - | extVersionCode = ${baseVersionCode + source.overrideVersionCode + MULTISRC_LIBRARY_VERSION} - | ${if (source.isNsfw) "isNsfw = true\n" else ""} - |} - | - |apply from: "${'$'}rootDir/common.gradle" - | - |$defaultAdditionalGradleText - |$additionalGradleOverrideText - | - |android { - | defaultConfig { - | manifestPlaceholders += [ - |$placeholdersStr - | ] - | } - |} - """.trimMargin(), - ) - } - - private fun writeAndroidManifest(androidManifestFile: File, manifestOverridesPath: String, defaultAndroidManifestPath: String) { - val androidManifestOverride = File(manifestOverridesPath) - val defaultAndroidManifest = File(defaultAndroidManifestPath) - if (androidManifestOverride.exists()) { - androidManifestOverride.copyTo(androidManifestFile) - } else if (defaultAndroidManifest.exists()) { - defaultAndroidManifest.copyTo(androidManifestFile) - } - } - - fun createGradleProject(source: ThemeSourceData, themePkg: String, themeClass: String, baseVersionCode: Int, userDir: String) { - // userDir = aniyomi-extensions project root path - val projectRootPath = "$userDir/generated-src/${pkgNameSuffix(source, "/")}" - val projectSrcPath = "$projectRootPath/src/eu/kanade/tachiyomi/animeextension/${pkgNameSuffix(source, "/")}" - val overridesPath = "$userDir/multisrc/overrides/$themePkg/${source.pkgName}" - val defaultResPath = "$userDir/multisrc/overrides/$themePkg/default/res" - val defaultAndroidManifestPath = "$userDir/multisrc/overrides/$themePkg/default/AndroidManifest.xml" - val defaultAdditionalGradlePath = "$userDir/multisrc/overrides/$themePkg/default/additional.gradle" - val resOverridePath = "$overridesPath/res" - val srcOverridePath = "$overridesPath/src" - val manifestOverridePath = "$overridesPath/AndroidManifest.xml" - val additionalGradleOverridePath = "$overridesPath/additional.gradle" - val projectGradleFile = File("$projectRootPath/build.gradle") - val projectAndroidManifestFile = File("$projectRootPath/AndroidManifest.xml") - - File(projectRootPath).let { projectRootFile -> - println("Generating $source") - - // remove everything from past runs - projectRootFile.deleteRecursively() - projectRootFile.mkdirs() - - writeGradle(projectGradleFile, source, baseVersionCode, defaultAdditionalGradlePath, additionalGradleOverridePath) - writeAndroidManifest(projectAndroidManifestFile, manifestOverridePath, defaultAndroidManifestPath) - - writeSourceClasses(projectSrcPath, srcOverridePath, source, themePkg, themeClass) - copyThemeClasses(userDir, themePkg, projectRootPath) - copyThemeReadmes(userDir, themePkg, overridesPath, projectRootPath) - copyResFiles(resOverridePath, defaultResPath, projectRootPath) - } - } - - private fun copyThemeReadmes(userDir: String, themePkg: String, overridesPath: String, projectRootPath: String) { - val sourcePath = "$userDir/multisrc/src/main/java/${themeSuffix(themePkg, "/")}" - - File(projectRootPath).mkdirs() - - listOf(sourcePath, overridesPath).forEach { path -> - File(path).list() - ?.filter { it.endsWith("README.md") || it.endsWith("CHANGELOG.md") } - ?.forEach { - Files.copy( - File("$path/$it").toPath(), - File("$projectRootPath/$it").toPath(), - StandardCopyOption.REPLACE_EXISTING, - ) - } - } - } - - private fun copyThemeClasses(userDir: String, themePkg: String, projectRootPath: String) { - val themeSrcPath = "$userDir/multisrc/src/main/java/${themeSuffix(themePkg, "/")}" - .replace("/", File.separator) - - val themeDestPath = "$projectRootPath/src/${themeSuffix(themePkg, "/")}" - File(themeDestPath).mkdirs() - - File(themeSrcPath).walk() - .map { it.toString().replace(themeSrcPath, "") } - .filter { it.endsWith(".kt") && !it.endsWith("Generator.kt") && !it.endsWith("Gen.kt") } - .forEach { - File("$themeSrcPath/$it").copyTo( - File("$themeDestPath/$it"), - true, // REPLACE_EXISTING - ) - } - } - - private fun copyResFiles(resOverridePath: String, defaultResPath: String, projectRootPath: String): Any { - // check if res override exists if not copy default res - val resOverride = File(resOverridePath) - return if (resOverride.exists()) { - resOverride.copyRecursively(File("$projectRootPath/res")) - } else { - File(defaultResPath).let { defaultResFile -> - if (defaultResFile.exists()) defaultResFile.copyRecursively(File("$projectRootPath/res")) - } - } - } - - private fun writeSourceClasses(projectSrcPath: String, srcOverridePath: String, source: ThemeSourceData, themePkg: String, themeClass: String) { - val projectSrcFile = File(projectSrcPath) - projectSrcFile.mkdirs() - - val srcOverrideFile = File(srcOverridePath) - if (srcOverrideFile.exists()) { - srcOverrideFile.copyRecursively(projectSrcFile) - } else { - writeSourceClass(projectSrcFile, source, themePkg, themeClass) - } - } - - private fun writeSourceClass(classPath: File, source: ThemeSourceData, themePkg: String, themeClass: String) { - fun factoryClassText() = when (source) { - is ThemeSourceData.SingleLang -> { - """class ${source.className} : $themeClass("${source.sourceName}", "${source.baseUrl}", "${source.lang}")""" - } - is ThemeSourceData.MultiLang -> { - val sourceClasses = source.langs.map { lang -> - """$themeClass("${source.sourceName}", "${source.baseUrl}", "$lang")""" - } - - """ - |class ${source.className} : AnimeSourceFactory { - | override fun createSources() = listOf( - | ${sourceClasses.joinToString(",\n")} - | ) - |} - """.trimMargin() - } - } - - File("$classPath/${source.className}.kt").writeText( - """ - |/* ktlint-disable */ - |// THIS FILE IS AUTO-GENERATED; DO NOT EDIT - |package eu.kanade.tachiyomi.animeextension.${pkgNameSuffix(source, ".")} - | - |import eu.kanade.tachiyomi.multisrc.$themePkg.$themeClass - |${if (source is ThemeSourceData.MultiLang) "import eu.kanade.tachiyomi.animesource.AnimeSourceFactory" else ""} - | - |${factoryClassText()} - """.trimMargin(), - ) - } - } -} - -sealed class ThemeSourceData { - abstract val name: String - abstract val baseUrl: String - abstract val isNsfw: Boolean - abstract val className: String - abstract val pkgName: String - - /** - * Override it if for some reason the name attribute inside the source class - * should be different from the extension name. Useful in cases where the - * extension name should be romanized and the source name should be the one - * in the source language. Defaults to the extension name if not specified. - */ - abstract val sourceName: String - - /** - * overrideVersionCode defaults to 0, if a source changes their source override code or - * a previous existing source suddenly needs source code overrides, overrideVersionCode - * should be increased. - * When a new source is added with overrides, overrideVersionCode should still be set to 0 - * - * Note: source code overrides are located in "multisrc/overrides/src//" - */ - abstract val overrideVersionCode: Int - - data class SingleLang( - override val name: String, - override val baseUrl: String, - val lang: String, - override val isNsfw: Boolean = false, - override val className: String = name.replace(" ", ""), - override val pkgName: String = className.lowercase(Locale.ENGLISH), - override val sourceName: String = name, - override val overrideVersionCode: Int = 0, - ) : ThemeSourceData() - - data class MultiLang( - override val name: String, - override val baseUrl: String, - val langs: List, - override val isNsfw: Boolean = false, - override val className: String = name.replace(" ", "") + "Factory", - override val pkgName: String = className.substringBefore("Factory").lowercase(Locale.ENGLISH), - override val sourceName: String = name, - override val overrideVersionCode: Int = 0, - ) : ThemeSourceData() -} - -/** - * This variable should be increased when the multisrc library changes in a way that prompts global extension upgrade - */ -const val MULTISRC_LIBRARY_VERSION = 0 diff --git a/repositories.gradle.kts b/repositories.gradle.kts index 6a819f836c..b25bbb580d 100644 --- a/repositories.gradle.kts +++ b/repositories.gradle.kts @@ -1,5 +1,6 @@ dependencyResolutionManagement { repositories { + gradlePluginPortal() mavenCentral() google() maven(url = "https://jitpack.io") diff --git a/settings.gradle.kts b/settings.gradle.kts index 0cef88a250..80cfda1a02 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,92 +1,42 @@ apply(from = "repositories.gradle.kts") -pluginManagement { - includeBuild("build-plugins") -} - include(":core") // Load all modules under /lib File(rootDir, "lib").eachDir { include("lib:${it.name}") } -// Fix deprecation warnings with Gradle 8.5+. -// See https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory -listOf( - ":extensions" to "$rootDir/gradle", // Temporary workaround. - ":extensions:individual" to "$rootDir/src", - ":extensions:multisrc" to "$rootDir/generated-src", -).forEach { (name, path) -> - val projectDir = file(path) - if (projectDir.exists()) { - include(name) - project(name).projectDir = projectDir - } -} +// Load all modules under /lib-multisrc +File(rootDir, "lib-multisrc").eachDir { include("lib-multisrc:${it.name}") } -if (System.getenv("CI") == null || System.getenv("CI_MODULE_GEN") == "true") { +if (System.getenv("CI") != "true") { // Local development (full project build) - include(":multisrc") - project(":multisrc").projectDir = File("multisrc") - /** * Add or remove modules to load as needed for local development here. - * To generate multisrc extensions first, run the `:multisrc:generateExtensions` task first. */ loadAllIndividualExtensions() - loadAllGeneratedMultisrcExtensions() // loadIndividualExtension("all", "jellyfin") - // loadGeneratedMultisrcExtension("en", "aniwatch") } else { // Running in CI (GitHub Actions) - val isMultisrc = System.getenv("CI_MULTISRC") == "true" val chunkSize = System.getenv("CI_CHUNK_SIZE").toInt() val chunk = System.getenv("CI_CHUNK_NUM").toInt() - if (isMultisrc) { - include(":multisrc") - project(":multisrc").projectDir = File("multisrc") - - // Loads generated extensions from multisrc - File(rootDir, "generated-src").getChunk(chunk, chunkSize)?.forEach { - loadGeneratedMultisrcExtension(it.parentFile.name, it.name, log = true) - } - } else { - // Loads individual extensions - File(rootDir, "src").getChunk(chunk, chunkSize)?.forEach { - loadIndividualExtension(it.parentFile.name, it.name, log = true) - } + // Loads individual extensions + File(rootDir, "src").getChunk(chunk, chunkSize)?.forEach { + loadIndividualExtension(it.parentFile.name, it.name) } } fun loadAllIndividualExtensions() { - File(rootDir, "src").eachDir { lang -> - lang.eachDir { extension -> - loadIndividualExtension(lang.name, extension.name) + File(rootDir, "src").eachDir { dir -> + dir.eachDir { subdir -> + loadIndividualExtension(dir.name, subdir.name) } } } -fun loadAllGeneratedMultisrcExtensions() { - File(rootDir, "generated-src").eachDir { lang -> - lang.eachDir { extension -> - loadGeneratedMultisrcExtension(lang.name, extension.name) - } - } -} - -fun loadIndividualExtension(lang: String, name: String, log: Boolean = false) { - val projectName = ":extensions:individual:$lang:$name" - if (log) println(projectName) - include(projectName) - project(projectName).projectDir = File("src/$lang/$name") -} - -fun loadGeneratedMultisrcExtension(lang: String, name: String, log: Boolean = false) { - val projectName = ":extensions:multisrc:$lang:$name" - if (log) println(projectName) - include(projectName) - project(projectName).projectDir = File("generated-src/$lang/$name") +fun loadIndividualExtension(lang: String, name: String) { + include("src:$lang:$name") } fun File.getChunk(chunk: Int, chunkSize: Int): List? { @@ -102,5 +52,10 @@ fun File.getChunk(chunk: Int, chunkSize: Int): List? { } fun File.eachDir(block: (File) -> Unit) { - listFiles()?.filter { it.isDirectory }?.forEach { block(it) } + val files = listFiles() ?: return + for (file in files) { + if (file.isDirectory && file.name != ".gradle" && file.name != "build") { + block(file) + } + } } diff --git a/multisrc/overrides/animestream/animexin/additional.gradle b/src/all/animexin/build.gradle similarity index 60% rename from multisrc/overrides/animestream/animexin/additional.gradle rename to src/all/animexin/build.gradle index 052f396d5d..0dbeb5f371 100644 --- a/multisrc/overrides/animestream/animexin/additional.gradle +++ b/src/all/animexin/build.gradle @@ -1,7 +1,17 @@ +ext { + extName = 'AnimeXin' + extClass = '.AnimeXin' + themePkg = 'animestream' + baseUrl = 'https://animexin.vip' + overrideVersionCode = 8 +} + +apply from: "$rootDir/common.gradle" + dependencies { implementation(project(':lib:dailymotion-extractor')) implementation(project(':lib:okru-extractor')) implementation(project(':lib:gdriveplayer-extractor')) implementation(project(':lib:dood-extractor')) implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" -} +} \ No newline at end of file diff --git a/multisrc/overrides/animestream/animexin/res/mipmap-hdpi/ic_launcher.png b/src/all/animexin/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animexin/res/mipmap-hdpi/ic_launcher.png rename to src/all/animexin/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animexin/res/mipmap-mdpi/ic_launcher.png b/src/all/animexin/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animexin/res/mipmap-mdpi/ic_launcher.png rename to src/all/animexin/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animexin/res/mipmap-xhdpi/ic_launcher.png b/src/all/animexin/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animexin/res/mipmap-xhdpi/ic_launcher.png rename to src/all/animexin/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animexin/res/mipmap-xxhdpi/ic_launcher.png b/src/all/animexin/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animexin/res/mipmap-xxhdpi/ic_launcher.png rename to src/all/animexin/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animexin/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/animexin/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animexin/res/mipmap-xxxhdpi/ic_launcher.png rename to src/all/animexin/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animexin/src/AnimeXin.kt b/src/all/animexin/src/eu/kanade/tachiyomi/animeextension/all/animexin/AnimeXin.kt similarity index 100% rename from multisrc/overrides/animestream/animexin/src/AnimeXin.kt rename to src/all/animexin/src/eu/kanade/tachiyomi/animeextension/all/animexin/AnimeXin.kt diff --git a/multisrc/overrides/animestream/animexin/src/extractors/VidstreamingExtractor.kt b/src/all/animexin/src/eu/kanade/tachiyomi/animeextension/all/animexin/extractors/VidstreamingExtractor.kt similarity index 100% rename from multisrc/overrides/animestream/animexin/src/extractors/VidstreamingExtractor.kt rename to src/all/animexin/src/eu/kanade/tachiyomi/animeextension/all/animexin/extractors/VidstreamingExtractor.kt diff --git a/multisrc/overrides/animestream/animexin/src/extractors/YouTubeExtractor.kt b/src/all/animexin/src/eu/kanade/tachiyomi/animeextension/all/animexin/extractors/YouTubeExtractor.kt similarity index 100% rename from multisrc/overrides/animestream/animexin/src/extractors/YouTubeExtractor.kt rename to src/all/animexin/src/eu/kanade/tachiyomi/animeextension/all/animexin/extractors/YouTubeExtractor.kt diff --git a/src/all/chineseanime/build.gradle b/src/all/chineseanime/build.gradle new file mode 100644 index 0000000000..b7ad88018e --- /dev/null +++ b/src/all/chineseanime/build.gradle @@ -0,0 +1,15 @@ +ext { + extName = 'ChineseAnime' + extClass = '.ChineseAnime' + themePkg = 'animestream' + baseUrl = 'https://chineseanime.top' + overrideVersionCode = 4 +} + +apply from: "$rootDir/common.gradle" + +dependencies { + implementation(project(":lib:dailymotion-extractor")) + implementation(project(":lib:streamwish-extractor")) + implementation(project(":lib:playlist-utils")) +} \ No newline at end of file diff --git a/multisrc/overrides/animestream/chineseanime/res/mipmap-hdpi/ic_launcher.png b/src/all/chineseanime/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/chineseanime/res/mipmap-hdpi/ic_launcher.png rename to src/all/chineseanime/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/chineseanime/res/mipmap-mdpi/ic_launcher.png b/src/all/chineseanime/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/chineseanime/res/mipmap-mdpi/ic_launcher.png rename to src/all/chineseanime/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/chineseanime/res/mipmap-xhdpi/ic_launcher.png b/src/all/chineseanime/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/chineseanime/res/mipmap-xhdpi/ic_launcher.png rename to src/all/chineseanime/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/chineseanime/res/mipmap-xxhdpi/ic_launcher.png b/src/all/chineseanime/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/chineseanime/res/mipmap-xxhdpi/ic_launcher.png rename to src/all/chineseanime/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/chineseanime/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/chineseanime/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/chineseanime/res/mipmap-xxxhdpi/ic_launcher.png rename to src/all/chineseanime/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/chineseanime/res/web_hi_res_512.png b/src/all/chineseanime/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/animestream/chineseanime/res/web_hi_res_512.png rename to src/all/chineseanime/res/web_hi_res_512.png diff --git a/multisrc/overrides/animestream/chineseanime/src/ChineseAnime.kt b/src/all/chineseanime/src/eu/kanade/tachiyomi/animeextension/all/chineseanime/ChineseAnime.kt similarity index 100% rename from multisrc/overrides/animestream/chineseanime/src/ChineseAnime.kt rename to src/all/chineseanime/src/eu/kanade/tachiyomi/animeextension/all/chineseanime/ChineseAnime.kt diff --git a/multisrc/overrides/animestream/chineseanime/src/extractors/VatchusExtractor.kt b/src/all/chineseanime/src/eu/kanade/tachiyomi/animeextension/all/chineseanime/extractors/VatchusExtractor.kt similarity index 100% rename from multisrc/overrides/animestream/chineseanime/src/extractors/VatchusExtractor.kt rename to src/all/chineseanime/src/eu/kanade/tachiyomi/animeextension/all/chineseanime/extractors/VatchusExtractor.kt diff --git a/src/all/lmanime/build.gradle b/src/all/lmanime/build.gradle new file mode 100644 index 0000000000..4710fec19d --- /dev/null +++ b/src/all/lmanime/build.gradle @@ -0,0 +1,15 @@ +ext { + extName = 'LMAnime' + extClass = '.LMAnime' + themePkg = 'animestream' + baseUrl = 'https://lmanime.com' + overrideVersionCode = 6 +} + +apply from: "$rootDir/common.gradle" + +dependencies { + implementation(project(":lib:dailymotion-extractor")) + implementation(project(":lib:mp4upload-extractor")) + implementation(project(":lib:streamwish-extractor")) +} \ No newline at end of file diff --git a/multisrc/overrides/animestream/lmanime/res/mipmap-hdpi/ic_launcher.png b/src/all/lmanime/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/lmanime/res/mipmap-hdpi/ic_launcher.png rename to src/all/lmanime/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/lmanime/res/mipmap-mdpi/ic_launcher.png b/src/all/lmanime/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/lmanime/res/mipmap-mdpi/ic_launcher.png rename to src/all/lmanime/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/lmanime/res/mipmap-xhdpi/ic_launcher.png b/src/all/lmanime/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/lmanime/res/mipmap-xhdpi/ic_launcher.png rename to src/all/lmanime/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/lmanime/res/mipmap-xxhdpi/ic_launcher.png b/src/all/lmanime/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/lmanime/res/mipmap-xxhdpi/ic_launcher.png rename to src/all/lmanime/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/lmanime/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/lmanime/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/lmanime/res/mipmap-xxxhdpi/ic_launcher.png rename to src/all/lmanime/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/lmanime/src/LMAnime.kt b/src/all/lmanime/src/eu/kanade/tachiyomi/animeextension/all/lmanime/LMAnime.kt similarity index 100% rename from multisrc/overrides/animestream/lmanime/src/LMAnime.kt rename to src/all/lmanime/src/eu/kanade/tachiyomi/animeextension/all/lmanime/LMAnime.kt diff --git a/multisrc/overrides/dooplay/cinemathek/additional.gradle b/src/de/cinemathek/build.gradle similarity index 57% rename from multisrc/overrides/dooplay/cinemathek/additional.gradle rename to src/de/cinemathek/build.gradle index b9f611ecc4..aa53fdeb1c 100644 --- a/multisrc/overrides/dooplay/cinemathek/additional.gradle +++ b/src/de/cinemathek/build.gradle @@ -1,7 +1,18 @@ +ext { + extName = 'Cinemathek' + extClass = '.Cinemathek' + themePkg = 'dooplay' + baseUrl = 'https://cinemathek.net' + overrideVersionCode = 19 + isNsfw = true +} + +apply from: "$rootDir/common.gradle" + dependencies { implementation(project(':lib:filemoon-extractor')) implementation(project(':lib:dood-extractor')) implementation(project(':lib:streamlare-extractor')) implementation(project(':lib:streamtape-extractor')) implementation(project(':lib:streamwish-extractor')) -} +} \ No newline at end of file diff --git a/multisrc/overrides/dooplay/cinemathek/res/mipmap-hdpi/ic_launcher.png b/src/de/cinemathek/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/cinemathek/res/mipmap-hdpi/ic_launcher.png rename to src/de/cinemathek/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_back.png b/src/de/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_back.png similarity index 100% rename from multisrc/overrides/dooplay/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_back.png rename to src/de/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_back.png diff --git a/multisrc/overrides/dooplay/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_fore.png b/src/de/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_fore.png similarity index 100% rename from multisrc/overrides/dooplay/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_fore.png rename to src/de/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_fore.png diff --git a/multisrc/overrides/dooplay/cinemathek/res/mipmap-mdpi/ic_launcher.png b/src/de/cinemathek/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/cinemathek/res/mipmap-mdpi/ic_launcher.png rename to src/de/cinemathek/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_back.png b/src/de/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_back.png similarity index 100% rename from multisrc/overrides/dooplay/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_back.png rename to src/de/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_back.png diff --git a/multisrc/overrides/dooplay/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_fore.png b/src/de/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_fore.png similarity index 100% rename from multisrc/overrides/dooplay/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_fore.png rename to src/de/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_fore.png diff --git a/multisrc/overrides/dooplay/cinemathek/res/mipmap-xhdpi/ic_launcher.png b/src/de/cinemathek/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/cinemathek/res/mipmap-xhdpi/ic_launcher.png rename to src/de/cinemathek/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_back.png b/src/de/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_back.png similarity index 100% rename from multisrc/overrides/dooplay/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_back.png rename to src/de/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_back.png diff --git a/multisrc/overrides/dooplay/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png b/src/de/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png similarity index 100% rename from multisrc/overrides/dooplay/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png rename to src/de/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png diff --git a/multisrc/overrides/dooplay/cinemathek/res/mipmap-xxhdpi/ic_launcher.png b/src/de/cinemathek/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/cinemathek/res/mipmap-xxhdpi/ic_launcher.png rename to src/de/cinemathek/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png b/src/de/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png similarity index 100% rename from multisrc/overrides/dooplay/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png rename to src/de/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png diff --git a/multisrc/overrides/dooplay/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png b/src/de/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png similarity index 100% rename from multisrc/overrides/dooplay/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png rename to src/de/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png diff --git a/multisrc/overrides/dooplay/cinemathek/res/mipmap-xxxhdpi/ic_launcher.png b/src/de/cinemathek/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/cinemathek/res/mipmap-xxxhdpi/ic_launcher.png rename to src/de/cinemathek/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png b/src/de/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png similarity index 100% rename from multisrc/overrides/dooplay/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png rename to src/de/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png diff --git a/multisrc/overrides/dooplay/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png b/src/de/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png similarity index 100% rename from multisrc/overrides/dooplay/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png rename to src/de/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png diff --git a/multisrc/overrides/dooplay/cinemathek/src/Cinemathek.kt b/src/de/cinemathek/src/eu/kanade/tachiyomi/animeextension/de/cinemathek/Cinemathek.kt similarity index 100% rename from multisrc/overrides/dooplay/cinemathek/src/Cinemathek.kt rename to src/de/cinemathek/src/eu/kanade/tachiyomi/animeextension/de/cinemathek/Cinemathek.kt diff --git a/src/de/kinoking/build.gradle b/src/de/kinoking/build.gradle new file mode 100644 index 0000000000..9fa529dadd --- /dev/null +++ b/src/de/kinoking/build.gradle @@ -0,0 +1,14 @@ +ext { + extName = 'Kinoking' + extClass = '.Kinoking' + themePkg = 'dooplay' + baseUrl = 'https://kinoking.cc' + overrideVersionCode = 20 +} + +apply from: "$rootDir/common.gradle" + +dependencies { + implementation(project(':lib:voe-extractor')) + implementation(project(':lib:dood-extractor')) +} \ No newline at end of file diff --git a/multisrc/overrides/dooplay/kinoking/res/mipmap-hdpi/ic_launcher.png b/src/de/kinoking/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/kinoking/res/mipmap-hdpi/ic_launcher.png rename to src/de/kinoking/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/kinoking/res/mipmap-hdpi/ic_launcher_adaptive_back.png b/src/de/kinoking/res/mipmap-hdpi/ic_launcher_adaptive_back.png similarity index 100% rename from multisrc/overrides/dooplay/kinoking/res/mipmap-hdpi/ic_launcher_adaptive_back.png rename to src/de/kinoking/res/mipmap-hdpi/ic_launcher_adaptive_back.png diff --git a/multisrc/overrides/dooplay/kinoking/res/mipmap-hdpi/ic_launcher_adaptive_fore.png b/src/de/kinoking/res/mipmap-hdpi/ic_launcher_adaptive_fore.png similarity index 100% rename from multisrc/overrides/dooplay/kinoking/res/mipmap-hdpi/ic_launcher_adaptive_fore.png rename to src/de/kinoking/res/mipmap-hdpi/ic_launcher_adaptive_fore.png diff --git a/multisrc/overrides/dooplay/kinoking/res/mipmap-mdpi/ic_launcher.png b/src/de/kinoking/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/kinoking/res/mipmap-mdpi/ic_launcher.png rename to src/de/kinoking/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/kinoking/res/mipmap-mdpi/ic_launcher_adaptive_back.png b/src/de/kinoking/res/mipmap-mdpi/ic_launcher_adaptive_back.png similarity index 100% rename from multisrc/overrides/dooplay/kinoking/res/mipmap-mdpi/ic_launcher_adaptive_back.png rename to src/de/kinoking/res/mipmap-mdpi/ic_launcher_adaptive_back.png diff --git a/multisrc/overrides/dooplay/kinoking/res/mipmap-mdpi/ic_launcher_adaptive_fore.png b/src/de/kinoking/res/mipmap-mdpi/ic_launcher_adaptive_fore.png similarity index 100% rename from multisrc/overrides/dooplay/kinoking/res/mipmap-mdpi/ic_launcher_adaptive_fore.png rename to src/de/kinoking/res/mipmap-mdpi/ic_launcher_adaptive_fore.png diff --git a/multisrc/overrides/dooplay/kinoking/res/mipmap-xhdpi/ic_launcher.png b/src/de/kinoking/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/kinoking/res/mipmap-xhdpi/ic_launcher.png rename to src/de/kinoking/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/kinoking/res/mipmap-xhdpi/ic_launcher_adaptive_back.png b/src/de/kinoking/res/mipmap-xhdpi/ic_launcher_adaptive_back.png similarity index 100% rename from multisrc/overrides/dooplay/kinoking/res/mipmap-xhdpi/ic_launcher_adaptive_back.png rename to src/de/kinoking/res/mipmap-xhdpi/ic_launcher_adaptive_back.png diff --git a/multisrc/overrides/dooplay/kinoking/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png b/src/de/kinoking/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png similarity index 100% rename from multisrc/overrides/dooplay/kinoking/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png rename to src/de/kinoking/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png diff --git a/multisrc/overrides/dooplay/kinoking/res/mipmap-xxhdpi/ic_launcher.png b/src/de/kinoking/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/kinoking/res/mipmap-xxhdpi/ic_launcher.png rename to src/de/kinoking/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/kinoking/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png b/src/de/kinoking/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png similarity index 100% rename from multisrc/overrides/dooplay/kinoking/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png rename to src/de/kinoking/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png diff --git a/multisrc/overrides/dooplay/kinoking/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png b/src/de/kinoking/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png similarity index 100% rename from multisrc/overrides/dooplay/kinoking/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png rename to src/de/kinoking/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png diff --git a/multisrc/overrides/dooplay/kinoking/res/mipmap-xxxhdpi/ic_launcher.png b/src/de/kinoking/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/kinoking/res/mipmap-xxxhdpi/ic_launcher.png rename to src/de/kinoking/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/kinoking/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png b/src/de/kinoking/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png similarity index 100% rename from multisrc/overrides/dooplay/kinoking/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png rename to src/de/kinoking/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png diff --git a/multisrc/overrides/dooplay/kinoking/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png b/src/de/kinoking/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png similarity index 100% rename from multisrc/overrides/dooplay/kinoking/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png rename to src/de/kinoking/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png diff --git a/multisrc/overrides/dooplay/kinoking/src/Kinoking.kt b/src/de/kinoking/src/eu/kanade/tachiyomi/animeextension/de/kinoking/Kinoking.kt similarity index 100% rename from multisrc/overrides/dooplay/kinoking/src/Kinoking.kt rename to src/de/kinoking/src/eu/kanade/tachiyomi/animeextension/de/kinoking/Kinoking.kt diff --git a/src/en/animekhor/build.gradle b/src/en/animekhor/build.gradle new file mode 100644 index 0000000000..31b4dfcb53 --- /dev/null +++ b/src/en/animekhor/build.gradle @@ -0,0 +1,15 @@ +ext { + extName = 'AnimeKhor' + extClass = '.AnimeKhor' + themePkg = 'animestream' + baseUrl = 'https://animekhor.xyz' + overrideVersionCode = 3 +} + +apply from: "$rootDir/common.gradle" + +dependencies { + implementation(project(':lib:okru-extractor')) + implementation(project(':lib:streamwish-extractor')) + implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" +} \ No newline at end of file diff --git a/multisrc/overrides/animestream/animekhor/res/mipmap-hdpi/ic_launcher.png b/src/en/animekhor/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animekhor/res/mipmap-hdpi/ic_launcher.png rename to src/en/animekhor/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animekhor/res/mipmap-mdpi/ic_launcher.png b/src/en/animekhor/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animekhor/res/mipmap-mdpi/ic_launcher.png rename to src/en/animekhor/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animekhor/res/mipmap-xhdpi/ic_launcher.png b/src/en/animekhor/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animekhor/res/mipmap-xhdpi/ic_launcher.png rename to src/en/animekhor/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animekhor/res/mipmap-xxhdpi/ic_launcher.png b/src/en/animekhor/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animekhor/res/mipmap-xxhdpi/ic_launcher.png rename to src/en/animekhor/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animekhor/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/animekhor/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animekhor/res/mipmap-xxxhdpi/ic_launcher.png rename to src/en/animekhor/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animekhor/src/AnimeKhor.kt b/src/en/animekhor/src/eu/kanade/tachiyomi/animeextension/en/animekhor/AnimeKhor.kt similarity index 100% rename from multisrc/overrides/animestream/animekhor/src/AnimeKhor.kt rename to src/en/animekhor/src/eu/kanade/tachiyomi/animeextension/en/animekhor/AnimeKhor.kt diff --git a/multisrc/overrides/animestream/animekhor/src/extractors/AnimeABCExtractor.kt b/src/en/animekhor/src/eu/kanade/tachiyomi/animeextension/en/animekhor/extractors/AnimeABCExtractor.kt similarity index 100% rename from multisrc/overrides/animestream/animekhor/src/extractors/AnimeABCExtractor.kt rename to src/en/animekhor/src/eu/kanade/tachiyomi/animeextension/en/animekhor/extractors/AnimeABCExtractor.kt diff --git a/multisrc/overrides/animestream/animekhor/src/extractors/StreamHideExtractor.kt b/src/en/animekhor/src/eu/kanade/tachiyomi/animeextension/en/animekhor/extractors/StreamHideExtractor.kt similarity index 100% rename from multisrc/overrides/animestream/animekhor/src/extractors/StreamHideExtractor.kt rename to src/en/animekhor/src/eu/kanade/tachiyomi/animeextension/en/animekhor/extractors/StreamHideExtractor.kt diff --git a/src/en/animenosub/build.gradle b/src/en/animenosub/build.gradle new file mode 100644 index 0000000000..f1b68561eb --- /dev/null +++ b/src/en/animenosub/build.gradle @@ -0,0 +1,16 @@ +ext { + extName = 'Animenosub' + extClass = '.Animenosub' + themePkg = 'animestream' + baseUrl = 'https://animenosub.com' + overrideVersionCode = 4 + isNsfw = true +} + +apply from: "$rootDir/common.gradle" + +dependencies { + implementation(project(':lib:filemoon-extractor')) + implementation(project(':lib:streamwish-extractor')) + implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" +} \ No newline at end of file diff --git a/multisrc/overrides/animestream/animenosub/res/mipmap-hdpi/ic_launcher.png b/src/en/animenosub/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animenosub/res/mipmap-hdpi/ic_launcher.png rename to src/en/animenosub/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animenosub/res/mipmap-mdpi/ic_launcher.png b/src/en/animenosub/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animenosub/res/mipmap-mdpi/ic_launcher.png rename to src/en/animenosub/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animenosub/res/mipmap-xhdpi/ic_launcher.png b/src/en/animenosub/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animenosub/res/mipmap-xhdpi/ic_launcher.png rename to src/en/animenosub/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animenosub/res/mipmap-xxhdpi/ic_launcher.png b/src/en/animenosub/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animenosub/res/mipmap-xxhdpi/ic_launcher.png rename to src/en/animenosub/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animenosub/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/animenosub/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animenosub/res/mipmap-xxxhdpi/ic_launcher.png rename to src/en/animenosub/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animenosub/src/Animenosub.kt b/src/en/animenosub/src/eu/kanade/tachiyomi/animeextension/en/animenosub/Animenosub.kt similarity index 100% rename from multisrc/overrides/animestream/animenosub/src/Animenosub.kt rename to src/en/animenosub/src/eu/kanade/tachiyomi/animeextension/en/animenosub/Animenosub.kt diff --git a/multisrc/overrides/animestream/animenosub/src/extractors/VidMolyExtractor.kt b/src/en/animenosub/src/eu/kanade/tachiyomi/animeextension/en/animenosub/extractors/VidMolyExtractor.kt similarity index 100% rename from multisrc/overrides/animestream/animenosub/src/extractors/VidMolyExtractor.kt rename to src/en/animenosub/src/eu/kanade/tachiyomi/animeextension/en/animenosub/extractors/VidMolyExtractor.kt diff --git a/multisrc/overrides/animestream/animenosub/src/extractors/VtubeExtractor.kt b/src/en/animenosub/src/eu/kanade/tachiyomi/animeextension/en/animenosub/extractors/VtubeExtractor.kt similarity index 100% rename from multisrc/overrides/animestream/animenosub/src/extractors/VtubeExtractor.kt rename to src/en/animenosub/src/eu/kanade/tachiyomi/animeextension/en/animenosub/extractors/VtubeExtractor.kt diff --git a/multisrc/overrides/animestream/animenosub/src/extractors/WolfstreamExtractor.kt b/src/en/animenosub/src/eu/kanade/tachiyomi/animeextension/en/animenosub/extractors/WolfstreamExtractor.kt similarity index 100% rename from multisrc/overrides/animestream/animenosub/src/extractors/WolfstreamExtractor.kt rename to src/en/animenosub/src/eu/kanade/tachiyomi/animeextension/en/animenosub/extractors/WolfstreamExtractor.kt diff --git a/src/en/donghuastream/build.gradle b/src/en/donghuastream/build.gradle new file mode 100644 index 0000000000..6134171221 --- /dev/null +++ b/src/en/donghuastream/build.gradle @@ -0,0 +1,14 @@ +ext { + extName = 'DonghuaStream' + extClass = '.DonghuaStream' + themePkg = 'animestream' + baseUrl = 'https://donghuastream.co.in' + overrideVersionCode = 3 +} + +apply from: "$rootDir/common.gradle" + +dependencies { + implementation(project(':lib:dailymotion-extractor')) + implementation(project(':lib:playlist-utils')) +} \ No newline at end of file diff --git a/multisrc/overrides/animestream/donghuastream/res/mipmap-hdpi/ic_launcher.png b/src/en/donghuastream/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/donghuastream/res/mipmap-hdpi/ic_launcher.png rename to src/en/donghuastream/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/donghuastream/res/mipmap-mdpi/ic_launcher.png b/src/en/donghuastream/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/donghuastream/res/mipmap-mdpi/ic_launcher.png rename to src/en/donghuastream/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/donghuastream/res/mipmap-xhdpi/ic_launcher.png b/src/en/donghuastream/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/donghuastream/res/mipmap-xhdpi/ic_launcher.png rename to src/en/donghuastream/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/donghuastream/res/mipmap-xxhdpi/ic_launcher.png b/src/en/donghuastream/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/donghuastream/res/mipmap-xxhdpi/ic_launcher.png rename to src/en/donghuastream/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/donghuastream/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/donghuastream/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/donghuastream/res/mipmap-xxxhdpi/ic_launcher.png rename to src/en/donghuastream/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/donghuastream/src/DonghuaStream.kt b/src/en/donghuastream/src/eu/kanade/tachiyomi/animeextension/en/donghuastream/DonghuaStream.kt similarity index 100% rename from multisrc/overrides/animestream/donghuastream/src/DonghuaStream.kt rename to src/en/donghuastream/src/eu/kanade/tachiyomi/animeextension/en/donghuastream/DonghuaStream.kt diff --git a/multisrc/overrides/animestream/donghuastream/src/extractors/StreamPlayExtractor.kt b/src/en/donghuastream/src/eu/kanade/tachiyomi/animeextension/en/donghuastream/extractors/StreamPlayExtractor.kt similarity index 100% rename from multisrc/overrides/animestream/donghuastream/src/extractors/StreamPlayExtractor.kt rename to src/en/donghuastream/src/eu/kanade/tachiyomi/animeextension/en/donghuastream/extractors/StreamPlayExtractor.kt diff --git a/src/en/dopebox/build.gradle b/src/en/dopebox/build.gradle new file mode 100644 index 0000000000..6c3c1e62dd --- /dev/null +++ b/src/en/dopebox/build.gradle @@ -0,0 +1,9 @@ +ext { + extName = 'DopeBox' + extClass = '.DopeBox' + themePkg = 'dopeflix' + baseUrl = 'https://dopebox.to' + overrideVersionCode = 6 +} + +apply from: "$rootDir/common.gradle" \ No newline at end of file diff --git a/multisrc/overrides/dopeflix/dopebox/res/mipmap-hdpi/ic_launcher.png b/src/en/dopebox/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dopeflix/dopebox/res/mipmap-hdpi/ic_launcher.png rename to src/en/dopebox/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/dopeflix/dopebox/res/mipmap-mdpi/ic_launcher.png b/src/en/dopebox/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dopeflix/dopebox/res/mipmap-mdpi/ic_launcher.png rename to src/en/dopebox/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/dopeflix/dopebox/res/mipmap-xhdpi/ic_launcher.png b/src/en/dopebox/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dopeflix/dopebox/res/mipmap-xhdpi/ic_launcher.png rename to src/en/dopebox/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/dopeflix/dopebox/res/mipmap-xxhdpi/ic_launcher.png b/src/en/dopebox/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dopeflix/dopebox/res/mipmap-xxhdpi/ic_launcher.png rename to src/en/dopebox/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dopeflix/dopebox/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/dopebox/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dopeflix/dopebox/res/mipmap-xxxhdpi/ic_launcher.png rename to src/en/dopebox/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dopeflix/dopebox/res/play_store_512.png b/src/en/dopebox/res/play_store_512.png similarity index 100% rename from multisrc/overrides/dopeflix/dopebox/res/play_store_512.png rename to src/en/dopebox/res/play_store_512.png diff --git a/multisrc/overrides/dopeflix/dopebox/src/DopeBox.kt b/src/en/dopebox/src/eu/kanade/tachiyomi/animeextension/en/dopebox/DopeBox.kt similarity index 100% rename from multisrc/overrides/dopeflix/dopebox/src/DopeBox.kt rename to src/en/dopebox/src/eu/kanade/tachiyomi/animeextension/en/dopebox/DopeBox.kt diff --git a/src/en/kaido/build.gradle b/src/en/kaido/build.gradle new file mode 100644 index 0000000000..6f031ee133 --- /dev/null +++ b/src/en/kaido/build.gradle @@ -0,0 +1,9 @@ +ext { + extName = 'Kaido' + extClass = '.Kaido' + themePkg = 'zorotheme' + baseUrl = 'https://kaido.to' + overrideVersionCode = 6 +} + +apply from: "$rootDir/common.gradle" \ No newline at end of file diff --git a/multisrc/overrides/zorotheme/kaido/res/mipmap-hdpi/ic_launcher.png b/src/en/kaido/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/zorotheme/kaido/res/mipmap-hdpi/ic_launcher.png rename to src/en/kaido/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/zorotheme/kaido/res/mipmap-mdpi/ic_launcher.png b/src/en/kaido/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/zorotheme/kaido/res/mipmap-mdpi/ic_launcher.png rename to src/en/kaido/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/zorotheme/kaido/res/mipmap-xhdpi/ic_launcher.png b/src/en/kaido/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/zorotheme/kaido/res/mipmap-xhdpi/ic_launcher.png rename to src/en/kaido/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/zorotheme/kaido/res/mipmap-xxhdpi/ic_launcher.png b/src/en/kaido/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/zorotheme/kaido/res/mipmap-xxhdpi/ic_launcher.png rename to src/en/kaido/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/zorotheme/kaido/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/kaido/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/zorotheme/kaido/res/mipmap-xxxhdpi/ic_launcher.png rename to src/en/kaido/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/zorotheme/kaido/res/play_store_512.png b/src/en/kaido/res/play_store_512.png similarity index 100% rename from multisrc/overrides/zorotheme/kaido/res/play_store_512.png rename to src/en/kaido/res/play_store_512.png diff --git a/multisrc/overrides/zorotheme/kaido/src/Kaido.kt b/src/en/kaido/src/eu/kanade/tachiyomi/animeextension/en/kaido/Kaido.kt similarity index 100% rename from multisrc/overrides/zorotheme/kaido/src/Kaido.kt rename to src/en/kaido/src/eu/kanade/tachiyomi/animeextension/en/kaido/Kaido.kt diff --git a/src/en/luciferdonghua/build.gradle b/src/en/luciferdonghua/build.gradle new file mode 100644 index 0000000000..12559391d4 --- /dev/null +++ b/src/en/luciferdonghua/build.gradle @@ -0,0 +1,15 @@ +ext { + extName = 'LuciferDonghua' + extClass = '.LuciferDonghua' + themePkg = 'animestream' + baseUrl = 'https://luciferdonghua.in' + overrideVersionCode = 4 +} + +apply from: "$rootDir/common.gradle" + +dependencies { + implementation(project(':lib:dailymotion-extractor')) + implementation(project(':lib:okru-extractor')) + implementation(project(':lib:streamwish-extractor')) +} \ No newline at end of file diff --git a/multisrc/overrides/animestream/luciferdonghua/res/mipmap-hdpi/ic_launcher.png b/src/en/luciferdonghua/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/luciferdonghua/res/mipmap-hdpi/ic_launcher.png rename to src/en/luciferdonghua/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/luciferdonghua/res/mipmap-mdpi/ic_launcher.png b/src/en/luciferdonghua/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/luciferdonghua/res/mipmap-mdpi/ic_launcher.png rename to src/en/luciferdonghua/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/luciferdonghua/res/mipmap-xhdpi/ic_launcher.png b/src/en/luciferdonghua/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/luciferdonghua/res/mipmap-xhdpi/ic_launcher.png rename to src/en/luciferdonghua/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/luciferdonghua/res/mipmap-xxhdpi/ic_launcher.png b/src/en/luciferdonghua/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/luciferdonghua/res/mipmap-xxhdpi/ic_launcher.png rename to src/en/luciferdonghua/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/luciferdonghua/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/luciferdonghua/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/luciferdonghua/res/mipmap-xxxhdpi/ic_launcher.png rename to src/en/luciferdonghua/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/luciferdonghua/src/LuciferDonghua.kt b/src/en/luciferdonghua/src/eu/kanade/tachiyomi/animeextension/en/luciferdonghua/LuciferDonghua.kt similarity index 100% rename from multisrc/overrides/animestream/luciferdonghua/src/LuciferDonghua.kt rename to src/en/luciferdonghua/src/eu/kanade/tachiyomi/animeextension/en/luciferdonghua/LuciferDonghua.kt diff --git a/multisrc/overrides/dooplay/multimovies/additional.gradle b/src/en/multimovies/build.gradle similarity index 62% rename from multisrc/overrides/dooplay/multimovies/additional.gradle rename to src/en/multimovies/build.gradle index 3724cbb788..f3e7c8eee9 100644 --- a/multisrc/overrides/dooplay/multimovies/additional.gradle +++ b/src/en/multimovies/build.gradle @@ -1,3 +1,13 @@ +ext { + extName = 'Multimovies' + extClass = '.Multimovies' + themePkg = 'dooplay' + baseUrl = 'https://multimovies.live' + overrideVersionCode = 15 +} + +apply from: "$rootDir/common.gradle" + dependencies { implementation(project(':lib:streamlare-extractor')) implementation(project(':lib:voe-extractor')) @@ -5,4 +15,4 @@ dependencies { implementation(project(':lib:mixdrop-extractor')) implementation(project(':lib:cryptoaes')) implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" -} +} \ No newline at end of file diff --git a/multisrc/overrides/dooplay/multimovies/res/mipmap-hdpi/ic_launcher.png b/src/en/multimovies/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/multimovies/res/mipmap-hdpi/ic_launcher.png rename to src/en/multimovies/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/multimovies/res/mipmap-mdpi/ic_launcher.png b/src/en/multimovies/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/multimovies/res/mipmap-mdpi/ic_launcher.png rename to src/en/multimovies/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/multimovies/res/mipmap-xhdpi/ic_launcher.png b/src/en/multimovies/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/multimovies/res/mipmap-xhdpi/ic_launcher.png rename to src/en/multimovies/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/multimovies/res/mipmap-xxhdpi/ic_launcher.png b/src/en/multimovies/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/multimovies/res/mipmap-xxhdpi/ic_launcher.png rename to src/en/multimovies/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/multimovies/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/multimovies/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/multimovies/res/mipmap-xxxhdpi/ic_launcher.png rename to src/en/multimovies/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/multimovies/src/Multimovies.kt b/src/en/multimovies/src/eu/kanade/tachiyomi/animeextension/en/multimovies/Multimovies.kt similarity index 100% rename from multisrc/overrides/dooplay/multimovies/src/Multimovies.kt rename to src/en/multimovies/src/eu/kanade/tachiyomi/animeextension/en/multimovies/Multimovies.kt diff --git a/multisrc/overrides/dooplay/multimovies/src/MultimoviesFilters.kt b/src/en/multimovies/src/eu/kanade/tachiyomi/animeextension/en/multimovies/MultimoviesFilters.kt similarity index 100% rename from multisrc/overrides/dooplay/multimovies/src/MultimoviesFilters.kt rename to src/en/multimovies/src/eu/kanade/tachiyomi/animeextension/en/multimovies/MultimoviesFilters.kt diff --git a/multisrc/overrides/dooplay/multimovies/src/extractors/AutoEmbedExtractor.kt b/src/en/multimovies/src/eu/kanade/tachiyomi/animeextension/en/multimovies/extractors/AutoEmbedExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/multimovies/src/extractors/AutoEmbedExtractor.kt rename to src/en/multimovies/src/eu/kanade/tachiyomi/animeextension/en/multimovies/extractors/AutoEmbedExtractor.kt diff --git a/multisrc/overrides/dooplay/multimovies/src/extractors/MultimoviesCloudExtractor.kt b/src/en/multimovies/src/eu/kanade/tachiyomi/animeextension/en/multimovies/extractors/MultimoviesCloudExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/multimovies/src/extractors/MultimoviesCloudExtractor.kt rename to src/en/multimovies/src/eu/kanade/tachiyomi/animeextension/en/multimovies/extractors/MultimoviesCloudExtractor.kt diff --git a/multisrc/overrides/dooplay/multimovies/src/extractors/RabbitStreamExtractor.kt b/src/en/multimovies/src/eu/kanade/tachiyomi/animeextension/en/multimovies/extractors/RabbitStreamExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/multimovies/src/extractors/RabbitStreamExtractor.kt rename to src/en/multimovies/src/eu/kanade/tachiyomi/animeextension/en/multimovies/extractors/RabbitStreamExtractor.kt diff --git a/src/en/sflix/build.gradle b/src/en/sflix/build.gradle new file mode 100644 index 0000000000..5c3ebef519 --- /dev/null +++ b/src/en/sflix/build.gradle @@ -0,0 +1,9 @@ +ext { + extName = 'SFlix' + extClass = '.SFlix' + themePkg = 'dopeflix' + baseUrl = 'https://sflix.to' + overrideVersionCode = 5 +} + +apply from: "$rootDir/common.gradle" \ No newline at end of file diff --git a/multisrc/overrides/dopeflix/sflix/res/mipmap-hdpi/ic_launcher.png b/src/en/sflix/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dopeflix/sflix/res/mipmap-hdpi/ic_launcher.png rename to src/en/sflix/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/dopeflix/sflix/res/mipmap-mdpi/ic_launcher.png b/src/en/sflix/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dopeflix/sflix/res/mipmap-mdpi/ic_launcher.png rename to src/en/sflix/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/dopeflix/sflix/res/mipmap-xhdpi/ic_launcher.png b/src/en/sflix/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dopeflix/sflix/res/mipmap-xhdpi/ic_launcher.png rename to src/en/sflix/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/dopeflix/sflix/res/mipmap-xxhdpi/ic_launcher.png b/src/en/sflix/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dopeflix/sflix/res/mipmap-xxhdpi/ic_launcher.png rename to src/en/sflix/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dopeflix/sflix/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/sflix/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dopeflix/sflix/res/mipmap-xxxhdpi/ic_launcher.png rename to src/en/sflix/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dopeflix/sflix/res/play_store_512.png b/src/en/sflix/res/play_store_512.png similarity index 100% rename from multisrc/overrides/dopeflix/sflix/res/play_store_512.png rename to src/en/sflix/res/play_store_512.png diff --git a/multisrc/overrides/dopeflix/sflix/src/SFlix.kt b/src/en/sflix/src/eu/kanade/tachiyomi/animeextension/en/sflix/SFlix.kt similarity index 100% rename from multisrc/overrides/dopeflix/sflix/src/SFlix.kt rename to src/en/sflix/src/eu/kanade/tachiyomi/animeextension/en/sflix/SFlix.kt diff --git a/src/en/uniquestream/build.gradle b/src/en/uniquestream/build.gradle new file mode 100644 index 0000000000..9fb7d20f53 --- /dev/null +++ b/src/en/uniquestream/build.gradle @@ -0,0 +1,9 @@ +ext { + extName = 'UniqueStream' + extClass = '.UniqueStream' + themePkg = 'dooplay' + baseUrl = 'https://uniquestream.net' + overrideVersionCode = 2 +} + +apply from: "$rootDir/common.gradle" \ No newline at end of file diff --git a/multisrc/overrides/dooplay/uniquestream/res/mipmap-hdpi/ic_launcher.png b/src/en/uniquestream/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/uniquestream/res/mipmap-hdpi/ic_launcher.png rename to src/en/uniquestream/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/uniquestream/res/mipmap-mdpi/ic_launcher.png b/src/en/uniquestream/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/uniquestream/res/mipmap-mdpi/ic_launcher.png rename to src/en/uniquestream/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/uniquestream/res/mipmap-xhdpi/ic_launcher.png b/src/en/uniquestream/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/uniquestream/res/mipmap-xhdpi/ic_launcher.png rename to src/en/uniquestream/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/uniquestream/res/mipmap-xxhdpi/ic_launcher.png b/src/en/uniquestream/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/uniquestream/res/mipmap-xxhdpi/ic_launcher.png rename to src/en/uniquestream/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/uniquestream/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/uniquestream/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/uniquestream/res/mipmap-xxxhdpi/ic_launcher.png rename to src/en/uniquestream/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/uniquestream/res/web_hi_res_512.png b/src/en/uniquestream/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/dooplay/uniquestream/res/web_hi_res_512.png rename to src/en/uniquestream/res/web_hi_res_512.png diff --git a/multisrc/overrides/dooplay/uniquestream/src/UniqueStream.kt b/src/en/uniquestream/src/eu/kanade/tachiyomi/animeextension/en/uniquestream/UniqueStream.kt similarity index 100% rename from multisrc/overrides/dooplay/uniquestream/src/UniqueStream.kt rename to src/en/uniquestream/src/eu/kanade/tachiyomi/animeextension/en/uniquestream/UniqueStream.kt diff --git a/src/en/zoro/build.gradle b/src/en/zoro/build.gradle new file mode 100644 index 0000000000..27a1b15d23 --- /dev/null +++ b/src/en/zoro/build.gradle @@ -0,0 +1,9 @@ +ext { + extName = 'AniWatch' + extClass = '.AniWatch' + themePkg = 'zorotheme' + baseUrl = 'https://aniwatch.to' + overrideVersionCode = 39 +} + +apply from: "$rootDir/common.gradle" \ No newline at end of file diff --git a/multisrc/overrides/zorotheme/zoro/res/mipmap-hdpi/ic_launcher.png b/src/en/zoro/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/zorotheme/zoro/res/mipmap-hdpi/ic_launcher.png rename to src/en/zoro/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/zorotheme/zoro/res/mipmap-mdpi/ic_launcher.png b/src/en/zoro/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/zorotheme/zoro/res/mipmap-mdpi/ic_launcher.png rename to src/en/zoro/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/zorotheme/zoro/res/mipmap-xhdpi/ic_launcher.png b/src/en/zoro/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/zorotheme/zoro/res/mipmap-xhdpi/ic_launcher.png rename to src/en/zoro/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/zorotheme/zoro/res/mipmap-xxhdpi/ic_launcher.png b/src/en/zoro/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/zorotheme/zoro/res/mipmap-xxhdpi/ic_launcher.png rename to src/en/zoro/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/zorotheme/zoro/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/zoro/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/zorotheme/zoro/res/mipmap-xxxhdpi/ic_launcher.png rename to src/en/zoro/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/zorotheme/zoro/res/play_store_512.png b/src/en/zoro/res/play_store_512.png similarity index 100% rename from multisrc/overrides/zorotheme/zoro/res/play_store_512.png rename to src/en/zoro/res/play_store_512.png diff --git a/multisrc/overrides/zorotheme/zoro/src/AniWatch.kt b/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/AniWatch.kt similarity index 100% rename from multisrc/overrides/zorotheme/zoro/src/AniWatch.kt rename to src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/AniWatch.kt diff --git a/multisrc/overrides/dooplay/animeonlineninja/additional.gradle b/src/es/animeonlineninja/build.gradle similarity index 57% rename from multisrc/overrides/dooplay/animeonlineninja/additional.gradle rename to src/es/animeonlineninja/build.gradle index a0915cc32c..03392ca74a 100644 --- a/multisrc/overrides/dooplay/animeonlineninja/additional.gradle +++ b/src/es/animeonlineninja/build.gradle @@ -1,7 +1,17 @@ +ext { + extName = 'AnimeOnline.Ninja' + extClass = '.AnimeOnlineNinja' + themePkg = 'dooplay' + baseUrl = 'https://ww3.animeonline.ninja' + overrideVersionCode = 36 +} + +apply from: "$rootDir/common.gradle" + dependencies { implementation(project(':lib:streamtape-extractor')) implementation(project(':lib:dood-extractor')) implementation(project(':lib:filemoon-extractor')) implementation(project(':lib:mixdrop-extractor')) implementation(project(':lib:uqload-extractor')) -} +} \ No newline at end of file diff --git a/multisrc/overrides/dooplay/animeonlineninja/res/mipmap-hdpi/ic_launcher.png b/src/es/animeonlineninja/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animeonlineninja/res/mipmap-hdpi/ic_launcher.png rename to src/es/animeonlineninja/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animeonlineninja/res/mipmap-mdpi/ic_launcher.png b/src/es/animeonlineninja/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animeonlineninja/res/mipmap-mdpi/ic_launcher.png rename to src/es/animeonlineninja/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animeonlineninja/res/mipmap-xhdpi/ic_launcher.png b/src/es/animeonlineninja/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animeonlineninja/res/mipmap-xhdpi/ic_launcher.png rename to src/es/animeonlineninja/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animeonlineninja/res/mipmap-xxhdpi/ic_launcher.png b/src/es/animeonlineninja/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animeonlineninja/res/mipmap-xxhdpi/ic_launcher.png rename to src/es/animeonlineninja/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animeonlineninja/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/animeonlineninja/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animeonlineninja/res/mipmap-xxxhdpi/ic_launcher.png rename to src/es/animeonlineninja/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animeonlineninja/src/AnimeOnlineNinja.kt b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeOnlineNinja.kt similarity index 100% rename from multisrc/overrides/dooplay/animeonlineninja/src/AnimeOnlineNinja.kt rename to src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeOnlineNinja.kt diff --git a/multisrc/overrides/dooplay/animeonlineninja/src/AnimeOnlineNinjaFilters.kt b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeOnlineNinjaFilters.kt similarity index 100% rename from multisrc/overrides/dooplay/animeonlineninja/src/AnimeOnlineNinjaFilters.kt rename to src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeOnlineNinjaFilters.kt diff --git a/multisrc/overrides/dooplay/animeonlineninja/src/VrfInterceptor.kt b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/VrfInterceptor.kt similarity index 100% rename from multisrc/overrides/dooplay/animeonlineninja/src/VrfInterceptor.kt rename to src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/VrfInterceptor.kt diff --git a/src/es/animeytes/build.gradle b/src/es/animeytes/build.gradle new file mode 100644 index 0000000000..8b0be06a70 --- /dev/null +++ b/src/es/animeytes/build.gradle @@ -0,0 +1,15 @@ +ext { + extName = 'AnimeYT.es' + extClass = '.AnimeYTES' + themePkg = 'animestream' + baseUrl = 'https://animeyt.es' + overrideVersionCode = 3 +} + +apply from: "$rootDir/common.gradle" + +dependencies { + implementation(project(":lib:okru-extractor")) + implementation(project(":lib:streamtape-extractor")) + implementation(project(":lib:sendvid-extractor")) +} \ No newline at end of file diff --git a/multisrc/overrides/animestream/animeytes/res/mipmap-hdpi/ic_launcher.png b/src/es/animeytes/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animeytes/res/mipmap-hdpi/ic_launcher.png rename to src/es/animeytes/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animeytes/res/mipmap-mdpi/ic_launcher.png b/src/es/animeytes/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animeytes/res/mipmap-mdpi/ic_launcher.png rename to src/es/animeytes/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animeytes/res/mipmap-xhdpi/ic_launcher.png b/src/es/animeytes/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animeytes/res/mipmap-xhdpi/ic_launcher.png rename to src/es/animeytes/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animeytes/res/mipmap-xxhdpi/ic_launcher.png b/src/es/animeytes/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animeytes/res/mipmap-xxhdpi/ic_launcher.png rename to src/es/animeytes/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animeytes/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/animeytes/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animeytes/res/mipmap-xxxhdpi/ic_launcher.png rename to src/es/animeytes/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animeytes/src/AnimeYTES.kt b/src/es/animeytes/src/eu/kanade/tachiyomi/animeextension/es/animeytes/AnimeYTES.kt similarity index 100% rename from multisrc/overrides/animestream/animeytes/src/AnimeYTES.kt rename to src/es/animeytes/src/eu/kanade/tachiyomi/animeextension/es/animeytes/AnimeYTES.kt diff --git a/multisrc/overrides/animestream/tiodonghua/additional.gradle b/src/es/tiodonghua/build.gradle similarity index 52% rename from multisrc/overrides/animestream/tiodonghua/additional.gradle rename to src/es/tiodonghua/build.gradle index dd8c564208..661db5a632 100644 --- a/multisrc/overrides/animestream/tiodonghua/additional.gradle +++ b/src/es/tiodonghua/build.gradle @@ -1,7 +1,17 @@ +ext { + extName = 'Tiodonghua.com' + extClass = '.Tiodonghua' + themePkg = 'animestream' + baseUrl = 'https://anime.tiodonghua.com' + overrideVersionCode = 2 +} + +apply from: "$rootDir/common.gradle" + dependencies { implementation(project(":lib:okru-extractor")) implementation(project(":lib:mixdrop-extractor")) implementation(project(":lib:voe-extractor")) implementation(project(":lib:yourupload-extractor")) -} +} \ No newline at end of file diff --git a/multisrc/overrides/animestream/tiodonghua/res/mipmap-hdpi/ic_launcher.png b/src/es/tiodonghua/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/tiodonghua/res/mipmap-hdpi/ic_launcher.png rename to src/es/tiodonghua/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/tiodonghua/res/mipmap-mdpi/ic_launcher.png b/src/es/tiodonghua/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/tiodonghua/res/mipmap-mdpi/ic_launcher.png rename to src/es/tiodonghua/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/tiodonghua/res/mipmap-xhdpi/ic_launcher.png b/src/es/tiodonghua/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/tiodonghua/res/mipmap-xhdpi/ic_launcher.png rename to src/es/tiodonghua/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/tiodonghua/res/mipmap-xxhdpi/ic_launcher.png b/src/es/tiodonghua/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/tiodonghua/res/mipmap-xxhdpi/ic_launcher.png rename to src/es/tiodonghua/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/tiodonghua/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/tiodonghua/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/tiodonghua/res/mipmap-xxxhdpi/ic_launcher.png rename to src/es/tiodonghua/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/tiodonghua/src/Tiodonghua.kt b/src/es/tiodonghua/src/eu/kanade/tachiyomi/animeextension/es/tiodonghua/Tiodonghua.kt similarity index 100% rename from multisrc/overrides/animestream/tiodonghua/src/Tiodonghua.kt rename to src/es/tiodonghua/src/eu/kanade/tachiyomi/animeextension/es/tiodonghua/Tiodonghua.kt diff --git a/multisrc/overrides/datalifeengine/frenchanime/additional.gradle b/src/fr/frenchanime/build.gradle similarity index 72% rename from multisrc/overrides/datalifeengine/frenchanime/additional.gradle rename to src/fr/frenchanime/build.gradle index a5112c5010..8e06a7eed6 100644 --- a/multisrc/overrides/datalifeengine/frenchanime/additional.gradle +++ b/src/fr/frenchanime/build.gradle @@ -1,3 +1,13 @@ +ext { + extName = 'French Anime' + extClass = '.FrenchAnime' + themePkg = 'datalifeengine' + baseUrl = 'https://french-anime.com' + overrideVersionCode = 5 +} + +apply from: "$rootDir/common.gradle" + dependencies { implementation(project(':lib:dood-extractor')) implementation(project(':lib:vido-extractor')) diff --git a/multisrc/overrides/datalifeengine/frenchanime/res/mipmap-hdpi/ic_launcher.png b/src/fr/frenchanime/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/datalifeengine/frenchanime/res/mipmap-hdpi/ic_launcher.png rename to src/fr/frenchanime/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/datalifeengine/frenchanime/res/mipmap-mdpi/ic_launcher.png b/src/fr/frenchanime/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/datalifeengine/frenchanime/res/mipmap-mdpi/ic_launcher.png rename to src/fr/frenchanime/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/datalifeengine/frenchanime/res/mipmap-xhdpi/ic_launcher.png b/src/fr/frenchanime/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/datalifeengine/frenchanime/res/mipmap-xhdpi/ic_launcher.png rename to src/fr/frenchanime/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/datalifeengine/frenchanime/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/frenchanime/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/datalifeengine/frenchanime/res/mipmap-xxhdpi/ic_launcher.png rename to src/fr/frenchanime/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/datalifeengine/frenchanime/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/frenchanime/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/datalifeengine/frenchanime/res/mipmap-xxxhdpi/ic_launcher.png rename to src/fr/frenchanime/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/datalifeengine/frenchanime/res/web_hi_res_512.png b/src/fr/frenchanime/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/datalifeengine/frenchanime/res/web_hi_res_512.png rename to src/fr/frenchanime/res/web_hi_res_512.png diff --git a/multisrc/overrides/datalifeengine/frenchanime/src/FrenchAnime.kt b/src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime/FrenchAnime.kt similarity index 100% rename from multisrc/overrides/datalifeengine/frenchanime/src/FrenchAnime.kt rename to src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime/FrenchAnime.kt diff --git a/src/fr/jetanime/build.gradle b/src/fr/jetanime/build.gradle new file mode 100644 index 0000000000..36ae0bef5d --- /dev/null +++ b/src/fr/jetanime/build.gradle @@ -0,0 +1,14 @@ +ext { + extName = 'JetAnime' + extClass = '.JetAnime' + themePkg = 'dooplay' + baseUrl = 'https://ssl.jetanimes.com' + overrideVersionCode = 3 +} + +apply from: "$rootDir/common.gradle" + +dependencies { + implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" + implementation(project(':lib:playlist-utils')) +} \ No newline at end of file diff --git a/multisrc/overrides/dooplay/jetanime/res/mipmap-hdpi/ic_launcher.png b/src/fr/jetanime/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/jetanime/res/mipmap-hdpi/ic_launcher.png rename to src/fr/jetanime/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/jetanime/res/mipmap-mdpi/ic_launcher.png b/src/fr/jetanime/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/jetanime/res/mipmap-mdpi/ic_launcher.png rename to src/fr/jetanime/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/jetanime/res/mipmap-xhdpi/ic_launcher.png b/src/fr/jetanime/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/jetanime/res/mipmap-xhdpi/ic_launcher.png rename to src/fr/jetanime/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/jetanime/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/jetanime/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/jetanime/res/mipmap-xxhdpi/ic_launcher.png rename to src/fr/jetanime/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/jetanime/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/jetanime/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/jetanime/res/mipmap-xxxhdpi/ic_launcher.png rename to src/fr/jetanime/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/jetanime/res/web_hi_res_512.png b/src/fr/jetanime/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/dooplay/jetanime/res/web_hi_res_512.png rename to src/fr/jetanime/res/web_hi_res_512.png diff --git a/multisrc/overrides/dooplay/jetanime/src/JetAnime.kt b/src/fr/jetanime/src/eu/kanade/tachiyomi/animeextension/fr/jetanime/JetAnime.kt similarity index 100% rename from multisrc/overrides/dooplay/jetanime/src/JetAnime.kt rename to src/fr/jetanime/src/eu/kanade/tachiyomi/animeextension/fr/jetanime/JetAnime.kt diff --git a/multisrc/overrides/dooplay/jetanime/src/extractors/HdsplayExtractor.kt b/src/fr/jetanime/src/eu/kanade/tachiyomi/animeextension/fr/jetanime/extractors/HdsplayExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/jetanime/src/extractors/HdsplayExtractor.kt rename to src/fr/jetanime/src/eu/kanade/tachiyomi/animeextension/fr/jetanime/extractors/HdsplayExtractor.kt diff --git a/multisrc/overrides/dooplay/jetanime/src/extractors/SentinelExtractor.kt b/src/fr/jetanime/src/eu/kanade/tachiyomi/animeextension/fr/jetanime/extractors/SentinelExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/jetanime/src/extractors/SentinelExtractor.kt rename to src/fr/jetanime/src/eu/kanade/tachiyomi/animeextension/fr/jetanime/extractors/SentinelExtractor.kt diff --git a/multisrc/overrides/animestream/mykdrama/additional.gradle b/src/fr/mykdrama/build.gradle similarity index 53% rename from multisrc/overrides/animestream/mykdrama/additional.gradle rename to src/fr/mykdrama/build.gradle index ea9a4ad60c..f67e43036c 100644 --- a/multisrc/overrides/animestream/mykdrama/additional.gradle +++ b/src/fr/mykdrama/build.gradle @@ -1,3 +1,13 @@ +ext { + extName = 'MyKdrama' + extClass = '.MyKdrama' + themePkg = 'animestream' + baseUrl = 'https://mykdrama.co' + overrideVersionCode = 0 +} + +apply from: "$rootDir/common.gradle" + dependencies { implementation(project(":lib:okru-extractor")) implementation(project(":lib:uqload-extractor")) diff --git a/multisrc/overrides/animestream/mykdrama/res/mipmap-hdpi/ic_launcher.png b/src/fr/mykdrama/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/mykdrama/res/mipmap-hdpi/ic_launcher.png rename to src/fr/mykdrama/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/mykdrama/res/mipmap-mdpi/ic_launcher.png b/src/fr/mykdrama/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/mykdrama/res/mipmap-mdpi/ic_launcher.png rename to src/fr/mykdrama/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/mykdrama/res/mipmap-xhdpi/ic_launcher.png b/src/fr/mykdrama/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/mykdrama/res/mipmap-xhdpi/ic_launcher.png rename to src/fr/mykdrama/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/mykdrama/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/mykdrama/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/mykdrama/res/mipmap-xxhdpi/ic_launcher.png rename to src/fr/mykdrama/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/mykdrama/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/mykdrama/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/mykdrama/res/mipmap-xxxhdpi/ic_launcher.png rename to src/fr/mykdrama/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/mykdrama/res/web_hi_res_512.png b/src/fr/mykdrama/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/animestream/mykdrama/res/web_hi_res_512.png rename to src/fr/mykdrama/res/web_hi_res_512.png diff --git a/multisrc/overrides/animestream/mykdrama/src/MyKdrama.kt b/src/fr/mykdrama/src/eu/kanade/tachiyomi/animeextension/fr/mykdrama/MyKdrama.kt similarity index 100% rename from multisrc/overrides/animestream/mykdrama/src/MyKdrama.kt rename to src/fr/mykdrama/src/eu/kanade/tachiyomi/animeextension/fr/mykdrama/MyKdrama.kt diff --git a/multisrc/overrides/animestream/mykdrama/src/MyKdramaFilters.kt b/src/fr/mykdrama/src/eu/kanade/tachiyomi/animeextension/fr/mykdrama/MyKdramaFilters.kt similarity index 100% rename from multisrc/overrides/animestream/mykdrama/src/MyKdramaFilters.kt rename to src/fr/mykdrama/src/eu/kanade/tachiyomi/animeextension/fr/mykdrama/MyKdramaFilters.kt diff --git a/src/fr/voircartoon/build.gradle b/src/fr/voircartoon/build.gradle new file mode 100644 index 0000000000..0b1e17504b --- /dev/null +++ b/src/fr/voircartoon/build.gradle @@ -0,0 +1,14 @@ +ext { + extName = 'VoirCartoon' + extClass = '.VoirCartoon' + themePkg = 'dooplay' + baseUrl = 'https://voircartoon.com' + overrideVersionCode = 1 + isNsfw = true +} + +apply from: "$rootDir/common.gradle" + +dependencies { + implementation(project(":lib:playlist-utils")) +} \ No newline at end of file diff --git a/multisrc/overrides/dooplay/voircartoon/res/mipmap-hdpi/ic_launcher.png b/src/fr/voircartoon/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/voircartoon/res/mipmap-hdpi/ic_launcher.png rename to src/fr/voircartoon/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/voircartoon/res/mipmap-mdpi/ic_launcher.png b/src/fr/voircartoon/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/voircartoon/res/mipmap-mdpi/ic_launcher.png rename to src/fr/voircartoon/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/voircartoon/res/mipmap-xhdpi/ic_launcher.png b/src/fr/voircartoon/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/voircartoon/res/mipmap-xhdpi/ic_launcher.png rename to src/fr/voircartoon/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/voircartoon/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/voircartoon/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/voircartoon/res/mipmap-xxhdpi/ic_launcher.png rename to src/fr/voircartoon/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/voircartoon/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/voircartoon/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/voircartoon/res/mipmap-xxxhdpi/ic_launcher.png rename to src/fr/voircartoon/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/voircartoon/src/VoirCartoon.kt b/src/fr/voircartoon/src/eu/kanade/tachiyomi/animeextension/fr/voircartoon/VoirCartoon.kt similarity index 100% rename from multisrc/overrides/dooplay/voircartoon/src/VoirCartoon.kt rename to src/fr/voircartoon/src/eu/kanade/tachiyomi/animeextension/fr/voircartoon/VoirCartoon.kt diff --git a/multisrc/overrides/dooplay/voircartoon/src/VoirCartoonFilters.kt b/src/fr/voircartoon/src/eu/kanade/tachiyomi/animeextension/fr/voircartoon/VoirCartoonFilters.kt similarity index 100% rename from multisrc/overrides/dooplay/voircartoon/src/VoirCartoonFilters.kt rename to src/fr/voircartoon/src/eu/kanade/tachiyomi/animeextension/fr/voircartoon/VoirCartoonFilters.kt diff --git a/multisrc/overrides/dooplay/voircartoon/src/extractors/ComedyShowExtractor.kt b/src/fr/voircartoon/src/eu/kanade/tachiyomi/animeextension/fr/voircartoon/extractors/ComedyShowExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/voircartoon/src/extractors/ComedyShowExtractor.kt rename to src/fr/voircartoon/src/eu/kanade/tachiyomi/animeextension/fr/voircartoon/extractors/ComedyShowExtractor.kt diff --git a/multisrc/overrides/datalifeengine/wiflix/additional.gradle b/src/fr/wiflix/build.gradle similarity index 72% rename from multisrc/overrides/datalifeengine/wiflix/additional.gradle rename to src/fr/wiflix/build.gradle index ad6c3fe9b1..8f7d909841 100644 --- a/multisrc/overrides/datalifeengine/wiflix/additional.gradle +++ b/src/fr/wiflix/build.gradle @@ -1,3 +1,13 @@ +ext { + extName = 'Wiflix' + extClass = '.Wiflix' + themePkg = 'datalifeengine' + baseUrl = 'https://wiflix.voto' + overrideVersionCode = 4 +} + +apply from: "$rootDir/common.gradle" + dependencies { implementation(project(':lib:dood-extractor')) implementation(project(':lib:vido-extractor')) diff --git a/multisrc/overrides/datalifeengine/wiflix/res/mipmap-hdpi/ic_launcher.png b/src/fr/wiflix/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/datalifeengine/wiflix/res/mipmap-hdpi/ic_launcher.png rename to src/fr/wiflix/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/datalifeengine/wiflix/res/mipmap-mdpi/ic_launcher.png b/src/fr/wiflix/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/datalifeengine/wiflix/res/mipmap-mdpi/ic_launcher.png rename to src/fr/wiflix/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/datalifeengine/wiflix/res/mipmap-xhdpi/ic_launcher.png b/src/fr/wiflix/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/datalifeengine/wiflix/res/mipmap-xhdpi/ic_launcher.png rename to src/fr/wiflix/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/datalifeengine/wiflix/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/wiflix/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/datalifeengine/wiflix/res/mipmap-xxhdpi/ic_launcher.png rename to src/fr/wiflix/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/datalifeengine/wiflix/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/wiflix/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/datalifeengine/wiflix/res/mipmap-xxxhdpi/ic_launcher.png rename to src/fr/wiflix/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/datalifeengine/wiflix/res/web_hi_res_512.png b/src/fr/wiflix/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/datalifeengine/wiflix/res/web_hi_res_512.png rename to src/fr/wiflix/res/web_hi_res_512.png diff --git a/multisrc/overrides/datalifeengine/wiflix/src/Wiflix.kt b/src/fr/wiflix/src/eu/kanade/tachiyomi/animeextension/fr/wiflix/Wiflix.kt similarity index 100% rename from multisrc/overrides/datalifeengine/wiflix/src/Wiflix.kt rename to src/fr/wiflix/src/eu/kanade/tachiyomi/animeextension/fr/wiflix/Wiflix.kt diff --git a/src/hi/animesaga/build.gradle b/src/hi/animesaga/build.gradle new file mode 100644 index 0000000000..dadf50cee3 --- /dev/null +++ b/src/hi/animesaga/build.gradle @@ -0,0 +1,13 @@ +ext { + extName = 'AnimeSAGA' + extClass = '.AnimeSAGA' + themePkg = 'dooplay' + baseUrl = 'https://www.animesaga.in' + overrideVersionCode = 9 +} + +apply from: "$rootDir/common.gradle" + +dependencies { + implementation(project(":lib:chillx-extractor")) +} \ No newline at end of file diff --git a/multisrc/overrides/dooplay/animesaga/res/mipmap-hdpi/ic_launcher.png b/src/hi/animesaga/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animesaga/res/mipmap-hdpi/ic_launcher.png rename to src/hi/animesaga/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animesaga/res/mipmap-mdpi/ic_launcher.png b/src/hi/animesaga/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animesaga/res/mipmap-mdpi/ic_launcher.png rename to src/hi/animesaga/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animesaga/res/mipmap-xhdpi/ic_launcher.png b/src/hi/animesaga/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animesaga/res/mipmap-xhdpi/ic_launcher.png rename to src/hi/animesaga/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animesaga/res/mipmap-xxhdpi/ic_launcher.png b/src/hi/animesaga/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animesaga/res/mipmap-xxhdpi/ic_launcher.png rename to src/hi/animesaga/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animesaga/res/mipmap-xxxhdpi/ic_launcher.png b/src/hi/animesaga/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animesaga/res/mipmap-xxxhdpi/ic_launcher.png rename to src/hi/animesaga/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animesaga/src/AnimeSAGA.kt b/src/hi/animesaga/src/eu/kanade/tachiyomi/animeextension/hi/animesaga/AnimeSAGA.kt similarity index 100% rename from multisrc/overrides/dooplay/animesaga/src/AnimeSAGA.kt rename to src/hi/animesaga/src/eu/kanade/tachiyomi/animeextension/hi/animesaga/AnimeSAGA.kt diff --git a/multisrc/overrides/animestream/animeindo/additional.gradle b/src/id/animeindo/build.gradle similarity index 60% rename from multisrc/overrides/animestream/animeindo/additional.gradle rename to src/id/animeindo/build.gradle index 70de4fa0b2..ac34b4312f 100644 --- a/multisrc/overrides/animestream/animeindo/additional.gradle +++ b/src/id/animeindo/build.gradle @@ -1,7 +1,17 @@ +ext { + extName = 'AnimeIndo' + extClass = '.AnimeIndo' + themePkg = 'animestream' + baseUrl = 'https://animeindo.skin' + overrideVersionCode = 10 +} + +apply from: "$rootDir/common.gradle" + dependencies { implementation(project(":lib:mp4upload-extractor")) implementation(project(":lib:gdriveplayer-extractor")) implementation(project(":lib:streamtape-extractor")) implementation(project(":lib:yourupload-extractor")) implementation(project(":lib:okru-extractor")) -} +} \ No newline at end of file diff --git a/multisrc/overrides/animestream/animeindo/res/mipmap-hdpi/ic_launcher.png b/src/id/animeindo/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animeindo/res/mipmap-hdpi/ic_launcher.png rename to src/id/animeindo/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animeindo/res/mipmap-mdpi/ic_launcher.png b/src/id/animeindo/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animeindo/res/mipmap-mdpi/ic_launcher.png rename to src/id/animeindo/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animeindo/res/mipmap-xhdpi/ic_launcher.png b/src/id/animeindo/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animeindo/res/mipmap-xhdpi/ic_launcher.png rename to src/id/animeindo/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animeindo/res/mipmap-xxhdpi/ic_launcher.png b/src/id/animeindo/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animeindo/res/mipmap-xxhdpi/ic_launcher.png rename to src/id/animeindo/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animeindo/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/animeindo/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animeindo/res/mipmap-xxxhdpi/ic_launcher.png rename to src/id/animeindo/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animeindo/src/AnimeIndo.kt b/src/id/animeindo/src/eu/kanade/tachiyomi/animeextension/id/animeindo/AnimeIndo.kt similarity index 100% rename from multisrc/overrides/animestream/animeindo/src/AnimeIndo.kt rename to src/id/animeindo/src/eu/kanade/tachiyomi/animeextension/id/animeindo/AnimeIndo.kt diff --git a/multisrc/overrides/animestream/animeindo/src/AnimeIndoFilters.kt b/src/id/animeindo/src/eu/kanade/tachiyomi/animeextension/id/animeindo/AnimeIndoFilters.kt similarity index 100% rename from multisrc/overrides/animestream/animeindo/src/AnimeIndoFilters.kt rename to src/id/animeindo/src/eu/kanade/tachiyomi/animeextension/id/animeindo/AnimeIndoFilters.kt diff --git a/src/id/minioppai/build.gradle b/src/id/minioppai/build.gradle new file mode 100644 index 0000000000..9998362919 --- /dev/null +++ b/src/id/minioppai/build.gradle @@ -0,0 +1,15 @@ +ext { + extName = 'MiniOppai' + extClass = '.MiniOppai' + themePkg = 'animestream' + baseUrl = 'https://minioppai.org' + overrideVersionCode = 4 + isNsfw = true +} + +apply from: "$rootDir/common.gradle" + +dependencies { + implementation(project(":lib:gdriveplayer-extractor")) + implementation(project(":lib:unpacker")) +} \ No newline at end of file diff --git a/multisrc/overrides/animestream/minioppai/res/mipmap-hdpi/ic_launcher.png b/src/id/minioppai/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/minioppai/res/mipmap-hdpi/ic_launcher.png rename to src/id/minioppai/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/minioppai/res/mipmap-mdpi/ic_launcher.png b/src/id/minioppai/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/minioppai/res/mipmap-mdpi/ic_launcher.png rename to src/id/minioppai/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/minioppai/res/mipmap-xhdpi/ic_launcher.png b/src/id/minioppai/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/minioppai/res/mipmap-xhdpi/ic_launcher.png rename to src/id/minioppai/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/minioppai/res/mipmap-xxhdpi/ic_launcher.png b/src/id/minioppai/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/minioppai/res/mipmap-xxhdpi/ic_launcher.png rename to src/id/minioppai/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/minioppai/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/minioppai/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/minioppai/res/mipmap-xxxhdpi/ic_launcher.png rename to src/id/minioppai/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/minioppai/res/web_hi_res_512.png b/src/id/minioppai/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/animestream/minioppai/res/web_hi_res_512.png rename to src/id/minioppai/res/web_hi_res_512.png diff --git a/multisrc/overrides/animestream/minioppai/src/MiniOppai.kt b/src/id/minioppai/src/eu/kanade/tachiyomi/animeextension/id/minioppai/MiniOppai.kt similarity index 100% rename from multisrc/overrides/animestream/minioppai/src/MiniOppai.kt rename to src/id/minioppai/src/eu/kanade/tachiyomi/animeextension/id/minioppai/MiniOppai.kt diff --git a/multisrc/overrides/animestream/minioppai/src/MiniOppaiFilters.kt b/src/id/minioppai/src/eu/kanade/tachiyomi/animeextension/id/minioppai/MiniOppaiFilters.kt similarity index 100% rename from multisrc/overrides/animestream/minioppai/src/MiniOppaiFilters.kt rename to src/id/minioppai/src/eu/kanade/tachiyomi/animeextension/id/minioppai/MiniOppaiFilters.kt diff --git a/multisrc/overrides/animestream/minioppai/src/extractors/MiniOppaiExtractor.kt b/src/id/minioppai/src/eu/kanade/tachiyomi/animeextension/id/minioppai/extractors/MiniOppaiExtractor.kt similarity index 100% rename from multisrc/overrides/animestream/minioppai/src/extractors/MiniOppaiExtractor.kt rename to src/id/minioppai/src/eu/kanade/tachiyomi/animeextension/id/minioppai/extractors/MiniOppaiExtractor.kt diff --git a/src/pl/desuonline/build.gradle b/src/pl/desuonline/build.gradle new file mode 100644 index 0000000000..29e739a574 --- /dev/null +++ b/src/pl/desuonline/build.gradle @@ -0,0 +1,15 @@ +ext { + extName = 'desu-online' + extClass = '.DesuOnline' + themePkg = 'animestream' + baseUrl = 'https://desu-online.pl' + overrideVersionCode = 4 +} + +apply from: "$rootDir/common.gradle" + +dependencies { + implementation(project(':lib:okru-extractor')) + implementation(project(':lib:googledrive-extractor')) + implementation(project(':lib:sibnet-extractor')) +} \ No newline at end of file diff --git a/multisrc/overrides/animestream/desuonline/res/mipmap-hdpi/ic_launcher.png b/src/pl/desuonline/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/desuonline/res/mipmap-hdpi/ic_launcher.png rename to src/pl/desuonline/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/desuonline/res/mipmap-mdpi/ic_launcher.png b/src/pl/desuonline/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/desuonline/res/mipmap-mdpi/ic_launcher.png rename to src/pl/desuonline/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/desuonline/res/mipmap-xhdpi/ic_launcher.png b/src/pl/desuonline/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/desuonline/res/mipmap-xhdpi/ic_launcher.png rename to src/pl/desuonline/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/desuonline/res/mipmap-xxhdpi/ic_launcher.png b/src/pl/desuonline/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/desuonline/res/mipmap-xxhdpi/ic_launcher.png rename to src/pl/desuonline/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/desuonline/res/mipmap-xxxhdpi/ic_launcher.png b/src/pl/desuonline/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/desuonline/res/mipmap-xxxhdpi/ic_launcher.png rename to src/pl/desuonline/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/desuonline/res/web_hi_res_512.png b/src/pl/desuonline/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/animestream/desuonline/res/web_hi_res_512.png rename to src/pl/desuonline/res/web_hi_res_512.png diff --git a/multisrc/overrides/animestream/desuonline/src/DesuOnline.kt b/src/pl/desuonline/src/eu/kanade/tachiyomi/animeextension/pl/desuonline/DesuOnline.kt similarity index 100% rename from multisrc/overrides/animestream/desuonline/src/DesuOnline.kt rename to src/pl/desuonline/src/eu/kanade/tachiyomi/animeextension/pl/desuonline/DesuOnline.kt diff --git a/multisrc/overrides/animestream/desuonline/src/extractors/CDAExtractor.kt b/src/pl/desuonline/src/eu/kanade/tachiyomi/animeextension/pl/desuonline/extractors/CDAExtractor.kt similarity index 100% rename from multisrc/overrides/animestream/desuonline/src/extractors/CDAExtractor.kt rename to src/pl/desuonline/src/eu/kanade/tachiyomi/animeextension/pl/desuonline/extractors/CDAExtractor.kt diff --git a/src/pt/animeplayer/build.gradle b/src/pt/animeplayer/build.gradle new file mode 100644 index 0000000000..bc9e7d377c --- /dev/null +++ b/src/pt/animeplayer/build.gradle @@ -0,0 +1,14 @@ +ext { + extName = 'AnimePlayer' + extClass = '.AnimePlayer' + themePkg = 'dooplay' + baseUrl = 'https://animeplayer.com.br' + overrideVersionCode = 2 + isNsfw = true +} + +apply from: "$rootDir/common.gradle" + +dependencies { + implementation(project(":lib:blogger-extractor")) +} \ No newline at end of file diff --git a/multisrc/overrides/dooplay/animeplayer/res/mipmap-hdpi/ic_launcher.png b/src/pt/animeplayer/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animeplayer/res/mipmap-hdpi/ic_launcher.png rename to src/pt/animeplayer/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animeplayer/res/mipmap-mdpi/ic_launcher.png b/src/pt/animeplayer/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animeplayer/res/mipmap-mdpi/ic_launcher.png rename to src/pt/animeplayer/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animeplayer/res/mipmap-xhdpi/ic_launcher.png b/src/pt/animeplayer/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animeplayer/res/mipmap-xhdpi/ic_launcher.png rename to src/pt/animeplayer/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animeplayer/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/animeplayer/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animeplayer/res/mipmap-xxhdpi/ic_launcher.png rename to src/pt/animeplayer/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animeplayer/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/animeplayer/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animeplayer/res/mipmap-xxxhdpi/ic_launcher.png rename to src/pt/animeplayer/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animeplayer/src/AnimePlayer.kt b/src/pt/animeplayer/src/eu/kanade/tachiyomi/animeextension/pt/animeplayer/AnimePlayer.kt similarity index 100% rename from multisrc/overrides/dooplay/animeplayer/src/AnimePlayer.kt rename to src/pt/animeplayer/src/eu/kanade/tachiyomi/animeextension/pt/animeplayer/AnimePlayer.kt diff --git a/src/pt/animesfoxbr/build.gradle b/src/pt/animesfoxbr/build.gradle new file mode 100644 index 0000000000..f7b79d1890 --- /dev/null +++ b/src/pt/animesfoxbr/build.gradle @@ -0,0 +1,9 @@ +ext { + extName = 'AnimesFox BR' + extClass = '.AnimesFoxBR' + themePkg = 'dooplay' + baseUrl = 'https://animesfox.net' + overrideVersionCode = 2 +} + +apply from: "$rootDir/common.gradle" \ No newline at end of file diff --git a/multisrc/overrides/dooplay/animesfoxbr/res/mipmap-hdpi/ic_launcher.png b/src/pt/animesfoxbr/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animesfoxbr/res/mipmap-hdpi/ic_launcher.png rename to src/pt/animesfoxbr/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animesfoxbr/res/mipmap-mdpi/ic_launcher.png b/src/pt/animesfoxbr/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animesfoxbr/res/mipmap-mdpi/ic_launcher.png rename to src/pt/animesfoxbr/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animesfoxbr/res/mipmap-xhdpi/ic_launcher.png b/src/pt/animesfoxbr/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animesfoxbr/res/mipmap-xhdpi/ic_launcher.png rename to src/pt/animesfoxbr/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animesfoxbr/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/animesfoxbr/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animesfoxbr/res/mipmap-xxhdpi/ic_launcher.png rename to src/pt/animesfoxbr/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animesfoxbr/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/animesfoxbr/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animesfoxbr/res/mipmap-xxxhdpi/ic_launcher.png rename to src/pt/animesfoxbr/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animesfoxbr/src/AnimesFoxBR.kt b/src/pt/animesfoxbr/src/eu/kanade/tachiyomi/animeextension/pt/animesfoxbr/AnimesFoxBR.kt similarity index 100% rename from multisrc/overrides/dooplay/animesfoxbr/src/AnimesFoxBR.kt rename to src/pt/animesfoxbr/src/eu/kanade/tachiyomi/animeextension/pt/animesfoxbr/AnimesFoxBR.kt diff --git a/multisrc/overrides/dooplay/animesgratis/additional.gradle b/src/pt/animesgratis/build.gradle similarity index 59% rename from multisrc/overrides/dooplay/animesgratis/additional.gradle rename to src/pt/animesgratis/build.gradle index d0fb02f9a1..50ba2bfd8a 100644 --- a/multisrc/overrides/dooplay/animesgratis/additional.gradle +++ b/src/pt/animesgratis/build.gradle @@ -1,7 +1,17 @@ +ext { + extName = 'AnimesOnline' + extClass = '.AnimesOnline' + themePkg = 'dooplay' + baseUrl = 'https://animesonline.nz' + overrideVersionCode = 8 +} + +apply from: "$rootDir/common.gradle" + dependencies { implementation(project(":lib:blogger-extractor")) implementation(project(":lib:filemoon-extractor")) implementation(project(":lib:streamwish-extractor")) implementation(project(":lib:mixdrop-extractor")) implementation(project(":lib:streamtape-extractor")) -} +} \ No newline at end of file diff --git a/multisrc/overrides/dooplay/animesgratis/res/mipmap-hdpi/ic_launcher.png b/src/pt/animesgratis/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animesgratis/res/mipmap-hdpi/ic_launcher.png rename to src/pt/animesgratis/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animesgratis/res/mipmap-mdpi/ic_launcher.png b/src/pt/animesgratis/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animesgratis/res/mipmap-mdpi/ic_launcher.png rename to src/pt/animesgratis/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animesgratis/res/mipmap-xhdpi/ic_launcher.png b/src/pt/animesgratis/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animesgratis/res/mipmap-xhdpi/ic_launcher.png rename to src/pt/animesgratis/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animesgratis/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/animesgratis/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animesgratis/res/mipmap-xxhdpi/ic_launcher.png rename to src/pt/animesgratis/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animesgratis/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/animesgratis/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animesgratis/res/mipmap-xxxhdpi/ic_launcher.png rename to src/pt/animesgratis/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animesgratis/src/AnimesOnline.kt b/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/AnimesOnline.kt similarity index 100% rename from multisrc/overrides/dooplay/animesgratis/src/AnimesOnline.kt rename to src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/AnimesOnline.kt diff --git a/multisrc/overrides/dooplay/animesgratis/src/extractors/AnimesOnlinePlayerExtractor.kt b/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/extractors/AnimesOnlinePlayerExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/animesgratis/src/extractors/AnimesOnlinePlayerExtractor.kt rename to src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/extractors/AnimesOnlinePlayerExtractor.kt diff --git a/multisrc/overrides/dooplay/animesgratis/src/extractors/RuplayExtractor.kt b/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/extractors/RuplayExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/animesgratis/src/extractors/RuplayExtractor.kt rename to src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/extractors/RuplayExtractor.kt diff --git a/src/pt/animeshouse/build.gradle b/src/pt/animeshouse/build.gradle new file mode 100644 index 0000000000..50253107ec --- /dev/null +++ b/src/pt/animeshouse/build.gradle @@ -0,0 +1,13 @@ +ext { + extName = 'Animes House' + extClass = '.AnimesHouse' + themePkg = 'dooplay' + baseUrl = 'https://animeshouse.net' + overrideVersionCode = 9 +} + +apply from: "$rootDir/common.gradle" + +dependencies { + implementation(project(":lib:playlist-utils")) +} \ No newline at end of file diff --git a/multisrc/overrides/dooplay/animeshouse/res/mipmap-hdpi/ic_launcher.png b/src/pt/animeshouse/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animeshouse/res/mipmap-hdpi/ic_launcher.png rename to src/pt/animeshouse/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animeshouse/res/mipmap-mdpi/ic_launcher.png b/src/pt/animeshouse/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animeshouse/res/mipmap-mdpi/ic_launcher.png rename to src/pt/animeshouse/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animeshouse/res/mipmap-xhdpi/ic_launcher.png b/src/pt/animeshouse/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animeshouse/res/mipmap-xhdpi/ic_launcher.png rename to src/pt/animeshouse/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animeshouse/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/animeshouse/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animeshouse/res/mipmap-xxhdpi/ic_launcher.png rename to src/pt/animeshouse/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animeshouse/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/animeshouse/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/animeshouse/res/mipmap-xxxhdpi/ic_launcher.png rename to src/pt/animeshouse/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animeshouse/src/AnimesHouse.kt b/src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse/AnimesHouse.kt similarity index 100% rename from multisrc/overrides/dooplay/animeshouse/src/AnimesHouse.kt rename to src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse/AnimesHouse.kt diff --git a/multisrc/overrides/dooplay/animeshouse/src/extractors/EdifierExtractor.kt b/src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse/extractors/EdifierExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/animeshouse/src/extractors/EdifierExtractor.kt rename to src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse/extractors/EdifierExtractor.kt diff --git a/multisrc/overrides/dooplay/animeshouse/src/extractors/EmbedExtractor.kt b/src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse/extractors/EmbedExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/animeshouse/src/extractors/EmbedExtractor.kt rename to src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse/extractors/EmbedExtractor.kt diff --git a/multisrc/overrides/dooplay/animeshouse/src/extractors/GenericExtractor.kt b/src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse/extractors/GenericExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/animeshouse/src/extractors/GenericExtractor.kt rename to src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse/extractors/GenericExtractor.kt diff --git a/multisrc/overrides/dooplay/animeshouse/src/extractors/JsUnpacker.kt b/src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse/extractors/JsUnpacker.kt similarity index 100% rename from multisrc/overrides/dooplay/animeshouse/src/extractors/JsUnpacker.kt rename to src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse/extractors/JsUnpacker.kt diff --git a/multisrc/overrides/dooplay/animeshouse/src/extractors/McpExtractor.kt b/src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse/extractors/McpExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/animeshouse/src/extractors/McpExtractor.kt rename to src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse/extractors/McpExtractor.kt diff --git a/multisrc/overrides/dooplay/animeshouse/src/extractors/MpFourDooExtractor.kt b/src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse/extractors/MpFourDooExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/animeshouse/src/extractors/MpFourDooExtractor.kt rename to src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse/extractors/MpFourDooExtractor.kt diff --git a/multisrc/overrides/dooplay/animeshouse/src/extractors/RedplayBypasser.kt b/src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse/extractors/RedplayBypasser.kt similarity index 100% rename from multisrc/overrides/dooplay/animeshouse/src/extractors/RedplayBypasser.kt rename to src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse/extractors/RedplayBypasser.kt diff --git a/src/pt/goanimes/build.gradle b/src/pt/goanimes/build.gradle new file mode 100644 index 0000000000..77c847b6f2 --- /dev/null +++ b/src/pt/goanimes/build.gradle @@ -0,0 +1,16 @@ +ext { + extName = 'GoAnimes' + extClass = '.GoAnimes' + themePkg = 'dooplay' + baseUrl = 'https://goanimes.net' + overrideVersionCode = 9 + isNsfw = true +} + +apply from: "$rootDir/common.gradle" + +dependencies { + implementation(project(":lib:playlist-utils")) + implementation(project(":lib:blogger-extractor")) + implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") +} \ No newline at end of file diff --git a/multisrc/overrides/dooplay/goanimes/res/mipmap-hdpi/ic_launcher.png b/src/pt/goanimes/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/goanimes/res/mipmap-hdpi/ic_launcher.png rename to src/pt/goanimes/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/goanimes/res/mipmap-mdpi/ic_launcher.png b/src/pt/goanimes/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/goanimes/res/mipmap-mdpi/ic_launcher.png rename to src/pt/goanimes/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/goanimes/res/mipmap-xhdpi/ic_launcher.png b/src/pt/goanimes/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/goanimes/res/mipmap-xhdpi/ic_launcher.png rename to src/pt/goanimes/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/goanimes/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/goanimes/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/goanimes/res/mipmap-xxhdpi/ic_launcher.png rename to src/pt/goanimes/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/goanimes/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/goanimes/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/goanimes/res/mipmap-xxxhdpi/ic_launcher.png rename to src/pt/goanimes/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/goanimes/src/GoAnimes.kt b/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/GoAnimes.kt similarity index 100% rename from multisrc/overrides/dooplay/goanimes/src/GoAnimes.kt rename to src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/GoAnimes.kt diff --git a/multisrc/overrides/dooplay/goanimes/src/extractors/BloggerJWPlayerExtractor.kt b/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/BloggerJWPlayerExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/goanimes/src/extractors/BloggerJWPlayerExtractor.kt rename to src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/BloggerJWPlayerExtractor.kt diff --git a/multisrc/overrides/dooplay/goanimes/src/extractors/GoAnimesExtractor.kt b/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/GoAnimesExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/goanimes/src/extractors/GoAnimesExtractor.kt rename to src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/GoAnimesExtractor.kt diff --git a/multisrc/overrides/dooplay/goanimes/src/extractors/JsDecoder.kt b/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/JsDecoder.kt similarity index 100% rename from multisrc/overrides/dooplay/goanimes/src/extractors/JsDecoder.kt rename to src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/JsDecoder.kt diff --git a/multisrc/overrides/dooplay/goanimes/src/extractors/LinkfunBypasser.kt b/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/LinkfunBypasser.kt similarity index 100% rename from multisrc/overrides/dooplay/goanimes/src/extractors/LinkfunBypasser.kt rename to src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/LinkfunBypasser.kt diff --git a/multisrc/overrides/dooplay/goanimes/src/extractors/PlaylistExtractor.kt b/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/PlaylistExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/goanimes/src/extractors/PlaylistExtractor.kt rename to src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/PlaylistExtractor.kt diff --git a/src/pt/pifansubs/build.gradle b/src/pt/pifansubs/build.gradle new file mode 100644 index 0000000000..78017d7b92 --- /dev/null +++ b/src/pt/pifansubs/build.gradle @@ -0,0 +1,14 @@ +ext { + extName = 'Pi Fansubs' + extClass = '.PiFansubs' + themePkg = 'dooplay' + baseUrl = 'https://pifansubs.club' + overrideVersionCode = 18 + isNsfw = true +} + +apply from: "$rootDir/common.gradle" + +dependencies { + implementation(project(':lib:streamhidevid-extractor')) +} \ No newline at end of file diff --git a/multisrc/overrides/dooplay/pifansubs/res/mipmap-hdpi/ic_launcher.png b/src/pt/pifansubs/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/pifansubs/res/mipmap-hdpi/ic_launcher.png rename to src/pt/pifansubs/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/pifansubs/res/mipmap-mdpi/ic_launcher.png b/src/pt/pifansubs/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/pifansubs/res/mipmap-mdpi/ic_launcher.png rename to src/pt/pifansubs/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/pifansubs/res/mipmap-xhdpi/ic_launcher.png b/src/pt/pifansubs/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/pifansubs/res/mipmap-xhdpi/ic_launcher.png rename to src/pt/pifansubs/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/pifansubs/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/pifansubs/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/pifansubs/res/mipmap-xxhdpi/ic_launcher.png rename to src/pt/pifansubs/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/pifansubs/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/pifansubs/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/pifansubs/res/mipmap-xxxhdpi/ic_launcher.png rename to src/pt/pifansubs/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/pifansubs/res/web_hi_res_512.png b/src/pt/pifansubs/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/dooplay/pifansubs/res/web_hi_res_512.png rename to src/pt/pifansubs/res/web_hi_res_512.png diff --git a/multisrc/overrides/dooplay/pifansubs/src/PiFansubs.kt b/src/pt/pifansubs/src/eu/kanade/tachiyomi/animeextension/pt/pifansubs/PiFansubs.kt similarity index 100% rename from multisrc/overrides/dooplay/pifansubs/src/PiFansubs.kt rename to src/pt/pifansubs/src/eu/kanade/tachiyomi/animeextension/pt/pifansubs/PiFansubs.kt diff --git a/multisrc/overrides/dooplay/pifansubs/src/extractors/BlembedExtractor.kt b/src/pt/pifansubs/src/eu/kanade/tachiyomi/animeextension/pt/pifansubs/extractors/BlembedExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/pifansubs/src/extractors/BlembedExtractor.kt rename to src/pt/pifansubs/src/eu/kanade/tachiyomi/animeextension/pt/pifansubs/extractors/BlembedExtractor.kt diff --git a/multisrc/overrides/dooplay/pobreflix/additional.gradle b/src/pt/pobreflix/build.gradle similarity index 53% rename from multisrc/overrides/dooplay/pobreflix/additional.gradle rename to src/pt/pobreflix/build.gradle index 2b5bd36165..2efc994c77 100644 --- a/multisrc/overrides/dooplay/pobreflix/additional.gradle +++ b/src/pt/pobreflix/build.gradle @@ -1,6 +1,17 @@ +ext { + extName = 'Pobreflix' + extClass = '.Pobreflix' + themePkg = 'dooplay' + baseUrl = 'https://pobreflix.biz' + overrideVersionCode = 5 + isNsfw = true +} + +apply from: "$rootDir/common.gradle" + dependencies { implementation(project(":lib:filemoon-extractor")) implementation(project(":lib:streamwish-extractor")) implementation(project(":lib:streamtape-extractor")) implementation(project(":lib:playlist-utils")) -} +} \ No newline at end of file diff --git a/multisrc/overrides/dooplay/pobreflix/res/mipmap-hdpi/ic_launcher.png b/src/pt/pobreflix/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/pobreflix/res/mipmap-hdpi/ic_launcher.png rename to src/pt/pobreflix/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/pobreflix/res/mipmap-mdpi/ic_launcher.png b/src/pt/pobreflix/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/pobreflix/res/mipmap-mdpi/ic_launcher.png rename to src/pt/pobreflix/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/pobreflix/res/mipmap-xhdpi/ic_launcher.png b/src/pt/pobreflix/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/pobreflix/res/mipmap-xhdpi/ic_launcher.png rename to src/pt/pobreflix/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/pobreflix/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/pobreflix/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/pobreflix/res/mipmap-xxhdpi/ic_launcher.png rename to src/pt/pobreflix/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/pobreflix/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/pobreflix/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/dooplay/pobreflix/res/mipmap-xxxhdpi/ic_launcher.png rename to src/pt/pobreflix/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/pobreflix/src/Pobreflix.kt b/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/Pobreflix.kt similarity index 100% rename from multisrc/overrides/dooplay/pobreflix/src/Pobreflix.kt rename to src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/Pobreflix.kt diff --git a/multisrc/overrides/dooplay/pobreflix/src/extractors/EplayerExtractor.kt b/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/extractors/EplayerExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/pobreflix/src/extractors/EplayerExtractor.kt rename to src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/extractors/EplayerExtractor.kt diff --git a/multisrc/overrides/dooplay/pobreflix/src/extractors/MyStreamExtractor.kt b/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/extractors/MyStreamExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/pobreflix/src/extractors/MyStreamExtractor.kt rename to src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/extractors/MyStreamExtractor.kt diff --git a/multisrc/overrides/dooplay/pobreflix/src/extractors/SuperFlixExtractor.kt b/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/extractors/SuperFlixExtractor.kt similarity index 100% rename from multisrc/overrides/dooplay/pobreflix/src/extractors/SuperFlixExtractor.kt rename to src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/extractors/SuperFlixExtractor.kt diff --git a/src/pt/rinecloud/build.gradle b/src/pt/rinecloud/build.gradle new file mode 100644 index 0000000000..4e90df24cd --- /dev/null +++ b/src/pt/rinecloud/build.gradle @@ -0,0 +1,14 @@ +ext { + extName = 'RineCloud' + extClass = '.RineCloud' + themePkg = 'animestream' + baseUrl = 'https://rine.cloud' + overrideVersionCode = 6 +} + +apply from: "$rootDir/common.gradle" + +dependencies { + implementation(project(":lib:unpacker")) + implementation(project(":lib:playlist-utils")) +} \ No newline at end of file diff --git a/multisrc/overrides/animestream/rinecloud/res/mipmap-hdpi/ic_launcher.png b/src/pt/rinecloud/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/rinecloud/res/mipmap-hdpi/ic_launcher.png rename to src/pt/rinecloud/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/rinecloud/res/mipmap-mdpi/ic_launcher.png b/src/pt/rinecloud/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/rinecloud/res/mipmap-mdpi/ic_launcher.png rename to src/pt/rinecloud/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/rinecloud/res/mipmap-xhdpi/ic_launcher.png b/src/pt/rinecloud/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/rinecloud/res/mipmap-xhdpi/ic_launcher.png rename to src/pt/rinecloud/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/rinecloud/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/rinecloud/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/rinecloud/res/mipmap-xxhdpi/ic_launcher.png rename to src/pt/rinecloud/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/rinecloud/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/rinecloud/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/rinecloud/res/mipmap-xxxhdpi/ic_launcher.png rename to src/pt/rinecloud/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/rinecloud/src/RineCloud.kt b/src/pt/rinecloud/src/eu/kanade/tachiyomi/animeextension/pt/rinecloud/RineCloud.kt similarity index 100% rename from multisrc/overrides/animestream/rinecloud/src/RineCloud.kt rename to src/pt/rinecloud/src/eu/kanade/tachiyomi/animeextension/pt/rinecloud/RineCloud.kt diff --git a/multisrc/overrides/animestream/rinecloud/src/extractors/RineCloudExtractor.kt b/src/pt/rinecloud/src/eu/kanade/tachiyomi/animeextension/pt/rinecloud/extractors/RineCloudExtractor.kt similarity index 100% rename from multisrc/overrides/animestream/rinecloud/src/extractors/RineCloudExtractor.kt rename to src/pt/rinecloud/src/eu/kanade/tachiyomi/animeextension/pt/rinecloud/extractors/RineCloudExtractor.kt diff --git a/src/sr/animebalkan/build.gradle b/src/sr/animebalkan/build.gradle new file mode 100644 index 0000000000..91014186a3 --- /dev/null +++ b/src/sr/animebalkan/build.gradle @@ -0,0 +1,14 @@ +ext { + extName = 'AnimeBalkan' + extClass = '.AnimeBalkan' + themePkg = 'animestream' + baseUrl = 'https://animebalkan.org' + overrideVersionCode = 1 +} + +apply from: "$rootDir/common.gradle" + +dependencies { + implementation(project(":lib:okru-extractor")) + implementation(project(":lib:googledrive-extractor")) +} \ No newline at end of file diff --git a/multisrc/overrides/animestream/animebalkan/res/mipmap-hdpi/ic_launcher.png b/src/sr/animebalkan/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animebalkan/res/mipmap-hdpi/ic_launcher.png rename to src/sr/animebalkan/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animebalkan/res/mipmap-mdpi/ic_launcher.png b/src/sr/animebalkan/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animebalkan/res/mipmap-mdpi/ic_launcher.png rename to src/sr/animebalkan/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animebalkan/res/mipmap-xhdpi/ic_launcher.png b/src/sr/animebalkan/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animebalkan/res/mipmap-xhdpi/ic_launcher.png rename to src/sr/animebalkan/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animebalkan/res/mipmap-xxhdpi/ic_launcher.png b/src/sr/animebalkan/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animebalkan/res/mipmap-xxhdpi/ic_launcher.png rename to src/sr/animebalkan/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animebalkan/res/mipmap-xxxhdpi/ic_launcher.png b/src/sr/animebalkan/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/animebalkan/res/mipmap-xxxhdpi/ic_launcher.png rename to src/sr/animebalkan/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/animebalkan/src/AnimeBalkan.kt b/src/sr/animebalkan/src/eu/kanade/tachiyomi/animeextension/sr/animebalkan/AnimeBalkan.kt similarity index 100% rename from multisrc/overrides/animestream/animebalkan/src/AnimeBalkan.kt rename to src/sr/animebalkan/src/eu/kanade/tachiyomi/animeextension/sr/animebalkan/AnimeBalkan.kt diff --git a/multisrc/overrides/animestream/animebalkan/src/extractors/MailRuExtractor.kt b/src/sr/animebalkan/src/eu/kanade/tachiyomi/animeextension/sr/animebalkan/extractors/MailRuExtractor.kt similarity index 100% rename from multisrc/overrides/animestream/animebalkan/src/extractors/MailRuExtractor.kt rename to src/sr/animebalkan/src/eu/kanade/tachiyomi/animeextension/sr/animebalkan/extractors/MailRuExtractor.kt diff --git a/multisrc/overrides/animestream/asyaanimeleri/additional.gradle b/src/tr/asyaanimeleri/build.gradle similarity index 62% rename from multisrc/overrides/animestream/asyaanimeleri/additional.gradle rename to src/tr/asyaanimeleri/build.gradle index db2d9f382e..46501a2a17 100644 --- a/multisrc/overrides/animestream/asyaanimeleri/additional.gradle +++ b/src/tr/asyaanimeleri/build.gradle @@ -1,3 +1,13 @@ +ext { + extName = 'AsyaAnimeleri' + extClass = '.AsyaAnimeleri' + themePkg = 'animestream' + baseUrl = 'https://asyaanimeleri.com' + overrideVersionCode = 3 +} + +apply from: "$rootDir/common.gradle" + dependencies { implementation(project(":lib:vk-extractor")) implementation(project(":lib:okru-extractor")) @@ -5,4 +15,4 @@ dependencies { implementation(project(":lib:gdriveplayer-extractor")) implementation(project(":lib:dood-extractor")) // implementation(project(":lib:dailymotion-extractor")) -} +} \ No newline at end of file diff --git a/multisrc/overrides/animestream/asyaanimeleri/res/mipmap-hdpi/ic_launcher.png b/src/tr/asyaanimeleri/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/asyaanimeleri/res/mipmap-hdpi/ic_launcher.png rename to src/tr/asyaanimeleri/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/asyaanimeleri/res/mipmap-mdpi/ic_launcher.png b/src/tr/asyaanimeleri/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/asyaanimeleri/res/mipmap-mdpi/ic_launcher.png rename to src/tr/asyaanimeleri/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/asyaanimeleri/res/mipmap-xhdpi/ic_launcher.png b/src/tr/asyaanimeleri/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/asyaanimeleri/res/mipmap-xhdpi/ic_launcher.png rename to src/tr/asyaanimeleri/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/asyaanimeleri/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/asyaanimeleri/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/asyaanimeleri/res/mipmap-xxhdpi/ic_launcher.png rename to src/tr/asyaanimeleri/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/asyaanimeleri/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/asyaanimeleri/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/asyaanimeleri/res/mipmap-xxxhdpi/ic_launcher.png rename to src/tr/asyaanimeleri/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/asyaanimeleri/src/AsyaAnimeleri.kt b/src/tr/asyaanimeleri/src/eu/kanade/tachiyomi/animeextension/tr/asyaanimeleri/AsyaAnimeleri.kt similarity index 100% rename from multisrc/overrides/animestream/asyaanimeleri/src/AsyaAnimeleri.kt rename to src/tr/asyaanimeleri/src/eu/kanade/tachiyomi/animeextension/tr/asyaanimeleri/AsyaAnimeleri.kt diff --git a/multisrc/overrides/animestream/asyaanimeleri/src/AsyaAnimeleriFilters.kt b/src/tr/asyaanimeleri/src/eu/kanade/tachiyomi/animeextension/tr/asyaanimeleri/AsyaAnimeleriFilters.kt similarity index 100% rename from multisrc/overrides/animestream/asyaanimeleri/src/AsyaAnimeleriFilters.kt rename to src/tr/asyaanimeleri/src/eu/kanade/tachiyomi/animeextension/tr/asyaanimeleri/AsyaAnimeleriFilters.kt diff --git a/multisrc/overrides/animestream/asyaanimeleri/src/ShittyProtectionInterceptor.kt b/src/tr/asyaanimeleri/src/eu/kanade/tachiyomi/animeextension/tr/asyaanimeleri/ShittyProtectionInterceptor.kt similarity index 100% rename from multisrc/overrides/animestream/asyaanimeleri/src/ShittyProtectionInterceptor.kt rename to src/tr/asyaanimeleri/src/eu/kanade/tachiyomi/animeextension/tr/asyaanimeleri/ShittyProtectionInterceptor.kt diff --git a/src/tr/tranimeci/build.gradle b/src/tr/tranimeci/build.gradle new file mode 100644 index 0000000000..0c24ae9d85 --- /dev/null +++ b/src/tr/tranimeci/build.gradle @@ -0,0 +1,9 @@ +ext { + extName = 'TRAnimeCI' + extClass = '.TRAnimeCI' + themePkg = 'animestream' + baseUrl = 'https://tranimaci.com' + overrideVersionCode = 1 +} + +apply from: "$rootDir/common.gradle" \ No newline at end of file diff --git a/multisrc/overrides/animestream/tranimeci/res/mipmap-hdpi/ic_launcher.png b/src/tr/tranimeci/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/tranimeci/res/mipmap-hdpi/ic_launcher.png rename to src/tr/tranimeci/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/tranimeci/res/mipmap-mdpi/ic_launcher.png b/src/tr/tranimeci/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/tranimeci/res/mipmap-mdpi/ic_launcher.png rename to src/tr/tranimeci/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/tranimeci/res/mipmap-xhdpi/ic_launcher.png b/src/tr/tranimeci/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/tranimeci/res/mipmap-xhdpi/ic_launcher.png rename to src/tr/tranimeci/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/tranimeci/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/tranimeci/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/tranimeci/res/mipmap-xxhdpi/ic_launcher.png rename to src/tr/tranimeci/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/tranimeci/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/tranimeci/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/animestream/tranimeci/res/mipmap-xxxhdpi/ic_launcher.png rename to src/tr/tranimeci/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/animestream/tranimeci/src/ShittyProtectionInterceptor.kt b/src/tr/tranimeci/src/eu/kanade/tachiyomi/animeextension/tr/tranimeci/ShittyProtectionInterceptor.kt similarity index 100% rename from multisrc/overrides/animestream/tranimeci/src/ShittyProtectionInterceptor.kt rename to src/tr/tranimeci/src/eu/kanade/tachiyomi/animeextension/tr/tranimeci/ShittyProtectionInterceptor.kt diff --git a/multisrc/overrides/animestream/tranimeci/src/TRAnimeCI.kt b/src/tr/tranimeci/src/eu/kanade/tachiyomi/animeextension/tr/tranimeci/TRAnimeCI.kt similarity index 100% rename from multisrc/overrides/animestream/tranimeci/src/TRAnimeCI.kt rename to src/tr/tranimeci/src/eu/kanade/tachiyomi/animeextension/tr/tranimeci/TRAnimeCI.kt diff --git a/multisrc/overrides/animestream/tranimeci/src/TRAnimeCIFilters.kt b/src/tr/tranimeci/src/eu/kanade/tachiyomi/animeextension/tr/tranimeci/TRAnimeCIFilters.kt similarity index 100% rename from multisrc/overrides/animestream/tranimeci/src/TRAnimeCIFilters.kt rename to src/tr/tranimeci/src/eu/kanade/tachiyomi/animeextension/tr/tranimeci/TRAnimeCIFilters.kt