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

[RU]Remanga hotfix #13900 (#13921)

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

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

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

10
src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt
View File

@ -116,7 +116,6 @@ class Remanga : ConfigurableSource, HttpSource() {
private val count = 30 private val count = 30
private var branches = mutableMapOf<String, List<BranchesDto>>() private var branches = mutableMapOf<String, List<BranchesDto>>()
private var dirManga = ""
override fun popularMangaRequest(page: Int) = GET("$baseUrl/api/search/catalog/?ordering=-rating&count=$count&page=$page", headers) override fun popularMangaRequest(page: Int) = GET("$baseUrl/api/search/catalog/?ordering=-rating&count=$count&page=$page", headers)
@ -321,7 +320,6 @@ class Remanga : ConfigurableSource, HttpSource() {
override fun mangaDetailsParse(response: Response): SManga { override fun mangaDetailsParse(response: Response): SManga {
val series = json.decodeFromString<SeriesWrapperDto<MangaDetDto>>(response.body!!.string()) val series = json.decodeFromString<SeriesWrapperDto<MangaDetDto>>(response.body!!.string())
branches[series.content.en_name] = series.content.branches branches[series.content.en_name] = series.content.branches
dirManga = series.content.dir
return series.content.toSManga() return series.content.toSManga()
} }
@ -352,7 +350,7 @@ class Remanga : ConfigurableSource, HttpSource() {
val selectedBranch = branch.maxByOrNull { selector(it) }!! val selectedBranch = branch.maxByOrNull { selector(it) }!!
return (1..(selectedBranch.count_chapters / 100 + 1)).map { return (1..(selectedBranch.count_chapters / 100 + 1)).map {
val response = chapterListRequest(selectedBranch.id, it) val response = chapterListRequest(selectedBranch.id, it)
chapterListParse(response) chapterListParse(response, manga)
}.let { Observable.just(it.flatten()) } }.let { Observable.just(it.flatten()) }
} }
} }
@ -383,7 +381,9 @@ class Remanga : ConfigurableSource, HttpSource() {
return chapterName return chapterName
} }
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): List<SChapter> {
var chapters = json.decodeFromString<SeriesWrapperDto<List<BookDto>>>(response.body!!.string()).content var chapters = json.decodeFromString<SeriesWrapperDto<List<BookDto>>>(response.body!!.string()).content
if (!preferences.getBoolean(PAID_PREF, false)) { if (!preferences.getBoolean(PAID_PREF, false)) {
chapters = chapters.filter { !it.is_paid or (it.is_bought == true) } chapters = chapters.filter { !it.is_paid or (it.is_bought == true) }
@ -392,7 +392,7 @@ class Remanga : ConfigurableSource, HttpSource() {
SChapter.create().apply { SChapter.create().apply {
chapter_number = chapter.chapter.split(".").take(2).joinToString(".").toFloat() chapter_number = chapter.chapter.split(".").take(2).joinToString(".").toFloat()
name = chapterName(chapter) name = chapterName(chapter)
url = "/manga/$dirManga/ch${chapter.id}" url = "/manga/${manga.url.substringAfterLast("/api/titles/")}ch${chapter.id}"
date_upload = parseDate(chapter.upload_date) date_upload = parseDate(chapter.upload_date)
scanlator = if (chapter.publishers.isNotEmpty()) { scanlator = if (chapter.publishers.isNotEmpty()) {
chapter.publishers.joinToString { it.name } chapter.publishers.joinToString { it.name }