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

Use error message from MangaPlus API (#2400) 

Use error message from MangaPlus API
This commit is contained in:
Alessandro Jean 2020-03-11 00:20:06 -03:00 committed by GitHub
parent 9ad04a5b01
commit 92d64e95a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all/mangaplus/build.gradle
View File

@ -6,7 +6,7 @@ ext {
appName = 'Tachiyomi: MANGA Plus by SHUEISHA' appName = 'Tachiyomi: MANGA Plus by SHUEISHA'
pkgNameSuffix = 'all.mangaplus' pkgNameSuffix = 'all.mangaplus'
extClass = '.MangaPlusFactory' extClass = '.MangaPlusFactory'
extVersionCode = 3 extVersionCode = 4
libVersion = '1.2' libVersion = '1.2'
} }

30
src/all/mangaplus/src/eu/kanade/tachiyomi/extension/all/mangaplus/MangaPlus.kt
View File

@ -47,7 +47,7 @@ abstract class MangaPlus(override val lang: String,
val result = response.asProto() val result = response.asProto()
if (result.success == null) if (result.success == null)
return MangasPage(emptyList(), false) throw Exception(result.error!!.langPopup.body)
val mangas = result.success.titleRankingView!!.titles val mangas = result.success.titleRankingView!!.titles
.filter { it.language == langCode } .filter { it.language == langCode }
@ -70,7 +70,7 @@ abstract class MangaPlus(override val lang: String,
val result = response.asProto() val result = response.asProto()
if (result.success == null) if (result.success == null)
return MangasPage(emptyList(), false) throw Exception(result.error!!.langPopup.body)
val mangas = result.success.webHomeView!!.groups val mangas = result.success.webHomeView!!.groups
.flatMap { it.titles } .flatMap { it.titles }
@ -101,7 +101,7 @@ abstract class MangaPlus(override val lang: String,
val result = response.asProto() val result = response.asProto()
if (result.success == null) if (result.success == null)
return MangasPage(emptyList(), false) throw Exception(result.error!!.langPopup.body)
val mangas = result.success.allTitlesView!!.titles val mangas = result.success.allTitlesView!!.titles
.filter { it.language == langCode } .filter { it.language == langCode }
@ -137,7 +137,7 @@ abstract class MangaPlus(override val lang: String,
val result = response.asProto() val result = response.asProto()
if (result.success == null) if (result.success == null)
throw Exception(mapLangToErrorProperty(result.error!!).body) throw Exception(result.error!!.langPopup.body)
val details = result.success.titleDetailView!! val details = result.success.titleDetailView!!
val title = details.title val title = details.title
@ -157,7 +157,7 @@ abstract class MangaPlus(override val lang: String,
val result = response.asProto() val result = response.asProto()
if (result.success == null) if (result.success == null)
throw Exception(mapLangToErrorProperty(result.error!!).body) throw Exception(result.error!!.langPopup.body)
val titleDetailView = result.success.titleDetailView!! val titleDetailView = result.success.titleDetailView!!
@ -186,7 +186,7 @@ abstract class MangaPlus(override val lang: String,
val result = response.asProto() val result = response.asProto()
if (result.success == null) if (result.success == null)
throw Exception(mapLangToErrorProperty(result.error!!).body) throw Exception(result.error!!.langPopup.body)
return result.success.mangaViewer!!.pages return result.success.mangaViewer!!.pages
.mapNotNull { it.page } .mapNotNull { it.page }
@ -211,12 +211,6 @@ abstract class MangaPlus(override val lang: String,
return GET(page.imageUrl!!, newHeaders) return GET(page.imageUrl!!, newHeaders)
} }
private fun mapLangToErrorProperty(error: ErrorResult): Popup = when (lang) {
"es" -> error.spanishPopup
else -> error.englishPopup
}
// Maybe removing the duration parameter make the image accessible forever.
private fun getImageUrl(url: String): String { private fun getImageUrl(url: String): String {
val imageUrl = url.substringBefore("&duration") val imageUrl = url.substringBefore("&duration")
@ -240,9 +234,9 @@ abstract class MangaPlus(override val lang: String,
val response = chain.proceed(request) val response = chain.proceed(request)
val contentType = response.header("Content-Type", "image/jpeg")!!
val image = decodeImage(encryptionKey, response.body()!!.bytes()) val image = decodeImage(encryptionKey, response.body()!!.bytes())
val body = ResponseBody.create(MediaType.parse(contentType), image)
val body = ResponseBody.create(MediaType.parse("image/jpeg"), image)
return response.newBuilder().body(body).build() return response.newBuilder().body(body).build()
} }
@ -265,6 +259,12 @@ abstract class MangaPlus(override val lang: String,
return ByteArray(content.size) { pos -> content[pos].toByte() } return ByteArray(content.size) { pos -> content[pos].toByte() }
} }
private val ErrorResult.langPopup: Popup
get() = when(lang) {
"es" -> spanishPopup
else -> englishPopup
}
private fun Response.asProto(): MangaPlusResponse { private fun Response.asProto(): MangaPlusResponse {
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT)
return ProtoBuf.load(MangaPlusSerializer, body()!!.bytes()) return ProtoBuf.load(MangaPlusSerializer, body()!!.bytes())
@ -296,7 +296,7 @@ abstract class MangaPlus(override val lang: String,
companion object { companion object {
private const val WEB_URL = "https://mangaplus.shueisha.co.jp" private const val WEB_URL = "https://mangaplus.shueisha.co.jp"
private const val IMAGES_WESERV_URL = "https://images.weserv.nl" private const val IMAGES_WESERV_URL = "https://images.weserv.nl"
private const val USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.92 Safari/537.36" private const val USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36"
private val HEX_GROUP = "(.{1,2})".toRegex() private val HEX_GROUP = "(.{1,2})".toRegex()