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

zaimanhua: fix empty author and upload time (#6786)

This commit is contained in:
zhongfly 2024-12-24 20:06:42 +08:00 committed by Draff
parent 820806815b
commit 7813eb9117
No known key found for this signature in database
GPG Key ID: E8A89F3211677653
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zh/zaimanhua/build.gradle
View File

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

24
src/zh/zaimanhua/src/eu/kanade/tachiyomi/extension/zh/zaimanhua/ZaimanhuaDto.kt
View File

@ -15,14 +15,18 @@ class MangaDto(
private val description: String? = null, private val description: String? = null,
private val types: List<TagDto>, private val types: List<TagDto>,
private val status: List<TagDto>, private val status: List<TagDto>,
private val authors: List<TagDto>, private val authors: List<TagDto>? = null,
@SerialName("chapters") @SerialName("chapters")
private val chapterGroups: List<ChapterGroupDto>, private val chapterGroups: List<ChapterGroupDto>,
@SerialName("last_update_chapter_id")
private val lastUpdateChapterId: Int = 0,
@SerialName("last_updatetime")
private val lastUpdateTime: Long = 0,
) { ) {
fun toSManga() = SManga.create().apply { fun toSManga() = SManga.create().apply {
url = id.toString() url = id.toString()
title = this@MangaDto.title title = this@MangaDto.title
author = authors.joinToString { it.name } author = authors?.joinToString { it.name }
description = this@MangaDto.description description = this@MangaDto.description
genre = types.joinToString { it.name } genre = types.joinToString { it.name }
status = parseStatus(this@MangaDto.status[0].name) status = parseStatus(this@MangaDto.status[0].name)
@ -32,9 +36,10 @@ class MangaDto(
fun parseChapterList(): List<SChapter> { fun parseChapterList(): List<SChapter> {
val mangaId = id.toString() val mangaId = id.toString()
val lastUpdateChapter = lastUpdateChapterId.toString()
val size = chapterGroups.sumOf { it.size } val size = chapterGroups.sumOf { it.size }
return chapterGroups.flatMapTo(ArrayList(size)) { return chapterGroups.flatMapTo(ArrayList(size)) {
it.toSChapterList(mangaId) it.toSChapterList(mangaId, lastUpdateChapter, lastUpdateTime)
} }
} }
} }
@ -44,17 +49,24 @@ class ChapterGroupDto(
private val title: String, private val title: String,
private val data: List<ChapterDto>, private val data: List<ChapterDto>,
) { ) {
fun toSChapterList(mangaId: String): List<SChapter> { fun toSChapterList(mangaId: String, lastUpdateChapter: String, lastUpdateTime: Long): List<SChapter> {
val groupName = title val groupName = title
val isDefaultGroup = groupName == "连载" val isDefaultGroup = groupName == "连载"
val current = System.currentTimeMillis() val current = System.currentTimeMillis()
return data.map { return data.map {
it.toSChapterInternal().apply { it.toSChapterInternal().apply {
url = "$mangaId/$url"
if (!isDefaultGroup) scanlator = groupName if (!isDefaultGroup) scanlator = groupName
// For some chapters, api will always return current time as upload time // For some chapters, api will always return current time as upload time
// Therefore upload times that differ too little from the current time will be ignored // Therefore upload times that differ too little from the current time will be ignored
if ((current - date_upload) < 10000) date_upload = 0 // When the chapter is the latest chapter, use the last update time as the upload time
if ((current - date_upload) < 10000) {
date_upload = if (url == lastUpdateChapter) {
lastUpdateTime * 1000
} else {
0L
}
}
url = "$mangaId/$url"
} }
} }
} }