Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-19 03:09:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't enqueue bookmarked chapters for deletion (fixes #3691)

Browse Source
This commit is contained in:
arkon 2020-08-18 17:47:07 -04:00
parent ba67781431
commit 4c8665c9f0
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
View File

@ -198,14 +198,10 @@ class DownloadManager(private val context: Context) {
* @param manga the manga of the chapters. * @param manga the manga of the chapters.
* @param source the source of the chapters. * @param source the source of the chapters.
*/ */
fun deleteChapters(chapters: List<Chapter>, manga: Manga, source: Source) { fun deleteChapters(chapters: List<Chapter>, manga: Manga, source: Source): List<Chapter> {
queue.remove(chapters) val filteredChapters = getChaptersToDelete(chapters)
val filteredChapters = if (!preferences.removeBookmarkedChapters()) { queue.remove(filteredChapters)
chapters.filterNot { it.bookmark }
} else {
chapters
}
val chapterDirs = provider.findChapterDirs(filteredChapters, manga, source) val chapterDirs = provider.findChapterDirs(filteredChapters, manga, source)
chapterDirs.forEach { it.delete() } chapterDirs.forEach { it.delete() }
@ -213,6 +209,8 @@ class DownloadManager(private val context: Context) {
if (cache.getDownloadCount(manga) == 0) { // Delete manga directory if empty if (cache.getDownloadCount(manga) == 0) { // Delete manga directory if empty
chapterDirs.firstOrNull()?.parentFile?.delete() chapterDirs.firstOrNull()?.parentFile?.delete()
} }
return filteredChapters
} }
/** /**
@ -234,7 +232,7 @@ class DownloadManager(private val context: Context) {
* @param manga the manga of the chapters. * @param manga the manga of the chapters.
*/ */
fun enqueueDeleteChapters(chapters: List<Chapter>, manga: Manga) { fun enqueueDeleteChapters(chapters: List<Chapter>, manga: Manga) {
pendingDeleter.addChapters(chapters, manga) pendingDeleter.addChapters(getChaptersToDelete(chapters), manga)
} }
/** /**
@ -273,4 +271,12 @@ class DownloadManager(private val context: Context) {
Timber.e("Could not rename downloaded chapter: %s.", oldNames.joinToString()) Timber.e("Could not rename downloaded chapter: %s.", oldNames.joinToString())
} }
} }
private fun getChaptersToDelete(chapters: List<Chapter>): List<Chapter> {
return if (!preferences.removeBookmarkedChapters()) {
chapters.filterNot { it.bookmark }
} else {
chapters
}
}
} }

11
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
View File

@ -494,18 +494,13 @@ class MangaPresenter(
* @param chapters the chapters to delete. * @param chapters the chapters to delete.
*/ */
private fun deleteChaptersInternal(chapters: List<ChapterItem>) { private fun deleteChaptersInternal(chapters: List<ChapterItem>) {
val filteredChapters = if (!preferences.removeBookmarkedChapters()) { downloadManager.deleteChapters(chapters, manga, source).forEach {
chapters.filterNot { it.bookmark } if (it is ChapterItem) {
} else {
chapters
}
downloadManager.deleteChapters(filteredChapters, manga, source)
filteredChapters.forEach {
it.status = Download.NOT_DOWNLOADED it.status = Download.NOT_DOWNLOADED
it.download = null it.download = null
} }
} }
}
/** /**
* Reverses the sorting and requests an UI update. * Reverses the sorting and requests an UI update.