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

fix(lib/lycoris&lulu) Repair decode json and work LuluStream #810

Merged
Hayanek merged 14 commits from fix-lycoris into main 2025-04-06 13:41:23 -05:00
Conversation 30 Commits 14 Files changed 4 +21 -22
1 changed files with 21 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b9e9dbb2a9 - Show all commits

43
lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
View file

@ -34,7 +34,7 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
GET(url, headers = embedHeaders),
).execute().asJsoup()
val script = document.select("script[type='application/json']").first()?.data().toString()
val script = document.select("script[type='application/json']").first()?.data()?.toString() ?: return emptyList()
val scriptData = script.parseAs<ScriptBody>()
@ -77,14 +77,13 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
}?: sdLink?.takeIf { it.contains("https://") }?.let {
videos.add(Video(it, "${prefix}lycoris.cafe - 480p", it))
}
}
return videos
}
private fun decodeVideoLinks(encodedUrl: String?): String? {
if (encodedUrl.isNullOrEmpty()) {
private fun decodeVideoLinks(encodedUrl: String): String? {
if (encodedUrl.isBlank()) {
return null
}
@ -108,27 +107,27 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
}
private fun fetchAndDecodeVideo(client: OkHttpClient, episodeId: String, isSecondary: Boolean = false): String? {
val url: HttpUrl
val url: HttpUrl
if (isSecondary) {
val convertedText = episodeId.toByteArray(Charset.forName("UTF-8")).toString(Charset.forName("ISO-8859-1"))
val unicodeEscape = decodePythonEscape(convertedText)
val finalText = unicodeEscape.toByteArray(Charsets.ISO_8859_1).toString(Charsets.UTF_8)
if (isSecondary) {
val convertedText = episodeId.toByteArray(Charset.forName("UTF-8")).toString(Charset.forName("ISO-8859-1"))
val unicodeEscape = decodePythonEscape(convertedText)
val finalText = unicodeEscape.toByteArray(Charsets.ISO_8859_1).toString(Charsets.UTF_8)
cuong-tran commented 2025-03-13 08:17:32 -05:00 (Migrated from github.com)
Copy link
            val finalText = unicodeEscape.toByteArray(Charsets.ISO_8859_1).toString(Charsets.UTF_8)

            url = GETLNKURL.toHttpUrl().newBuilder()
```suggestion val finalText = unicodeEscape.toByteArray(Charsets.ISO_8859_1).toString(Charsets.UTF_8) url = GETLNKURL.toHttpUrl().newBuilder() ```
cuong-tran commented 2025-03-13 08:17:56 -05:00 (Migrated from github.com)
Copy link
                 addQueryParameter("link", finalText)
                .build()
        } else {
            url = GETSECONDARYURL.toHttpUrl().newBuilder()
```suggestion addQueryParameter("link", finalText) .build() } else { url = GETSECONDARYURL.toHttpUrl().newBuilder() ```
cuong-tran commented 2025-03-13 08:18:18 -05:00 (Migrated from github.com)
Copy link
                .addQueryParameter("id", episodeId)
                .build()
        }
        client.newCall(GET(url))
            .execute()
```suggestion .addQueryParameter("id", episodeId) .build() } client.newCall(GET(url)) .execute() ```
cuong-tran commented 2025-03-13 10:32:29 -05:00 (Migrated from github.com)
Copy link

also fix indent for the rest of this function (and the whole file?)

also fix indent for the rest of this function (and the whole file?)
url = GETLNKURL.toHttpUrl().newBuilder()
.addQueryParameter("link", finalText)
.build()
} else {
url = GETSECONDARYURL.toHttpUrl().newBuilder()
.addQueryParameter("id", episodeId)
.build()
url = GETLNKURL.toHttpUrl().newBuilder()
.addQueryParameter("link", finalText)
.build()
} else {
url = GETSECONDARYURL.toHttpUrl().newBuilder()
.addQueryParameter("id", episodeId)
.build()
}
client.newCall(GET(url))
.execute()
.use { response ->
val data = response.body.string() ?: ""
return decodeVideoLinks(data)
}
client.newCall(GET(url))
.execute()
.use { response ->
val data = response.body.string() ?: ""
return decodeVideoLinks(data)
}
}
private fun checkLinks(client: OkHttpClient, link: String): Boolean {