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

Added support for new recommended sort API response. (#1419)

This commit is contained in:
funkyhippo 2019-08-27 15:36:27 -07:00 committed by Eugene
parent 6423c4d8ed
commit 0596adc5a1
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/en/guya/build.gradle
View File

@ -5,7 +5,7 @@ ext {
appName = 'Tachiyomi: Guya' appName = 'Tachiyomi: Guya'
pkgNameSuffix = "en.guya" pkgNameSuffix = "en.guya"
extClass = '.Guya' extClass = '.Guya'
extVersionCode = 5 extVersionCode = 6
libVersion = '1.2' libVersion = '1.2'
} }

26
src/en/guya/src/eu/kanade/tachiyomi/extension/en/guya/Guya.kt
View File

@ -12,6 +12,7 @@ import android.support.v7.preference.ListPreference
import android.support.v7.preference.PreferenceScreen import android.support.v7.preference.PreferenceScreen
import eu.kanade.tachiyomi.extension.BuildConfig import eu.kanade.tachiyomi.extension.BuildConfig
import okhttp3.* import okhttp3.*
import org.json.JSONArray
import org.json.JSONObject import org.json.JSONObject
import rx.Observable import rx.Observable
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
@ -191,6 +192,7 @@ open class Guya() : ConfigurableSource, HttpSource() {
// ------------- Helpers and whatnot --------------- // ------------- Helpers and whatnot ---------------
private fun parseChapterList(payload: String): List<SChapter> { private fun parseChapterList(payload: String): List<SChapter> {
val SORT_KEY = "preferred_sort"
val response = JSONObject(payload) val response = JSONObject(payload)
val chapters = response.getJSONObject("chapters") val chapters = response.getJSONObject("chapters")
@ -201,7 +203,11 @@ open class Guya() : ConfigurableSource, HttpSource() {
while (iter.hasNext()) { while (iter.hasNext()) {
val chapter = iter.next() val chapter = iter.next()
val chapterObj = chapters.getJSONObject(chapter) val chapterObj = chapters.getJSONObject(chapter)
chapterList.add(parseChapterFromJson(chapterObj, chapter, response.getString("slug"))) var preferredSort = response.getJSONArray(SORT_KEY)
if (chapterObj.has(SORT_KEY)) {
preferredSort = chapterObj.getJSONArray(SORT_KEY)
}
chapterList.add(parseChapterFromJson(chapterObj, chapter, preferredSort, response.getString("slug")))
} }
return chapterList.reversed() return chapterList.reversed()
@ -235,11 +241,11 @@ open class Guya() : ConfigurableSource, HttpSource() {
return manga return manga
} }
private fun parseChapterFromJson(json: JSONObject, num: String, slug: String): SChapter { private fun parseChapterFromJson(json: JSONObject, num: String, sort: JSONArray, slug: String): SChapter {
val chapter = SChapter.create() val chapter = SChapter.create()
// Get the scanlator info based on group ranking; do it first since we need it later // Get the scanlator info based on group ranking; do it first since we need it later
val firstGroupId = getBestScanlator(json.getJSONObject("groups")) val firstGroupId = getBestScanlator(json.getJSONObject("groups"), sort)
chapter.scanlator = Scanlators.getValueFromKey(firstGroupId) chapter.scanlator = Scanlators.getValueFromKey(firstGroupId)
chapter.name = num + " - " + json.getString("title") chapter.name = num + " - " + json.getString("title")
chapter.chapter_number = num.toFloat() chapter.chapter_number = num.toFloat()
@ -263,13 +269,19 @@ open class Guya() : ConfigurableSource, HttpSource() {
return pageArray return pageArray
} }
private fun getBestScanlator(json: JSONObject): String { private fun getBestScanlator(json: JSONObject, sort: JSONArray): String {
val preferred = preferences.getString(SCANLATOR_PREFERENCE, null) val preferred = preferences.getString(SCANLATOR_PREFERENCE, null)
return if (preferred != null && json.has(preferred)) { if (preferred != null && json.has(preferred)) {
preferred return preferred
} else { } else {
json.keys().next() for (i in 0 until sort.length()) {
if (json.has(sort.get(i).toString())) {
return sort.get(i).toString()
}
}
// If all fails, fall-back to the next available key
return json.keys().next()
} }
} }