fixed SoraStream sources

This commit is contained in:
hexated 2022-10-16 22:17:47 +07:00
parent 1a3f922a54
commit dc30c372e4
3 changed files with 72 additions and 8 deletions

View file

@ -3,6 +3,8 @@ package com.hexated
import com.lagradost.cloudstream3.* import com.lagradost.cloudstream3.*
import com.lagradost.cloudstream3.LoadResponse.Companion.addActors import com.lagradost.cloudstream3.LoadResponse.Companion.addActors
import com.lagradost.cloudstream3.utils.* import com.lagradost.cloudstream3.utils.*
import com.lagradost.cloudstream3.utils.AppUtils.parseJson
import com.lagradost.cloudstream3.utils.AppUtils.toJson
import org.jsoup.nodes.Element import org.jsoup.nodes.Element
import java.util.* import java.util.*
@ -50,7 +52,8 @@ class GoodPorn : MainAPI() {
val title = this.selectFirst("strong.title")?.text() ?: return null val title = this.selectFirst("strong.title")?.text() ?: return null
val href = fixUrl(this.selectFirst("a")!!.attr("href")) val href = fixUrl(this.selectFirst("a")!!.attr("href"))
val posterUrl = fixUrlNull(this.select("div.img > img").attr("data-original")) val posterUrl = fixUrlNull(this.select("div.img > img").attr("data-original"))
return newMovieSearchResponse(title, href, TvType.Movie) { val previewUrl = fixUrlNull(this.select("div.img > img").attr("data-preview"))
return newMovieSearchResponse(title, LoadData(href, previewUrl).toJson(), TvType.Movie) {
this.posterUrl = posterUrl this.posterUrl = posterUrl
} }
@ -76,7 +79,8 @@ class GoodPorn : MainAPI() {
} }
override suspend fun load(url: String): LoadResponse { override suspend fun load(url: String): LoadResponse {
val document = app.get(url).document val res = parseJson<LoadData>(url)
val document = app.get(res.url.toString()).document
val title = document.selectFirst("div.headline > h1")?.text()?.trim().toString() val title = document.selectFirst("div.headline > h1")?.text()?.trim().toString()
val poster = val poster =
@ -89,12 +93,19 @@ class GoodPorn : MainAPI() {
it.toSearchResult() it.toSearchResult()
} }
return newMovieLoadResponse(title, url, TvType.Movie, url) { return newMovieLoadResponse(title, url, TvType.Movie, LoadData(res.url, res.trailer).toJson()) {
this.posterUrl = poster this.posterUrl = poster
this.plot = description this.plot = description
this.tags = tags this.tags = tags
addActors(actors) addActors(actors)
this.recommendations = recommendations this.recommendations = recommendations
this.trailers = mutableListOf(
TrailerData(
res.trailer.toString(),
referer = "$mainUrl/",
raw = true
)
)
} }
} }
@ -104,8 +115,8 @@ class GoodPorn : MainAPI() {
subtitleCallback: (SubtitleFile) -> Unit, subtitleCallback: (SubtitleFile) -> Unit,
callback: (ExtractorLink) -> Unit callback: (ExtractorLink) -> Unit
): Boolean { ): Boolean {
val res = parseJson<LoadData>(data)
val document = app.get(data).document val document = app.get(res.url.toString()).document
document.select("div.info div:last-child a").map { res -> document.select("div.info div:last-child a").map { res ->
callback.invoke( callback.invoke(
ExtractorLink( ExtractorLink(
@ -121,6 +132,22 @@ class GoodPorn : MainAPI() {
) )
} }
callback.invoke(
ExtractorLink(
"Preview",
"Preview",
res.trailer.toString(),
referer = data,
quality = Qualities.Unknown.value,
headers = mapOf("Range" to "bytes=0-"),
)
)
return true return true
} }
data class LoadData(
val url: String? = null,
val trailer: String? = null,
)
} }

View file

@ -1,12 +1,12 @@
// use an integer for version numbers // use an integer for version numbers
version = 1 version = 2
cloudstream { cloudstream {
language = "en" language = "en"
// All of these properties are optional, you can safely remove them // All of these properties are optional, you can safely remove them
description = "Experimental" description = "#2 best extention based on MultiAPI"
authors = listOf("Hexated", "Sora") authors = listOf("Hexated", "Sora")
/** /**

View file

@ -4,6 +4,7 @@ import android.util.Log
import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonProperty
import com.lagradost.cloudstream3.* import com.lagradost.cloudstream3.*
import com.lagradost.cloudstream3.metaproviders.TmdbProvider import com.lagradost.cloudstream3.metaproviders.TmdbProvider
import com.lagradost.cloudstream3.utils.AppUtils
import com.lagradost.cloudstream3.utils.AppUtils.parseJson import com.lagradost.cloudstream3.utils.AppUtils.parseJson
import com.lagradost.cloudstream3.utils.AppUtils.toJson import com.lagradost.cloudstream3.utils.AppUtils.toJson
import com.lagradost.cloudstream3.utils.ExtractorLink import com.lagradost.cloudstream3.utils.ExtractorLink
@ -217,6 +218,41 @@ class SoraStream : TmdbProvider() {
} }
} }
private suspend fun invokeLocalSources(
url: String,
subtitleCallback: (SubtitleFile) -> Unit,
callback: (ExtractorLink) -> Unit
) {
val doc = app.get(url).document
val script = doc.select("script").find { it.data().contains("\"sources\":[") }?.data()
val sourcesData = script?.substringAfter("\"sources\":[")?.substringBefore("],")
val subData = script?.substringAfter("\"subtitles\":[")?.substringBefore("],")
AppUtils.tryParseJson<List<Sources>>("[$sourcesData]")?.map { source ->
callback.invoke(
ExtractorLink(
this.name,
this.name,
source.url ?: return@map null,
"$mainServerAPI/",
source.quality?.toIntOrNull() ?: Qualities.Unknown.value,
isM3u8 = source.isM3U8,
headers = mapOf("Origin" to mainServerAPI)
)
)
}
AppUtils.tryParseJson<List<Subtitles>>("[$subData]")?.map { sub ->
subtitleCallback.invoke(
SubtitleFile(
sub.lang.toString(),
sub.url ?: return@map null
)
)
}
}
override suspend fun loadLinks( override suspend fun loadLinks(
data: String, data: String,
isCasting: Boolean, isCasting: Boolean,
@ -242,7 +278,8 @@ class SoraStream : TmdbProvider() {
).parsedSafe<LoadLinks>() ).parsedSafe<LoadLinks>()
if (json?.sources.isNullOrEmpty()) { if (json?.sources.isNullOrEmpty()) {
invokeTwoEmbed(res.id, res.season, res.episode, subtitleCallback, callback) // invokeTwoEmbed(res.id, res.season, res.episode, subtitleCallback, callback)
invokeLocalSources(referer, subtitleCallback, callback)
} else { } else {
json?.sources?.map { source -> json?.sources?.map { source ->
callback.invoke( callback.invoke(