Draff
/
Tachiyomi-Extensions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[RU]Newbie open chapter no API (#13923)

This commit is contained in:
Eshlender 2022-10-19 19:09:47 +05:00 committed by GitHub
parent 15d43ad4c1
commit 784219f7bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ru/newbie/build.gradle
View File

@ -6,7 +6,7 @@ ext {
extName = 'NewManga(Newbie)' extName = 'NewManga(Newbie)'
pkgNameSuffix = 'ru.newbie' pkgNameSuffix = 'ru.newbie'
extClass = '.Newbie' extClass = '.Newbie'
extVersionCode = 13 extVersionCode = 14
} }
dependencies { dependencies {

18
src/ru/newbie/src/eu/kanade/tachiyomi/extension/ru/newbie/Newbie.kt
View File

@ -318,13 +318,15 @@ class Newbie : ConfigurableSource, HttpSource() {
client.newCall(chapterListRequest(branchId)) client.newCall(chapterListRequest(branchId))
.asObservableSuccess() .asObservableSuccess()
.map { response -> .map { response ->
chapterListParse(response) chapterListParse(response, manga, branchId)
} }
} }
} }
} }
override fun chapterListParse(response: Response): List<SChapter> { override fun chapterListParse(response: Response) = throw UnsupportedOperationException("chapterListParse(response: Response, manga: SManga)")
private fun chapterListParse(response: Response, manga: SManga, branch: Long): List<SChapter> {
var chapters = json.decodeFromString<SeriesWrapperDto<List<BookDto>>>(response.body!!.string()).items var chapters = json.decodeFromString<SeriesWrapperDto<List<BookDto>>>(response.body!!.string()).items
if (!preferences.getBoolean(PAID_PREF, false)) { if (!preferences.getBoolean(PAID_PREF, false)) {
chapters = chapters.filter { it.is_available } chapters = chapters.filter { it.is_available }
@ -333,13 +335,13 @@ class Newbie : ConfigurableSource, HttpSource() {
SChapter.create().apply { SChapter.create().apply {
chapter_number = chapter.number chapter_number = chapter.number
name = chapterName(chapter) name = chapterName(chapter)
url = "/chapters/${chapter.id}/pages" url = "/p/${manga.url}/$branch/r/${chapter.id}"
date_upload = parseDate(chapter.created_at) date_upload = parseDate(chapter.created_at)
scanlator = chapter.translator scanlator = chapter.translator
} }
} }
} }
override fun chapterListRequest(manga: SManga): Request = throw NotImplementedError("Unused") override fun chapterListRequest(manga: SManga): Request = throw UnsupportedOperationException("chapterListRequest(branch: Long)")
private fun chapterListRequest(branch: Long): Request { private fun chapterListRequest(branch: Long): Request {
return GET( return GET(
"$API_URL/branches/$branch/chapters?reverse=true&size=1000000", "$API_URL/branches/$branch/chapters?reverse=true&size=1000000",
@ -349,15 +351,15 @@ class Newbie : ConfigurableSource, HttpSource() {
@TargetApi(Build.VERSION_CODES.N) @TargetApi(Build.VERSION_CODES.N)
override fun pageListRequest(chapter: SChapter): Request { override fun pageListRequest(chapter: SChapter): Request {
return GET(API_URL + chapter.url, headers) return GET(API_URL + "/chapters/${chapter.url.substringAfterLast("/")}/pages", headers)
} }
private fun pageListParse(response: Response, chapter: SChapter): List<Page> { private fun pageListParse(response: Response, urlRequest: String): List<Page> {
val pages = json.decodeFromString<List<PageDto>>(response.body?.string()!!) val pages = json.decodeFromString<List<PageDto>>(response.body?.string()!!)
val result = mutableListOf<Page>() val result = mutableListOf<Page>()
pages.forEach { page -> pages.forEach { page ->
(1..page.slices!!).map { i -> (1..page.slices!!).map { i ->
result.add(Page(result.size, API_URL + chapter.url + "/${page.id}?slice=$i")) result.add(Page(result.size, urlRequest + "/${page.id}?slice=$i"))
} }
} }
return result return result
@ -368,7 +370,7 @@ class Newbie : ConfigurableSource, HttpSource() {
return client.newCall(pageListRequest(chapter)) return client.newCall(pageListRequest(chapter))
.asObservableSuccess() .asObservableSuccess()
.map { response -> .map { response ->
pageListParse(response, chapter) pageListParse(response, pageListRequest(chapter).url.toString())
} }
} }