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 c3af8bee..3f910cd4 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt @@ -2,7 +2,6 @@ package com.lagradost.cloudstream3.extractors import com.lagradost.cloudstream3.SubtitleFile import com.lagradost.cloudstream3.app -import com.lagradost.cloudstream3.base64Decode import com.lagradost.cloudstream3.utils.* open class Acefile : ExtractorApi() { @@ -16,22 +15,19 @@ open class Acefile : ExtractorApi() { subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit ) { - val script = getAndUnpack(app.get(url).text) - val id = script.substringAfter("\"code\":\"").substringBefore("\",") - val doc = app.get("https://drive.google.com/uc?id=${base64Decode(id)}&export=download").document - val form = doc.select("form#download-form").attr("action") - val uc = doc.select("input#uc-download-link").attr("value") - val video = app.post( - form, data = mapOf( - "uc-download-link" to uc - ) - ).url + val id = "/(?:d|download|player|f|file)/(\\w+)".toRegex().find(url)?.groupValues?.get(1) + val script = getAndUnpack(app.get("$mainUrl/player/${id ?: return}").text) + val service = """service\s*=\s*['"]([^'"]+)""".toRegex().find(script)?.groupValues?.get(1) + val serverUrl = """['"](\S+check&id\S+?)['"]""".toRegex().find(script)?.groupValues?.get(1) + ?.replace("\"+service+\"", service ?: return) + + val video = app.get(serverUrl ?: return, referer = "$mainUrl/").parsedSafe()?.data callback.invoke( ExtractorLink( this.name, this.name, - video, + video ?: return, "", Qualities.Unknown.value, INFER_TYPE @@ -40,4 +36,8 @@ open class Acefile : ExtractorApi() { } + data class Source( + val data: String? = null, + ) + } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Chillx.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Chillx.kt index 68d543d3..f03a5525 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Chillx.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Chillx.kt @@ -49,8 +49,23 @@ open class Chillx : ExtractorApi() { val decrypt = cryptoAESHandler(master ?: return, getKey().toByteArray(), false)?.replace("\\", "") ?: throw ErrorLoadingException("failed to decrypt") val source = Regex(""""?file"?:\s*"([^"]+)""").find(decrypt)?.groupValues?.get(1) - val tracks = Regex("""tracks:\s*\[(.+)]""").find(decrypt)?.groupValues?.get(1) + val subtitles = Regex("""subtitle"?:\s*"([^"]+)""").find(decrypt)?.groupValues?.get(1) + val subtitlePattern = """\[(.*?)\](https?://[^\s,]+)""".toRegex() + val matches = subtitlePattern.findAll(subtitles ?: "") + val languageUrlPairs = matches.map { matchResult -> + val (language, url) = matchResult.destructured + decodeUnicodeEscape(language) to url + }.toList() + + languageUrlPairs.forEach{ (name, file) -> + subtitleCallback.invoke( + SubtitleFile( + name, + file + ) + ) + } // required val headers = mapOf( "Accept" to "*/*", @@ -67,18 +82,15 @@ open class Chillx : ExtractorApi() { "$mainUrl/", headers = headers ).forEach(callback) - - AppUtils.tryParseJson>("[$tracks]") - ?.filter { it.kind == "captions" }?.map { track -> - subtitleCallback.invoke( - SubtitleFile( - track.label ?: "", - track.file ?: return@map null - ) - ) - } } - + + private fun decodeUnicodeEscape(input: String): String { + val regex = Regex("u([0-9a-fA-F]{4})") + return regex.replace(input) { + it.groupValues[1].toInt(16).toChar().toString() + } + } + suspend fun getKey() = key ?: fetchKey().also { key = it } private suspend fun fetchKey(): String { diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Gofile.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Gofile.kt index eaf9c65f..8d78c1a4 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Gofile.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Gofile.kt @@ -22,9 +22,9 @@ open class Gofile : ExtractorApi() { val id = Regex("/(?:\\?c=|d/)([\\da-zA-Z-]+)").find(url)?.groupValues?.get(1) val token = app.get("$mainApi/createAccount").parsedSafe()?.data?.get("token") val websiteToken = app.get("$mainUrl/dist/js/alljs.js").text.let { - Regex("websiteToken\\s*=\\s*\"([^\"]+)").find(it)?.groupValues?.get(1) + Regex("fetchData.wt\\s*=\\s*\"([^\"]+)").find(it)?.groupValues?.get(1) } - app.get("$mainApi/getContent?contentId=$id&token=$token&websiteToken=$websiteToken") + app.get("$mainApi/getContent?contentId=$id&token=$token&wt=$websiteToken") .parsedSafe()?.data?.contents?.forEach { callback.invoke( ExtractorLink( diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/HotlingerExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/HotlingerExtractor.kt index 7389db68..b557a53e 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/extractors/HotlingerExtractor.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/HotlingerExtractor.kt @@ -10,4 +10,14 @@ class Hotlinger : ContentX() { class FourCX : ContentX() { override var name = "FourCX" override var mainUrl = "https://four.contentx.me" +} + +class PlayRu : ContentX() { + override var name = "PlayRu" + override var mainUrl = "https://playru.net" +} + +class FourPlayRu : ContentX() { + override var name = "FourPlayRu" + override var mainUrl = "https://four.playru.net" } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Rabbitstream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Rabbitstream.kt index d5b52dd7..74009b70 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Rabbitstream.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Rabbitstream.kt @@ -47,7 +47,7 @@ open class Rabbitstream : ExtractorApi() { val response = app.get( "$mainUrl/$embed/getSources?id=$id", - referer = mainUrl, + referer = url, headers = mapOf("X-Requested-With" to "XMLHttpRequest") ) @@ -72,7 +72,7 @@ open class Rabbitstream : ExtractorApi() { ).forEach(callback) } - decryptedSources?.tracks?.map { track -> + decryptedSources?.tracks?.filter { it?.kind == "captions" }?.map { track -> subtitleCallback.invoke( SubtitleFile( track?.label ?: "", diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt index 4f9c5e8c..637f65b9 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt @@ -106,6 +106,8 @@ import com.lagradost.cloudstream3.extractors.ContentX import com.lagradost.cloudstream3.extractors.EmturbovidExtractor import com.lagradost.cloudstream3.extractors.Hotlinger import com.lagradost.cloudstream3.extractors.FourCX +import com.lagradost.cloudstream3.extractors.PlayRu +import com.lagradost.cloudstream3.extractors.FourPlayRu import com.lagradost.cloudstream3.extractors.HDMomPlayer import com.lagradost.cloudstream3.extractors.HDPlayerSystem import com.lagradost.cloudstream3.extractors.VideoSeyred @@ -704,6 +706,8 @@ val extractorApis: MutableList = arrayListOf( ContentX(), Hotlinger(), FourCX(), + PlayRu(), + FourPlayRu(), HDMomPlayer(), HDPlayerSystem(), VideoSeyred(), diff --git a/app/src/main/res/layout/fragment_result_swipe.xml b/app/src/main/res/layout/fragment_result_swipe.xml index eb2653d0..bb8a5c10 100644 --- a/app/src/main/res/layout/fragment_result_swipe.xml +++ b/app/src/main/res/layout/fragment_result_swipe.xml @@ -83,7 +83,7 @@ android:layout_height="25dp" android:layout_margin="5dp" android:elevation="10dp" - + android:tooltipText="@string/subscribe_tooltip" android:background="?android:attr/selectableItemBackgroundBorderless" android:src="@drawable/baseline_notifications_none_24" android:layout_gravity="end|center_vertical" @@ -100,7 +100,7 @@ android:layout_height="25dp" android:layout_margin="5dp" android:elevation="10dp" - + android:tooltipText="@string/action_add_to_favorites" android:background="?android:attr/selectableItemBackgroundBorderless" android:src="@drawable/ic_baseline_favorite_border_24" android:layout_gravity="end|center_vertical" @@ -117,7 +117,7 @@ android:layout_height="25dp" android:layout_margin="5dp" android:elevation="10dp" - + android:tooltipText="@string/result_share" android:background="?android:attr/selectableItemBackgroundBorderless" android:src="@drawable/ic_outline_share_24" android:layout_gravity="end|center_vertical" @@ -135,7 +135,7 @@ android:layout_height="25dp" android:layout_margin="5dp" android:elevation="10dp" - + android:tooltipText="@string/result_open_in_browser" android:background="?android:attr/selectableItemBackgroundBorderless" android:src="@drawable/ic_baseline_public_24" android:layout_gravity="end|center_vertical" @@ -153,7 +153,7 @@ android:layout_height="30dp" android:layout_margin="5dp" android:elevation="10dp" - + android:tooltipText="@string/result_search_tooltip" android:background="?android:attr/selectableItemBackgroundBorderless" android:src="@drawable/search_icon" android:layout_gravity="end|center_vertical" @@ -171,7 +171,7 @@ android:layout_height="25dp" android:layout_margin="5dp" android:elevation="10dp" - + android:tooltipText="@string/recommendations_tooltip" android:background="?android:attr/selectableItemBackgroundBorderless" android:src="@drawable/baseline_list_alt_24" android:layout_gravity="end|center_vertical" diff --git a/app/src/main/res/layout/fragment_result_tv.xml b/app/src/main/res/layout/fragment_result_tv.xml index 7b5fc291..b8f5b5ca 100644 --- a/app/src/main/res/layout/fragment_result_tv.xml +++ b/app/src/main/res/layout/fragment_result_tv.xml @@ -399,6 +399,7 @@ https://developer.android.com/design/ui/tv/samples/jet-fit android:id="@+id/result_meta_content_rating" android:layout_gravity="center_vertical" style="@style/SmallWhiteButton" + android:focusable="false" tools:text="PG-13" /> Download Done %s - %s Update Started - Stream + Network stream Error Loading Links Links Reloaded Internal Storage @@ -175,6 +175,9 @@ Save Title copied! Repo URL copied! + New episode notification + Search in other extensions + Show recommendations Player Speed Subtitle Settings Text Color @@ -214,8 +217,8 @@ Player subtitles settings Chromecast Subtitles Chromecast subtitles settings - Eigengravy Mode - Adds a speed option in the player + Playback speed + Adds a speed option in the player Swipe to seek Swipe from side to side to control your position in a video Swipe to change settings @@ -392,9 +395,9 @@ Causes problems if set too high on devices with low storage space, such as Android TV. DNS over HTTPS Useful for bypassing ISP blocks - raw.githubusercontent.com Proxy + GitHub Proxy Could not reach GitHub. Turning on jsDelivr proxy… - Bypasses blocking of GitHub using jsDelivr. May cause updates to be delayed by few days. + Bypass blocking of raw github URLs using jsDelivr. May cause updates to be delayed by few days. Clone site Remove site Add a clone of an existing site, with a different URL @@ -440,13 +443,15 @@ General Random Button Show random button on Homepage and Library - Provider languages + Extension languages App Layout Preferred media - Enable NSFW on supported providers + Enable NSFW on supported Extensions Subtitle encoding Providers Provider test + Test all Extensions + This Test is meant for developers only and does not verifies or denies working of any extension. Layout Auto TV layout @@ -463,11 +468,11 @@ opensubtitles_key nginx_key password123 - MyCoolUsername + Username hello@world.com 127.0.0.1 - MyCoolSite - example.com + NewSiteName + https://example.com Language code (en)