add StreamSbExtractor to animeflv and fix it on animeworld (#332)
This commit is contained in:
@ -5,7 +5,7 @@ ext {
|
|||||||
extName = 'AnimeFLV'
|
extName = 'AnimeFLV'
|
||||||
pkgNameSuffix = 'es.animeflv'
|
pkgNameSuffix = 'es.animeflv'
|
||||||
extClass = '.AnimeFlv'
|
extClass = '.AnimeFlv'
|
||||||
extVersionCode = 8
|
extVersionCode = 9
|
||||||
libVersion = '12'
|
libVersion = '12'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@ import androidx.preference.ListPreference
|
|||||||
import androidx.preference.PreferenceScreen
|
import androidx.preference.PreferenceScreen
|
||||||
import eu.kanade.tachiyomi.animeextension.es.animeflv.extractors.FembedExtractor
|
import eu.kanade.tachiyomi.animeextension.es.animeflv.extractors.FembedExtractor
|
||||||
import eu.kanade.tachiyomi.animeextension.es.animeflv.extractors.OkruExtractor
|
import eu.kanade.tachiyomi.animeextension.es.animeflv.extractors.OkruExtractor
|
||||||
|
import eu.kanade.tachiyomi.animeextension.es.animeflv.extractors.StreamSBExtractor
|
||||||
import eu.kanade.tachiyomi.animeextension.es.animeflv.extractors.StreamTapeExtractor
|
import eu.kanade.tachiyomi.animeextension.es.animeflv.extractors.StreamTapeExtractor
|
||||||
import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
|
import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
|
||||||
import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
|
import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
|
||||||
@ -111,6 +112,16 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
|
|||||||
for (server in sub.jsonArray) {
|
for (server in sub.jsonArray) {
|
||||||
val url = server.jsonObject["code"]!!.jsonPrimitive.content.replace("\\/", "/")
|
val url = server.jsonObject["code"]!!.jsonPrimitive.content.replace("\\/", "/")
|
||||||
val quality = server.jsonObject["title"]!!.jsonPrimitive.content
|
val quality = server.jsonObject["title"]!!.jsonPrimitive.content
|
||||||
|
if (quality == "SB") {
|
||||||
|
val headers = headers.newBuilder()
|
||||||
|
// .set("Referer", "https://sbplay2.com/")
|
||||||
|
.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")
|
||||||
|
.build()
|
||||||
|
val videos = StreamSBExtractor(client).videosFromUrl(url, headers)
|
||||||
|
videoList.addAll(videos)
|
||||||
|
}
|
||||||
if (quality == "Fembed") {
|
if (quality == "Fembed") {
|
||||||
val videos = FembedExtractor().videosFromUrl(url)
|
val videos = FembedExtractor().videosFromUrl(url)
|
||||||
videoList.addAll(videos)
|
videoList.addAll(videos)
|
||||||
|
@ -0,0 +1,56 @@
|
|||||||
|
package eu.kanade.tachiyomi.animeextension.es.animeflv.extractors
|
||||||
|
|
||||||
|
import android.util.Log
|
||||||
|
import eu.kanade.tachiyomi.animesource.model.Video
|
||||||
|
import eu.kanade.tachiyomi.network.GET
|
||||||
|
import kotlinx.serialization.decodeFromString
|
||||||
|
import kotlinx.serialization.json.Json
|
||||||
|
import kotlinx.serialization.json.JsonObject
|
||||||
|
import kotlinx.serialization.json.jsonObject
|
||||||
|
import okhttp3.Headers
|
||||||
|
import okhttp3.OkHttpClient
|
||||||
|
import org.jsoup.Jsoup
|
||||||
|
|
||||||
|
class StreamSBExtractor(private val client: OkHttpClient) {
|
||||||
|
|
||||||
|
private val hexArray = "0123456789ABCDEF".toCharArray()
|
||||||
|
|
||||||
|
private fun bytesToHex(bytes: ByteArray): String {
|
||||||
|
val hexChars = CharArray(bytes.size * 2)
|
||||||
|
for (j in bytes.indices) {
|
||||||
|
val v = bytes[j].toInt() and 0xFF
|
||||||
|
|
||||||
|
hexChars[j * 2] = hexArray[v ushr 4]
|
||||||
|
hexChars[j * 2 + 1] = hexArray[v and 0x0F]
|
||||||
|
}
|
||||||
|
return String(hexChars)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun videosFromUrl(url: String, headers: Headers): List<Video> {
|
||||||
|
val id = url.substringAfter("e/").substringBefore(".html")
|
||||||
|
Log.i("id", id)
|
||||||
|
val bytes = id.toByteArray()
|
||||||
|
Log.i("bytes", "$bytes")
|
||||||
|
val bytesToHex = bytesToHex(bytes)
|
||||||
|
Log.i("bytesToHex", bytesToHex)
|
||||||
|
val master =
|
||||||
|
"https://embedsb.com/sources40/566d337678566f743674494a7c7c${bytesToHex}7c7c346b6767586d6934774855537c7c73747265616d7362/6565417268755339773461447c7c346133383438333436313335376136323337373433383634376337633465366534393338373136643732373736343735373237613763376334363733353737303533366236333463353333363534366137633763373337343732363536313664373336327c7c6b586c3163614468645a47617c7c73747265616d7362"
|
||||||
|
Log.i("master", master)
|
||||||
|
val json = Json.decodeFromString<JsonObject>(
|
||||||
|
Jsoup.connect(master).ignoreContentType(true).header("watchsb", "streamsb").header("accept-language", "en-US,en;q=0.5").header("Referer", url).header("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0").execute()
|
||||||
|
.body()
|
||||||
|
)
|
||||||
|
Log.i("json", "$json")
|
||||||
|
val masterUrl = json["stream_data"]!!.jsonObject["file"].toString().trim('"')
|
||||||
|
val masterPlaylist = client.newCall(GET(masterUrl, headers)).execute().body!!.string()
|
||||||
|
Log.i("masterplayl", masterPlaylist)
|
||||||
|
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 videoUrl = it.substringAfter("\n").substringBefore("\n")
|
||||||
|
videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
|
||||||
|
}
|
||||||
|
return videoList
|
||||||
|
}
|
||||||
|
}
|
@ -5,7 +5,7 @@ ext {
|
|||||||
extName = 'ANIMEWORLD.tv'
|
extName = 'ANIMEWORLD.tv'
|
||||||
pkgNameSuffix = 'it.animeworld'
|
pkgNameSuffix = 'it.animeworld'
|
||||||
extClass = '.ANIMEWORLD'
|
extClass = '.ANIMEWORLD'
|
||||||
extVersionCode = 1
|
extVersionCode = 2
|
||||||
libVersion = '12'
|
libVersion = '12'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,19 +37,19 @@ class StreamSBExtractor(private val client: OkHttpClient) {
|
|||||||
"https://animeworld.biz/sources40/566d337678566f743674494a7c7c${bytesToHex}7c7c346b6767586d6934774855537c7c73747265616d7362/6565417268755339773461447c7c346133383438333436313335376136323337373433383634376337633465366534393338373136643732373736343735373237613763376334363733353737303533366236333463353333363534366137633763373337343732363536313664373336327c7c6b586c3163614468645a47617c7c73747265616d7362"
|
"https://animeworld.biz/sources40/566d337678566f743674494a7c7c${bytesToHex}7c7c346b6767586d6934774855537c7c73747265616d7362/6565417268755339773461447c7c346133383438333436313335376136323337373433383634376337633465366534393338373136643732373736343735373237613763376334363733353737303533366236333463353333363534366137633763373337343732363536313664373336327c7c6b586c3163614468645a47617c7c73747265616d7362"
|
||||||
Log.i("master", master)
|
Log.i("master", master)
|
||||||
val json = Json.decodeFromString<JsonObject>(
|
val json = Json.decodeFromString<JsonObject>(
|
||||||
Jsoup.connect(master).ignoreContentType(true).header("watchsb", "streamsb").execute()
|
Jsoup.connect(master).ignoreContentType(true).header("watchsb", "streamsb").header("accept-language", "en-US,en;q=0.5").header("Referer", url).header("User-Agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0").execute()
|
||||||
.body()
|
.body()
|
||||||
)
|
)
|
||||||
Log.i("json", "$json")
|
Log.i("json", "$json")
|
||||||
val masterUrl = json["stream_data"]!!.jsonObject["file"].toString().trim('"')
|
val masterUrl = json["stream_data"]!!.jsonObject["file"].toString().trim('"')
|
||||||
val masterPlaylist = client.newCall(GET(masterUrl)).execute().body!!.string()
|
val masterPlaylist = client.newCall(GET(masterUrl, headers)).execute().body!!.string()
|
||||||
Log.i("masterplayl", masterPlaylist)
|
Log.i("masterplayl", masterPlaylist)
|
||||||
val videoList = mutableListOf<Video>()
|
val videoList = mutableListOf<Video>()
|
||||||
masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
|
masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
|
||||||
val quality = "StreamSB:" + it.substringAfter("RESOLUTION=").substringAfter("x")
|
val quality = "StreamSB:" + it.substringAfter("RESOLUTION=").substringAfter("x")
|
||||||
.substringBefore(",") + "p"
|
.substringBefore(",") + "p"
|
||||||
val videoUrl = it.substringAfter("\n").substringBefore("\n")
|
val videoUrl = it.substringAfter("\n").substringBefore("\n")
|
||||||
videoList.add(Video(videoUrl, quality, videoUrl, null))
|
videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
|
||||||
}
|
}
|
||||||
return videoList
|
return videoList
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user