From 22814aeb5a0b46aaea8f0c9f8a1a15696cfa29b2 Mon Sep 17 00:00:00 2001 From: hexated Date: Fri, 20 Jan 2023 04:29:09 +0700 Subject: [PATCH] fixed Linkbox --- .../lagradost/cloudstream3/extractors/Acefile.kt | 1 - .../lagradost/cloudstream3/extractors/Linkbox.kt | 16 +++++++++------- .../syncproviders/providers/IndexSubtitleApi.kt | 7 +++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt index 18198f44..c782b29d 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt @@ -27,7 +27,6 @@ open class Acefile : ExtractorApi() { res.substringAfter("\"file\":\"").substringBefore("\","), "$mainUrl/", Qualities.Unknown.value, - headers = mapOf("range" to "bytes=0-") ) ) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Linkbox.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Linkbox.kt index 73734e2a..c28a8900 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Linkbox.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Linkbox.kt @@ -1,6 +1,7 @@ package com.lagradost.cloudstream3.extractors import com.fasterxml.jackson.annotation.JsonProperty +import com.lagradost.cloudstream3.SubtitleFile import com.lagradost.cloudstream3.app import com.lagradost.cloudstream3.utils.ExtractorApi import com.lagradost.cloudstream3.utils.ExtractorLink @@ -11,12 +12,15 @@ open class Linkbox : ExtractorApi() { override val mainUrl = "https://www.linkbox.to" override val requiresReferer = true - override suspend fun getUrl(url: String, referer: String?): List { - val id = url.substringAfter("id=") - val sources = mutableListOf() - + override suspend fun getUrl( + url: String, + referer: String?, + subtitleCallback: (SubtitleFile) -> Unit, + callback: (ExtractorLink) -> Unit + ) { + val id = Regex("""(/file/|id=)(\S+)[&/?]""").find(url)?.groupValues?.get(2) app.get("$mainUrl/api/open/get_url?itemId=$id", referer=url).parsedSafe()?.data?.rList?.map { link -> - sources.add( + callback.invoke( ExtractorLink( name, name, @@ -26,8 +30,6 @@ open class Linkbox : ExtractorApi() { ) ) } - - return sources } data class RList( diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/IndexSubtitleApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/IndexSubtitleApi.kt index 2fc97477..668d10bd 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/IndexSubtitleApi.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/IndexSubtitleApi.kt @@ -4,7 +4,6 @@ import android.util.Log import com.lagradost.cloudstream3.TvType import com.lagradost.cloudstream3.app import com.lagradost.cloudstream3.imdbUrlToIdNullable -import com.lagradost.cloudstream3.network.CloudflareKiller import com.lagradost.cloudstream3.subtitles.AbstractSubApi import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities import com.lagradost.cloudstream3.utils.SubtitleHelper @@ -22,7 +21,7 @@ class IndexSubtitleApi : AbstractSubApi { companion object { - const val host = "https://subscene.cyou" + const val host = "https://indexsubtitle.com" const val TAG = "INDEXSUBS" } @@ -242,7 +241,7 @@ class IndexSubtitleApi : AbstractSubApi { document.selectFirst("div.my-3.p-3 div.media a")!!.attr("href") ) } else { - document.select("div.my-3.p-3 div.media").mapNotNull { block -> + document.select("div.my-3.p-3 div.media").firstNotNullOf { block -> val name = block.selectFirst("strong.d-block")?.text()?.trim().toString() if (seasonNum!! > 0) { @@ -254,7 +253,7 @@ class IndexSubtitleApi : AbstractSubApi { } else { fixUrl(block.selectFirst("a")!!.attr("href")) } - }.first() + } } return link }