From 3f6900d27e5e5ebb15822fe6ea079db4c4d9f5c5 Mon Sep 17 00:00:00 2001 From: hollow <35398794+hollowshiroyuki@users.noreply.github.com> Date: Mon, 25 Sep 2023 11:29:27 +0000 Subject: [PATCH] refactor: Move some extractor to libraries for datalife engine multisrc (#2246) --- lib/streamdav-extractor/build.gradle.kts | 17 ++ .../streamdavextractor/StreamDavExtractor.kt | 17 ++ lib/streamhidevid-extractor/build.gradle.kts | 20 ++ .../StreamHideVidExtractor.kt | 36 ++++ lib/streamhub-extractor/build.gradle.kts | 18 ++ .../streamhubextractor/StreamHubExtractor.kt | 18 ++ lib/streamvid-extractor/build.gradle.kts | 21 ++ .../streamvidextractor/StreamVidExtractor.kt | 22 ++ lib/upstream-extractor/build.gradle.kts | 21 ++ .../upstreamextractor/UpstreamExtractor.kt | 19 ++ lib/vido-extractor/build.gradle.kts | 21 ++ .../lib/vidoextractor/VidoExtractor.kt | 17 ++ .../frenchanime/additional.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 .../frenchanime/res/web_hi_res_512.png | Bin .../frenchanime/src/FrenchAnime.kt | 119 ++++++++++ .../datalifeengine/wiflix/additional.gradle | 11 + .../wiflix/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 4551 bytes .../wiflix/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2536 bytes .../wiflix/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 6052 bytes .../wiflix/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 11027 bytes .../wiflix/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 15808 bytes .../wiflix/res/web_hi_res_512.png | Bin 0 -> 72734 bytes .../datalifeengine/wiflix/src/Wiflix.kt | 104 +++++++++ .../multisrc/datalifeengine/DataLifeEngine.kt | 204 +++--------------- .../datalifeengine/DataLifeEngineGenerator.kt | 22 ++ src/fr/frenchanime/AndroidManifest.xml | 2 - src/fr/frenchanime/build.gradle | 21 -- .../extractors/StreamHideExtractor.kt | 49 ----- .../extractors/StreamVidExtractor.kt | 46 ---- .../extractors/UpstreamExtractor.kt | 38 ---- .../frenchanime/extractors/VidoExtractor.kt | 81 ------- 36 files changed, 550 insertions(+), 406 deletions(-) create mode 100644 lib/streamdav-extractor/build.gradle.kts create mode 100644 lib/streamdav-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamdavextractor/StreamDavExtractor.kt create mode 100644 lib/streamhidevid-extractor/build.gradle.kts create mode 100644 lib/streamhidevid-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamhidevidextractor/StreamHideVidExtractor.kt create mode 100644 lib/streamhub-extractor/build.gradle.kts create mode 100644 lib/streamhub-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamhubextractor/StreamHubExtractor.kt create mode 100644 lib/streamvid-extractor/build.gradle.kts create mode 100644 lib/streamvid-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamvidextractor/StreamVidExtractor.kt create mode 100644 lib/upstream-extractor/build.gradle.kts create mode 100644 lib/upstream-extractor/src/main/java/eu/kanade/tachiyomi/lib/upstreamextractor/UpstreamExtractor.kt create mode 100644 lib/vido-extractor/build.gradle.kts create mode 100644 lib/vido-extractor/src/main/java/eu/kanade/tachiyomi/lib/vidoextractor/VidoExtractor.kt create mode 100644 multisrc/overrides/datalifeengine/frenchanime/additional.gradle rename {src/fr => multisrc/overrides/datalifeengine}/frenchanime/res/mipmap-hdpi/ic_launcher.png (100%) rename {src/fr => multisrc/overrides/datalifeengine}/frenchanime/res/mipmap-mdpi/ic_launcher.png (100%) rename {src/fr => multisrc/overrides/datalifeengine}/frenchanime/res/mipmap-xhdpi/ic_launcher.png (100%) rename {src/fr => multisrc/overrides/datalifeengine}/frenchanime/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {src/fr => multisrc/overrides/datalifeengine}/frenchanime/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {src/fr => multisrc/overrides/datalifeengine}/frenchanime/res/web_hi_res_512.png (100%) create mode 100644 multisrc/overrides/datalifeengine/frenchanime/src/FrenchAnime.kt create mode 100644 multisrc/overrides/datalifeengine/wiflix/additional.gradle create mode 100644 multisrc/overrides/datalifeengine/wiflix/res/mipmap-hdpi/ic_launcher.png create mode 100644 multisrc/overrides/datalifeengine/wiflix/res/mipmap-mdpi/ic_launcher.png create mode 100644 multisrc/overrides/datalifeengine/wiflix/res/mipmap-xhdpi/ic_launcher.png create mode 100644 multisrc/overrides/datalifeengine/wiflix/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 multisrc/overrides/datalifeengine/wiflix/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 multisrc/overrides/datalifeengine/wiflix/res/web_hi_res_512.png create mode 100644 multisrc/overrides/datalifeengine/wiflix/src/Wiflix.kt rename src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime/FrenchAnime.kt => multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/datalifeengine/DataLifeEngine.kt (52%) create mode 100644 multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/datalifeengine/DataLifeEngineGenerator.kt delete mode 100644 src/fr/frenchanime/AndroidManifest.xml delete mode 100644 src/fr/frenchanime/build.gradle delete mode 100644 src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime/extractors/StreamHideExtractor.kt delete mode 100644 src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime/extractors/StreamVidExtractor.kt delete mode 100644 src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime/extractors/UpstreamExtractor.kt delete mode 100644 src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime/extractors/VidoExtractor.kt diff --git a/lib/streamdav-extractor/build.gradle.kts b/lib/streamdav-extractor/build.gradle.kts new file mode 100644 index 000000000..c57d104f1 --- /dev/null +++ b/lib/streamdav-extractor/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + id("com.android.library") + kotlin("android") +} + +android { + compileSdk = AndroidConfig.compileSdk + namespace = "eu.kanade.tachiyomi.lib.streamdavextractor" + + defaultConfig { + minSdk = AndroidConfig.minSdk + } +} + +dependencies { + compileOnly(libs.bundles.common) +} diff --git a/lib/streamdav-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamdavextractor/StreamDavExtractor.kt b/lib/streamdav-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamdavextractor/StreamDavExtractor.kt new file mode 100644 index 000000000..a2754890f --- /dev/null +++ b/lib/streamdav-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamdavextractor/StreamDavExtractor.kt @@ -0,0 +1,17 @@ +package eu.kanade.tachiyomi.lib.streamdavextractor + +import eu.kanade.tachiyomi.animesource.model.Video +import eu.kanade.tachiyomi.network.GET +import eu.kanade.tachiyomi.util.asJsoup +import okhttp3.OkHttpClient + +class StreamDavExtractor(private val client: OkHttpClient) { + fun videosFromUrl(url: String, prefix: String = ""): List