diff --git a/multisrc/overrides/animestream/animeytes/src/AnimeYTES.kt b/multisrc/overrides/animestream/animeytes/src/AnimeYTES.kt index 7032193532..af918c13b1 100644 --- a/multisrc/overrides/animestream/animeytes/src/AnimeYTES.kt +++ b/multisrc/overrides/animestream/animeytes/src/AnimeYTES.kt @@ -5,7 +5,6 @@ import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor import eu.kanade.tachiyomi.lib.sendvidextractor.SendvidExtractor import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor import eu.kanade.tachiyomi.multisrc.animestream.AnimeStream -import eu.kanade.tachiyomi.network.GET class AnimeYTES : AnimeStream( "es", diff --git a/multisrc/overrides/animestream/tiodonghua/src/Tiodonghua.kt b/multisrc/overrides/animestream/tiodonghua/src/Tiodonghua.kt index e001157cbd..20e287a171 100644 --- a/multisrc/overrides/animestream/tiodonghua/src/Tiodonghua.kt +++ b/multisrc/overrides/animestream/tiodonghua/src/Tiodonghua.kt @@ -1,14 +1,11 @@ package eu.kanade.tachiyomi.animeextension.es.tiodonghua -import androidx.preference.ListPreference -import androidx.preference.PreferenceScreen import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor import eu.kanade.tachiyomi.multisrc.animestream.AnimeStream -import eu.kanade.tachiyomi.network.GET class Tiodonghua : AnimeStream( "es", @@ -16,7 +13,6 @@ class Tiodonghua : AnimeStream( "https://anime.tiodonghua.com", ) { - // ============================ Video Links ============================= private val okruExtractor by lazy { OkruExtractor(client) } private val voeExtractor by lazy { VoeExtractor(client) } @@ -35,5 +31,4 @@ class Tiodonghua : AnimeStream( override val fetchFilters: Boolean get() = false - } diff --git a/multisrc/overrides/dooplay/animeshouse/src/AnimesHouse.kt b/multisrc/overrides/dooplay/animeshouse/src/AnimesHouse.kt index 68c5014b52..d079ee07e6 100644 --- a/multisrc/overrides/dooplay/animeshouse/src/AnimesHouse.kt +++ b/multisrc/overrides/dooplay/animeshouse/src/AnimesHouse.kt @@ -33,6 +33,8 @@ class AnimesHouse : DooPlay( override fun latestUpdatesNextPageSelector(): String = "div.resppages > a > span.icon-chevron-right" // ============================ Video Links ============================= + private val redplayBypasser by lazy { RedplayBypasser(client, headers) } + private fun getPlayerUrl(player: Element): String { val body = FormBody.Builder() .add("action", "doo_player_ajax") @@ -45,8 +47,10 @@ class AnimesHouse : DooPlay( .use { it.asJsoup().selectFirst("iframe")!!.attr("src") } .let { when { - it.startsWith("/redplay") -> - RedplayBypasser(client, headers).fromUrl(baseUrl + it) + it.contains("/redplay") -> { + val url = if (it.startsWith("/")) baseUrl + it else it + redplayBypasser.fromUrl(url) + } else -> it } } @@ -62,6 +66,12 @@ class AnimesHouse : DooPlay( } } + private val embedExtractor by lazy { EmbedExtractor(headers) } + private val edifierExtractor by lazy { EdifierExtractor(client, headers) } + private val mp4dooExtractor by lazy { MpFourDooExtractor(client, headers) } + private val genericExtractor by lazy { GenericExtractor(client, headers) } + private val mcpExtractor by lazy { McpExtractor(client, headers) } + private fun getPlayerVideos(url: String): List