[RU]Remanga User's mangalist (#10428)

* [RU]Remanga User's mangalist

* worked filter

* Exception

src/ru/remanga/build.gradle

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

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

@@ -5,6 +5,7 @@ import BranchesDto
 import ChunksPageDto
 import LibraryDto
 import MangaDetDto
+import MyLibraryDto
 import PageDto
 import PageWrapperDto
 import SeriesWrapperDto
@@ -115,10 +116,11 @@ class Remanga : ConfigurableSource, HttpSource() {
         val body = jsonObject.toString().toRequestBody(MEDIA_TYPE)
         val response = chain.proceed(POST("$baseUrl/api/users/login/", headers, body))
         if (response.code >= 400) {
-            throw Exception("Failed to login")
+            throw Exception("Не удалось войти")
         }
-        val user = json.decodeFromString<SeriesWrapperDto<UserDto>>(response.body!!.string())
+        val user = json.decodeFromString<SeriesWrapperDto<UserDto>>(response.body!!.string()).content
-        return user.content.access_token
+        USER_ID = user.id.toString()
+        return user.access_token
     }
 
     override fun popularMangaRequest(page: Int) = GET("$baseUrl/api/search/catalog/?ordering=-rating&count=$count&page=$page", headers)
@@ -130,12 +132,20 @@ class Remanga : ConfigurableSource, HttpSource() {
     override fun latestUpdatesParse(response: Response): MangasPage = searchMangaParse(response)
 
     override fun searchMangaParse(response: Response): MangasPage {
+        if (response.request.url.toString().contains("bookmarks")) {
+            val page = json.decodeFromString<PageWrapperDto<MyLibraryDto>>(response.body!!.string())
+            val mangas = page.content.map {
+                it.title.toSManga()
+            }
+            return MangasPage(mangas, page.props.page < page.props.total_pages)
+        } else {
             val page = json.decodeFromString<PageWrapperDto<LibraryDto>>(response.body!!.string())
             val mangas = page.content.map {
                 it.toSManga()
             }
             return MangasPage(mangas, page.props.page < page.props.total_pages)
         }
+    }
 
     private fun LibraryDto.toSManga(): SManga =
         SManga.create().apply {
@@ -195,6 +205,16 @@ class Remanga : ConfigurableSource, HttpSource() {
                         url.addQueryParameter(if (genre.isIncluded()) "genres" else "exclude_genres", genre.id)
                     }
                 }
+                is MyList -> {
+                    if (filter.state > 0) {
+                        if (USER_ID == "") {
+                            throw Exception("Пользователь не найден")
+                        }
+                        val TypeQ = getMyList()[filter.state].id
+                        val UserProfileUrl = "$baseUrl/api/users/$USER_ID/bookmarks/?type=$TypeQ&page=$page".toHttpUrlOrNull()!!.newBuilder()
+                        return GET(UserProfileUrl.toString(), headers)
+                    }
+                }
             }
         }
         return GET(url.toString(), headers)
@@ -427,7 +447,8 @@ class Remanga : ConfigurableSource, HttpSource() {
         CategoryList(getCategoryList()),
         TypeList(getTypeList()),
         StatusList(getStatusList()),
-        AgeList(getAgeList())
+        AgeList(getAgeList()),
+        MyList(MyStatus)
     )
 
     private class OrderBy : Filter.Sort(
@@ -607,6 +628,21 @@ class Remanga : ConfigurableSource, HttpSource() {
         SearchFilter("юри", "41"),
         SearchFilter("яой", "43")
     )
+    private class MyList(favorites: Array<String>) : Filter.Select<String>("Мои списки (только)", favorites)
+    private data class MyListUnit(val name: String, val id: String)
+    private val MyStatus = getMyList().map {
+        it.name
+    }.toTypedArray()
+
+    private fun getMyList() = listOf(
+        MyListUnit("Каталог", "-"),
+        MyListUnit("Читаю", "0"),
+        MyListUnit("Буду читать", "1"),
+        MyListUnit("Прочитано", "2"),
+        MyListUnit("Отложено", "4"),
+        MyListUnit("Брошено ", "3"),
+        MyListUnit("Не интересно ", "5")
+    )
 
     private fun androidx.preference.PreferenceScreen.editTextPreference(title: String, default: String, value: String, isPassword: Boolean = false): androidx.preference.EditTextPreference {
         return androidx.preference.EditTextPreference(context).apply {
@@ -679,6 +715,8 @@ class Remanga : ConfigurableSource, HttpSource() {
     private val password by lazy { getPrefPassword() }
 
     companion object {
+        private var USER_ID = ""
+
         private val MEDIA_TYPE = "application/json; charset=utf-8".toMediaTypeOrNull()
 
         private const val USERNAME_TITLE = "Username"

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

@@ -27,6 +27,10 @@ data class LibraryDto(
     val dir: String,
     val img: ImgDto
 )
+@Serializable
+data class MyLibraryDto(
+    val title: LibraryDto
+)
 
 @Serializable
 data class StatusDto(
@@ -109,5 +113,6 @@ data class ChunksPageDto(
 
 @Serializable
 data class UserDto(
+    val id: Long,
     val access_token: String
 )