AllAnime: refactor repetitive code (#15947)

* AllAnime: refactor repetitive code

* move some stuff

src/en/allanime/build.gradle

@@ -6,7 +6,7 @@ ext {
     extName = 'AllAnime'
     pkgNameSuffix = 'en.allanime'
     extClass = '.AllAnime'
-    extVersionCode = 1
+    extVersionCode = 2
 }
 
 apply from: "$rootDir/common.gradle"

src/en/allanime/src/eu/kanade/tachiyomi/extension/en/allanime/AllAnime.kt

@@ -22,6 +22,7 @@ import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.put
@@ -81,33 +82,16 @@ class AllAnime : ConfigurableSource, HttpSource() {
             put("query", POPULAR_QUERY)
         }
 
-        val body = payload.toString().toRequestBody(JSON_MEDIA_TYPE)
+        return apiRequest(payload)
-
-        val newHeaders = headersBuilder()
-            .add("Content-Length", body.contentLength().toString())
-            .add("Content-Type", body.contentType().toString())
-            .build()
-
-        return POST(apiUrl, newHeaders, body)
     }
 
     override fun popularMangaParse(response: Response): MangasPage {
         val result = json.decodeFromString<ApiPopularResponse>(response.body.string())
 
-        val titleStyle = preferences.getString(TITLE_PREF, "romaji")!!
-
         val mangaList = result.data.queryPopular.recommendations
             .mapNotNull { it.anyCard }
             .map { manga ->
-                SManga.create().apply {
+                toSManga(manga)
-                    title = when (titleStyle) {
-                        "romaji" -> manga.name
-                        "eng" -> manga.englishName ?: manga.name
-                        else -> manga.nativeName ?: manga.name
-                    }
-                    url = "/manga/${manga._id}/${manga.name.titleToSlug()}"
-                    thumbnail_url = manga.thumbnail.parseThumbnailUrl()
-                }
             }
 
         return MangasPage(mangaList, mangaList.size == limit)
@@ -173,32 +157,15 @@ class AllAnime : ConfigurableSource, HttpSource() {
             put("query", SEARCH_QUERY)
         }
 
-        val body = payload.toString().toRequestBody(JSON_MEDIA_TYPE)
+        return apiRequest(payload)
-
-        val newHeaders = headersBuilder()
-            .add("Content-Length", body.contentLength().toString())
-            .add("Content-Type", body.contentType().toString())
-            .build()
-
-        return POST(apiUrl, newHeaders, body)
     }
 
     override fun searchMangaParse(response: Response): MangasPage {
         val result = json.decodeFromString<ApiSearchResponse>(response.body.string())
 
-        val titleStyle = preferences.getString(TITLE_PREF, "romaji")!!
-
         val mangaList = result.data.mangas.edges
             .map { manga ->
-                SManga.create().apply {
+                toSManga(manga)
-                    title = when (titleStyle) {
-                        "romaji" -> manga.name
-                        "eng" -> manga.englishName ?: manga.name
-                        else -> manga.nativeName ?: manga.name
-                    }
-                    url = "/manga/${manga._id}/${manga.name.titleToSlug()}"
-                    thumbnail_url = manga.thumbnail.parseThumbnailUrl()
-                }
             }
 
         return MangasPage(mangaList, mangaList.size == limit)
@@ -217,45 +184,14 @@ class AllAnime : ConfigurableSource, HttpSource() {
             put("query", DETAILS_QUERY)
         }
 
-        val body = payload.toString().toRequestBody(JSON_MEDIA_TYPE)
+        return apiRequest(payload)
-
-        val newHeaders = headersBuilder()
-            .add("Content-Length", body.contentLength().toString())
-            .add("Content-Type", body.contentType().toString())
-            .build()
-
-        return POST(apiUrl, newHeaders, body)
     }
 
     override fun mangaDetailsParse(response: Response): SManga {
         val result = json.decodeFromString<ApiMangaDetailsResponse>(response.body.string())
         val manga = result.data.manga
 
-        val titleStyle = preferences.getString(TITLE_PREF, "romaji")!!
+        return toSManga(manga)
-
-        return SManga.create().apply {
-            title = when (titleStyle) {
-                "romaji" -> manga.name
-                "eng" -> manga.englishName ?: manga.name
-                else -> manga.nativeName ?: manga.name
-            }
-            url = "/manga/${manga._id}/${manga.name.titleToSlug()}"
-            thumbnail_url = manga.thumbnail.parseThumbnailUrl()
-            description = Jsoup.parse(
-                manga.description?.replace("<br>", "br2n") ?: "",
-            ).text().replace("br2n", "\n")
-            description += if (manga.altNames != null) {
-                "\n\nAlternative Names: ${manga.altNames.joinToString { it.trim() }}"
-            } else {
-                ""
-            }
-            if (manga.authors?.isNotEmpty() == true) {
-                author = manga.authors.first().trim()
-                artist = author
-            }
-            genre = "${manga.genres?.joinToString { it.trim() }}, ${manga.tags?.joinToString { it.trim() }}"
-            status = manga.status.parseStatus()
-        }
     }
 
     override fun getMangaUrl(manga: SManga): String {
@@ -281,14 +217,7 @@ class AllAnime : ConfigurableSource, HttpSource() {
             put("query", CHAPTERS_QUERY)
         }
 
-        val body = payload.toString().toRequestBody(JSON_MEDIA_TYPE)
+        return apiRequest(payload)
-
-        val newHeaders = headersBuilder()
-            .add("Content-Length", body.contentLength().toString())
-            .add("Content-Type", body.contentType().toString())
-            .build()
-
-        return POST(apiUrl, newHeaders, body)
     }
 
     private fun chapterListParse(response: Response, manga: SManga): List<SChapter> {
@@ -337,14 +266,7 @@ class AllAnime : ConfigurableSource, HttpSource() {
             put("query", PAGE_QUERY)
         }
 
-        val body = payload.toString().toRequestBody(JSON_MEDIA_TYPE)
+        return apiRequest(payload)
-
-        val newHeaders = headersBuilder()
-            .add("Content-Length", body.contentLength().toString())
-            .add("Content-Type", body.contentType().toString())
-            .build()
-
-        return POST(apiUrl, newHeaders, body)
     }
 
     private fun pageListParse(response: Response, chapter: SChapter): List<Page> {
@@ -393,6 +315,45 @@ class AllAnime : ConfigurableSource, HttpSource() {
     }
 
     /* Helpers */
+    private fun apiRequest(payload: JsonObject): Request {
+        val body = payload.toString().toRequestBody(JSON_MEDIA_TYPE)
+
+        val newHeaders = headersBuilder()
+            .add("Content-Length", body.contentLength().toString())
+            .add("Content-Type", body.contentType().toString())
+            .build()
+
+        return POST(apiUrl, newHeaders, body)
+    }
+
+    private fun toSManga(manga: Manga): SManga {
+        val titleStyle = preferences.getString(TITLE_PREF, "romaji")!!
+
+        return SManga.create().apply {
+            title = when (titleStyle) {
+                "romaji" -> manga.name
+                "eng" -> manga.englishName ?: manga.name
+                else -> manga.nativeName ?: manga.name
+            }
+            url = "/manga/${manga._id}/${manga.name.titleToSlug()}"
+            thumbnail_url = manga.thumbnail.parseThumbnailUrl()
+            description = Jsoup.parse(
+                manga.description?.replace("<br>", "br2n") ?: "",
+            ).text().replace("br2n", "\n")
+            description += if (manga.altNames != null) {
+                "\n\nAlternative Names: ${manga.altNames.joinToString { it.trim() }}"
+            } else {
+                ""
+            }
+            if (manga.authors?.isNotEmpty() == true) {
+                author = manga.authors.first().trim()
+                artist = author
+            }
+            genre = "${manga.genres?.joinToString { it.trim() }}, ${manga.tags?.joinToString { it.trim() }}"
+            status = manga.status.parseStatus()
+        }
+    }
+
     private fun String.parseThumbnailUrl(): String {
         return if (this.matches(urlRegex)) {
             this

src/en/allanime/src/eu/kanade/tachiyomi/extension/en/allanime/AllAnimeDto.kt

@@ -16,17 +16,8 @@ data class ApiPopularResponse(
         ) {
             @Serializable
             data class Recommendation(
-                val anyCard: Card? = null,
+                val anyCard: Manga? = null,
-            ) {
+            )
-                @Serializable
-                data class Card(
-                    val _id: String,
-                    val name: String,
-                    val thumbnail: String,
-                    val englishName: String? = null,
-                    val nativeName: String? = null,
-                )
-            }
         }
     }
 }
@@ -41,17 +32,8 @@ data class ApiSearchResponse(
     ) {
         @Serializable
         data class SearchResultMangas(
-            val edges: List<SearchResultEdge>,
+            val edges: List<Manga>,
-        ) {
+        )
-            @Serializable
-            data class SearchResultEdge(
-                val _id: String,
-                val name: String,
-                val thumbnail: String,
-                val englishName: String? = null,
-                val nativeName: String? = null,
-            )
-        }
     }
 }
 
@@ -61,25 +43,25 @@ data class ApiMangaDetailsResponse(
 ) {
     @Serializable
     data class MangaDetailsData(
-        val manga: MangaDetails,
+        val manga: Manga,
-    ) {
+    )
-        @Serializable
-        data class MangaDetails(
-            val _id: String,
-            val name: String,
-            val thumbnail: String,
-            val description: String?,
-            val authors: List<String>?,
-            val genres: List<String>?,
-            val tags: List<String>?,
-            val status: String?,
-            val altNames: List<String>?,
-            val englishName: String? = null,
-            val nativeName: String? = null,
-        )
-    }
 }
 
+@Serializable
+data class Manga(
+    val _id: String,
+    val name: String,
+    val thumbnail: String,
+    val description: String?,
+    val authors: List<String>?,
+    val genres: List<String>?,
+    val tags: List<String>?,
+    val status: String?,
+    val altNames: List<String>?,
+    val englishName: String? = null,
+    val nativeName: String? = null,
+)
+
 @Serializable
 data class ApiChapterListResponse(
     val data: ChapterListData,