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

[mangarock] Add null check for authors, convert hardcoded JSON string… (#977)

Browse Source 
* [mangarock] Add null check for authors, convert hardcoded JSON strings to maps

* dammit
This commit is contained in:
Logan B 2019-03-29 01:14:12 +13:00 committed by Carlos
parent 48ac7ffcf9
commit 9560a68fdc
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/en/mangarock/build.gradle
View File

@ -5,8 +5,12 @@ ext {
appName = 'Tachiyomi: Manga Rock' appName = 'Tachiyomi: Manga Rock'
pkgNameSuffix = 'en.mangarock' pkgNameSuffix = 'en.mangarock'
extClass = '.MangaRock' extClass = '.MangaRock'
extVersionCode = 5 extVersionCode = 6
libVersion = '1.0' libVersion = '1.0'
} }
dependencies {
compileOnly 'com.google.code.gson:gson:2.8.2'
}
apply from: "$rootDir/common.gradle" apply from: "$rootDir/common.gradle"

33
src/en/mangarock/src/eu/kanade/tachiyomi/extension/en/mangarock/MangaRock.kt
View File

@ -1,5 +1,6 @@
package eu.kanade.tachiyomi.extension.en.mangarock package eu.kanade.tachiyomi.extension.en.mangarock
import com.google.gson.GsonBuilder
import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.network.POST
import eu.kanade.tachiyomi.source.model.* import eu.kanade.tachiyomi.source.model.*
@ -58,6 +59,7 @@ class MangaRock : HttpSource() {
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
val jsonType = MediaType.parse("application/jsonType; charset=utf-8") val jsonType = MediaType.parse("application/jsonType; charset=utf-8")
val gson = GsonBuilder().create()
// Filter // Filter
if (query.isBlank()) { if (query.isBlank()) {
@ -91,12 +93,12 @@ class MangaRock : HttpSource() {
} }
} }
val body = RequestBody.create(jsonType, "{\"status\":\"$status\",\"genres\":{$genres},\"rank\":\"$rank\",\"order\":\"$orderBy\"}") val body = RequestBody.create(jsonType, gson.toJson(mapOf("status" to status, "genres" to genres, "rank" to rank, "order" to orderBy)))
return POST("$baseUrl/mrs_filter", headers, body) return POST("$baseUrl/mrs_filter", headers, body)
} }
// Regular search // Regular search
val body = RequestBody.create(jsonType, "{\"type\":\"series\", \"keywords\":\"$query\"}") val body = RequestBody.create(jsonType, gson.toJson(mapOf("type" to "series", "keywords" to query)))
return POST("$baseUrl/mrs_search", headers, body) return POST("$baseUrl/mrs_search", headers, body)
} }
@ -143,7 +145,7 @@ class MangaRock : HttpSource() {
} }
private fun sortByRank(arr: List<JSONObject>): List<JSONObject> { private fun sortByRank(arr: List<JSONObject>): List<JSONObject> {
return arr.sortedBy({ it.getInt("rank") }) return arr.sortedBy { it.getInt("rank") }
} }
override fun mangaDetailsParse(response: Response) = SManga.create().apply { override fun mangaDetailsParse(response: Response) = SManga.create().apply {
@ -153,18 +155,23 @@ class MangaRock : HttpSource() {
title = obj.getString("name") title = obj.getString("name")
description = obj.getString("description") description = obj.getString("description")
val people = obj.getJSONArray("authors") if (obj.isNull("authors")) {
val authors = ArrayList<String>() artist = ""
val artists = ArrayList<String>() author = ""
for (i in 0 until people.length()) { } else {
val person = people.getJSONObject(i) val people = obj.getJSONArray("authors")
when (person.getString("role")) { val authors = ArrayList<String>()
"art" -> artists.add(person.getString("name")) val artists = ArrayList<String>()
"story" -> authors.add(person.getString("name")) for (i in 0 until people.length()) {
val person = people.getJSONObject(i)
when (person.getString("role")) {
"art" -> artists.add(person.getString("name"))
"story" -> authors.add(person.getString("name"))
}
} }
artist = artists.sorted().joinToString(", ")
author = authors.sorted().joinToString(", ")
} }
artist = artists.sorted().joinToString(", ")
author = authors.sorted().joinToString(", ")
val categories = obj.getJSONArray("rich_categories") val categories = obj.getJSONArray("rich_categories")
val genres = ArrayList<String>(categories.length()) val genres = ArrayList<String>(categories.length())