From 0be4ce68e8e2614772c0177bcbb7032bf6646a36 Mon Sep 17 00:00:00 2001 From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com> Date: Wed, 15 Mar 2023 06:22:38 -0300 Subject: [PATCH] Convert Cinemathek to multisrc (#1394) --- .../dooplay/cinemathek/additional.gradle | 3 + .../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 .../dooplay/cinemathek/src/Cinemathek.kt | 172 ++++++++++++ .../src}/extractors/FilemoonExtractor.kt | 0 .../cinemathek/src}/extractors/JsUnpacker.kt | 0 .../src}/extractors/StreamlareExtractor.kt | 0 .../multisrc/dooplay/DooPlayGenerator.kt | 1 + src/de/cinemathek/AndroidManifest.xml | 2 - src/de/cinemathek/build.gradle | 16 -- .../de/cinemathek/Cinemathek.kt | 246 ------------------ 24 files changed, 176 insertions(+), 264 deletions(-) create mode 100644 multisrc/overrides/dooplay/cinemathek/additional.gradle rename {src/de => multisrc/overrides/dooplay}/cinemathek/res/mipmap-hdpi/ic_launcher.png (100%) rename {src/de => multisrc/overrides/dooplay}/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_back.png (100%) rename {src/de => multisrc/overrides/dooplay}/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_fore.png (100%) rename {src/de => multisrc/overrides/dooplay}/cinemathek/res/mipmap-mdpi/ic_launcher.png (100%) rename {src/de => multisrc/overrides/dooplay}/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_back.png (100%) rename {src/de => multisrc/overrides/dooplay}/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_fore.png (100%) rename {src/de => multisrc/overrides/dooplay}/cinemathek/res/mipmap-xhdpi/ic_launcher.png (100%) rename {src/de => multisrc/overrides/dooplay}/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_back.png (100%) rename {src/de => multisrc/overrides/dooplay}/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png (100%) rename {src/de => multisrc/overrides/dooplay}/cinemathek/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {src/de => multisrc/overrides/dooplay}/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png (100%) rename {src/de => multisrc/overrides/dooplay}/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png (100%) rename {src/de => multisrc/overrides/dooplay}/cinemathek/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {src/de => multisrc/overrides/dooplay}/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png (100%) rename {src/de => multisrc/overrides/dooplay}/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png (100%) create mode 100644 multisrc/overrides/dooplay/cinemathek/src/Cinemathek.kt rename {src/de/cinemathek/src/eu/kanade/tachiyomi/animeextension/de/cinemathek => multisrc/overrides/dooplay/cinemathek/src}/extractors/FilemoonExtractor.kt (100%) rename {src/de/cinemathek/src/eu/kanade/tachiyomi/animeextension/de/cinemathek => multisrc/overrides/dooplay/cinemathek/src}/extractors/JsUnpacker.kt (100%) rename {src/de/cinemathek/src/eu/kanade/tachiyomi/animeextension/de/cinemathek => multisrc/overrides/dooplay/cinemathek/src}/extractors/StreamlareExtractor.kt (100%) delete mode 100644 src/de/cinemathek/AndroidManifest.xml delete mode 100644 src/de/cinemathek/build.gradle delete mode 100644 src/de/cinemathek/src/eu/kanade/tachiyomi/animeextension/de/cinemathek/Cinemathek.kt diff --git a/multisrc/overrides/dooplay/cinemathek/additional.gradle b/multisrc/overrides/dooplay/cinemathek/additional.gradle new file mode 100644 index 000000000..2916d9ff7 --- /dev/null +++ b/multisrc/overrides/dooplay/cinemathek/additional.gradle @@ -0,0 +1,3 @@ +dependencies { + implementation(project(':lib-streamsb-extractor')) +} diff --git a/src/de/cinemathek/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/dooplay/cinemathek/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from src/de/cinemathek/res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/dooplay/cinemathek/res/mipmap-hdpi/ic_launcher.png diff --git a/src/de/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_back.png b/multisrc/overrides/dooplay/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_back.png similarity index 100% rename from src/de/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_back.png rename to multisrc/overrides/dooplay/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_back.png diff --git a/src/de/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_fore.png b/multisrc/overrides/dooplay/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_fore.png similarity index 100% rename from src/de/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_fore.png rename to multisrc/overrides/dooplay/cinemathek/res/mipmap-hdpi/ic_launcher_adaptive_fore.png diff --git a/src/de/cinemathek/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/dooplay/cinemathek/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from src/de/cinemathek/res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/dooplay/cinemathek/res/mipmap-mdpi/ic_launcher.png diff --git a/src/de/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_back.png b/multisrc/overrides/dooplay/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_back.png similarity index 100% rename from src/de/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_back.png rename to multisrc/overrides/dooplay/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_back.png diff --git a/src/de/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_fore.png b/multisrc/overrides/dooplay/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_fore.png similarity index 100% rename from src/de/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_fore.png rename to multisrc/overrides/dooplay/cinemathek/res/mipmap-mdpi/ic_launcher_adaptive_fore.png diff --git a/src/de/cinemathek/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/dooplay/cinemathek/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from src/de/cinemathek/res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/dooplay/cinemathek/res/mipmap-xhdpi/ic_launcher.png diff --git a/src/de/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_back.png b/multisrc/overrides/dooplay/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_back.png similarity index 100% rename from src/de/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_back.png rename to multisrc/overrides/dooplay/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_back.png diff --git a/src/de/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png b/multisrc/overrides/dooplay/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png similarity index 100% rename from src/de/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png rename to multisrc/overrides/dooplay/cinemathek/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png diff --git a/src/de/cinemathek/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/dooplay/cinemathek/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from src/de/cinemathek/res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/dooplay/cinemathek/res/mipmap-xxhdpi/ic_launcher.png diff --git a/src/de/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png b/multisrc/overrides/dooplay/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png similarity index 100% rename from src/de/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png rename to multisrc/overrides/dooplay/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png diff --git a/src/de/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png b/multisrc/overrides/dooplay/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png similarity index 100% rename from src/de/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png rename to multisrc/overrides/dooplay/cinemathek/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png diff --git a/src/de/cinemathek/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/dooplay/cinemathek/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from src/de/cinemathek/res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/dooplay/cinemathek/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/src/de/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png b/multisrc/overrides/dooplay/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png similarity index 100% rename from src/de/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png rename to multisrc/overrides/dooplay/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png diff --git a/src/de/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png b/multisrc/overrides/dooplay/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png similarity index 100% rename from src/de/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png rename to multisrc/overrides/dooplay/cinemathek/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png diff --git a/multisrc/overrides/dooplay/cinemathek/src/Cinemathek.kt b/multisrc/overrides/dooplay/cinemathek/src/Cinemathek.kt new file mode 100644 index 000000000..438a941d6 --- /dev/null +++ b/multisrc/overrides/dooplay/cinemathek/src/Cinemathek.kt @@ -0,0 +1,172 @@ +package eu.kanade.tachiyomi.animeextension.de.cinemathek + +import androidx.preference.ListPreference +import androidx.preference.MultiSelectListPreference +import androidx.preference.PreferenceScreen +import eu.kanade.tachiyomi.animeextension.de.cinemathek.extractors.FilemoonExtractor +import eu.kanade.tachiyomi.animeextension.de.cinemathek.extractors.StreamlareExtractor +import eu.kanade.tachiyomi.animesource.model.Video +import eu.kanade.tachiyomi.lib.streamsbextractor.StreamSBExtractor +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.Request +import okhttp3.Response +import org.jsoup.nodes.Document +import org.jsoup.nodes.Element +import uy.kohesive.injekt.api.get + +class Cinemathek : DooPlay( + "de", + "Cinemathek", + "https://cinemathek.net", +) { + // ============================== Popular =============================== + override fun popularAnimeSelector(): String = "article.movies div.poster" + + override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/movies/page/$page/") + + override fun popularAnimeNextPageSelector() = latestUpdatesNextPageSelector() + + // =============================== Latest =============================== + override fun latestUpdatesNextPageSelector(): String = "#nextpagination" + + // =========================== Anime Details ============================ + override val additionalInfoItems = listOf("Original", "Start", "Staffeln", "letzte", "Episoden") + + // Dont get the text from the tag + override fun Document.getDescription(): String { + return selectFirst(".wp-content > p")!! + .ownText() + "\n" + } + + // ============================ Video Links ============================= + override fun videoListParse(response: Response): List