From b650471af6bbce10204898e1917602c60f427d42 Mon Sep 17 00:00:00 2001
From: Carlos <cargo8005@gmail.com>
Date: Tue, 6 Mar 2018 14:31:57 -0500
Subject: [PATCH] add support for multiple scanlators (#237)
---
src/all/mangadex/build.gradle | 4 ++--
.../extension/all/mangadex/Mangadex.kt | 19 ++++++++++++++-----
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/all/mangadex/build.gradle b/src/all/mangadex/build.gradle
index 2651aeda8..f79d68765 100644
--- a/src/all/mangadex/build.gradle
+++ b/src/all/mangadex/build.gradle
@@ -5,8 +5,8 @@ ext {
appName = 'Tachiyomi: MangaDex'
pkgNameSuffix = "all.mangadex"
extClass = '.MangadexFactory'
- extVersionCode = 11
- extVersionSuffix = 11
+ extVersionCode = 12
+ extVersionSuffix = 12
libVersion = '1.2'
}
diff --git a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/Mangadex.kt b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/Mangadex.kt
index c7b065d3e..cfd9c5637 100644
--- a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/Mangadex.kt
+++ b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/Mangadex.kt
@@ -1,9 +1,6 @@
package eu.kanade.tachiyomi.extension.all.mangadex
-import com.github.salomonbrys.kotson.forEach
-import com.github.salomonbrys.kotson.int
-import com.github.salomonbrys.kotson.long
-import com.github.salomonbrys.kotson.string
+import com.github.salomonbrys.kotson.*
import com.google.gson.JsonObject
import com.google.gson.JsonParser
import eu.kanade.tachiyomi.network.GET
@@ -253,7 +250,19 @@ open class Mangadex(override val lang: String, private val internalLang: String,
chapter.name = cleanString(chapterName.joinToString(" "))
//convert from unix time
chapter.date_upload = chapterJson.get("timestamp").long * 1000
- chapter.scanlator = chapterJson.get("group_name").string
+ var scanlatorName = mutableListOf<String>()
+ if (!chapterJson.get("group_name").nullString.isNullOrBlank()) {
+ scanlatorName.add(chapterJson.get("group_name").string)
+ }
+ if (!chapterJson.get("group_name_2").nullString.isNullOrBlank()) {
+ scanlatorName.add(chapterJson.get("group_name_2").string)
+ }
+ if (!chapterJson.get("group_name_3").nullString.isNullOrBlank()) {
+ scanlatorName.add(chapterJson.get("group_name_3").string)
+ }
+ chapter.scanlator = scanlatorName.joinToString(" & ")
+
+
return chapter
}