From 291e405d3c69854828bffd89fdf63d06f41c6c3e Mon Sep 17 00:00:00 2001 From: Lazycoder Date: Wed, 26 Oct 2022 17:47:47 +0200 Subject: [PATCH 1/2] some fixes --- .../kotlin/com/movizland/MovizlandProvider.kt | 180 ++++++++++++++---- 1 file changed, 141 insertions(+), 39 deletions(-) diff --git a/MovizlandProvider/src/main/kotlin/com/movizland/MovizlandProvider.kt b/MovizlandProvider/src/main/kotlin/com/movizland/MovizlandProvider.kt index e3de935..fff42a4 100644 --- a/MovizlandProvider/src/main/kotlin/com/movizland/MovizlandProvider.kt +++ b/MovizlandProvider/src/main/kotlin/com/movizland/MovizlandProvider.kt @@ -11,7 +11,7 @@ import org.jsoup.nodes.Element class Movizland : MainAPI() { override var lang = "ar" - override var mainUrl = "https://new.movizland.cyou" + override var mainUrl = "https://movizland.cyou" override var name = "Movizland" override val usesWebView = false override val hasMainPage = true @@ -20,13 +20,35 @@ class Movizland : MainAPI() { private fun String.getIntFromText(): Int? { return Regex("""\d+""").find(this)?.groupValues?.firstOrNull()?.toIntOrNull() } + + private fun String.getSeasonNameFromUrl(): String? { + return Regex("""\/series\/(.+)\/""").find(this)?.groupValues?.getOrNull(1) + } + + private fun String.getDomainFromUrl(): String? { + return Regex("""^(?:https?:\/\/)?(?:[^@\n]+@)?(?:www\.)?([^:\/\n\?\=]+)""").find(this)?.groupValues?.firstOrNull() + } + + private fun String.cleanTitle(): String { + val prefix = setOf("مشاهدة فيلم","مشاهدة وتحميل فيلم","فيلم","انمي","إنمي","مسلسل","برنامج") + val suffix = setOf("مدبلج للعربية","اون لاين","مترجم") + this.let{ clean -> + var aa = clean + prefix.forEach{ pre -> + aa = if (aa.startsWith(pre)) aa.replace(pre,"") else aa } + var bb = aa + suffix.mapNotNull{ suf -> + bb = if (bb.endsWith(suf)) bb.replace(suf,"") else bb } + return bb + } + } private fun Element.toSearchResponse(): SearchResponse? { - val url = select("div.BlockItem") - val title = select("div.BlockTitle").text() - val posterUrl = if (title.contains("فيلم")) {select("div.BlockImageItem img")?.attr("src")} else {select("div.BlockImageItem > img:nth-child(3)")?.attr("src")} - val year = select("ul.InfoEndBlock li").last()?.text()?.getIntFromText() - var quality = select("ul.RestInformation li").last()?.text()?.replace(" |-|1080p|720p".toRegex(), "") + val url = select(".BlockItem") + val title = url.select(".BlockTitle").text().cleanTitle() + val posterUrl = if (url.select(".BlockTitle").text().contains("فيلم")) {select(".BlockImageItem img")?.attr("src")} else {select(".BlockImageItem > img:nth-child(3)")?.attr("src")} + val year = select(".InfoEndBlock li").last()?.text()?.getIntFromText() + var quality = select(".RestInformation li").last()?.text()?.replace(" |-|1080p|720p".toRegex(), "") ?.replace("WEB DL","WEBDL")?.replace("BluRay","BLURAY") return MovieSearchResponse( title, @@ -54,7 +76,7 @@ class Movizland : MainAPI() { } override suspend fun search(query: String): List { - val q = query.replace(" ", "%20") + val q = query.replace(" ".toRegex(), "%20") val result = arrayListOf() listOf( "$mainUrl/category/movies/?s=$q", @@ -69,31 +91,56 @@ class Movizland : MainAPI() { return result.distinct().sortedBy { it.name } } - + /* private fun Element.toEpisode(): Episode { - val a = select("div.BlockItem") + val a = select("div.EpisodeItem") val url = a.select("a")?.attr("href") - val title = a.select("div.BlockTitle").text() - val thumbUrl = a.select("div.BlockImageItem img")?.attr("src") - val Epsnum = a.select("div.EPSNumber").text() + val title = a.text() + //val thumbUrl = a.select("div.BlockImageItem img")?.attr("src") + val Epsnum = a.select("em").text() return newEpisode(url) { name = title episode = Epsnum.getIntFromText() - posterUrl = thumbUrl + //posterUrl = thumbUrl } - } + }*/ + private fun getSeasonFromString(tit: String): Int { + if(tit.contains("الموسم الاول".toRegex())){ return 1 } + else if(tit.contains("الموسم الحادي عشر".toRegex())){ return 11 } + else if(tit.contains("الموسم الثاني عشر".toRegex())){return 12} + else if(tit.contains("الموسم الثالث عشر".toRegex())){return 13} + else if(tit.contains("الموسم الرابع عشر".toRegex())){return 14} + else if(tit.contains("الموسم الخامس عشر".toRegex())){return 15} + else if(tit.contains("الموسم السادس عشر".toRegex())){return 16} + else if(tit.contains("الموسم السابع عشر".toRegex())){return 17} + else if(tit.contains("الموسم الثامن عشر".toRegex())){return 18} + else if(tit.contains("الموسم التاسع عشر".toRegex())){return 19} + else if(tit.contains("الموسم الثاني".toRegex())){ return 2 } + else if(tit.contains("الموسم الثالث".toRegex())){ return 3 } + else if(tit.contains("الموسم الرابع".toRegex())){ return 4 } + else if(tit.contains("الموسم الخامس".toRegex())){ return 5 } + else if(tit.contains("الموسم السادس".toRegex())){ return 6 } + else if(tit.contains("الموسم السابع".toRegex())){ return 7 } + else if(tit.contains("الموسم الثامن".toRegex())){ return 8 } + else if(tit.contains("الموسم التاسع".toRegex())){ return 9 } + else if(tit.contains("الموسم العاشر".toRegex())){ return 10 } + else if(tit.contains("الموسم العشرون".toRegex())){return 20} + else { return 0 } + } + override suspend fun load(url: String): LoadResponse { var doc = app.get(url).document - val posterUrl = doc.select("img")?.attr("data-src") - val year = doc.select("div.SingleDetails a").last()?.text()?.getIntFromText() - val title = doc.select("h2.postTitle").text() - val isMovie = title.contains("فيلم") + val sdetails = doc.select(".SingleDetails") + val posterUrl = sdetails.select("img")?.attr("data-src") + val year = sdetails.select("li:has(.fa-clock) a").text()?.getIntFromText() + val title = doc.select("h2.postTitle").text().cleanTitle() + val isMovie = if(doc.select("h2.postTitle").text().contains("عرض|فيلم".toRegex())) true else false val synopsis = doc.select("section.story").text() val trailer = doc.select("div.InnerTrailer iframe").attr("data-src") - val tags = doc.select("div.SingleDetails li").map{ it.text() } + val tags = sdetails.select("li:has(.fa-film) a").map{ it.text() } return if (isMovie) { @@ -109,17 +156,83 @@ class Movizland : MainAPI() { this.plot = synopsis addTrailer(trailer) } - }else{ - val episodes = doc.select("div.BlockItem").map { - it.toEpisode() + } else { + val episodes = ArrayList() + val pageUrl = doc.select("meta[property='og:url']").attr("content") + val refererUrl = doc.select("body > header > div > div.Logo > a").attr("href") + if(doc.select(".BlockItem a").attr("href").contains("/series/")){//seasons + doc.select(".BlockItem").map { seas -> + seas.select("a").attr("href") }.apmap{ + val Sedoc = app.get(it).document + val pagEl = Sedoc.select(".pagination > div > ul > li.active > a").isNotEmpty() + val pagSt = if(pagEl) true else false + if(pagSt){ + Sedoc.select(".pagination > div > ul > li:nth-child(n):not(:last-child) a").map{ eppages -> + eppages.attr("href") }.apmap{ + val epidoc = app.get(it).document + epidoc.select("div.BlockItem").map{ element -> + episodes.add( + Episode( + element.select("a").attr("href"), + element.select(".BlockTitle").text(), + getSeasonFromString(element.select(".BlockTitle").text()), + element.select(".EPSNumber").text().getIntFromText(), + ) + ) + } + } + }else{ + Sedoc.select(".BlockItem").map{ el -> + episodes.add( + Episode( + el.select("a").attr("href"), + el.select(".BlockTitle").text(), + getSeasonFromString(el.select(".BlockTitle").text()), + el.select(".EPSNumber").text().getIntFromText(), + ) + ) + } + } + } + + } else {//episodes + val pagEl = doc.select(".pagination > div > ul > li.active > a").isNotEmpty() + val pagSt = if(pagEl) true else false + if(pagSt){ + doc.select(".pagination > div > ul > li:nth-child(n):not(:last-child) a").map{ eppages -> + eppages.attr("href") }.apmap{ + val epidoc = app.get(it).document + epidoc.select("div.BlockItem").map{ element -> + episodes.add( + Episode( + element.select("a").attr("href"), + element.select(".BlockTitle").text(), + getSeasonFromString(element.select(".BlockTitle").text()), + element.select(".EPSNumber").text().getIntFromText(), + ) + ) + } + } + }else{ + doc.select("div.BlockItem").map{ el -> + episodes.add( + Episode( + el.select("a").attr("href"), + el.select(".BlockTitle").text(), + getSeasonFromString(el.select(".BlockTitle").text()), + el.select(".EPSNumber").text().getIntFromText(), + ) + ) + } + } } - + newTvSeriesLoadResponse(title, url, TvType.TvSeries, episodes) { - this.posterUrl = posterUrl + /*this.posterUrl = posterUrl this.year = year this.tags = tags this.plot = synopsis - addTrailer(trailer) + addTrailer(trailer)*/ } } } @@ -132,21 +245,10 @@ class Movizland : MainAPI() { callback: (ExtractorLink) -> Unit ): Boolean { val doc = app.get(data).document - doc.select("code[id*='Embed']").apmap { - var sourceUrl = it.select("iframe").attr("data-srcout") + doc.select("code[id*='Embed'] iframe").apmap { + var sourceUrl = it.attr("data-srcout") loadExtractor(sourceUrl, data, subtitleCallback, callback) } - doc.select("table tbody tr").map { - callback.invoke( - ExtractorLink( - this.name, - this.name, - it.select("a").attr("href"), - this.mainUrl, - quality = it.select("td:nth-child(2)").text().getIntFromText() ?: Qualities.Unknown.value, - ) - ) - } - return true + return true } } From 1f548aac79f2ca21019fce60ef985f8e04a4185d Mon Sep 17 00:00:00 2001 From: Lazycoder Date: Wed, 26 Oct 2022 18:04:05 +0200 Subject: [PATCH 2/2] Update MovizlandProvider.kt --- .../src/main/kotlin/com/movizland/MovizlandProvider.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MovizlandProvider/src/main/kotlin/com/movizland/MovizlandProvider.kt b/MovizlandProvider/src/main/kotlin/com/movizland/MovizlandProvider.kt index fff42a4..451c41f 100644 --- a/MovizlandProvider/src/main/kotlin/com/movizland/MovizlandProvider.kt +++ b/MovizlandProvider/src/main/kotlin/com/movizland/MovizlandProvider.kt @@ -35,10 +35,10 @@ class Movizland : MainAPI() { this.let{ clean -> var aa = clean prefix.forEach{ pre -> - aa = if (aa.startsWith(pre)) aa.replace(pre,"") else aa } + aa = if (aa.contains(pre)) aa.replace(pre,"") else aa } var bb = aa suffix.mapNotNull{ suf -> - bb = if (bb.endsWith(suf)) bb.replace(suf,"") else bb } + bb = if (bb.contains(suf)) bb.replace(suf,"") else bb } return bb } }