Copymangas: 增加排行榜、最新上架 & 修复题材筛选

* 增加`CHANGELOG.md`

Author: zhongfly

src/zh/copymangas/CHANGELOG.md

@@ -0,0 +1,23 @@
+## 1.4.53
+
+### 功能
+
+* 筛选中增加排行榜、最新上架
+
+### 修复
+
+* 修复筛选中“题材”获取失败的问题
+
+## 1.4.52
+
+### 功能
+
+* 支持章末吐槽：使用热辣漫画时会显示拷贝的吐槽（因为热辣没有吐槽功能）
+
+## 1.4.51
+
+### 功能
+
+* 支持热辣漫画：可在设置里直接切换热辣漫画/拷贝漫画，切换后建议重启应用！（立即生效，书架里的漫画也不需要迁移，但是插件的设置务必重启后再修改！）
+
+

src/zh/copymangas/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'CopyMangas'
     extClass = '.CopyMangas'
-    extVersionCode = 52
+    extVersionCode = 53
 }
 
 apply from: "$rootDir/common.gradle"

src/zh/copymangas/src/eu/kanade/tachiyomi/extension/zh/copymangas/CopyMangas.kt

@@ -21,6 +21,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
+import keiyoushi.utils.firstInstanceOrNull
 import keiyoushi.utils.getPreferencesLazy
 import keiyoushi.utils.parseAs
 import kotlinx.serialization.json.Json
@@ -256,27 +257,54 @@ class CopyMangas : HttpSource(), ConfigurableSource {
         val builder = getUrl("api").toHttpUrl().newBuilder()
             .addQueryParameter("limit", "$PAGE_SIZE")
             .addQueryParameter("offset", "$offset")
+
         if (query.isNotBlank()) {
             builder.addPathSegments("api/v3/search/comic")
                 .addQueryParameter("q", query)
-            filters.filterIsInstance<SearchFilter>().firstOrNull()?.addQuery(builder)
+            filters.firstInstanceOrNull<SearchFilter>()?.addQuery(builder)
             // builder.addQueryParameter("q_type", "")
             headersBuilder.setToken(preferences.getString(if (useHotmanga) HOTMANGA_TOKEN_PREF else TOKEN_PREF, "")!!)
         } else {
-            builder.addPathSegments("api/v3/comics")
-            filters.filterIsInstance<CopyMangaFilter>().forEach {
-                if (it !is SearchFilter) {
-                    it.addQuery(builder)
+            val ranking = filters.firstInstanceOrNull<RankingGroup>()
+            if (ranking != null && (ranking.state[0] as TypeFilter).state != 0) {
+                val rankType = (ranking.state[0] as TypeFilter).state
+                if (rankType != 1) {
+                    // 排行榜
+                    builder.addPathSegments("api/v3/ranks")
+                        .addQueryParameter("type", "1")
+                    ranking.state.filterIsInstance<CopyMangaFilter>().forEach {
+                        it.addQuery(builder)
+                    }
+                } else {
+                    // 最新上架
+                    builder.addPathSegments("api/v3/update/newest")
+                }
+            } else {
+                // 分类/发现
+                builder.addPathSegments("api/v3/comics")
+                filters.filterIsInstance<CopyMangaFilter>().forEach {
+                    if (it !is SearchFilter) {
+                        it.addQuery(builder)
+                    }
                 }
             }
         }
         return Request.Builder().url(builder.build()).headers(headersBuilder.build()).build()
     }
 
     override fun searchMangaParse(response: Response): MangasPage {
-        val page = response.parseAs<ResultDto<ListDto<MangaDto>>>().results
+        val page = if (response.request.url.pathSegments.last() != "comics") {
+            response.parseAs<ResultDto<ListDto<RanksListWrapperDto>>>().results
+        } else {
+            response.parseAs<ResultDto<ListDto<MangaDto>>>().results
+        }
+
+        val mangas = page.list.map {
+            if (it is RanksListWrapperDto) it.comic.toSManga() else (it as MangaDto).toSManga()
+        }
         val hasNextPage = page.offset + page.limit < page.total
-        return MangasPage(page.list.map { it.toSManga() }, hasNextPage)
+
+        return MangasPage(mangas, hasNextPage)
     }
 
     override fun getMangaUrl(manga: SManga) = getUrl("web") + manga.url
@@ -410,6 +438,8 @@ class CopyMangas : HttpSource(), ConfigurableSource {
         return FilterList(
             SearchFilter(),
             Filter.Separator(),
+            RankingGroup(),
+            Filter.Separator(),
             Filter.Header("分类（搜索文本时无效）"),
             genreFilter,
             TopFilter(),
@@ -430,7 +460,7 @@ class CopyMangas : HttpSource(), ConfigurableSource {
                         apiHeaders,
                     ),
                 ).execute()
-                val list = response.parseAs<ListDto<KeywordDto>>().list.sortedBy { it.name }
+                val list = response.parseAs<ResultDto<ListDto<KeywordDto>>>().results.list.filter { it.count != null && it.count != 0 }.sortedBy { it.name }
                 val result = ArrayList<Param>(list.size + 1).apply { add(Param("全部", "")) }
                 genres = list.mapTo(result) { it.toParam() }.toTypedArray()
             } catch (e: Exception) {

src/zh/copymangas/src/eu/kanade/tachiyomi/extension/zh/copymangas/CopyMangasDto.kt

@@ -65,7 +65,7 @@ class ChapterDto(
 }
 
 @Serializable
-class KeywordDto(val name: String, val path_word: String) {
+class KeywordDto(val name: String, val path_word: String, val count: Int?) {
     fun toParam() = Param(ChineseUtils.toSimplified(name), path_word)
 }
 
@@ -89,6 +89,9 @@ class UrlDto(val url: String)
 @Serializable
 class ChapterPageListWrapperDto(val chapter: ChapterPageListDto)
 
+@Serializable
+class RanksListWrapperDto(val comic: MangaDto)
+
 @Serializable
 class ListDto<T>(
     val total: Int,

src/zh/copymangas/src/eu/kanade/tachiyomi/extension/zh/copymangas/CopyMangasFilters.kt

@@ -44,3 +44,34 @@ private val SORT_VALUES = arrayOf(
     Param("更新时间", "-datetime_updated"),
     Param("更新时间(逆序)", "datetime_updated"),
 )
+
+class RankingGroup : Filter.Group<Filter<*>>(
+    "排行榜（搜索文本时无效）",
+    listOf<Filter<*>>(
+        TypeFilter(),
+        DateFilter(),
+    ),
+) {
+    private class DateFilter : CopyMangaFilter(
+        "时间",
+        "date_type",
+        arrayOf(
+            Param("今日", "day"),
+            Param("近七天", "week"),
+            Param("近三十天", "month"),
+            Param("总榜单", "total"),
+        ),
+    )
+}
+
+class TypeFilter : CopyMangaFilter(
+    "类型",
+    "audience_type",
+    arrayOf(
+        Param("不查看排行榜", ""),
+        Param("最新上架", ""),
+        Param("男频", "male"),
+        Param("女频", "female"),
+
+    ),
+)