Fixed streamsb extractors (#863)

src/en/animension/build.gradle

@@ -5,7 +5,7 @@ ext {
     extName = 'Animension'
     pkgNameSuffix = 'en.animension'
     extClass = '.Animension'
-    extVersionCode = 3
+    extVersionCode = 4
     libVersion = '13'
 }
 

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) {

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<Video> {
         val sbUrl = url.substringBefore("/e")
         val id = url.substringAfter("e/").substringBefore("?")
-        val bytes = id.toByteArray()
-        val bytesToHex = bytesToHex(bytes)
-        val master = "$sbUrl/sources43/566d337678566f743674494a7c7c${bytesToHex}7c7c346b6767586d6934774855537c7c73747265616d7362/6565417268755339773461447c7c346133383438333436313335376136323337373433383634376337633465366534393338373136643732373736343735373237613763376334363733353737303533366236333463353333363534366137633763373337343732363536313664373336327c7c6b586c3163614468645a47617c7c73747265616d7362"
-        // "https://sbplay2.com/sourcesx38/4f395a53447166635a3836787c7c${bytesToHex}7c7c7965344f61436d467845586c7c7c73747265616d7362/6e56314c77564e6a6c6631737c7c333735383537363836633662373635323636376133343637376337633335346334343332353735343333366633343635346336383763376334313561373633343761346133303665363837363537353937633763373337343732363536313664373336327c7c395239444c3961626d634e6a7c7c73747265616d7362"
+        val master = "$sbUrl/sources48/${bytesToHex("||$id||||streamsb".toByteArray())}/"
         val json = Json.decodeFromString<JsonObject>(
             client.newCall(GET(master, headers))
                 .execute().body!!.string()
@@ -39,7 +36,7 @@ class StreamSBExtractor(private val client: OkHttpClient) {
         val masterPlaylist = client.newCall(GET(masterUrl, headers)).execute().body!!.string()
         val videoList = mutableListOf<Video>()
         masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
-            val quality = "StreamSB: " + it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
+            val quality = "StreamSB:" + it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
             val videoUrl = it.substringAfter("\n").substringBefore("\n")
             videoList.add(Video(videoUrl, quality, videoUrl, headers = headers))
         }

src/en/asianload/build.gradle

@@ -5,7 +5,7 @@ ext {
     extName = 'AsianLoad'
     pkgNameSuffix = 'en.asianload'
     extClass = '.AsianLoad'
-    extVersionCode = 15
+    extVersionCode = 16
     libVersion = '13'
 }
 

src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/AsianLoad.kt

@@ -17,7 +17,6 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -105,22 +104,19 @@ class AsianLoad : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val elements = document.select(videoListSelector())
         for (element in elements) {
             val url = element.attr("data-video")
-            val location = element.ownerDocument().location()
-            val videoHeaders = Headers.headersOf("Referer", location)
             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("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)
-                        .set("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0")
+                        .set(
+                            "User-Agent",
+                            "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()
                     val videos = StreamSBExtractor(client).videosFromUrl(url, headers)
                     videoList.addAll(videos)
@@ -131,25 +127,7 @@ class AsianLoad : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                         videoList.add(video)
                     }
                 }
-                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("") ||
-                    url.contains("embedsito.com") || url.contains("dutrag.com") || // url.contains("") ||
-                    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)
                     videoList.addAll(videos)

src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/StreamSBExtractor.kt

@@ -27,10 +27,7 @@ class StreamSBExtractor(private val client: OkHttpClient) {
     fun videosFromUrl(url: String, headers: Headers): List<Video> {
         val sbUrl = url.substringBefore("/e")
         val id = url.substringAfter("e/").substringBefore("?")
-        val bytes = id.toByteArray()
-        val bytesToHex = bytesToHex(bytes)
-        val master = "$sbUrl/sources43/566d337678566f743674494a7c7c${bytesToHex}7c7c346b6767586d6934774855537c7c73747265616d7362/6565417268755339773461447c7c346133383438333436313335376136323337373433383634376337633465366534393338373136643732373736343735373237613763376334363733353737303533366236333463353333363534366137633763373337343732363536313664373336327c7c6b586c3163614468645a47617c7c73747265616d7362"
-        // "https://sbplay2.com/sourcesx38/4f395a53447166635a3836787c7c${bytesToHex}7c7c7965344f61436d467845586c7c7c73747265616d7362/6e56314c77564e6a6c6631737c7c333735383537363836633662373635323636376133343637376337633335346334343332353735343333366633343635346336383763376334313561373633343761346133303665363837363537353937633763373337343732363536313664373336327c7c395239444c3961626d634e6a7c7c73747265616d7362"
+        val master = "$sbUrl/sources48/${bytesToHex("||$id||||streamsb".toByteArray())}/"
         val json = Json.decodeFromString<JsonObject>(
             client.newCall(GET(master, headers))
                 .execute().body!!.string()

src/en/dramacool/build.gradle

@@ -5,7 +5,7 @@ ext {
     extName = 'DramaCool'
     pkgNameSuffix = 'en.dramacool'
     extClass = '.DramaCool'
-    extVersionCode = 21
+    extVersionCode = 22
     libVersion = '13'
 }
 

src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/DramaCool.kt

@@ -70,7 +70,7 @@ class DramaCool : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val episode = SEpisode.create()
         val epNum = element.select("h3").text().substringAfter("Episode ")
         episode.setUrlWithoutDomain(element.attr("abs:href"))
-        episode.name = element.select("span.type").text() + " Episode: " + element.select("h3").text().substringAfter("Episode ")
+        episode.name = element.select("span.type").text() + ": Episode " + element.select("h3").text().substringAfter("Episode ")
         episode.episode_number = when {
             (epNum.isNotEmpty()) -> epNum.toFloat()
             else -> 1F
@@ -99,20 +99,18 @@ class DramaCool : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         for (element in elements) {
             val url = element.attr("data-video")
             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)
-                        .set("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0")
+                        .set(
+                            "User-Agent",
+                            "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()
                     val videos = StreamSBExtractor(client).videosFromUrl(url, headers)
                     videoList.addAll(videos)
@@ -125,24 +123,14 @@ class DramaCool : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     }
                 }
 
-                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("") ||
-                    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("streamtape") -> {
+                    val video = StreamTapeExtractor(client).videoFromUrl(url)
+                    if (video != null) {
+                        videoList.add(video)
+                    }
+                }
+
+                url.contains("fembed")
                 -> {
                     val videos = FembedExtractor().videosFromUrl(url)
                     if (videos != null) {

src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/StreamSBExtractor.kt

@@ -27,10 +27,7 @@ class StreamSBExtractor(private val client: OkHttpClient) {
     fun videosFromUrl(url: String, headers: Headers): List<Video> {
         val sbUrl = url.substringBefore("/e")
         val id = url.substringAfter("e/").substringBefore("?")
-        val bytes = id.toByteArray()
-        val bytesToHex = bytesToHex(bytes)
-        val master = "$sbUrl/sources43/566d337678566f743674494a7c7c${bytesToHex}7c7c346b6767586d6934774855537c7c73747265616d7362/6565417268755339773461447c7c346133383438333436313335376136323337373433383634376337633465366534393338373136643732373736343735373237613763376334363733353737303533366236333463353333363534366137633763373337343732363536313664373336327c7c6b586c3163614468645a47617c7c73747265616d7362"
-        // "https://sbplay2.com/sourcesx38/4f395a53447166635a3836787c7c${bytesToHex}7c7c7965344f61436d467845586c7c7c73747265616d7362/6e56314c77564e6a6c6631737c7c333735383537363836633662373635323636376133343637376337633335346334343332353735343333366633343635346336383763376334313561373633343761346133303665363837363537353937633763373337343732363536313664373336327c7c395239444c3961626d634e6a7c7c73747265616d7362"
+        val master = "$sbUrl/sources48/${bytesToHex("||$id||||streamsb".toByteArray())}/"
         val json = Json.decodeFromString<JsonObject>(
             client.newCall(GET(master, headers))
                 .execute().body!!.string()