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

ar: gmanga: Fix index error while fetching chapters list (#6992) 

Signed-off-by: yshalsager <ysh-alsager@hotmail.com>
This commit is contained in:
Youssif Shaaban Alsager 2021-05-12 18:40:12 +02:00 committed by GitHub
parent a76d5bc782
commit bcc174e3a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ar/gmanga/build.gradle
View File

@ -5,7 +5,7 @@ ext {
extName = 'GMANGA' extName = 'GMANGA'
pkgNameSuffix = 'ar.gmanga' pkgNameSuffix = 'ar.gmanga'
extClass = '.Gmanga' extClass = '.Gmanga'
extVersionCode = 4 extVersionCode = 5
libVersion = '1.2' libVersion = '1.2'
containsNsfw = false containsNsfw = false
} }

22
src/ar/gmanga/src/eu/kanade/tachiyomi/extension/ar/gmanga/Gmanga.kt
View File

@ -4,6 +4,7 @@ import androidx.preference.PreferenceScreen
import com.github.salomonbrys.kotson.fromJson import com.github.salomonbrys.kotson.fromJson
import com.github.salomonbrys.kotson.get import com.github.salomonbrys.kotson.get
import com.github.salomonbrys.kotson.nullString import com.github.salomonbrys.kotson.nullString
import com.github.salomonbrys.kotson.toJsonArray
import com.google.gson.Gson import com.google.gson.Gson
import com.google.gson.JsonArray import com.google.gson.JsonArray
import com.google.gson.JsonObject import com.google.gson.JsonObject
@ -65,12 +66,19 @@ class Gmanga : ConfigurableSource, HttpSource() {
val data = decryptResponse(response) val data = decryptResponse(response)
val chapters: List<JsonArray> = buildList { val chapters: List<JsonArray> = buildList {
val allChapters = data["rows"][0]["rows"].asJsonArray.map { it.asJsonArray } val allChapters: ArrayList<JsonArray> = ArrayList()
data["rows"][0]["rows"].asJsonArray.forEach { release ->
val chapter = data["rows"][2]["rows"].asJsonArray.filter { it[0] == release[4] }.toJsonArray()
chapter.asJsonArray.forEach { release.asJsonArray.addAll(it.asJsonArray) }
val team = data["rows"][1]["rows"].asJsonArray.filter { it[0] == release[5] }.toJsonArray()
team.asJsonArray.forEach { release.asJsonArray.addAll(it.asJsonArray) }
allChapters.add(release.asJsonArray)
}
when (preferences.getString(PREF_CHAPTER_LISTING)) { when (preferences.getString(PREF_CHAPTER_LISTING)) {
PREF_CHAPTER_LISTING_SHOW_POPULAR -> addAll( PREF_CHAPTER_LISTING_SHOW_POPULAR -> addAll(
allChapters.groupBy { it.asJsonArray[6].asFloat } allChapters.groupBy { it.asJsonArray[4].asFloat }
.map { (_: Float, versions: List<JsonArray>) -> versions.maxByOrNull { it[4].asLong }!! } .map { (_: Float, versions: List<JsonArray>) -> versions.maxByOrNull { it[5].asLong }!! }
) )
else -> addAll(allChapters) else -> addAll(allChapters)
} }
@ -78,14 +86,14 @@ class Gmanga : ConfigurableSource, HttpSource() {
return chapters.map { return chapters.map {
SChapter.create().apply { SChapter.create().apply {
chapter_number = it[6].asFloat chapter_number = it[8].asFloat
val chapterName = it[8].asString.let { if (it.trim() != "") " - $it" else "" } val chapterName = it[10].asString.let { if (it.trim() != "") " - $it" else "" }
url = "/r/${it[0]}" url = "/r/${it[0]}"
name = "${chapter_number.let { if (it % 1 > 0) it else it.toInt() }}$chapterName" name = "${chapter_number.let { if (it % 1 > 0) it else it.toInt() }}$chapterName"
date_upload = it[3].asLong * 1000 date_upload = it[2].asLong * 1000
scanlator = it[10].asString scanlator = it[13].asString
} }
} }
} }