Don't attempt to check chapter download status for local chapters
Fixes #8541 (cherry picked from commit 8c1171a72256f76972e787d53e182869df2a87d4) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
This commit is contained in:
parent
4ec1065df2
commit
889fec251e
@ -69,6 +69,7 @@ import eu.kanade.tachiyomi.source.PagePreviewSource
|
|||||||
import eu.kanade.tachiyomi.source.Source
|
import eu.kanade.tachiyomi.source.Source
|
||||||
import eu.kanade.tachiyomi.source.SourceManager
|
import eu.kanade.tachiyomi.source.SourceManager
|
||||||
import eu.kanade.tachiyomi.source.getNameForMangaInfo
|
import eu.kanade.tachiyomi.source.getNameForMangaInfo
|
||||||
|
import eu.kanade.tachiyomi.source.isLocal
|
||||||
import eu.kanade.tachiyomi.source.online.MetadataSource
|
import eu.kanade.tachiyomi.source.online.MetadataSource
|
||||||
import eu.kanade.tachiyomi.source.online.all.MergedSource
|
import eu.kanade.tachiyomi.source.online.all.MergedSource
|
||||||
import eu.kanade.tachiyomi.ui.manga.track.TrackItem
|
import eu.kanade.tachiyomi.ui.manga.track.TrackItem
|
||||||
@ -940,12 +941,19 @@ class MangaInfoScreenModel(
|
|||||||
.filterNot { it in listOf("all", "other") }
|
.filterNot { it in listOf("all", "other") }
|
||||||
// SY <--
|
// SY <--
|
||||||
return map { chapter ->
|
return map { chapter ->
|
||||||
val activeDownload = downloadManager.queue.find { chapter.id == it.chapter.id }
|
val activeDownload = if (isLocal) {
|
||||||
|
null
|
||||||
|
} else {
|
||||||
|
downloadManager.queue.find { chapter.id == it.chapter.id }
|
||||||
|
}
|
||||||
// SY -->
|
// SY -->
|
||||||
val manga = mergedData?.manga?.get(chapter.mangaId) ?: manga
|
val manga = mergedData?.manga?.get(chapter.mangaId) ?: manga
|
||||||
val source = mergedData?.sources?.find { manga.source == it.id }?.takeIf { mergedData.sources.size > 2 }
|
val source = mergedData?.sources?.find { manga.source == it.id }?.takeIf { mergedData.sources.size > 2 }
|
||||||
// SY <--
|
// SY <--
|
||||||
val downloaded = downloadManager.isChapterDownloaded(
|
val downloaded = if (isLocal) {
|
||||||
|
true
|
||||||
|
} else {
|
||||||
|
downloadManager.isChapterDownloaded(
|
||||||
// SY -->
|
// SY -->
|
||||||
chapter.name,
|
chapter.name,
|
||||||
chapter.scanlator,
|
chapter.scanlator,
|
||||||
@ -953,11 +961,13 @@ class MangaInfoScreenModel(
|
|||||||
manga.source,
|
manga.source,
|
||||||
// SY <--
|
// SY <--
|
||||||
)
|
)
|
||||||
|
}
|
||||||
val downloadState = when {
|
val downloadState = when {
|
||||||
activeDownload != null -> activeDownload.status
|
activeDownload != null -> activeDownload.status
|
||||||
downloaded -> Download.State.DOWNLOADED
|
downloaded -> Download.State.DOWNLOADED
|
||||||
else -> Download.State.NOT_DOWNLOADED
|
else -> Download.State.NOT_DOWNLOADED
|
||||||
}
|
}
|
||||||
|
|
||||||
ChapterItem(
|
ChapterItem(
|
||||||
chapter = chapter,
|
chapter = chapter,
|
||||||
downloadState = downloadState,
|
downloadState = downloadState,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user