From b912cba29500c931d0861890499bb4ec34a92688 Mon Sep 17 00:00:00 2001 From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com> Date: Mon, 13 Mar 2023 18:07:37 -0300 Subject: [PATCH] Create DooPlay multisrc module (#1387) --- .../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 .../dooplay/animeshouse/src/AnimesHouse.kt | 97 ++++ .../src}/extractors/EdifierExtractor.kt | 0 .../src}/extractors/EmbedExtractor.kt | 0 .../src}/extractors/GenericExtractor.kt | 19 +- .../animeshouse/src}/extractors/JsUnpacker.kt | 0 .../src}/extractors/McpExtractor.kt | 13 +- .../src}/extractors/MpFourDooExtractor.kt | 2 +- .../src}/extractors/RedplayBypasser.kt | 38 +- .../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 .../cinevision/res/web_hi_res_512.png | Bin .../dooplay/cinevision/src/CineVision.kt | 62 +++ .../src}/extractors/StreamlareExtractor.kt | 2 +- .../src}/extractors/VidmolyExtractor.kt | 4 +- .../dooplay/default}/AndroidManifest.xml | 8 +- .../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 .../pactedanime/res/web_hi_res_512.png | Bin .../dooplay/pactedanime/src/pactedanime.kt | 66 +++ .../dooplay/pifansubs/additional.gradle | 5 + .../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 .../dooplay}/pifansubs/res/web_hi_res_512.png | Bin .../dooplay/pifansubs/src/PiFansubs.kt | 75 +++ .../src}/extractors/AdoroDoramasExtractor.kt | 4 +- .../src}/extractors/GdrivePlayerExtractor.kt | 2 +- .../src}/extractors/JMVStreamExtractor.kt | 10 +- .../tachiyomi/multisrc/dooplay/DooPlay.kt | 468 ++++++++++++++++++ .../multisrc/dooplay/DooPlayGenerator.kt | 24 + .../multisrc/dooplay/DooPlayUrlActivity.kt | 15 +- src/en/pactedanime/AndroidManifest.xml | 2 - src/en/pactedanime/build.gradle | 12 - .../en/pactedanime/pactedanime.kt | 297 ----------- src/pt/animeshouse/AndroidManifest.xml | 24 - src/pt/animeshouse/build.gradle | 12 - .../pt/animeshouse/AHFilters.kt | 65 --- .../pt/animeshouse/AHUrlActivity.kt | 42 -- .../pt/animeshouse/AnimesHouse.kt | 325 ------------ src/pt/cinevision/AndroidManifest.xml | 24 - src/pt/cinevision/build.gradle | 13 - .../animeextension/pt/cinevision/CVFilters.kt | 63 --- .../pt/cinevision/CVUrlActivity.kt | 42 -- .../pt/cinevision/CineVision.kt | 342 ------------- src/pt/pifansubs/build.gradle | 18 - .../pt/pifansubs/PFConstants.kt | 10 - .../animeextension/pt/pifansubs/PFFilters.kt | 73 --- .../animeextension/pt/pifansubs/PiFansubs.kt | 319 ------------ 61 files changed, 861 insertions(+), 1736 deletions(-) rename {src/pt => multisrc/overrides/dooplay}/animeshouse/res/mipmap-hdpi/ic_launcher.png (100%) rename {src/pt => multisrc/overrides/dooplay}/animeshouse/res/mipmap-mdpi/ic_launcher.png (100%) rename {src/pt => multisrc/overrides/dooplay}/animeshouse/res/mipmap-xhdpi/ic_launcher.png (100%) rename {src/pt => multisrc/overrides/dooplay}/animeshouse/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {src/pt => multisrc/overrides/dooplay}/animeshouse/res/mipmap-xxxhdpi/ic_launcher.png (100%) create mode 100644 multisrc/overrides/dooplay/animeshouse/src/AnimesHouse.kt rename {src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse => multisrc/overrides/dooplay/animeshouse/src}/extractors/EdifierExtractor.kt (100%) rename {src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse => multisrc/overrides/dooplay/animeshouse/src}/extractors/EmbedExtractor.kt (100%) rename {src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse => multisrc/overrides/dooplay/animeshouse/src}/extractors/GenericExtractor.kt (65%) rename {src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse => multisrc/overrides/dooplay/animeshouse/src}/extractors/JsUnpacker.kt (100%) rename {src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse => multisrc/overrides/dooplay/animeshouse/src}/extractors/McpExtractor.kt (69%) rename {src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse => multisrc/overrides/dooplay/animeshouse/src}/extractors/MpFourDooExtractor.kt (97%) rename {src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse => multisrc/overrides/dooplay/animeshouse/src}/extractors/RedplayBypasser.kt (55%) rename {src/pt => multisrc/overrides/dooplay}/cinevision/res/mipmap-hdpi/ic_launcher.png (100%) rename {src/pt => multisrc/overrides/dooplay}/cinevision/res/mipmap-mdpi/ic_launcher.png (100%) rename {src/pt => multisrc/overrides/dooplay}/cinevision/res/mipmap-xhdpi/ic_launcher.png (100%) rename {src/pt => multisrc/overrides/dooplay}/cinevision/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {src/pt => multisrc/overrides/dooplay}/cinevision/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {src/pt => multisrc/overrides/dooplay}/cinevision/res/web_hi_res_512.png (100%) create mode 100644 multisrc/overrides/dooplay/cinevision/src/CineVision.kt rename {src/pt/cinevision/src/eu/kanade/tachiyomi/animeextension/pt/cinevision => multisrc/overrides/dooplay/cinevision/src}/extractors/StreamlareExtractor.kt (95%) rename {src/pt/cinevision/src/eu/kanade/tachiyomi/animeextension/pt/cinevision => multisrc/overrides/dooplay/cinevision/src}/extractors/VidmolyExtractor.kt (93%) rename {src/pt/pifansubs => multisrc/overrides/dooplay/default}/AndroidManifest.xml (74%) rename {src/en => multisrc/overrides/dooplay}/pactedanime/res/mipmap-hdpi/ic_launcher.png (100%) rename {src/en => multisrc/overrides/dooplay}/pactedanime/res/mipmap-mdpi/ic_launcher.png (100%) rename {src/en => multisrc/overrides/dooplay}/pactedanime/res/mipmap-xhdpi/ic_launcher.png (100%) rename {src/en => multisrc/overrides/dooplay}/pactedanime/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {src/en => multisrc/overrides/dooplay}/pactedanime/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {src/en => multisrc/overrides/dooplay}/pactedanime/res/web_hi_res_512.png (100%) create mode 100644 multisrc/overrides/dooplay/pactedanime/src/pactedanime.kt create mode 100644 multisrc/overrides/dooplay/pifansubs/additional.gradle rename {src/pt => multisrc/overrides/dooplay}/pifansubs/res/mipmap-hdpi/ic_launcher.png (100%) rename {src/pt => multisrc/overrides/dooplay}/pifansubs/res/mipmap-mdpi/ic_launcher.png (100%) rename {src/pt => multisrc/overrides/dooplay}/pifansubs/res/mipmap-xhdpi/ic_launcher.png (100%) rename {src/pt => multisrc/overrides/dooplay}/pifansubs/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {src/pt => multisrc/overrides/dooplay}/pifansubs/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {src/pt => multisrc/overrides/dooplay}/pifansubs/res/web_hi_res_512.png (100%) create mode 100644 multisrc/overrides/dooplay/pifansubs/src/PiFansubs.kt rename {src/pt/pifansubs/src/eu/kanade/tachiyomi/animeextension/pt/pifansubs => multisrc/overrides/dooplay/pifansubs/src}/extractors/AdoroDoramasExtractor.kt (90%) rename {src/pt/pifansubs/src/eu/kanade/tachiyomi/animeextension/pt/pifansubs => multisrc/overrides/dooplay/pifansubs/src}/extractors/GdrivePlayerExtractor.kt (99%) rename {src/pt/pifansubs/src/eu/kanade/tachiyomi/animeextension/pt/pifansubs => multisrc/overrides/dooplay/pifansubs/src}/extractors/JMVStreamExtractor.kt (78%) create mode 100644 multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dooplay/DooPlay.kt create mode 100644 multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dooplay/DooPlayGenerator.kt rename src/pt/pifansubs/src/eu/kanade/tachiyomi/animeextension/pt/pifansubs/PFUrlActivity.kt => multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dooplay/DooPlayUrlActivity.kt (71%) delete mode 100644 src/en/pactedanime/AndroidManifest.xml delete mode 100644 src/en/pactedanime/build.gradle delete mode 100644 src/en/pactedanime/src/eu/kanade/tachiyomi/animeextension/en/pactedanime/pactedanime.kt delete mode 100644 src/pt/animeshouse/AndroidManifest.xml delete mode 100644 src/pt/animeshouse/build.gradle delete mode 100644 src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse/AHFilters.kt delete mode 100644 src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse/AHUrlActivity.kt delete mode 100644 src/pt/animeshouse/src/eu/kanade/tachiyomi/animeextension/pt/animeshouse/AnimesHouse.kt delete mode 100644 src/pt/cinevision/AndroidManifest.xml delete mode 100644 src/pt/cinevision/build.gradle delete mode 100644 src/pt/cinevision/src/eu/kanade/tachiyomi/animeextension/pt/cinevision/CVFilters.kt delete mode 100644 src/pt/cinevision/src/eu/kanade/tachiyomi/animeextension/pt/cinevision/CVUrlActivity.kt delete mode 100644 src/pt/cinevision/src/eu/kanade/tachiyomi/animeextension/pt/cinevision/CineVision.kt delete mode 100644 src/pt/pifansubs/build.gradle delete mode 100644 src/pt/pifansubs/src/eu/kanade/tachiyomi/animeextension/pt/pifansubs/PFConstants.kt delete mode 100644 src/pt/pifansubs/src/eu/kanade/tachiyomi/animeextension/pt/pifansubs/PFFilters.kt delete mode 100644 src/pt/pifansubs/src/eu/kanade/tachiyomi/animeextension/pt/pifansubs/PiFansubs.kt diff --git a/src/pt/animeshouse/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/dooplay/animeshouse/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from src/pt/animeshouse/res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/dooplay/animeshouse/res/mipmap-hdpi/ic_launcher.png diff --git a/src/pt/animeshouse/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/dooplay/animeshouse/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from src/pt/animeshouse/res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/dooplay/animeshouse/res/mipmap-mdpi/ic_launcher.png diff --git a/src/pt/animeshouse/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/dooplay/animeshouse/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from src/pt/animeshouse/res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/dooplay/animeshouse/res/mipmap-xhdpi/ic_launcher.png diff --git a/src/pt/animeshouse/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/dooplay/animeshouse/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from src/pt/animeshouse/res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/dooplay/animeshouse/res/mipmap-xxhdpi/ic_launcher.png diff --git a/src/pt/animeshouse/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/dooplay/animeshouse/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from src/pt/animeshouse/res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/dooplay/animeshouse/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/dooplay/animeshouse/src/AnimesHouse.kt b/multisrc/overrides/dooplay/animeshouse/src/AnimesHouse.kt new file mode 100644 index 000000000..047654efa --- /dev/null +++ b/multisrc/overrides/dooplay/animeshouse/src/AnimesHouse.kt @@ -0,0 +1,97 @@ +package eu.kanade.tachiyomi.animeextension.pt.animeshouse + +import eu.kanade.tachiyomi.animeextension.pt.animeshouse.extractors.EdifierExtractor +import eu.kanade.tachiyomi.animeextension.pt.animeshouse.extractors.EmbedExtractor +import eu.kanade.tachiyomi.animeextension.pt.animeshouse.extractors.GenericExtractor +import eu.kanade.tachiyomi.animeextension.pt.animeshouse.extractors.JsUnpacker +import eu.kanade.tachiyomi.animeextension.pt.animeshouse.extractors.McpExtractor +import eu.kanade.tachiyomi.animeextension.pt.animeshouse.extractors.MpFourDooExtractor +import eu.kanade.tachiyomi.animeextension.pt.animeshouse.extractors.RedplayBypasser +import eu.kanade.tachiyomi.animesource.model.Video +import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay +import eu.kanade.tachiyomi.network.GET +import eu.kanade.tachiyomi.network.POST +import eu.kanade.tachiyomi.util.asJsoup +import okhttp3.FormBody +import okhttp3.Response +import org.jsoup.nodes.Element + +class AnimesHouse : DooPlay( + "pt-BR", + "Animes House", + "https://animeshouse.net", +) { + override fun headersBuilder() = super.headersBuilder() + .add("Accept-Language", "pt-BR,pt;q=0.9,en-US;q=0.8,en;q=0.7") + + // ============================== Popular =============================== + override fun popularAnimeSelector(): String = "div#featured-titles div.poster" + + // =============================== Latest =============================== + override fun latestUpdatesNextPageSelector(): String = "div.resppages > a > span.icon-chevron-right" + + // ============================ Video Links ============================= + private fun getPlayerUrl(player: Element): String { + val body = FormBody.Builder() + .add("action", "doo_player_ajax") + .add("post", player.attr("data-post")) + .add("nume", player.attr("data-nume")) + .add("type", player.attr("data-type")) + .build() + return client.newCall(POST("$baseUrl/wp-admin/admin-ajax.php", headers, body)) + .execute() + .use { it.asJsoup().selectFirst("iframe")!!.attr("src") } + .let { + if (it.startsWith("/redplay")) { + RedplayBypasser(client, headers).fromUrl(baseUrl + it) + } else { + it + } + } + } + + override fun videoListParse(response: Response): List