From 76185338bf8830571bd033a46cfc207c0708958b Mon Sep 17 00:00:00 2001 From: arkon Date: Fri, 23 Apr 2021 08:44:12 -0400 Subject: [PATCH] Make manga and chapter folder name searching case insensitive (cherry picked from commit 4cefbce7c34e724b409b6ba127f3c6c5c346ad8d) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt --- .../eu/kanade/tachiyomi/data/download/DownloadProvider.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt index bc2dd6398..9fe0a6650 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt @@ -76,7 +76,7 @@ class DownloadProvider(private val context: Context) { */ fun findMangaDir(manga: Manga, source: Source): UniFile? { val sourceDir = findSourceDir(source) - return sourceDir?.findFile(getMangaDirName(manga)) + return sourceDir?.findFile(getMangaDirName(manga), true) } /** @@ -89,7 +89,7 @@ class DownloadProvider(private val context: Context) { fun findChapterDir(chapter: Chapter, manga: Manga, source: Source): UniFile? { val mangaDir = findMangaDir(manga, source) return getValidChapterDirNames(chapter).asSequence() - .mapNotNull { mangaDir?.findFile(it) ?: mangaDir?.findFile("$it.cbz") } + .mapNotNull { mangaDir?.findFile(it, true) ?: mangaDir?.findFile("$it.cbz", true) } .firstOrNull() } @@ -176,6 +176,7 @@ class DownloadProvider(private val context: Context) { return listOf( getChapterDirName(chapter), + // TODO: remove this // Legacy chapter directory name used in v0.9.2 and before DiskUtil.buildValidFilename(chapter.name) )