Skip to content

fix: prevent stuck download cache renewal on error #432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dark25 merged 4 commits into from
Jul 12, 2026
+101 −97
Merged

fix: prevent stuck download cache renewal on error #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5fe2743
fix: prevent stuck download cache renewal on error
Dark25 Jul 12, 2026
1df0de2
Potential fix for pull request finding
Dark25 Jul 12, 2026
3063ef7
Potential fix for pull request finding
Dark25 Jul 12, 2026
67819e7
run spotless
Dark25 Jul 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 53 additions & 51 deletions app/src/main/java/eu/kanade/tachiyomi/data/download/anime/AnimeDownloadCache.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,67 +356,69 @@ class AnimeDownloadCache(
_isInitializing.emit(true)
}

// Try to wait until extensions and sources have loaded
var sources = emptyList<AnimeSource>()
withTimeoutOrNull(30.seconds) {
extensionManager.isInitialized.first { it }
sourceManager.isInitialized.first { it }
try {
// Try to wait until extensions and sources have loaded
var sources = emptyList<AnimeSource>()
withTimeoutOrNull(30.seconds) {
extensionManager.isInitialized.first { it }
sourceManager.isInitialized.first { it }

sources = getSources()
}
sources = getSources()
}

val sourceMap = sources.associate {
provider.getSourceDirName(it).lowercase() to it.id
}
val sourceMap = sources.associate {
provider.getSourceDirName(it).lowercase() to it.id
}

rootDownloadsDirMutex.withLock {
val updatedRootDir = RootDirectory(storageManager.getDownloadsDirectory())
rootDownloadsDirMutex.withLock {
val updatedRootDir = RootDirectory(storageManager.getDownloadsDirectory())

updatedRootDir.sourceDirs = updatedRootDir.dir?.listFiles().orEmpty()
.filter { it.isDirectory && !it.name.isNullOrBlank() }
.mapNotNull { dir ->
val sourceId = sourceMap[dir.name!!.lowercase()]
sourceId?.let { it to SourceDirectory(dir) }
}
.toMap()

updatedRootDir.sourceDirs.values.map { sourceDir ->
async {
sourceDir.animeDirs = sourceDir.dir?.listFiles().orEmpty()
.filter { it.isDirectory && !it.name.isNullOrBlank() }
.associate { it.name!! to AnimeDirectory(it) }
sourceDir.animeDirs.values.forEach { animeDir ->
val episodeDirs = animeDir.dir?.listFiles().orEmpty()
.mapNotNull {
when {
// Ignore incomplete downloads
it.name?.endsWith(AnimeDownloader.TMP_DIR_SUFFIX) == true -> null

// Folder of videos
it.isDirectory -> it.name

// MP4 files
it.isFile && it.extension == "mp4" -> it.nameWithoutExtension

// MKV files
it.isFile && it.extension == "mkv" -> it.nameWithoutExtension

// Anything else is irrelevant
else -> null
updatedRootDir.sourceDirs = updatedRootDir.dir?.listFiles().orEmpty()
.filter { it.isDirectory && !it.name.isNullOrBlank() }
.mapNotNull { dir ->
val sourceId = sourceMap[dir.name!!.lowercase()]
sourceId?.let { it to SourceDirectory(dir) }
}
.toMap()

updatedRootDir.sourceDirs.values.map { sourceDir ->
async {
sourceDir.animeDirs = sourceDir.dir?.listFiles().orEmpty()
.filter { it.isDirectory && !it.name.isNullOrBlank() }
.associate { it.name!! to AnimeDirectory(it) }
sourceDir.animeDirs.values.forEach { animeDir ->
val episodeDirs = animeDir.dir?.listFiles().orEmpty()
.mapNotNull {
when {
// Ignore incomplete downloads
it.name?.endsWith(AnimeDownloader.TMP_DIR_SUFFIX) == true -> null

// Folder of videos
it.isDirectory -> it.name

// MP4 files
it.isFile && it.extension == "mp4" -> it.nameWithoutExtension

// MKV files
it.isFile && it.extension == "mkv" -> it.nameWithoutExtension

// Anything else is irrelevant
else -> null
}
}
}
.toMutableSet()
.toMutableSet()

animeDir.episodeDirs = episodeDirs
animeDir.episodeDirs = episodeDirs
}
}
}
}
.awaitAll()
.awaitAll()

rootDownloadsDir = updatedRootDir
rootDownloadsDir = updatedRootDir
}
} finally {
_isInitializing.value = false
}

_isInitializing.emit(false)
}.also {
it.invokeOnCompletion(onCancelling = true) { exception ->
if (exception != null && exception !is CancellationException) {
Expand Down
94 changes: 48 additions & 46 deletions app/src/main/java/eu/kanade/tachiyomi/data/download/manga/MangaDownloadCache.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,62 +358,64 @@ class MangaDownloadCache(
_isInitializing.emit(true)
}

// Try to wait until extensions and sources have loaded
var sources = emptyList<MangaSource>()
withTimeoutOrNull(30.seconds) {
extensionManager.isInitialized.first { it }
sourceManager.isInitialized.first { it }
try {
// Try to wait until extensions and sources have loaded
var sources = emptyList<MangaSource>()
withTimeoutOrNull(30.seconds) {
extensionManager.isInitialized.first { it }
sourceManager.isInitialized.first { it }

sources = getSources()
}
sources = getSources()
}

val sourceMap = sources.associate { provider.getSourceDirName(it).lowercase() to it.id }
val sourceMap = sources.associate { provider.getSourceDirName(it).lowercase() to it.id }

rootDownloadsDirMutex.withLock {
val updatedRootDir = RootDirectory(storageManager.getDownloadsDirectory())
rootDownloadsDirMutex.withLock {
val updatedRootDir = RootDirectory(storageManager.getDownloadsDirectory())

updatedRootDir.sourceDirs = updatedRootDir.dir?.listFiles().orEmpty()
.filter { it.isDirectory && !it.name.isNullOrBlank() }
.mapNotNull { dir ->
val sourceId = sourceMap[dir.name!!.lowercase()]
sourceId?.let { it to SourceDirectory(dir) }
}
.toMap()

updatedRootDir.sourceDirs.values.map { sourceDir ->
async {
sourceDir.mangaDirs = sourceDir.dir?.listFiles().orEmpty()
.filter { it.isDirectory && !it.name.isNullOrBlank() }
.associate { it.name!! to MangaDirectory(it) }
sourceDir.mangaDirs.values.forEach { mangaDir ->
val chapterDirs = mangaDir.dir?.listFiles().orEmpty()
.mapNotNull {
when {
// Ignore incomplete downloads
it.name?.endsWith(MangaDownloader.TMP_DIR_SUFFIX) == true -> null

// Folder of images
it.isDirectory -> it.name

// CBZ files
it.isFile && it.extension == "cbz" -> it.nameWithoutExtension

// Anything else is irrelevant
else -> null
updatedRootDir.sourceDirs = updatedRootDir.dir?.listFiles().orEmpty()
.filter { it.isDirectory && !it.name.isNullOrBlank() }
.mapNotNull { dir ->
val sourceId = sourceMap[dir.name!!.lowercase()]
sourceId?.let { it to SourceDirectory(dir) }
}
.toMap()

updatedRootDir.sourceDirs.values.map { sourceDir ->
async {
sourceDir.mangaDirs = sourceDir.dir?.listFiles().orEmpty()
.filter { it.isDirectory && !it.name.isNullOrBlank() }
.associate { it.name!! to MangaDirectory(it) }
sourceDir.mangaDirs.values.forEach { mangaDir ->
val chapterDirs = mangaDir.dir?.listFiles().orEmpty()
.mapNotNull {
when {
// Ignore incomplete downloads
it.name?.endsWith(MangaDownloader.TMP_DIR_SUFFIX) == true -> null

// Folder of images
it.isDirectory -> it.name

// CBZ files
it.isFile && it.extension == "cbz" -> it.nameWithoutExtension

// Anything else is irrelevant
else -> null
}
}
}
.toMutableSet()
.toMutableSet()

mangaDir.chapterDirs = chapterDirs
mangaDir.chapterDirs = chapterDirs
}
}
}
}
.awaitAll()
.awaitAll()

rootDownloadsDir = updatedRootDir
rootDownloadsDir = updatedRootDir
}
} finally {
_isInitializing.value = false
}

_isInitializing.emit(false)
}.also {
it.invokeOnCompletion(onCancelling = true) { exception ->
if (exception != null && exception !is CancellationException) {
Expand Down
Loading