diff --git a/app/src/main/java/eu/kanade/domain/DomainModule.kt b/app/src/main/java/eu/kanade/domain/DomainModule.kt index b39842268..7e23ff3ef 100644 --- a/app/src/main/java/eu/kanade/domain/DomainModule.kt +++ b/app/src/main/java/eu/kanade/domain/DomainModule.kt @@ -152,7 +152,7 @@ class DomainModule : InjektModule { addFactory { UpdateChapter(get()) } addFactory { SetReadStatus(get(), get(), get(), get(), get()) } addFactory { ShouldUpdateDbChapter() } - addFactory { SyncChaptersWithSource(get(), get(), get(), get(), get(), get(), get(), get()) } + addFactory { SyncChaptersWithSource(get(), get(), get(), get(), get(), get(), get(), get(), get()) } addFactory { GetAvailableScanlators(get()) } addFactory { FilterChaptersForDownload(get(), get(), get(), get()) } diff --git a/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt b/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt index 0a430d0d2..ff3df6339 100644 --- a/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt +++ b/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt @@ -20,6 +20,7 @@ import tachiyomi.domain.chapter.model.NoChaptersException import tachiyomi.domain.chapter.model.toChapterUpdate import tachiyomi.domain.chapter.repository.ChapterRepository import tachiyomi.domain.chapter.service.ChapterRecognition +import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.domain.manga.model.Manga import tachiyomi.source.local.isLocal import java.lang.Long.max @@ -35,6 +36,7 @@ class SyncChaptersWithSource( private val updateChapter: UpdateChapter, private val getChaptersByMangaId: GetChaptersByMangaId, private val getExcludedScanlators: GetExcludedScanlators, + private val libraryPreferences: LibraryPreferences, ) { /** @@ -150,12 +152,18 @@ class SyncChaptersWithSource( return emptyList() } - val reAdded = mutableListOf() + val changedOrDuplicateReadUrls = mutableSetOf() val deletedChapterNumbers = TreeSet() val deletedReadChapterNumbers = TreeSet() val deletedBookmarkedChapterNumbers = TreeSet() + val readChapterNumbers = dbChapters + .asSequence() + .filter { it.read && it.isRecognizedNumber } + .map { it.chapterNumber } + .toSet() + removedChapters.forEach { chapter -> if (chapter.read) deletedReadChapterNumbers.add(chapter.chapterNumber) if (chapter.bookmark) deletedBookmarkedChapterNumbers.add(chapter.chapterNumber) @@ -165,12 +173,19 @@ class SyncChaptersWithSource( val deletedChapterNumberDateFetchMap = removedChapters.sortedByDescending { it.dateFetch } .associate { it.chapterNumber to it.dateFetch } + val markDuplicateAsRead = libraryPreferences.markDuplicateChapterRead().get() + // Date fetch is set in such a way that the upper ones will have bigger value than the lower ones // Sources MUST return the chapters from most to less recent, which is common. var itemCount = newChapters.size var updatedToAdd = newChapters.map { toAddItem -> var chapter = toAddItem.copy(dateFetch = nowMillis + itemCount--) + if (chapter.chapterNumber in readChapterNumbers && markDuplicateAsRead) { + changedOrDuplicateReadUrls.add(chapter.url) + chapter = chapter.copy(read = true) + } + if (!chapter.isRecognizedNumber || chapter.chapterNumber !in deletedChapterNumbers) return@map chapter chapter = chapter.copy( @@ -183,7 +198,7 @@ class SyncChaptersWithSource( chapter = chapter.copy(dateFetch = it) } - reAdded.add(chapter) + changedOrDuplicateReadUrls.add(chapter.url) chapter } @@ -225,12 +240,8 @@ class SyncChaptersWithSource( // Note that last_update actually represents last time the chapter list changed at all updateManga.awaitUpdateLastUpdate(manga.id) - val reAddedUrls = reAdded.map { it.url }.toHashSet() - val excludedScanlators = getExcludedScanlators.await(manga.id).toHashSet() - return updatedToAdd.filterNot { - it.url in reAddedUrls || it.scanlator in excludedScanlators - } + return updatedToAdd.filterNot { it.url in changedOrDuplicateReadUrls || it.scanlator in excludedScanlators } } } diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt index f802723ec..88252e738 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt @@ -228,13 +228,10 @@ object SettingsLibraryScreen : SearchableSettings { preference = libraryPreferences.newShowUpdatesCount(), title = stringResource(MR.strings.pref_library_update_show_tab_badge), ), - // SY --> Preference.PreferenceItem.SwitchPreference( - preference = libraryPreferences.libraryReadDuplicateChapters(), - title = stringResource(SYMR.strings.pref_library_mark_duplicate_chapters), - subtitle = stringResource(SYMR.strings.pref_library_mark_duplicate_chapters_summary), + preference = libraryPreferences.markDuplicateChapterRead(), + title = stringResource(MR.strings.pref_mark_duplicate_chapter_read), ), - // SY <-- ), ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt index c5ef317e9..7c7011d7e 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt @@ -401,29 +401,7 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet ) { try { val newChapters = updateManga(manga, fetchWindow) - // SY --> - .sortedByDescending { it.sourceOrder }.run { - if (libraryPreferences.libraryReadDuplicateChapters().get()) { - val readChapters = getChaptersByMangaId.await(manga.id).filter { - it.read - } - val newReadChapters = this.filter { chapter -> - chapter.chapterNumber >= 0 && - readChapters.any { - it.chapterNumber == chapter.chapterNumber - } - } - - if (newReadChapters.isNotEmpty()) { - setReadStatus.await(true, *newReadChapters.toTypedArray()) - } - - this.filterNot { newReadChapters.contains(it) } - } else { - this - } - } - // SY <-- + .sortedByDescending { it.sourceOrder } if (newChapters.isNotEmpty()) { val chaptersToDownload = filterChaptersForDownload.await(manga, newChapters) diff --git a/domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt b/domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt index 62fa0c073..1ca5d1647 100644 --- a/domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt +++ b/domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt @@ -94,8 +94,6 @@ class LibraryPreferences( "pref_filter_library_lewd_v2", TriState.DISABLED, ) - - fun libraryReadDuplicateChapters() = preferenceStore.getBoolean("pref_library_mark_duplicate_chapters", false) // SY <-- fun filterTracking(id: Int) = preferenceStore.getEnum( @@ -130,6 +128,8 @@ class LibraryPreferences( fun categorizedDisplaySettings() = preferenceStore.getBoolean("categorized_display", false) + fun markDuplicateChapterRead() = preferenceStore.getBoolean("mark_duplicate_chapter_read", false) + fun updateCategories() = preferenceStore.getStringSet(LIBRARY_UPDATE_CATEGORIES_PREF_KEY, emptySet()) fun updateCategoriesExclude() = preferenceStore.getStringSet(LIBRARY_UPDATE_CATEGORIES_EXCLUDE_PREF_KEY, emptySet()) diff --git a/i18n/src/commonMain/moko-resources/base/strings.xml b/i18n/src/commonMain/moko-resources/base/strings.xml index a5951521f..a97a4d796 100755 --- a/i18n/src/commonMain/moko-resources/base/strings.xml +++ b/i18n/src/commonMain/moko-resources/base/strings.xml @@ -292,6 +292,7 @@ Skip unstarted entries Predict next release time Show unread count on Updates icon + Mark new duplicate read chapters as read Automatically refresh metadata Check for new cover and details when updating library