From dce08d49220be446f85e25e16c5de62c98cc5a5c Mon Sep 17 00:00:00 2001 From: NerdNumber9 Date: Thu, 8 Aug 2019 13:49:27 -0400 Subject: [PATCH] Fix false update notifications for lewd sources --- .../tachiyomi/data/library/LibraryUpdateService.kt | 7 +++---- app/src/main/java/exh/EHSourceHelpers.kt | 11 +++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt index c8f2028bc..eecdebd6b 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt @@ -30,8 +30,7 @@ import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.util.* -import exh.EH_SOURCE_ID -import exh.EXH_SOURCE_ID +import exh.LIBRARY_UPDATE_EXCLUDED_SOURCES import rx.Observable import rx.Subscription import rx.schedulers.Schedulers @@ -288,9 +287,9 @@ class LibraryUpdateService( .doOnNext { showProgressNotification(it, count.andIncrement, mangaToUpdate.size) } // Update the chapters of the manga. .concatMap { manga -> - if(manga.source == EXH_SOURCE_ID || manga.source == EH_SOURCE_ID) { + if(manga.source in LIBRARY_UPDATE_EXCLUDED_SOURCES) { // Ignore EXH manga, updating chapters for every manga will get you banned - Observable.just(manga) + Observable.empty() } else { updateManga(manga) // If there's any error, return empty update and continue. diff --git a/app/src/main/java/exh/EHSourceHelpers.kt b/app/src/main/java/exh/EHSourceHelpers.kt index b5ed6ba6b..8f056b469 100755 --- a/app/src/main/java/exh/EHSourceHelpers.kt +++ b/app/src/main/java/exh/EHSourceHelpers.kt @@ -17,6 +17,7 @@ const val PERV_EDEN_EN_SOURCE_ID = LEWD_SOURCE_SERIES + 5 const val PERV_EDEN_IT_SOURCE_ID = LEWD_SOURCE_SERIES + 6 const val NHENTAI_SOURCE_ID = LEWD_SOURCE_SERIES + 7 val HENTAI_CAFE_SOURCE_ID = delegatedSourceId() +val PURURIN_SOURCE_ID = delegatedSourceId() const val TSUMINO_SOURCE_ID = LEWD_SOURCE_SERIES + 9 const val HITOMI_SOURCE_ID = LEWD_SOURCE_SERIES + 10 const val MERGED_SOURCE_ID = LEWD_SOURCE_SERIES + 69 @@ -26,6 +27,16 @@ private val DELEGATED_LEWD_SOURCES = listOf( Pururin::class ) +val LIBRARY_UPDATE_EXCLUDED_SOURCES = listOf( + EH_SOURCE_ID, + EXH_SOURCE_ID, + NHENTAI_SOURCE_ID, + HENTAI_CAFE_SOURCE_ID, + TSUMINO_SOURCE_ID, + HITOMI_SOURCE_ID, + PURURIN_SOURCE_ID +) + private inline fun delegatedSourceId(): Long { return SourceManager.DELEGATED_SOURCES.entries.find { it.value.newSourceClass == T::class