diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt index f0360387..57c29dc4 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt @@ -89,7 +89,7 @@ object APIHolder { TantifilmProvider(), HDMovie5(), RebahinProvider(), - LayarKaca21Provider(), + LayarKacaProvider(), // Metadata providers //TmdbProvider(), diff --git a/app/src/main/java/com/lagradost/cloudstream3/animeproviders/GomunimeProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/animeproviders/GomunimeProvider.kt index d5f2706f..1287ae6f 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/animeproviders/GomunimeProvider.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/animeproviders/GomunimeProvider.kt @@ -3,20 +3,11 @@ package com.lagradost.cloudstream3.animeproviders import com.fasterxml.jackson.annotation.JsonProperty import com.lagradost.cloudstream3.* import org.jsoup.Jsoup -import org.jsoup.nodes.Element import java.util.* -import com.fasterxml.jackson.module.kotlin.readValue -import com.lagradost.cloudstream3.movieproviders.SflixProvider -import com.lagradost.cloudstream3.movieproviders.SflixProvider.Companion.extractRabbitStream -import com.lagradost.cloudstream3.movieproviders.SflixProvider.Companion.toExtractorLink import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.mvvm.safeApiCall import com.lagradost.cloudstream3.utils.* import com.lagradost.cloudstream3.utils.AppUtils.parseJson -import com.lagradost.nicehttp.Requests.Companion.await -import kotlinx.coroutines.runBlocking -import okhttp3.Interceptor -import java.net.URI class GomunimeProvider : MainAPI() { override var mainUrl = "https://185.231.223.76" @@ -210,7 +201,8 @@ class GomunimeProvider : MainAPI() { M3u8Helper.generateM3u8( this.name, link, - mainUrl, + "$mainUrl/", + headers = mapOf("Origin" to mainUrl) ).forEach(callback) } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/animeproviders/KuronimeProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/animeproviders/KuronimeProvider.kt index 8af7e501..14e841fc 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/animeproviders/KuronimeProvider.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/animeproviders/KuronimeProvider.kt @@ -1,6 +1,5 @@ package com.lagradost.cloudstream3.animeproviders -import com.fasterxml.jackson.annotation.JsonProperty import com.lagradost.cloudstream3.* import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer import com.lagradost.cloudstream3.mvvm.safeApiCall @@ -157,6 +156,8 @@ class KuronimeProvider : MainAPI() { val token = data.substringAfter("var token = \"").substringBefore("\";") val pat = data.substringAfter("var pat = \"").substringBefore("\";") val link = "$doma$token$pat/index.m3u8" + val quality = + Regex("\\d{3,4}p").find(doc.select("title").text())?.groupValues?.get(0) sourceCallback.invoke( ExtractorLink( @@ -164,7 +165,8 @@ class KuronimeProvider : MainAPI() { this.name, link, referer = "https://animeku.org/", - quality = Qualities.Unknown.value, + quality = getQualityFromName(quality), + headers = mapOf("Origin" to "https://animeku.org"), isM3u8 = true ) ) @@ -186,7 +188,7 @@ class KuronimeProvider : MainAPI() { sources.apmap { safeApiCall { when { - it.contains("animeku.org") -> invokeKuroSource(it, callback) + it.startsWith("https://animeku.org") -> invokeKuroSource(it, callback) else -> loadExtractor(it, mainUrl, callback) } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/animeproviders/NeonimeProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/animeproviders/NeonimeProvider.kt index 2e3cceab..d844e043 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/animeproviders/NeonimeProvider.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/animeproviders/NeonimeProvider.kt @@ -1,8 +1,6 @@ package com.lagradost.cloudstream3.animeproviders -import com.fasterxml.jackson.annotation.JsonProperty import com.lagradost.cloudstream3.* -import com.lagradost.cloudstream3.mvvm.safeApiCall import com.lagradost.cloudstream3.utils.ExtractorLink import com.lagradost.cloudstream3.utils.loadExtractor import org.jsoup.nodes.Element @@ -33,6 +31,7 @@ class NeonimeProvider : MainAPI() { return when (t) { "Ended" -> ShowStatus.Completed "OnGoing" -> ShowStatus.Ongoing + "Ongoing" -> ShowStatus.Ongoing "In Production" -> ShowStatus.Ongoing "Returning Series" -> ShowStatus.Ongoing else -> ShowStatus.Completed diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/DoodExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/DoodExtractor.kt index 71a11d60..3be8f510 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/extractors/DoodExtractor.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/DoodExtractor.kt @@ -4,6 +4,7 @@ import com.lagradost.cloudstream3.app import com.lagradost.cloudstream3.utils.ExtractorApi import com.lagradost.cloudstream3.utils.ExtractorLink import com.lagradost.cloudstream3.utils.Qualities +import com.lagradost.cloudstream3.utils.getQualityFromName import kotlinx.coroutines.delay class DoodCxExtractor : DoodLaExtractor() { @@ -40,13 +41,14 @@ open class DoodLaExtractor : ExtractorApi() { val response0 = app.get(url).text // html of DoodStream page to look for /pass_md5/... val md5 =mainUrl+(Regex("/pass_md5/[^']*").find(response0)?.value ?: return null) // get https://dood.ws/pass_md5/... val trueUrl = app.get(md5, referer = url).text + "zUEJeL3mUN?token=" + md5.substringAfterLast("/") //direct link to extract (zUEJeL3mUN is random) + val quality = Regex("\\d{3,4}p").find(response0.substringAfter("