AlmightyHak/extensions-source
2
0
Fork 1
Code Issues 296 Pull requests 6 Projects Releases Packages Wiki Activity Actions

Fix(lib/ChillxExtractor): fix REGEX_SUBS

Browse source
This commit is contained in:
Dark25 2024-10-07 00:18:14 +02:00
parent cb5e3283f9
commit f812527e51
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/chillx-extractor/src/main/java/eu/kanade/tachiyomi/lib/chillxextractor/ChillxExtractor.kt
View file

@ -1,5 +1,6 @@
package eu.kanade.tachiyomi.lib.chillxextractor package eu.kanade.tachiyomi.lib.chillxextractor
import android.util.Log
import eu.kanade.tachiyomi.animesource.model.Track import eu.kanade.tachiyomi.animesource.model.Track
import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.animesource.model.Video
import eu.kanade.tachiyomi.lib.cryptoaes.CryptoAES import eu.kanade.tachiyomi.lib.cryptoaes.CryptoAES
@ -23,13 +24,14 @@ class ChillxExtractor(private val client: OkHttpClient, private val headers: Hea
private val REGEX_SOURCES = Regex("""sources:\s*\[\{"file":"([^"]+)""") private val REGEX_SOURCES = Regex("""sources:\s*\[\{"file":"([^"]+)""")
private val REGEX_FILE = Regex("""file: ?"([^"]+)"""") private val REGEX_FILE = Regex("""file: ?"([^"]+)"""")
private val REGEX_SOURCE = Regex("""source = ?"([^"]+)"""") private val REGEX_SOURCE = Regex("""source = ?"([^"]+)"""")
private val REGEX_SUBS = Regex("""\[(.*?)\](https?://[^\s,]+)""") private val REGEX_SUBS = Regex("""\{"file":"([^"]+)","label":"([^"]+)","kind":"captions","default":\w+\}""")
private const val KEY_SOURCE = "https://raw.githubusercontent.com/Rowdy-Avocado/multi-keys/keys/index.html" private const val KEY_SOURCE = "https://raw.githubusercontent.com/Rowdy-Avocado/multi-keys/keys/index.html"
} }
fun videoFromUrl(url: String, referer: String, prefix: String = "Chillx - "): List<Video> { fun videoFromUrl(url: String, referer: String, prefix: String = "Chillx - "): List<Video> {
val newHeaders = headers.newBuilder() val newHeaders = headers.newBuilder()
.set("Referer", referer) .set("Referer", "$referer/")
.set("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8")
.set("Accept-Language", "en-US,en;q=0.5") .set("Accept-Language", "en-US,en;q=0.5")
.build() .build()
@ -50,13 +52,14 @@ class ChillxExtractor(private val client: OkHttpClient, private val headers: Hea
val subtitleList = buildList { val subtitleList = buildList {
val subtitles = REGEX_SUBS.findAll(decryptedScript) val subtitles = REGEX_SUBS.findAll(decryptedScript)
subtitles.forEach { subtitles.forEach {
add(Track(it.groupValues[2], decodeUnicodeEscape(it.groupValues[1]))) Log.d("ChillxExtractor", "Found subtitle: ${it.groupValues}")
add(Track(it.groupValues[1], decodeUnicodeEscape(it.groupValues[2])))
} }
} }
return playlistUtils.extractFromHls( return playlistUtils.extractFromHls(
playlistUrl = masterUrl, playlistUrl = masterUrl,
referer = referer, referer = url,
videoNameGen = { "$prefix$it" }, videoNameGen = { "$prefix$it" },
subtitleList = subtitleList, subtitleList = subtitleList,
) )

2
src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Hikari.kt
View file

@ -339,7 +339,7 @@ class Hikari : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
private fun getVideosFromEmbed(embedUrl: String, name: String): List<Video> = when { private fun getVideosFromEmbed(embedUrl: String, name: String): List<Video> = when {
name.contains("vidhide", true) -> vidHideExtractor.videosFromUrl(embedUrl, videoNameGen = { s -> "$name - $s" }) name.contains("vidhide", true) -> vidHideExtractor.videosFromUrl(embedUrl, videoNameGen = { s -> "$name - $s" })
embedUrl.contains("filemoon", true) -> filemoonExtractor.videosFromUrl(embedUrl, prefix = "$name - ", headers = headers) embedUrl.contains("filemoon", true) -> filemoonExtractor.videosFromUrl(embedUrl, prefix = "$name - ", headers = headers)
else -> chillxExtractor.videoFromUrl(embedUrl, referer = "https://playerx.stream/", prefix = "$name - ") else -> chillxExtractor.videoFromUrl(embedUrl, referer = baseUrl, prefix = "$name - ")
} }
override fun videoListSelector() = ".server-item:has(a[onclick~=getEmbed])" override fun videoListSelector() = ".server-item:has(a[onclick~=getEmbed])"