mirror of
https://github.com/mihonapp/mihon.git
synced 2025-08-20 13:31:32 +02:00
Compare commits
4 Commits
65400ef085
...
7214b34705
Author | SHA1 | Date | |
---|---|---|---|
|
7214b34705 | ||
|
3d191f4855 | ||
|
76129a55cd | ||
|
f26d152d0f |
@@ -98,7 +98,7 @@ fun Manga.hasCustomCover(coverCache: CoverCache = Injekt.get()): Boolean {
|
||||
fun getComicInfo(
|
||||
manga: Manga,
|
||||
chapter: Chapter,
|
||||
urls: String,
|
||||
urls: List<String>,
|
||||
categories: List<String>?,
|
||||
sourceName: String,
|
||||
) = ComicInfo(
|
||||
@@ -111,7 +111,7 @@ fun getComicInfo(
|
||||
ComicInfo.Number(it.toString())
|
||||
}
|
||||
},
|
||||
web = ComicInfo.Web(urls),
|
||||
web = ComicInfo.Web(urls.joinToString(" ")),
|
||||
summary = manga.description?.let { ComicInfo.Summary(it) },
|
||||
writer = manga.author?.let { ComicInfo.Writer(it) },
|
||||
penciller = manga.artist?.let { ComicInfo.Penciller(it) },
|
||||
|
@@ -629,12 +629,12 @@ class Downloader(
|
||||
source: HttpSource,
|
||||
) {
|
||||
val categories = getCategories.await(manga.id).map { it.name.trim() }.takeUnless { it.isEmpty() }
|
||||
val urls = listOf(source.getChapterUrl(chapter.toSChapter()))
|
||||
.plus(getTracks.await(manga.id).mapNotNull { it.remoteUrl.takeUnless { url -> url.isEmpty() } })
|
||||
.map { it.trim() }
|
||||
val urls = getTracks.await(manga.id)
|
||||
.mapNotNull { track ->
|
||||
track.remoteUrl.takeUnless { url -> url.isBlank() }?.trim()
|
||||
}
|
||||
.plus(source.getChapterUrl(chapter.toSChapter()).trim())
|
||||
.distinct()
|
||||
.joinToString(" ")
|
||||
.trim()
|
||||
|
||||
val comicInfo = getComicInfo(
|
||||
manga,
|
||||
|
@@ -158,7 +158,7 @@ data class ComicInfo(
|
||||
data class CategoriesTachiyomi(@XmlValue(true) val value: String = "")
|
||||
|
||||
@Serializable
|
||||
@XmlSerialName("SourceMihon", "http://www.w3.org/2001/XMLSchema", "ty")
|
||||
@XmlSerialName("SourceMihon", "http://www.w3.org/2001/XMLSchema", "mh")
|
||||
data class SourceMihon(@XmlValue(true) val value: String = "")
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user