Merge remote-tracking branch 'origin/master'

This commit is contained in:
LagradOst 2022-07-25 23:51:50 +02:00
commit 390bfca05b
12 changed files with 227 additions and 51 deletions

View file

@ -114,8 +114,11 @@
<data android:scheme="https" android:host="secretlink.xyz" android:pathPrefix="/"/>
<data android:scheme="https" android:host="hdm.to" android:pathPrefix="/"/>
<data android:scheme="https" android:host="theflix.to" android:pathPrefix="/"/>
<data android:scheme="https" android:host="streamingcommunity.org" android:pathPrefix="/"/>
<data android:scheme="https" android:host="www.tantifilm.rodeo" android:pathPrefix="/"/>
<data android:scheme="https" android:host="streamingcommunity.best" android:pathPrefix="/"/>
<data android:scheme="https" android:host="altadefinizione.tienda" android:pathPrefix="/"/>
<data android:scheme="https" android:host="cb01.rip" android:pathPrefix="/"/>
<data android:scheme="https" android:host="filmpertutti.love" android:pathPrefix="/"/>
<data android:scheme="https" android:host="www.tantifilm.nl" android:pathPrefix="/"/>
<data android:scheme="https" android:host="v2.apimdb.net" android:pathPrefix="/"/>
<data android:scheme="https" android:host="www.wcostream.com" android:pathPrefix="/"/>
<data android:scheme="https" android:host="gogoanime.film" android:pathPrefix="/"/>

View file

@ -85,6 +85,7 @@ object APIHolder {
KdramaHoodProvider(),
AkwamProvider(),
MyCimaProvider(),
CimaNowProvider(),
EgyBestProvider(),
FaselHDProvider(),
SoaptwoDayProvider(),

View file

@ -10,7 +10,7 @@ import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
class AltadefinizioneProvider : MainAPI() {
override var lang = "it"
override var mainUrl = "https://altadefinizione.hair"
override var mainUrl = "https://altadefinizione.tienda"
override var name = "Altadefinizione"
override val hasMainPage = true
override val hasChromecastSupport = true

View file

@ -0,0 +1,163 @@
package com.lagradost.cloudstream3.movieproviders
import com.lagradost.cloudstream3.*
import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.Qualities
import org.jsoup.nodes.Element
class CimaNowProvider : MainAPI() {
override var lang = "ar"
override var mainUrl = "https://cimanow.cc"
override var name = "CimaNow"
override val usesWebView = false
override val hasMainPage = true
override val supportedTypes = setOf(TvType.TvSeries, TvType.Movie)
private fun String.getIntFromText(): Int? {
return Regex("""\d+""").find(this)?.groupValues?.firstOrNull()?.toIntOrNull()
}
private fun Element.toSearchResponse(): SearchResponse? {
val url = this.attr("href")
val posterUrl = select("img")?.attr("data-src")
var title = select("li[aria-label=\"title\"]").html().replace(" <em>.*|\\\\n".toRegex(), "").replace("&nbsp;", "")
val year = select("li[aria-label=\"year\"]").text().toIntOrNull()
val tvType = if (url.contains("فيلم|مسرحية|حفلات".toRegex())) TvType.Movie else TvType.TvSeries
val quality = select("li[aria-label=\"ribbon\"]").first()?.text()?.replace(" |-|1080|720".toRegex(), "")
val dubEl = select("li[aria-label=\"ribbon\"]:nth-child(2)").isNotEmpty()
val dubStatus = if(dubEl) select("li[aria-label=\"ribbon\"]:nth-child(2)").text().contains("مدبلج")
else select("li[aria-label=\"ribbon\"]:nth-child(1)").text().contains("مدبلج")
if(dubStatus) title = "$title (مدبلج)"
return MovieSearchResponse(
"$title ${select("li[aria-label=\"ribbon\"]:contains(الموسم)").text()}",
url,
this@CimaNowProvider.name,
tvType,
posterUrl,
year,
null,
quality = getQualityFromString(quality)
)
}
override suspend fun getMainPage(): HomePageResponse {
val doc = app.get("$mainUrl/home", headers = mapOf("user-agent" to "MONKE")).document
val pages = doc.select("section").not("section:contains(أختر وجهتك المفضلة)").not("section:contains(تم اضافته حديثاً)").apmap {
val name = it.select("span").html().replace("<em>.*| <i c.*".toRegex(), "")
val list = it.select("a").mapNotNull {
if(it.attr("href").contains("$mainUrl/category/|$mainUrl/الاكثر-مشاهدة/".toRegex())) return@mapNotNull null
it.toSearchResponse()
}
HomePageList(name, list)
}
return HomePageResponse(pages)
}
override suspend fun search(query: String): List<SearchResponse> {
val result = arrayListOf<SearchResponse>()
val doc = app.get("$mainUrl/page/1/?s=$query").document
val paginationElement = doc.select("ul[aria-label=\"pagination\"]")
doc.select("section article a").map {
val postUrl = it.attr("href")
if(it.select("li[aria-label=\"episode\"]").isNotEmpty()) return@map
if(postUrl.contains("$mainUrl/expired-download/|$mainUrl/افلام-اون-لاين/".toRegex())) return@map
result.add(it.toSearchResponse()!!)
}
if(paginationElement.isNotEmpty()) {
val max = paginationElement.select("li").not("li.active").last()?.text()?.toIntOrNull()
if (max != null) {
if(max > 5) return result.distinct().sortedBy { it.name }
(2..max!!).toList().apmap {
app.get("$mainUrl/page/$it/?s=$query\"").document.select("section article a").map { element ->
val postUrl = element.attr("href")
if(element.select("li[aria-label=\"episode\"]").isNotEmpty()) return@map
if(postUrl.contains("$mainUrl/expired-download/|$mainUrl/افلام-اون-لاين/".toRegex())) return@map
result.add(element.toSearchResponse()!!)
}
}
}
}
return result.distinct().sortedBy { it.name }
}
override suspend fun load(url: String): LoadResponse {
val doc = app.get(url).document
val posterUrl = doc.select("body > script:nth-child(3)").html().replace(".*,\"image\":\"|\".*".toRegex(),"").ifEmpty { doc.select("meta[property=\"og:image\"]").attr("content") }
val year = doc.select("article ul:nth-child(1) li a").last()?.text()?.toIntOrNull()
val title = doc.select("title").text().split(" | ")[0]
val isMovie = title.contains("فيلم|حفلات|مسرحية".toRegex())
val youtubeTrailer = doc.select("iframe")?.attr("src")
val synopsis = doc.select("ul#details li:contains(لمحة) p").text()
val tags = doc.select("article ul").first()?.select("li")?.map { it.text() }
val recommendations = doc.select("ul#related li").map { element ->
MovieSearchResponse(
apiName = this@CimaNowProvider.name,
url = element.select("a").attr("href"),
name = element.select("img:nth-child(2)").attr("alt"),
posterUrl = element.select("img:nth-child(2)").attr("src")
)
}
return if (isMovie) {
newMovieLoadResponse(
title,
url,
TvType.Movie,
"$url/watching"
) {
this.posterUrl = posterUrl
this.year = year
this.recommendations = recommendations
this.plot = synopsis
this.tags = tags
addTrailer(youtubeTrailer)
}
} else {
val episodes = doc.select("ul#eps li").map { episode ->
Episode(
episode.select("a").attr("href")+"/watching",
episode.select("a img:nth-child(2)").attr("alt"),
doc.select("span[aria-label=\"season-title\"]").html().replace("<p>.*|\n".toRegex(), "").getIntFromText(),
episode.select("a em").text().toIntOrNull(),
episode.select("a img:nth-child(2)").attr("src")
)
}
newTvSeriesLoadResponse(title, url, TvType.TvSeries, episodes.distinct().sortedBy { it.episode }) {
this.posterUrl = posterUrl
this.tags = tags
this.year = year
this.plot = synopsis
this.recommendations = recommendations
addTrailer(youtubeTrailer)
}
}
}
override suspend fun loadLinks(
data: String,
isCasting: Boolean,
subtitleCallback: (SubtitleFile) -> Unit,
callback: (ExtractorLink) -> Unit
): Boolean {
app.get("$data").document.select("ul#download [aria-label=\"quality\"]").forEach {
val name = if(it.select("span").text().contains("فائق السرعة")) "Fast Servers" else "Servers"
it.select("a").forEach { media ->
callback.invoke(
ExtractorLink(
source = this.name,
name = name,
url = media.attr("href"),
referer = this.mainUrl,
quality = media.text().getIntFromText() ?: Qualities.Unknown.value
)
)
}
}
return true
}
}

View file

@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
import com.lagradost.cloudstream3.*
import com.lagradost.cloudstream3.utils.AppUtils.parseJson
import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
import org.jsoup.nodes.Element
class EgyBestProvider : MainAPI() {
@ -78,6 +79,7 @@ class EgyBestProvider : MainAPI() {
val posterUrl = doc.select("div.movie_img a img")?.attr("src")
val year = doc.select("div.movie_title h1 a")?.text()?.toIntOrNull()
val title = doc.select("div.movie_title h1 span").text()
val youtubeTrailer = doc.select("div.play")?.attr("url")
val synopsis = doc.select("div.mbox").firstOrNull {
it.text().contains("القصة")
@ -112,6 +114,7 @@ class EgyBestProvider : MainAPI() {
this.plot = synopsis
this.tags = tags
this.actors = actors
addTrailer(youtubeTrailer)
}
} else {
val episodes = ArrayList<Episode>()
@ -153,6 +156,7 @@ class EgyBestProvider : MainAPI() {
this.year = year
this.plot = synopsis
this.actors = actors
addTrailer(youtubeTrailer)
}
}
}

View file

@ -18,9 +18,8 @@ class FilmanProvider : MainAPI() {
)
override suspend fun getMainPage(): HomePageResponse {
val response = app.get(mainUrl).text
val document = Jsoup.parse(response)
val lists = document.select(".item-list,.series-list")
val document = app.get(mainUrl).document
val lists = document.select("div#item-list")
val categories = ArrayList<HomePageList>()
for (l in lists) {
val title = l.parent()!!.select("h3").text()
@ -53,17 +52,16 @@ class FilmanProvider : MainAPI() {
override suspend fun search(query: String): List<SearchResponse> {
val url = "$mainUrl/wyszukiwarka?phrase=$query"
val response = app.get(url).text
val document = Jsoup.parse(response)
val lists = document.select("#advanced-search > div")
val movies = lists[1].select(".item")
val series = lists[3].select(".item")
val document = app.get(url).document
val lists = document.select("div#item-list")
val movies = lists[0].select(".poster > a")
val series = lists[1].select(".poster > a")
if (movies.isEmpty() && series.isEmpty()) return ArrayList()
fun getVideos(type: TvType, items: Elements): List<SearchResponse> {
return items.map { i ->
val href = i.attr("href")
val img = i.selectFirst("> img")!!.attr("src").replace("/thumb/", "/big/")
val name = i.selectFirst(".title")!!.text()
val name = i.attr("title")
if (type === TvType.TvSeries) {
TvSeriesSearchResponse(
name,
@ -83,8 +81,7 @@ class FilmanProvider : MainAPI() {
}
override suspend fun load(url: String): LoadResponse {
val response = app.get(url).text
val document = Jsoup.parse(response)
val document = app.get(url).document
val documentTitle = document.select("title").text().trim()
if (documentTitle.startsWith("Logowanie")) {

View file

@ -14,7 +14,7 @@ import org.jsoup.nodes.Element
class FilmpertuttiProvider : MainAPI() {
override var lang = "it"
override var mainUrl = "https://www.filmpertutti.love"
override var mainUrl = "https://filmpertutti.love"
override var name = "Filmpertutti"
override val hasMainPage = true
override val hasChromecastSupport = true

View file

@ -10,7 +10,7 @@ import org.jsoup.nodes.Element
import java.util.*
class LayarKacaProvider : MainAPI() {
override var mainUrl = "https://149.56.24.226"
override var mainUrl = "https://lk21.xn--6frz82g"
override var name = "LayarKaca"
override val hasMainPage = true
override var lang = "id"
@ -214,7 +214,12 @@ class LayarKacaProvider : MainAPI() {
}
sources.apmap {
loadExtractor(it, data, callback)
val link = if(it.startsWith("https://layarkacaxxi.icu")) {
it.substringBeforeLast("/")
} else {
it
}
loadExtractor(link, data, callback)
}
return true

View file

@ -51,7 +51,7 @@ data class Image(
@JsonProperty("proxy_id") val proxyID: Long,
@JsonProperty("url") val url: String,
@JsonProperty("type") val type: String,
@JsonProperty("sc_url") val scURL: String,
// @JsonProperty("sc_url") val scURL: String,
// @JsonProperty("proxy") val proxy: Proxy,
// @JsonProperty("server") val server: Proxy
)
@ -128,7 +128,7 @@ data class TrailerElement(
class StreamingcommunityProvider : MainAPI() {
override var lang = "it"
override var mainUrl = "https://streamingcommunity.org"
override var mainUrl = "https://streamingcommunity.best"
override var name = "Streamingcommunity"
override val hasMainPage = true
override val hasChromecastSupport = true

View file

@ -9,7 +9,7 @@ import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
class TantifilmProvider : MainAPI() {
override var lang = "it"
override var mainUrl = "https://www.tantifilm.pics"
override var mainUrl = "https://www.tantifilm.nl"
override var name = "Tantifilm"
override val hasMainPage = true
override val hasChromecastSupport = true

View file

@ -231,30 +231,27 @@ class XcineProvider : MainAPI() {
cookies = parsed.cookies + cookies,
).text
val jsonRegex = Regex("""(vip_|)source.*?(\[.*);""")
val json = jsonRegex.findAll(response)
val urlRegex = Regex("""file['"].*?['"]([^'"]*)""")
val link = urlRegex.find(response)?.groupValues!![1]
val files = json.mapNotNull {
(it.groupValues.getOrNull(1) == "vip_") to (
tryParseJson<List<File>>(it.groupValues.getOrNull(2)) ?: return@mapNotNull null)
}
// files.forEach { (isVip, list) ->
// list.forEach file@{ file ->
// if (file.file == null) return@file
callback.invoke(
ExtractorLink(
this.name,
this.name,
link.replace("\\", ""),
this.mainUrl,
// file.label?.getIntFromText() ?:
Qualities.Unknown.value,
true
// file.type?.contains("hls", ignoreCase = true) == true,
)
)
// }
// }
files.forEach { (isVip, list) ->
list.forEach file@{ file ->
if (file.file == null) return@file
callback.invoke(
ExtractorLink(
this.name,
this.name + if (isVip) " VIP" else "",
file.file.replace("\\", ""),
this.mainUrl,
file.label?.getIntFromText() ?: Qualities.Unknown.value,
file.type?.contains("hls", ignoreCase = true) == true,
)
)
}
}
return files.sumOf { it.second.size } > 0
return true // files.sumOf { it.second.size } > 0
}
}

View file

@ -21,7 +21,7 @@
"language": "it",
"name": "Altadefinizione",
"status": 1,
"url": "https://altadefinizione.hair"
"url": "https://altadefinizione.tienda"
},
"AniflixProvider": {
"language": "en",
@ -100,10 +100,16 @@
"status": 1,
"url": "https://bflix.ru"
},
"CimaNowProvider": {
"language": "ar",
"name": "CimaNow",
"status": 1,
"url": "https://cimanow.cc"
},
"CineblogProvider": {
"language": "it",
"name": "CineBlog",
"status": 0,
"status": 1,
"url": "https://cb01.rip"
},
"CinecalidadProvider": {
@ -197,8 +203,8 @@
"FilmpertuttiProvider": {
"language": "it",
"name": "Filmpertutti",
"status": 0,
"url": "https://www.filmpertutti.love"
"status": 1,
"url": "https://filmpertutti.love"
},
"FmoviesToProvider": {
"language": "en",
@ -239,7 +245,7 @@
"HDrezkaProvider": {
"language": "ru",
"name": "HDrezka",
"status": 1,
"status": 0,
"url": "https://rezka.ag"
},
"IHaveNoTvProvider": {
@ -472,13 +478,13 @@
"language": "it",
"name": "Streamingcommunity",
"status": 1,
"url": "https://streamingcommunity.org"
"url": "https://streamingcommunity.best"
},
"TantifilmProvider": {
"language": "it",
"name": "Tantifilm",
"status": 1,
"url": "https://www.tantifilm.pics"
"url": "https://www.tantifilm.nl"
},
"TenshiProvider": {
"language": "en",