From 7dcba7c84e14450434f73ae3c2a61b65538bc24a Mon Sep 17 00:00:00 2001 From: notlaww <97511605+notlaww@users.noreply.github.com> Date: Wed, 14 Sep 2022 14:36:03 +0800 Subject: [PATCH] Fixed streamsb extractors (#863) --- src/en/animension/build.gradle | 2 +- .../en/animension/Animension.kt | 31 ++----------- .../extractors/StreamSBExtractor.kt | 7 +-- src/en/asianload/build.gradle | 2 +- .../animeextension/en/asianload/AsianLoad.kt | 40 ++++------------ .../asianload/extractors/StreamSBExtractor.kt | 5 +- src/en/dramacool/build.gradle | 2 +- .../animeextension/en/dramacool/DramaCool.kt | 46 +++++++------------ .../dramacool/extractors/StreamSBExtractor.kt | 5 +- 9 files changed, 38 insertions(+), 102 deletions(-) diff --git a/src/en/animension/build.gradle b/src/en/animension/build.gradle index 5d389b9ba..ed64ceb15 100644 --- a/src/en/animension/build.gradle +++ b/src/en/animension/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Animension' pkgNameSuffix = 'en.animension' extClass = '.Animension' - extVersionCode = 3 + extVersionCode = 4 libVersion = '13' } diff --git a/src/en/animension/src/eu/kanade/tachiyomi/animeextension/en/animension/Animension.kt b/src/en/animension/src/eu/kanade/tachiyomi/animeextension/en/animension/Animension.kt index 1c3fba4d2..440f3be29 100644 --- a/src/en/animension/src/eu/kanade/tachiyomi/animeextension/en/animension/Animension.kt +++ b/src/en/animension/src/eu/kanade/tachiyomi/animeextension/en/animension/Animension.kt @@ -100,14 +100,9 @@ class Animension() : ConfigurableAnimeSource, AnimeHttpSource() { for (key in videos.keys.toList()) { val url = videos[key]!!.jsonPrimitive.content when { - url.contains("sbembed.com") || url.contains("sbembed1.com") || url.contains("sbplay.org") || - url.contains("sbvideo.net") || url.contains("streamsb.net") || url.contains("sbplay.one") || - url.contains("cloudemb.com") || url.contains("playersb.com") || url.contains("tubesb.com") || - url.contains("sbplay1.com") || url.contains("embedsb.com") || url.contains("watchsb.com") || - url.contains("sbplay2.com") || url.contains("japopav.tv") || url.contains("viewsb.com") || - url.contains("sbfast") || url.contains("sbfull.com") || url.contains("javplaya.com") || - url.contains("ssbstream.net") || url.contains("p1ayerjavseen.com") || url.contains("sbthe.com") || - url.contains("streamsss.net") || url.contains("sbplay2.xyz") // || url.contains("") + url.contains("sbplay2.com") || url.contains("japopav.tv") || url.contains("viewsb.com") || + url.contains("sbfast") || url.contains("sbfull.com") || url.contains("ssbstream.net") || + url.contains("p1ayerjavseen.com") || url.contains("streamsss.net") || url.contains("sbplay2.xyz") -> { val headers = headers.newBuilder() .set("Referer", url) @@ -116,7 +111,7 @@ class Animension() : ConfigurableAnimeSource, AnimeHttpSource() { "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0" ) .set("Accept-Language", "en-US,en;q=0.5") - .set("watchsb", "streamsb") + .set("watchsb", "sbstream") .build() videoList.addAll(StreamSBExtractor(client).videosFromUrl(url, headers)) } @@ -128,23 +123,7 @@ class Animension() : ConfigurableAnimeSource, AnimeHttpSource() { } } - url.contains("fembed.com") || url.contains("anime789.com") || url.contains("24hd.club") || - url.contains("fembad.org") || url.contains("vcdn.io") || url.contains("sharinglink.club") || - url.contains("moviemaniac.org") || url.contains("votrefiles.club") || url.contains("femoload.xyz") || - url.contains("albavido.xyz") || url.contains("feurl.com") || url.contains("dailyplanet.pw") || - url.contains("ncdnstm.com") || url.contains("jplayer.net") || url.contains("xstreamcdn.com") || - url.contains("fembed-hd.com") || url.contains("gcloud.live") || url.contains("vcdnplay.com") || - url.contains("superplayxyz.club") || url.contains("vidohd.com") || url.contains("vidsource.me") || - url.contains("cinegrabber.com") || url.contains("votrefile.xyz") || url.contains("zidiplay.com") || - url.contains("ndrama.xyz") || url.contains("fcdn.stream") || url.contains("mediashore.org") || - url.contains("suzihaza.com") || url.contains("there.to") || url.contains("femax20.com") || - url.contains("javstream.top") || url.contains("viplayer.cc") || url.contains("sexhd.co") || - url.contains("fembed.net") || url.contains("mrdhan.com") || url.contains("votrefilms.xyz") || - url.contains("fembed9hd.com") || url.contains("embedsito.com") || url.contains("dutrag.com") || - url.contains("youvideos.ru") || url.contains("streamm4u.club") || // url.contains("") || - url.contains("moviepl.xyz") || url.contains("asianclub.tv") || // url.contains("") || - url.contains("vidcloud.fun") || url.contains("fplayer.info") || // url.contains("") || - url.contains("diasfem.com") || url.contains("javpoll.com") // url.contains("") + url.contains("fembed") -> { val videos = FembedExtractor().videosFromUrl(url) if (videos != null) { diff --git a/src/en/animension/src/eu/kanade/tachiyomi/animeextension/en/animension/extractors/StreamSBExtractor.kt b/src/en/animension/src/eu/kanade/tachiyomi/animeextension/en/animension/extractors/StreamSBExtractor.kt index 79f9498f4..3edffa1d1 100644 --- a/src/en/animension/src/eu/kanade/tachiyomi/animeextension/en/animension/extractors/StreamSBExtractor.kt +++ b/src/en/animension/src/eu/kanade/tachiyomi/animeextension/en/animension/extractors/StreamSBExtractor.kt @@ -27,10 +27,7 @@ class StreamSBExtractor(private val client: OkHttpClient) { fun videosFromUrl(url: String, headers: Headers): List