Ru: Remanga. Fix branches publisher and pagination (#10854)

* Ru: Remanga. Fix branches publisher and pagination

* Ru: Remanga. Reorder tags. Manga type first

src/ru/remanga/build.gradle

@@ -6,7 +6,7 @@ ext {
     extName = 'Remanga'
     pkgNameSuffix = 'ru.remanga'
     extClass = '.Remanga'
-    extVersionCode = 44
+    extVersionCode = 45
 }
 
 dependencies {

src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt

@@ -8,6 +8,7 @@ import MangaDetDto
 import MyLibraryDto
 import PageDto
 import PageWrapperDto
+import PublisherDto
 import SeriesWrapperDto
 import TagsDto
 import UserDto
@@ -219,10 +220,10 @@ class Remanga : ConfigurableSource, HttpSource() {
         }
     }
 
-    private fun parseType(type: TagsDto): TagsDto {
+    private fun parseType(type: TagsDto): String {
         return when (type.name) {
-            "Западный комикс" -> TagsDto(type.id, "Комикс")
+            "Западный комикс" -> "Комикс"
-            else -> type
+            else -> type.name
         }
     }
     private fun parseAge(age_limit: Int): String {
@@ -259,7 +260,7 @@ class Remanga : ConfigurableSource, HttpSource() {
                 altName = "Альтернативные названия:\n" + another_name + "\n\n"
             }
             this.description = rus_name + "\n" + ratingStar + " " + ratingValue + " (голосов: " + count_rating + ")\n" + altName + Jsoup.parse(o.description).text()
-            genre = (genres + categories + parseType(type)).joinToString { it.name } + ", " + parseAge(age_limit)
+            genre = parseType(type) + ", " + parseAge(age_limit) + ", " + (genres + categories).joinToString { it.name }
             status = parseStatus(o.status.id)
         }
     }
@@ -317,18 +318,27 @@ class Remanga : ConfigurableSource, HttpSource() {
                 Observable.error(Exception("Лицензировано - Нет глав"))
             }
             else -> {
-                val branchId = branch.maxByOrNull { selector(it) }!!.id
+                val selectedBranch = branch.maxByOrNull { selector(it) }!!
-                client.newCall(chapterListRequest(branchId))
+                return (1..(selectedBranch.count_chapters / 100 + 1)).map {
-                    .asObservableSuccess()
+                    val response = chapterListRequest(selectedBranch.id, it)
-                    .map { response ->
+                    chapterListParse(response, selectedBranch.publishers)
-                        chapterListParse(response)
+                }.let { Observable.just(it.flatten()) }
-                    }
             }
         }
     }
 
-    private fun chapterListRequest(branch: Long): Request {
+    private fun chapterListRequest(branch: Long, page: Number): Response =
-        return GET("$baseUrl/api/titles/chapters/?branch_id=$branch", headers)
+        client.newCall(
+            GET(
+                "$baseUrl/api/titles/chapters/?branch_id=$branch&page=$page&count=100",
+                headers
+            )
+        ).execute().run {
+            if (!isSuccessful) {
+                close()
+                throw Exception("HTTP error $code")
+            }
+            this
         }
 
     @SuppressLint("DefaultLocale")
@@ -340,7 +350,8 @@ class Remanga : ConfigurableSource, HttpSource() {
         return chapterName
     }
 
-    override fun chapterListParse(response: Response): List<SChapter> {
+    override fun chapterListParse(response: Response): List<SChapter> = throw NotImplementedError("Unused")
+    private fun chapterListParse(response: Response, publishers: List<PublisherDto>): List<SChapter> {
         var chapters = json.decodeFromString<SeriesWrapperDto<List<BookDto>>>(response.body!!.string()).content
         if (!preferences.getBoolean(PAID_PREF, false)) {
             chapters = chapters.filter { !it.is_paid or (it.is_bought == true) }
@@ -351,8 +362,8 @@ class Remanga : ConfigurableSource, HttpSource() {
                 name = chapterName(chapter)
                 url = "/api/titles/chapters/${chapter.id}"
                 date_upload = parseDate(chapter.upload_date)
-                scanlator = if (chapter.publishers.isNotEmpty()) {
+                scanlator = if (publishers.isNotEmpty()) {
-                    chapter.publishers.joinToString { it.name }
+                    publishers.joinToString { it.name }
                 } else null
             }
         }

src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/dto/Dto.kt

@@ -9,7 +9,8 @@ data class TagsDto(
 @Serializable
 data class BranchesDto(
     val id: Long,
-    val count_chapters: Int
+    val count_chapters: Int,
+    val publishers: List<PublisherDto>
 )
 
 @Serializable
@@ -90,8 +91,7 @@ data class BookDto(
     val name: String,
     val upload_date: String,
     val is_paid: Boolean,
-    val is_bought: Boolean?,
+    val is_bought: Boolean?
-    val publishers: List<PublisherDto>
 )
 
 @Serializable