From 9feb6a165e0c276b7fffcf6abf22156ebf46f826 Mon Sep 17 00:00:00 2001 From: Pavka Date: Wed, 19 Jan 2022 13:40:37 +0300 Subject: [PATCH] [Ru]Newbiew. Add branches and work with this (#10503) * [Ru]Newbiew. Add branches and work with this * [RU]Newbie. Remove unused dto Co-authored-by: pavkazzz --- src/ru/newbie/build.gradle | 2 +- .../tachiyomi/extension/ru/newbie/Newbie.kt | 53 +++++++++++++++++-- .../tachiyomi/extension/ru/newbie/dto/Dto.kt | 10 ++-- 3 files changed, 55 insertions(+), 10 deletions(-) diff --git a/src/ru/newbie/build.gradle b/src/ru/newbie/build.gradle index 7cd9bed3f..45913a1e4 100644 --- a/src/ru/newbie/build.gradle +++ b/src/ru/newbie/build.gradle @@ -6,7 +6,7 @@ ext { extName = 'Newbie' pkgNameSuffix = 'ru.newbie' extClass = '.Newbie' - extVersionCode = 4 + extVersionCode = 5 } dependencies { diff --git a/src/ru/newbie/src/eu/kanade/tachiyomi/extension/ru/newbie/Newbie.kt b/src/ru/newbie/src/eu/kanade/tachiyomi/extension/ru/newbie/Newbie.kt index 34d95bb50..6fc24fa70 100644 --- a/src/ru/newbie/src/eu/kanade/tachiyomi/extension/ru/newbie/Newbie.kt +++ b/src/ru/newbie/src/eu/kanade/tachiyomi/extension/ru/newbie/Newbie.kt @@ -1,6 +1,7 @@ package eu.kanade.tachiyomi.extension.ru.newbie import BookDto +import BranchesDto import LibraryDto import MangaDetDto import PageDto @@ -35,6 +36,7 @@ import java.text.DecimalFormat import java.text.SimpleDateFormat import java.util.Date import java.util.Locale + class Newbie : HttpSource() { override val name = "Newbie" @@ -44,6 +46,8 @@ class Newbie : HttpSource() { override val supportsLatest = true + private var branches = mutableMapOf>() + override fun headersBuilder(): Headers.Builder = Headers.Builder() .add("User-Agent", "Tachiyomi") .add("Referer", baseUrl) @@ -189,6 +193,7 @@ class Newbie : HttpSource() { private fun titleDetailsRequest(manga: SManga): Request { return GET(API_URL + "/projects/" + manga.url, headers) } + // Workaround to allow "Open in browser" use the real URL. override fun fetchMangaDetails(manga: SManga): Observable { return client.newCall(titleDetailsRequest(manga)) @@ -197,12 +202,14 @@ class Newbie : HttpSource() { mangaDetailsParse(response).apply { initialized = true } } } + override fun mangaDetailsRequest(manga: SManga): Request { return GET(baseUrl + "/p/" + manga.url, headers) } override fun mangaDetailsParse(response: Response): SManga { val series = json.decodeFromString(response.body!!.string()) + branches[series.title.en] = series.branches return series.toSManga() } @@ -215,9 +222,39 @@ class Newbie : HttpSource() { return chapterName } + private fun mangaBranches(manga: SManga): List { + val response = client.newCall(titleDetailsRequest(manga)).execute() + val series = json.decodeFromString(response.body!!.string()) + branches[series.title.en] = series.branches + return series.branches + } + + private fun selector(b: BranchesDto): Boolean = b.is_default + override fun fetchChapterList(manga: SManga): Observable> { + val branch = branches.getOrElse(manga.title) { mangaBranches(manga) } + return when { + branch.isEmpty() -> { + return Observable.just(listOf()) + } + manga.status == SManga.LICENSED -> { + Observable.error(Exception("Лицензировано - Нет глав")) + } + else -> { + val branchId = branch.first { selector(it) }.id + client.newCall(chapterListRequest(branchId)) + .asObservableSuccess() + .map { response -> + chapterListParse(response) + } + } + } + } + override fun chapterListParse(response: Response): List { - val chapters = json.decodeFromString>>(response.body!!.string()) - return chapters.items.filter { it.is_available == true }.map { chapter -> + val body = response.body!!.string() + val chapters = json.decodeFromString>>(body) + + return chapters.items.filter { it.is_available }.map { chapter -> SChapter.create().apply { chapter_number = chapter.number name = chapterName(chapter) @@ -227,8 +264,12 @@ class Newbie : HttpSource() { } } } - override fun chapterListRequest(manga: SManga): Request { - return GET(API_URL + "/branches/" + manga.url + "/chapters?reverse=true&size=1000000", headers) + override fun chapterListRequest(manga: SManga): Request = throw NotImplementedError("Unused") + private fun chapterListRequest(branch: Long): Request { + return GET( + "$API_URL/branches/$branch/chapters?reverse=true&size=1000000", + headers + ) } @TargetApi(Build.VERSION_CODES.N) @@ -247,6 +288,7 @@ class Newbie : HttpSource() { } return result } + override fun pageListParse(response: Response): List = throw Exception("Not used") override fun fetchPageList(chapter: SChapter): Observable> { return client.newCall(pageListRequest(chapter)) @@ -255,6 +297,7 @@ class Newbie : HttpSource() { pageListParse(response, chapter) } } + override fun fetchImageUrl(page: Page): Observable = Observable.just(page.imageUrl!!) override fun imageUrlRequest(page: Page): Request = throw NotImplementedError("Unused") @@ -352,9 +395,11 @@ class Newbie : HttpSource() { CheckFilter("юри", "16"), CheckFilter("яой", "32"), ) + companion object { private const val API_URL = "https://api.newmanga.org/v2" private const val IMAGE_URL = "https://storage.newmanga.org" } + private val json: Json by injectLazy() } diff --git a/src/ru/newbie/src/eu/kanade/tachiyomi/extension/ru/newbie/dto/Dto.kt b/src/ru/newbie/src/eu/kanade/tachiyomi/extension/ru/newbie/dto/Dto.kt index 1b52dbac1..5aadc27ed 100644 --- a/src/ru/newbie/src/eu/kanade/tachiyomi/extension/ru/newbie/dto/Dto.kt +++ b/src/ru/newbie/src/eu/kanade/tachiyomi/extension/ru/newbie/dto/Dto.kt @@ -2,21 +2,21 @@ import kotlinx.serialization.Serializable @Serializable data class TagsDto( - val id: Int, val title: TitleDto ) @Serializable data class BranchesDto( val id: Long, - val count_chapters: Int + val is_default: Boolean ) + @Serializable data class ImgsDto( val large: String, val small: String, - val thumbnail: String ) + @Serializable data class ImgDto( val srcset: ImgsDto, @@ -47,13 +47,13 @@ data class MangaDetDto( val author: AuthorDto?, val artist: AuthorDto?, val description: String, - val release_date: String, val image: ImgDto, val genres: List, val type: String, val status: String, val rating: Float, - val adult: String? + val adult: String?, + val branches: List, ) @Serializable