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

Show better Google Drive error messages on TS. (#11663)

Browse Source
This commit is contained in:
Alessandro Jean 2022-04-29 19:41:58 -03:00 committed by GitHub
parent 6f138f5b24
commit 10aaeb245e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ ext {
extName = 'Tao Sect' extName = 'Tao Sect'
pkgNameSuffix = 'pt.taosect' pkgNameSuffix = 'pt.taosect'
extClass = '.TaoSect' extClass = '.TaoSect'
extVersionCode = 15 extVersionCode = 16
isNsfw = true isNsfw = true
} }

27
src/pt/taosect/src/eu/kanade/tachiyomi/extension/pt/taosect/TaoSect.kt
View File

@ -289,12 +289,17 @@ class TaoSect : HttpSource() {
val firstPageRequest = imageRequest(firstPage) val firstPageRequest = imageRequest(firstPage)
client.newCall(firstPageRequest).execute().use { client.newCall(firstPageRequest).execute().use {
it.headers["Content-Type"]!!.contains("text/html") val isHtml = it.headers["Content-Type"]!!.contains("text/html")
GoogleDriveResponse(!isHtml && it.isSuccessful, it.code)
} }
} }
if (hasExceededViewLimit.getOrDefault(false)) { val defaultResponse = GoogleDriveResponse(false, GD_BACKEND_ERROR)
throw Exception(EXCEEDED_GOOGLE_DRIVE_VIEW_LIMIT) val googleDriveResponse = hasExceededViewLimit.getOrDefault(defaultResponse)
if (!googleDriveResponse.isValid) {
throw Exception(googleDriveResponse.errorMessage)
} }
return pages return pages
@ -401,6 +406,14 @@ class TaoSect : HttpSource() {
Tag("62", "Webtoon") Tag("62", "Webtoon")
) )
private data class GoogleDriveResponse(val isValid: Boolean, val code: Int) {
val errorMessage: String
get() = when (code) {
GD_SHARING_RATE_LIMIT_EXCEEDED -> EXCEEDED_GOOGLE_DRIVE_VIEW_LIMIT
else -> GOOGLE_DRIVE_UNAVAILABLE
}
}
companion object { companion object {
private const val ACCEPT_IMAGE = "image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8" private const val ACCEPT_IMAGE = "image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8"
private const val ACCEPT_JSON = "application/json" private const val ACCEPT_JSON = "application/json"
@ -415,7 +428,13 @@ class TaoSect : HttpSource() {
private const val PROJECT_NOT_FOUND = "Projeto não encontrado." private const val PROJECT_NOT_FOUND = "Projeto não encontrado."
private const val CHAPTERS_NOT_FOUND = "Capítulos não encontrados." private const val CHAPTERS_NOT_FOUND = "Capítulos não encontrados."
private const val EXCEEDED_GOOGLE_DRIVE_VIEW_LIMIT = "Limite de visualizações atingido " + private const val EXCEEDED_GOOGLE_DRIVE_VIEW_LIMIT = "Limite de visualizações atingido " +
"no Google Drive. Aguarde com que o limite seja reestabelecido." "no Google Drive. Tente novamente mais tarde."
private const val GOOGLE_DRIVE_UNAVAILABLE = "O Google Drive está indisponível no " +
"momento. Tente novamente mais tarde."
// Reference: https://developers.google.com/drive/api/guides/handle-errors
private const val GD_SHARING_RATE_LIMIT_EXCEEDED = 403
private const val GD_BACKEND_ERROR = 500
private val DATE_FORMATTER by lazy { private val DATE_FORMATTER by lazy {
SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ENGLISH) SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ENGLISH)