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

ScanManga: small improvements (#6333)

Browse Source
This commit is contained in:
Julien Papasian 2021-03-29 12:05:25 +01:00 committed by GitHub
parent 7655bf6483
commit 0d1ad39fc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fr/scanmanga/build.gradle
View File

@ -5,7 +5,7 @@ ext {
extName = 'Scan-Manga' extName = 'Scan-Manga'
pkgNameSuffix = 'fr.scanmanga' pkgNameSuffix = 'fr.scanmanga'
extClass = '.ScanManga' extClass = '.ScanManga'
extVersionCode = 2 extVersionCode = 3
libVersion = '1.2' libVersion = '1.2'
containsNsfw = true containsNsfw = true
} }

32
src/fr/scanmanga/src/eu/kanade/tachiyomi/extension/fr/scanmanga/ScanManga.kt
View File

@ -1,9 +1,9 @@
package eu.kanade.tachiyomi.extension.fr.scanmanga package eu.kanade.tachiyomi.extension.fr.scanmanga
import com.github.salomonbrys.kotson.fromJson
import com.github.salomonbrys.kotson.get import com.github.salomonbrys.kotson.get
import com.github.salomonbrys.kotson.string
import com.google.gson.Gson import com.google.gson.Gson
import com.google.gson.JsonObject import com.google.gson.JsonParser
import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.network.asObservableSuccess
import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.FilterList
@ -125,19 +125,37 @@ class ScanManga : ParsedHttpSource() {
} }
private fun parseMangaFromJson(response: Response): MangasPage { private fun parseMangaFromJson(response: Response): MangasPage {
val jsonString = response.body()!!.string() val jsonData = response.body()!!.string()!!
if (jsonString.equals("")) { if (jsonData == "") {
return MangasPage(listOf<SManga>(), false) return MangasPage(listOf<SManga>(), false)
} }
val jsonObject = gson.fromJson<JsonObject>(jsonString) val jsonObject = JsonParser().parse(jsonData).asJsonObject
val mangas = jsonObject.keySet() val mangas = jsonObject.keySet()
.map { key -> .map { key ->
// "95","%24100-is-Too-Cheap","0","3","One Shot","","2 avril 2010","","335","178","4010","" // "95","%24100-is-Too-Cheap","0","3","One Shot","","2 avril 2010","","335","178","4010",""
SManga.create().apply { SManga.create().apply {
url = "/" + Integer.parseInt(jsonObject.get(key)?.get(0).toString().replace("\"", "")) + "/" + jsonObject.get(key)?.get(1).toString().replace("\"", "") + ".html" url = "/" + jsonObject[key][0].string + "/" + jsonObject[key][1].string + ".html"
title = Parser.unescapeEntities(key, false) title = Parser.unescapeEntities(key, false)
genre = jsonObject[key][2].string.let {
when {
it.contains("0") -> "Shōnen"
it.contains("1") -> "Shōjo"
it.contains("2") -> "Seinen"
it.contains("3") -> "Josei"
else -> null
}
}
status = jsonObject[key][3].string.let {
when {
it.contains("0") -> SManga.ONGOING // En cours
it.contains("1") -> SManga.ONGOING // En pause
it.contains("2") -> SManga.COMPLETED // Terminé
it.contains("3") -> SManga.COMPLETED // One shot
else -> SManga.UNKNOWN
}
}
} }
} }
@ -150,7 +168,7 @@ class ScanManga : ParsedHttpSource() {
override fun mangaDetailsParse(document: Document): SManga { override fun mangaDetailsParse(document: Document): SManga {
return SManga.create().apply { return SManga.create().apply {
title = document.select("h2[itemprop=\"name\"]").text() title = document.select("h2[itemprop=\"name\"]").text()
author = document.select("li[itemprop=\"author\"]").text() author = document.select("li[itemprop=\"author\"] a").joinToString { it.text() }
description = document.select("p[itemprop=\"description\"]").text() description = document.select("p[itemprop=\"description\"]").text()
thumbnail_url = document.select(".contenu_fiche_technique .image_manga img").attr("src") thumbnail_url = document.select(".contenu_fiche_technique .image_manga img").attr("src")
} }