Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't auto-download chapters if excluded but no categories selected (fixes #6126)

Browse Source 
(cherry picked from commit 39722055f5a776263dd1b9080271fbeabff9b82b)
This commit is contained in:
arkon 2021-11-11 16:25:38 -05:00 committed by Jobobby04
parent 0f70c14879
commit 1cf6e030ef
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt
View File

@ -60,7 +60,10 @@ fun Manga.shouldDownloadNewChapters(db: DatabaseHelper, prefs: PreferencesHelper
if (!downloadNew) return false
val categoriesToDownload = prefs.downloadNewCategories().get().map(String::toInt)
if (categoriesToDownload.isEmpty()) return true
val categoriesToExclude = prefs.downloadNewCategoriesExclude().get().map(String::toInt)
// Default: download from all categories
if (categoriesToDownload.isEmpty() && categoriesToExclude.isEmpty()) return true
// Get all categories, else default category (0)
val categoriesForManga =
@ -68,8 +71,9 @@ fun Manga.shouldDownloadNewChapters(db: DatabaseHelper, prefs: PreferencesHelper
.mapNotNull { it.id }
.takeUnless { it.isEmpty() } ?: listOf(0)
val categoriesToExclude = prefs.downloadNewCategoriesExclude().get().map(String::toInt)
// In excluded category
if (categoriesForManga.intersect(categoriesToExclude).isNotEmpty()) return false
// In included category
return categoriesForManga.intersect(categoriesToDownload).isNotEmpty()
}