null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: No longer need to use .orEmpty() for ImageUtil.isImage

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2024-07-28 12:04:50 +07:00
parent 67b881dc3f
commit 5f19348633
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
View file

@ -107,7 +107,7 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
private fun getCoverFile(parent: UniFile?): UniFile? { private fun getCoverFile(parent: UniFile?): UniFile? {
return parent?.listFiles() return parent?.listFiles()
?.filter { it.isFile && it.nameWithoutExtension.equals("cover", ignoreCase = true) } ?.filter { it.isFile && it.nameWithoutExtension.equals("cover", ignoreCase = true) }
?.firstOrNull { ImageUtil.isImage(it.name.orEmpty()) { it.openInputStream() } } ?.firstOrNull { ImageUtil.isImage(it.name) { it.openInputStream() } }
} }
private fun getBaseDirectory(): UniFile? { private fun getBaseDirectory(): UniFile? {
@ -353,7 +353,7 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
is Format.Directory -> { is Format.Directory -> {
val entry = format.file.listFiles() val entry = format.file.listFiles()
?.sortedWith { f1, f2 -> f1.name.orEmpty().compareToCaseInsensitiveNaturalOrder(f2.name.orEmpty()) } ?.sortedWith { f1, f2 -> f1.name.orEmpty().compareToCaseInsensitiveNaturalOrder(f2.name.orEmpty()) }
?.find { !it.isDirectory && ImageUtil.isImage(it.name.orEmpty()) { FileInputStream(it.uri.toFile()) } } ?.find { !it.isDirectory && ImageUtil.isImage(it.name) { FileInputStream(it.uri.toFile()) } }
entry?.let { updateCover(manga, it.openInputStream()) } entry?.let { updateCover(manga, it.openInputStream()) }
} }

4
app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DirectoryPageLoader.kt
View file

@ -5,8 +5,6 @@ import eu.kanade.tachiyomi.source.model.Page
import eu.kanade.tachiyomi.ui.reader.model.ReaderPage import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
import eu.kanade.tachiyomi.util.lang.compareToCaseInsensitiveNaturalOrder import eu.kanade.tachiyomi.util.lang.compareToCaseInsensitiveNaturalOrder
import eu.kanade.tachiyomi.util.system.ImageUtil import eu.kanade.tachiyomi.util.system.ImageUtil
import java.io.File
import java.io.FileInputStream
/** /**
* Loader used to load a chapter from a directory given on [file]. * Loader used to load a chapter from a directory given on [file].
@ -18,7 +16,7 @@ class DirectoryPageLoader(val file: UniFile) : PageLoader() {
*/ */
override suspend fun getPages(): List<ReaderPage> { override suspend fun getPages(): List<ReaderPage> {
return file.listFiles() return file.listFiles()
?.filter { !it.isDirectory && ImageUtil.isImage(it.name.orEmpty()) { it.openInputStream() } } ?.filter { !it.isDirectory && ImageUtil.isImage(it.name) { it.openInputStream() } }
?.sortedWith { f1, f2 -> f1.name.orEmpty().compareToCaseInsensitiveNaturalOrder(f2.name.orEmpty()) } ?.sortedWith { f1, f2 -> f1.name.orEmpty().compareToCaseInsensitiveNaturalOrder(f2.name.orEmpty()) }
?.mapIndexed { i, file -> ?.mapIndexed { i, file ->
val streamFn = { file.openInputStream() } val streamFn = { file.openInputStream() }