Draff
/
Tachiyomi-Extensions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TsukiMangas: Fix (#4295) 

* Fix content loading for the logged-in user

* Some changes

* Remove annotation

* Remove unneeded code

* Fix indentation

* Add suppress lint

* Enable blockNetworkImage

Co-authored-by: AwkwardPeak7 <48650614+AwkwardPeak7@users.noreply.github.com>

---------

Co-authored-by: AwkwardPeak7 <48650614+AwkwardPeak7@users.noreply.github.com>
This commit is contained in:
Chopper 2024-07-29 00:00:57 -03:00 committed by Draff
parent ee3d182a5f
commit d07fbd5294
No known key found for this signature in database
GPG Key ID: E8A89F3211677653
2 changed files with 59 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pt/tsukimangas/build.gradle
View File

@ -1,7 +1,7 @@
ext {
extName = 'Tsuki Mangás'
extClass = '.TsukiMangas'
extVersionCode = 5
extVersionCode = 6
isNsfw = true
}

59
src/pt/tsukimangas/src/eu/kanade/tachiyomi/extension/pt/tsukimangas/TsukiMangas.kt
View File

@ -1,5 +1,11 @@
package eu.kanade.tachiyomi.extension.pt.tsukimangas
import android.annotation.SuppressLint
import android.app.Application
import android.os.Handler
import android.os.Looper
import android.webkit.WebView
import android.webkit.WebViewClient
import eu.kanade.tachiyomi.extension.pt.tsukimangas.dto.ChapterListDto
import eu.kanade.tachiyomi.extension.pt.tsukimangas.dto.CompleteMangaDto
import eu.kanade.tachiyomi.extension.pt.tsukimangas.dto.MangaListDto
@ -22,9 +28,13 @@ import okhttp3.Interceptor
import okhttp3.Request
import okhttp3.Response
import rx.Observable
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import uy.kohesive.injekt.injectLazy
import java.text.SimpleDateFormat
import java.util.Locale
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
class TsukiMangas : HttpSource() {
@ -38,6 +48,41 @@ class TsukiMangas : HttpSource() {
override val supportsLatest = true
@delegate:SuppressLint("SetJavaScriptEnabled")
private val token: String by lazy {
val latch = CountDownLatch(1)
var token = ""
Handler(Looper.getMainLooper()).post {
val webView = WebView(Injekt.get<Application>())
with(webView.settings) {
javaScriptEnabled = true
domStorageEnabled = true
databaseEnabled = true
blockNetworkImage = true
}
webView.webViewClient = object : WebViewClient() {
override fun onPageFinished(view: WebView, url: String) {
val script = "javascript:localStorage['token']"
view.evaluateJavascript(script) {
view.apply {
stopLoading()
destroy()
}
if (it.isBlank() || it in listOf("null", "undefined")) {
return@evaluateJavascript
}
token = it.replace("[\"]+".toRegex(), "")
latch.countDown()
}
}
}
webView.loadUrl(baseUrl)
}
latch.await(10, TimeUnit.SECONDS)
token
}
override val client by lazy {
network.client.newBuilder()
.addInterceptor(::apiHeadersInterceptor)
@ -213,7 +258,16 @@ class TsukiMangas : HttpSource() {
// ============================= Utilities ==============================
private inline fun <reified T> Response.parseAs(): T = use {
json.decodeFromStream(it.body.byteStream())
try {
json.decodeFromStream(it.body.byteStream())
} catch (_: Exception) {
throw Exception(
"""
Contéudo protegido ou foi removido.
Faça o login na WebView e tente novamente
""".trimIndent(),
)
}
}
private fun HttpUrl.Builder.addIfNotBlank(query: String, value: String): HttpUrl.Builder {
@ -284,6 +338,9 @@ class TsukiMangas : HttpSource() {
val newRequest = request.newBuilder().apply {
apiHeaders.entries.forEach { addHeader(it.key, it.value) }
if (token.isNotBlank()) {
addHeader("Authorization", "Bearer $token")
}
}.build()
return chain.proceed(newRequest)