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

Delete empty source folder when deleting all downloads for a manga

Browse Source 
It previously only attempted this after deleting a list of chapters, so it wasn't applicable
when deleting from Library or after unfavoriting an entry.

Closes #8594

(cherry picked from commit 5c37347cecc99582752ee500171e8480008c836e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
This commit is contained in:
arkon 2022-11-22 09:25:00 -05:00 committed by Jobobby04
parent c07ccf7943
commit aefdc2adbe
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,7 +242,22 @@ class DownloadManager(
// Delete manga directory if empty // Delete manga directory if empty
if (mangaDir?.listFiles()?.isEmpty() == true) { if (mangaDir?.listFiles()?.isEmpty() == true) {
mangaDir.delete() deleteManga(manga, source)
}
}
}
}
/**
* Deletes the directory of a downloaded manga.
*
* @param manga the manga to delete.
* @param source the source of the manga.
*/
fun deleteManga(manga: Manga, source: Source) {
launchIO {
downloader.queue.remove(manga)
provider.findMangaDir(/* SY --> */ manga.ogTitle /* SY <-- */, source)?.delete()
cache.removeManga(manga) cache.removeManga(manga)
// Delete source directory if empty // Delete source directory if empty
@ -253,8 +268,6 @@ class DownloadManager(
} }
} }
} }
}
}
private fun removeFromDownloadQueue(chapters: List<Chapter>) { private fun removeFromDownloadQueue(chapters: List<Chapter>) {
val wasRunning = downloader.isRunning val wasRunning = downloader.isRunning
@ -327,19 +340,6 @@ class DownloadManager(
// SY <-- // SY <--
/** /**
* Deletes the directory of a downloaded manga.
*
* @param manga the manga to delete.
* @param source the source of the manga.
*/
fun deleteManga(manga: Manga, source: Source) {
launchIO {
downloader.queue.remove(manga)
provider.findMangaDir(/* SY --> */ manga.ogTitle /* SY <-- */, source)?.delete()
cache.removeManga(manga)
}
}
/** /**
* Adds a list of chapters to be deleted later. * Adds a list of chapters to be deleted later.
* *