github/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-11-29 03:43:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: skip duplicate chapters on download ahead if option to skip duplicates is enabled (#9334)

Browse source 
* fix: skip duplicate chapters on download ahead if option is enabled

* fix: Use a function to filter duplicates
This commit is contained in:
Trace 2023-04-15 20:34:02 +07:00 committed by GitHub
parent 60d8650860
commit 4816b4b53a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
View file

@ -35,6 +35,7 @@ import eu.kanade.tachiyomi.ui.reader.model.ViewerChapters
import eu.kanade.tachiyomi.ui.reader.setting.OrientationType import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
import eu.kanade.tachiyomi.util.chapter.removeDuplicates
import eu.kanade.tachiyomi.util.editCover import eu.kanade.tachiyomi.util.editCover
import eu.kanade.tachiyomi.util.lang.byteSize import eu.kanade.tachiyomi.util.lang.byteSize
import eu.kanade.tachiyomi.util.lang.takeBytes import eu.kanade.tachiyomi.util.lang.takeBytes
@ -175,12 +176,7 @@ class ReaderViewModel(
else -> chapters else -> chapters
}.run { }.run {
if (readerPreferences.skipDupe().get()) { if (readerPreferences.skipDupe().get()) {
groupBy { it.chapterNumber } removeDuplicates(selectedChapter)
.map { (_, chapters) ->
chapters.find { it.id == selectedChapter.id }
?: chapters.find { it.scanlator == selectedChapter.scanlator }
?: chapters.first()
}
} else { } else {
this this
} }
@ -456,8 +452,14 @@ class ReaderViewModel(
) )
if (!isNextChapterDownloaded) return@launchIO if (!isNextChapterDownloaded) return@launchIO
val chaptersToDownload = getNextChapters.await(manga.id, nextChapter.id!!) val chaptersToDownload = getNextChapters.await(manga.id, nextChapter.id!!).run {
.take(amount) if (readerPreferences.skipDupe().get()) {
removeDuplicates(nextChapter.toDomainChapter()!!)
} else {
this
}
}.take(amount)
downloadManager.downloadChapters( downloadManager.downloadChapters(
manga, manga,
chaptersToDownload, chaptersToDownload,

15
app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterRemoveDuplicates.kt Normal file
View file

@ -0,0 +1,15 @@
package eu.kanade.tachiyomi.util.chapter
import tachiyomi.domain.chapter.model.Chapter
/**
* Returns a copy of the list with duplicate chapters removed
*/
fun List<Chapter>.removeDuplicates(currentChapter: Chapter): List<Chapter> {
return groupBy { it.chapterNumber }
.map { (_, chapters) ->
chapters.find { it.id == currentChapter.id }
?: chapters.find { it.scanlator == currentChapter.scanlator }
?: chapters.first()
}
}