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

Some cleanup in the downloads cache and disk util

Browse Source
This commit is contained in:
Jays2Kings 2021-04-04 12:55:37 -04:00
parent cb025624eb
commit 4e4f9b339f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
View File

@ -126,7 +126,7 @@ class DownloadCache(
val sourceDirs = getDirectoryFromPreference().listFiles().orEmpty() val sourceDirs = getDirectoryFromPreference().listFiles().orEmpty()
.associate { it.name to SourceDirectory(it) }.mapNotNullKeys { entry -> .associate { it.name to SourceDirectory(it) }.mapNotNullKeys { entry ->
onlineSources.find { provider.getSourceDirName(it).toLowerCase() == entry.key?.toLowerCase() }?.id onlineSources.find { provider.getSourceDirName(it).equals(entry.key, ignoreCase = true) }?.id
} }
val db: DatabaseHelper by injectLazy() val db: DatabaseHelper by injectLazy()
@ -159,7 +159,7 @@ class DownloadCache(
*/ */
private fun findManga(mangaList: List<Manga>, mangaKey: String, sourceKey: Long): Manga? { private fun findManga(mangaList: List<Manga>, mangaKey: String, sourceKey: Long): Manga? {
return mangaList.find { return mangaList.find {
DiskUtil.buildValidFilename(it.originalTitle).toLowerCase() == mangaKey.toLowerCase() && it.source == sourceKey DiskUtil.buildValidFilename(it.originalTitle).equals(mangaKey, ignoreCase = true) && it.source == sourceKey
} }
} }

2
app/src/main/java/eu/kanade/tachiyomi/util/storage/DiskUtil.kt
View File

@ -85,7 +85,7 @@ object DiskUtil {
*/ */
fun buildValidFilename(origName: String): String { fun buildValidFilename(origName: String): String {
val name = origName.trim('.', ' ') val name = origName.trim('.', ' ')
if (name.isNullOrEmpty()) { if (name.isEmpty()) {
return "(invalid)" return "(invalid)"
} }
val sb = StringBuilder(name.length) val sb = StringBuilder(name.length)