From 29417dffad80804800042e3cdddc686926034343 Mon Sep 17 00:00:00 2001 From: antonydp <38143733+antonydp@users.noreply.github.com> Date: Mon, 7 Nov 2022 16:37:34 +0100 Subject: [PATCH] comments fix and some other modifications --- .../kotlin/com/lagradost/AniPlayProvider.kt | 4 ++-- .../kotlin/com/lagradost/CineBlogProvider.kt | 6 ++++-- .../com/lagradost/FilmpertuttiProvider.kt | 21 +++++++++---------- .../com/lagradost/GuardaSerieProvider.kt | 2 +- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/AniPlayProvider/src/main/kotlin/com/lagradost/AniPlayProvider.kt b/AniPlayProvider/src/main/kotlin/com/lagradost/AniPlayProvider.kt index 2f006cc..76f5d4d 100644 --- a/AniPlayProvider/src/main/kotlin/com/lagradost/AniPlayProvider.kt +++ b/AniPlayProvider/src/main/kotlin/com/lagradost/AniPlayProvider.kt @@ -129,7 +129,7 @@ class AniPlayProvider : MainAPI() { val response = parseJson>(app.get(request.data + page).text) val results = response.map{ - val title = it.title?:it.title2!! + val title = it.title?:it.title2?: return@mapNotNull null val isDub = isDub(title) val id = if (it.id == 0) it.id2 else it.id newAnimeSearchResponse( @@ -196,7 +196,7 @@ class AniPlayProvider : MainAPI() { this.plot = response.plot this.tags = tags this.showStatus = getStatus(response.status) - addPoster(response.horizontalPosters.first().posterUrl) + addPoster(response.horizontalPosters.firstOrNull().posterUrl) addEpisodes(if (isDub) DubStatus.Dubbed else DubStatus.Subbed, episodes) addMalId(malId) addAniListId(aniListId) diff --git a/CineBlogProvider/src/main/kotlin/com/lagradost/CineBlogProvider.kt b/CineBlogProvider/src/main/kotlin/com/lagradost/CineBlogProvider.kt index b98033a..ee790a7 100644 --- a/CineBlogProvider/src/main/kotlin/com/lagradost/CineBlogProvider.kt +++ b/CineBlogProvider/src/main/kotlin/com/lagradost/CineBlogProvider.kt @@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.utils.loadExtractor class CineBlogProvider : MainAPI() { override var lang = "it" - override var mainUrl = "https://cb01.rip" + override var mainUrl = "https://cb01.li" override var name = "CB01" override val hasMainPage = true override val hasChromecastSupport = true @@ -79,7 +79,9 @@ class CineBlogProvider : MainAPI() { year = year.dropLast(4) } - val poster = document.selectFirst("div.poster > img")!!.attr("src") + val poster = + document.selectFirst("#dt_galery")?.selectFirst("a")?.attr("href")?.trim()?: + document.selectFirst("div.poster > img")!!.attr("src") val recomm = document.select("#single_relacionados >article").map { val href = it.selectFirst("a")!!.attr("href") diff --git a/FilmpertuttiProvider/src/main/kotlin/com/lagradost/FilmpertuttiProvider.kt b/FilmpertuttiProvider/src/main/kotlin/com/lagradost/FilmpertuttiProvider.kt index 44b0dfe..d1fd283 100644 --- a/FilmpertuttiProvider/src/main/kotlin/com/lagradost/FilmpertuttiProvider.kt +++ b/FilmpertuttiProvider/src/main/kotlin/com/lagradost/FilmpertuttiProvider.kt @@ -25,20 +25,19 @@ class FilmpertuttiProvider : MainAPI() { TvType.TvSeries ) override var sequentialMainPage = true - override var sequentialMainPageDelay: Long = 200 + override var sequentialMainPageDelay: Long = 50 override val mainPage = mainPageOf( Pair("$mainUrl/category/film/page/", "Film Popolari"), Pair("$mainUrl/category/serie-tv/page/", "Serie Tv Popolari"), Pair("$mainUrl/prime-visioni/", "Ultime uscite") ) - private val interceptor = CloudflareKiller() override suspend fun getMainPage( page: Int, request: MainPageRequest ): HomePageResponse { val url = request.data + page - val soup = app.get(url, interceptor = interceptor, referer = mainUrl).document + val soup = app.get(url).document val home = soup.select("ul.posts > li").map { val title = it.selectFirst("div.title")!!.text().substringBeforeLast("(") .substringBeforeLast("[") @@ -65,7 +64,7 @@ class FilmpertuttiProvider : MainAPI() { override suspend fun search(query: String): List { val queryformatted = query.replace(" ", "+") val url = "$mainUrl/?s=$queryformatted" - val doc = app.get(url, interceptor = interceptor).document + val doc = app.get(url).document return doc.select("ul.posts > li").map { val title = it.selectFirst("div.title")!!.text().substringBeforeLast("(") .substringBeforeLast("[") @@ -84,7 +83,7 @@ class FilmpertuttiProvider : MainAPI() { } override suspend fun load(url: String): LoadResponse { - val document = app.get(url, interceptor = interceptor).document + val document = app.get(url).document val type = if (document.selectFirst("a.taxonomy.category")!!.attr("href").contains("serie-tv") .not() @@ -92,10 +91,8 @@ class FilmpertuttiProvider : MainAPI() { val title = document.selectFirst("#content > h1")!!.text().substringBeforeLast("(") .substringBeforeLast("[") - val description = - document.selectFirst("i.fa.fa-file-text-o.fa-fw")?.parent()?.nextSibling()?.toString() - ?.html().toString() - + val descriptionindex = document.select("div.meta > div > div").indexOfFirst { it.getElementsContainingText("Trama").isNotEmpty() } + val description = document.select("div.meta > div > div")[descriptionindex +1].text() val rating = document.selectFirst("div.rating > div.value")?.text() @@ -107,8 +104,10 @@ class FilmpertuttiProvider : MainAPI() { ?.nextSibling() as Element?)?.text()?.substringAfterLast(" ") ?.filter { it.isDigit() }?.toIntOrNull() - - val poster = document.selectFirst("div.meta > div > img")?.attr("data-src") + val horizontalPosterData = document.selectFirst("body > main")?.attr("style")?:"" + val poster = + Regex("url\\('(.*)'").find(horizontalPosterData)?.groups?.lastOrNull()?.value?: + document.selectFirst("div.meta > div > img")?.attr("src") val trailerurl = diff --git a/GuardaSerieProvider/src/main/kotlin/com/lagradost/GuardaSerieProvider.kt b/GuardaSerieProvider/src/main/kotlin/com/lagradost/GuardaSerieProvider.kt index cd10e30..e153cd6 100644 --- a/GuardaSerieProvider/src/main/kotlin/com/lagradost/GuardaSerieProvider.kt +++ b/GuardaSerieProvider/src/main/kotlin/com/lagradost/GuardaSerieProvider.kt @@ -8,7 +8,7 @@ import com.lagradost.cloudstream3.utils.loadExtractor class GuardaSerieProvider : MainAPI() { override var lang = "it" - override var mainUrl = "https://guardaserie.baby" + override var mainUrl = "https://guardaserie.app" override var name = "GuardaSerie" override val hasMainPage = true override val hasChromecastSupport = true