From 5ab164e53704ea0ca8c731ddbea71090e3dc63c8 Mon Sep 17 00:00:00 2001 From: Secozzi <49240133+Secozzi@users.noreply.github.com> Date: Sun, 13 Aug 2023 22:11:16 +0200 Subject: [PATCH] feat(pl/desuonline): Convert to multisrc theme and fix video extractors (#2039) --- .../animestream/desuonline/additional.gradle | 4 + .../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 .../desuonline/res/web_hi_res_512.png | Bin .../animestream/desuonline/src/DesuOnline.kt | 86 +++++++ .../desuonline/src/extractors/CDAExtractor.kt | 110 ++++++++ .../src/extractors/GoogleDriveExtractor.kt | 98 ++++++++ .../animestream/AnimeStreamGenerator.kt | 1 + src/pl/desuonline/AndroidManifest.xml | 2 - src/pl/desuonline/build.gradle | 12 - .../pl/desuonline/DesuOnline.kt | 238 ------------------ 14 files changed, 299 insertions(+), 252 deletions(-) create mode 100644 multisrc/overrides/animestream/desuonline/additional.gradle rename {src/pl => multisrc/overrides/animestream}/desuonline/res/mipmap-hdpi/ic_launcher.png (100%) rename {src/pl => multisrc/overrides/animestream}/desuonline/res/mipmap-mdpi/ic_launcher.png (100%) rename {src/pl => multisrc/overrides/animestream}/desuonline/res/mipmap-xhdpi/ic_launcher.png (100%) rename {src/pl => multisrc/overrides/animestream}/desuonline/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {src/pl => multisrc/overrides/animestream}/desuonline/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {src/pl => multisrc/overrides/animestream}/desuonline/res/web_hi_res_512.png (100%) create mode 100644 multisrc/overrides/animestream/desuonline/src/DesuOnline.kt create mode 100644 multisrc/overrides/animestream/desuonline/src/extractors/CDAExtractor.kt create mode 100644 multisrc/overrides/animestream/desuonline/src/extractors/GoogleDriveExtractor.kt delete mode 100644 src/pl/desuonline/AndroidManifest.xml delete mode 100644 src/pl/desuonline/build.gradle delete mode 100644 src/pl/desuonline/src/eu/kanade/tachiyomi/animeextension/pl/desuonline/DesuOnline.kt diff --git a/multisrc/overrides/animestream/desuonline/additional.gradle b/multisrc/overrides/animestream/desuonline/additional.gradle new file mode 100644 index 000000000..a4b482339 --- /dev/null +++ b/multisrc/overrides/animestream/desuonline/additional.gradle @@ -0,0 +1,4 @@ +dependencies { + implementation(project(':lib-okru-extractor')) + implementation(project(':lib-sibnet-extractor')) +} diff --git a/src/pl/desuonline/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/animestream/desuonline/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from src/pl/desuonline/res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/animestream/desuonline/res/mipmap-hdpi/ic_launcher.png diff --git a/src/pl/desuonline/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/animestream/desuonline/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from src/pl/desuonline/res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/animestream/desuonline/res/mipmap-mdpi/ic_launcher.png diff --git a/src/pl/desuonline/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/animestream/desuonline/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from src/pl/desuonline/res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/animestream/desuonline/res/mipmap-xhdpi/ic_launcher.png diff --git a/src/pl/desuonline/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/animestream/desuonline/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from src/pl/desuonline/res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/animestream/desuonline/res/mipmap-xxhdpi/ic_launcher.png diff --git a/src/pl/desuonline/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/animestream/desuonline/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from src/pl/desuonline/res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/animestream/desuonline/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/src/pl/desuonline/res/web_hi_res_512.png b/multisrc/overrides/animestream/desuonline/res/web_hi_res_512.png similarity index 100% rename from src/pl/desuonline/res/web_hi_res_512.png rename to multisrc/overrides/animestream/desuonline/res/web_hi_res_512.png diff --git a/multisrc/overrides/animestream/desuonline/src/DesuOnline.kt b/multisrc/overrides/animestream/desuonline/src/DesuOnline.kt new file mode 100644 index 000000000..3fc4e1c62 --- /dev/null +++ b/multisrc/overrides/animestream/desuonline/src/DesuOnline.kt @@ -0,0 +1,86 @@ +package eu.kanade.tachiyomi.animeextension.pl.desuonline + +import androidx.preference.ListPreference +import androidx.preference.PreferenceScreen +import eu.kanade.tachiyomi.animeextension.pl.desuonline.extractors.CDAExtractor +import eu.kanade.tachiyomi.animeextension.pl.desuonline.extractors.GoogleDriveExtractor +import eu.kanade.tachiyomi.animesource.model.Video +import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor +import eu.kanade.tachiyomi.lib.sibnetextractor.SibnetExtractor +import eu.kanade.tachiyomi.multisrc.animestream.AnimeStream +import okhttp3.Response +import java.text.SimpleDateFormat +import java.util.Locale + +class DesuOnline : AnimeStream( + "pl", + "desu-online", + "https://desu-online.pl", +) { + override val dateFormatter by lazy { + SimpleDateFormat("d MMMM, yyyy", Locale("pl", "PL")) + } + + private val prefServerKey = "preferred_server" + private val prefServerDefault = "CDA" + + // ============================ Video Links ============================= + + override fun videoListParse(response: Response): List