From b4ba560787e6e7cc4bf79fd54842931def1a2ee0 Mon Sep 17 00:00:00 2001
From: Pavka <pavel-mosein@yandex.ru>
Date: Tue, 17 Jul 2018 19:13:46 +0300
Subject: [PATCH] Update desu source. Genre and Time support (#404)

---
 src/ru/desu/build.gradle                      |  4 +--
 .../tachiyomi/extension/ru/desu/Desu.kt       | 25 +++++++++++++++----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/ru/desu/build.gradle b/src/ru/desu/build.gradle
index 6bbcfe0b4..fd7148f51 100644
--- a/src/ru/desu/build.gradle
+++ b/src/ru/desu/build.gradle
@@ -5,8 +5,8 @@ ext {
     appName = 'Tachiyomi: Desu'
     pkgNameSuffix = "ru.desu"
     extClass = '.Desu'
-    extVersionCode = 3
-    extVersionSuffix = 2
+    extVersionCode = 4
+    extVersionSuffix = 3
     libVersion = '1.2'
 }
 
diff --git a/src/ru/desu/src/eu/kanade/tachiyomi/extension/ru/desu/Desu.kt b/src/ru/desu/src/eu/kanade/tachiyomi/extension/ru/desu/Desu.kt
index 062efdf5e..f32b169c5 100644
--- a/src/ru/desu/src/eu/kanade/tachiyomi/extension/ru/desu/Desu.kt
+++ b/src/ru/desu/src/eu/kanade/tachiyomi/extension/ru/desu/Desu.kt
@@ -30,19 +30,28 @@ class Desu : HttpSource() {
         for (i in 0 until arr.length()) {
             var obj = arr.getJSONObject(i)
             ret.add(SManga.create().apply {
-                mangaFromJSON(obj)
+                mangaFromJSON(obj, false)
             })
         }
         return MangasPage(ret, next)
     }
 
-    private fun SManga.mangaFromJSON(obj: JSONObject) {
+    private fun SManga.mangaFromJSON(obj: JSONObject, chapter: Boolean) {
         val id = obj.getInt("id")
         url = "/$id"
         title = obj.getString("name")
         thumbnail_url = obj.getJSONObject("image").getString("original")
         description = obj.getString("description")
-
+        genre = if (chapter) {
+            val jsonArray = obj.getJSONArray("genres")
+            var genreList = kotlin.collections.mutableListOf<String>()
+            for (i in 0 until jsonArray.length()) {
+                genreList.add(jsonArray.getJSONObject(i).getString("russian"))
+            }
+            genreList.joinToString()
+        } else {
+            obj.getString("genres")
+        }
         status = when (obj.getString("status")) {
             "ongoing" -> SManga.ONGOING
             "released" -> SManga.COMPLETED
@@ -95,7 +104,7 @@ class Desu : HttpSource() {
 
     override fun mangaDetailsParse(response: Response) = SManga.create().apply {
         val obj = JSONObject(response.body()!!.string()).getJSONObject("response")
-        mangaFromJSON(obj)
+        mangaFromJSON(obj, true)
     }
 
     override fun chapterListParse(response: Response): List<SChapter> {
@@ -110,9 +119,15 @@ class Desu : HttpSource() {
             ret.add(SChapter.create().apply {
                 val ch = obj2.getString("ch")
                 val title = if (obj2.getString("title") == "null") "" else obj2.getString("title")
-                name = "$ch - $title"
+                if (title.isEmpty()) {
+                    name = "Глава $ch"
+                } else {
+                    name = "$ch - $title"
+                }
                 val id = obj2.getString("id")
                 url = "/$cid/chapter/$id"
+                chapter_number = ch.toFloat()
+                date_upload = obj2.getLong("date")*1000
             })
         }
         return ret