From df48c233781b8aead596243ffa6d23db65c74804 Mon Sep 17 00:00:00 2001
From: Eshlender <35057681+e-shl@users.noreply.github.com>
Date: Tue, 25 Apr 2023 22:19:36 +0500
Subject: [PATCH] [RU]Remanga merge branches (#16160)

* [RU]Remanga merge branches

* extVersionCode
---
 src/ru/remanga/build.gradle                   |  2 +-
 .../tachiyomi/extension/ru/remanga/Remanga.kt | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/ru/remanga/build.gradle b/src/ru/remanga/build.gradle
index 3c1209ae0..e9bdea4af 100644
--- a/src/ru/remanga/build.gradle
+++ b/src/ru/remanga/build.gradle
@@ -6,7 +6,7 @@ ext {
     extName = 'Remanga'
     pkgNameSuffix = 'ru.remanga'
     extClass = '.Remanga'
-    extVersionCode = 70
+    extVersionCode = 71
 }
 
 dependencies {
diff --git a/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt b/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt
index 8fc1cd476..92a8ca9d3 100644
--- a/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt
+++ b/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt
@@ -439,10 +439,25 @@ class Remanga : ConfigurableSource, HttpSource() {
                     emptyList()
                 }
                 val selectedBranch = branch.maxByOrNull { selector(it) }!!
-                return (1..(selectedBranch.count_chapters / 100 + 1)).map {
+                val tempChaptersList = mutableListOf<SChapter>()
+                if (branch.size > 1) {
+                    val selectedBranch2 =
+                        branch.filter { it.id != selectedBranch.id }.maxByOrNull { selector(it) }!!
+                    if (selectedBranch.count_chapters < json.decodeFromString<SeriesWrapperDto<List<BookDto>>>(
+                            chapterListRequest(selectedBranch2.id, 1).body.string(),
+                        ).content.firstOrNull()?.chapter?.toFloatOrNull()!!
+                    ) {
+                        (1..(selectedBranch2.count_chapters / 100 + 1)).map {
+                            val response = chapterListRequest(selectedBranch2.id, it)
+                            chapterListParse(response, manga, exChapters)
+                        }.let { tempChaptersList.addAll(it.flatten()) }
+                    }
+                }
+                (1..(selectedBranch.count_chapters / 100 + 1)).map {
                     val response = chapterListRequest(selectedBranch.id, it)
                     chapterListParse(response, manga, exChapters)
-                }.let { Observable.just(it.flatten()) }
+                }.let { tempChaptersList.addAll(it.flatten()) }
+                return tempChaptersList.distinctBy { it.name.substringBefore(". Глава") + "--" + it.chapter_number }.sortedWith(compareBy({ -it.chapter_number }, { it.name.substringBefore(". Глава") })).let { Observable.just(it) }
             }
         }
     }