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

chore: Even more NPE prevention

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2024-06-05 18:48:41 +07:00
parent fd82d987aa
commit ce69203926
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -58,7 +58,7 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
fun getMangaLang(manga: SManga): String { fun getMangaLang(manga: SManga): String {
return langMap.getOrPut(manga.url) { return langMap.getOrPut(manga.url) {
val localDetails = getBaseDirectory().findFile(manga.url)?.listFiles().orEmpty() val localDetails = getBaseDirectory()?.findFile(manga.url)?.listFiles().orEmpty()
.filter { !it.isDirectory } .filter { !it.isDirectory }
.firstOrNull { it.name == COMIC_INFO_FILE } .firstOrNull { it.name == COMIC_INFO_FILE }
@ -70,8 +70,8 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
} }
} }
fun updateCover(manga: SManga, input: InputStream): UniFile { fun updateCover(manga: SManga, input: InputStream): UniFile? {
val dir = getBaseDirectory() val dir = getBaseDirectory() ?: return null
var cover = getCoverFile(dir.findFile(manga.url)) var cover = getCoverFile(dir.findFile(manga.url))
if (cover == null) { if (cover == null) {
cover = dir.findFile(manga.url)?.createFile(COVER_NAME)!! cover = dir.findFile(manga.url)?.createFile(COVER_NAME)!!
@ -106,9 +106,9 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
} }
} }
private fun getBaseDirectory(): UniFile { private fun getBaseDirectory(): UniFile? {
val storageManager: StorageManager by injectLazy() val storageManager: StorageManager by injectLazy()
return storageManager.getLocalSourceDirectory()!! return storageManager.getLocalSourceDirectory()
} }
} }
@ -135,7 +135,7 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
0L 0L
} }
var mangaDirs = getBaseDirectory().listFiles().orEmpty() var mangaDirs = getBaseDirectory()?.listFiles().orEmpty()
.filter { it.isDirectory || !it.name.orEmpty().startsWith('.') } .filter { it.isDirectory || !it.name.orEmpty().startsWith('.') }
.distinctBy { it.name } .distinctBy { it.name }
.filter { .filter {
@ -209,7 +209,7 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
override suspend fun getMangaDetails(manga: SManga): SManga = withIOContext { override suspend fun getMangaDetails(manga: SManga): SManga = withIOContext {
try { try {
val localMangaDir = getBaseDirectory().findFile(manga.url) ?: throw Exception("${manga.url} is not a valid directory") val localMangaDir = getBaseDirectory()?.findFile(manga.url) ?: throw Exception("${manga.url} is not a valid directory")
val localMangaFiles = localMangaDir.listFiles().orEmpty().filter { !it.isDirectory } val localMangaFiles = localMangaDir.listFiles().orEmpty().filter { !it.isDirectory }
val comicInfoFile = localMangaFiles.firstOrNull { it.name.orEmpty() == COMIC_INFO_FILE } val comicInfoFile = localMangaFiles.firstOrNull { it.name.orEmpty() == COMIC_INFO_FILE }
val legacyJsonFile = localMangaFiles.firstOrNull { it.extension.orEmpty().equals("json", true) } val legacyJsonFile = localMangaFiles.firstOrNull { it.extension.orEmpty().equals("json", true) }
@ -254,7 +254,7 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
} }
fun updateMangaInfo(manga: SManga, lang: String?) { fun updateMangaInfo(manga: SManga, lang: String?) {
val directory = getBaseDirectory().findFile(manga.url) ?: return val directory = getBaseDirectory()?.findFile(manga.url) ?: return
if (!directory.exists()) return if (!directory.exists()) return
lang?.let { langMap[manga.url] = it } lang?.let { langMap[manga.url] = it }
@ -289,7 +289,7 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
} }
override suspend fun getChapterList(manga: SManga): List<SChapter> = withIOContext { override suspend fun getChapterList(manga: SManga): List<SChapter> = withIOContext {
val chapters = getBaseDirectory().findFile(manga.url)?.listFiles().orEmpty() val chapters = getBaseDirectory()?.findFile(manga.url)?.listFiles().orEmpty()
.filter { it.isDirectory || isSupportedFile(it.extension.orEmpty()) } .filter { it.isDirectory || isSupportedFile(it.extension.orEmpty()) }
.map { chapterFile -> .map { chapterFile ->
SChapter.create().apply { SChapter.create().apply {
@ -325,7 +325,7 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
val (mangaDirName, chapterName) = chapter.url.split('/', limit = 2) val (mangaDirName, chapterName) = chapter.url.split('/', limit = 2)
val chapFile = dir val chapFile = dir
.findFile(mangaDirName) ?.findFile(mangaDirName)
?.findFile(chapterName) ?.findFile(chapterName)
if (chapFile == null || !chapFile.exists()) if (chapFile == null || !chapFile.exists())
throw Exception(context.getString(R.string.chapter_not_found)) throw Exception(context.getString(R.string.chapter_not_found))

7
app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsDataController.kt
View file

@ -217,7 +217,12 @@ class SettingsDataController : SettingsLegacyController() {
backupFlags = flags backupFlags = flags
val dir = storageManager.getBackupsDirectory() val dir = storageManager.getBackupsDirectory()
if (!picker && dir != null) { if (dir == null) {
activity?.toast(R.string.invalid_location_generic)
return
}
if (!picker) {
doBackup(backupFlags, dir.uri) doBackup(backupFlags, dir.uri)
return return
} }