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

Distinguish between novel and manga in Tsuki (closes #8171). (#8172)

This commit is contained in:
Alessandro Jean 2021-07-19 07:27:23 -03:00 committed by GitHub
parent 628fceecd7
commit b153c3cf22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pt/tsukimangas/build.gradle
View File

@ -6,7 +6,7 @@ ext {
extName = 'Tsuki Mangás' extName = 'Tsuki Mangás'
pkgNameSuffix = 'pt.tsukimangas' pkgNameSuffix = 'pt.tsukimangas'
extClass = '.TsukiMangas' extClass = '.TsukiMangas'
extVersionCode = 21 extVersionCode = 22
libVersion = '1.2' libVersion = '1.2'
containsNsfw = true containsNsfw = true
} }

10
src/pt/tsukimangas/src/eu/kanade/tachiyomi/extension/pt/tsukimangas/TsukiMangas.kt
View File

@ -95,7 +95,7 @@ class TsukiMangas : HttpSource(), ConfigurableSource {
private fun popularMangaItemParse(manga: TsukiMangaDto) = SManga.create().apply { private fun popularMangaItemParse(manga: TsukiMangaDto) = SManga.create().apply {
val poster = manga.poster?.substringBefore("?") val poster = manga.poster?.substringBefore("?")
title = manga.title title = manga.title + (if (manga.format == NOVEL_FORMAT_ID) " (Novel)" else "")
thumbnail_url = baseUrl + (if (poster.isNullOrEmpty()) EMPTY_COVER else "/imgs/$poster") thumbnail_url = baseUrl + (if (poster.isNullOrEmpty()) EMPTY_COVER else "/imgs/$poster")
url = "/obra/${manga.id}/${manga.url}" url = "/obra/${manga.id}/${manga.url}"
} }
@ -117,7 +117,7 @@ class TsukiMangas : HttpSource(), ConfigurableSource {
private fun latestMangaItemParse(manga: TsukiMangaDto) = SManga.create().apply { private fun latestMangaItemParse(manga: TsukiMangaDto) = SManga.create().apply {
val poster = manga.poster?.substringBefore("?") val poster = manga.poster?.substringBefore("?")
title = manga.title title = manga.title + (if (manga.format == NOVEL_FORMAT_ID) " (Novel)" else "")
thumbnail_url = baseUrl + (if (poster.isNullOrEmpty()) EMPTY_COVER else "/imgs/$poster") thumbnail_url = baseUrl + (if (poster.isNullOrEmpty()) EMPTY_COVER else "/imgs/$poster")
url = "/obra/${manga.id}/${manga.url}" url = "/obra/${manga.id}/${manga.url}"
} }
@ -203,7 +203,7 @@ class TsukiMangas : HttpSource(), ConfigurableSource {
private fun searchMangaItemParse(manga: TsukiMangaDto) = SManga.create().apply { private fun searchMangaItemParse(manga: TsukiMangaDto) = SManga.create().apply {
val poster = manga.poster?.substringBefore("?") val poster = manga.poster?.substringBefore("?")
title = manga.title title = manga.title + (if (manga.format == NOVEL_FORMAT_ID) " (Novel)" else "")
thumbnail_url = baseUrl + (if (poster.isNullOrEmpty()) EMPTY_COVER else "/imgs/$poster") thumbnail_url = baseUrl + (if (poster.isNullOrEmpty()) EMPTY_COVER else "/imgs/$poster")
url = "/obra/${manga.id}/${manga.url}" url = "/obra/${manga.id}/${manga.url}"
} }
@ -235,7 +235,7 @@ class TsukiMangas : HttpSource(), ConfigurableSource {
val mangaDto = json.decodeFromString<TsukiMangaDto>(response.body!!.string()) val mangaDto = json.decodeFromString<TsukiMangaDto>(response.body!!.string())
val poster = mangaDto.poster?.substringBefore("?") val poster = mangaDto.poster?.substringBefore("?")
title = mangaDto.title title = mangaDto.title + (if (mangaDto.format == NOVEL_FORMAT_ID) " (Novel)" else "")
thumbnail_url = baseUrl + (if (poster.isNullOrEmpty()) EMPTY_COVER else "/imgs/$poster") thumbnail_url = baseUrl + (if (poster.isNullOrEmpty()) EMPTY_COVER else "/imgs/$poster")
description = mangaDto.synopsis.orEmpty() description = mangaDto.synopsis.orEmpty()
status = mangaDto.status.orEmpty().toStatus() status = mangaDto.status.orEmpty().toStatus()
@ -572,6 +572,8 @@ class TsukiMangas : HttpSource(), ConfigurableSource {
private const val EMPTY_COVER = "/ext/errorcapa.jpg" private const val EMPTY_COVER = "/ext/errorcapa.jpg"
private const val NOVEL_FORMAT_ID = 4
private val DATE_FORMATTER by lazy { SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH) } private val DATE_FORMATTER by lazy { SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH) }
const val PREFIX_ID_SEARCH = "id:" const val PREFIX_ID_SEARCH = "id:"

1
src/pt/tsukimangas/src/eu/kanade/tachiyomi/extension/pt/tsukimangas/TsukiMangasDto.kt
View File

@ -27,6 +27,7 @@ data class TsukiPaginatedDto(
data class TsukiMangaDto( data class TsukiMangaDto(
val artist: String? = "", val artist: String? = "",
val author: String? = "", val author: String? = "",
val format: Int? = 1,
val genres: List<TsukiGenreDto> = emptyList(), val genres: List<TsukiGenreDto> = emptyList(),
val id: Int, val id: Int,
val poster: String? = "", val poster: String? = "",