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(LocalSource): Wrap some function in withIOContext

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2024-05-29 10:34:58 +07:00
parent 3776c0e194
commit 97da552bc9
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
1 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,8 +23,10 @@ import eu.kanade.tachiyomi.util.system.extension
import eu.kanade.tachiyomi.util.system.nameWithoutExtension import eu.kanade.tachiyomi.util.system.nameWithoutExtension
import eu.kanade.tachiyomi.util.system.openReadOnlyChannel import eu.kanade.tachiyomi.util.system.openReadOnlyChannel
import eu.kanade.tachiyomi.util.system.toZipFile import eu.kanade.tachiyomi.util.system.toZipFile
import eu.kanade.tachiyomi.util.system.withIOContext
import eu.kanade.tachiyomi.util.system.writeText import eu.kanade.tachiyomi.util.system.writeText
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlinx.serialization.json.decodeFromStream import kotlinx.serialization.json.decodeFromStream
@ -111,7 +113,7 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
page: Int, page: Int,
query: String, query: String,
filters: FilterList, filters: FilterList,
): MangasPage { ): MangasPage = withIOContext {
val time = if (filters === latestFilters) { val time = if (filters === latestFilters) {
System.currentTimeMillis() - LATEST_THRESHOLD System.currentTimeMillis() - LATEST_THRESHOLD
} else { } else {
@ -149,18 +151,18 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
} }
val mangas = mangaDirs.map { mangaDir -> val mangas = mangaDirs.map { mangaDir ->
SManga.create().apply { async {
title = mangaDir.name.orEmpty() SManga.create().apply {
url = mangaDir.name.orEmpty() title = mangaDir.name.orEmpty()
url = mangaDir.name.orEmpty()
// Try to find the cover // Try to find the cover
val cover = getCoverFile(mangaDir) val cover = getCoverFile(mangaDir)
if (cover != null && cover.exists()) { if (cover != null && cover.exists()) {
thumbnail_url = cover.uri.toString() thumbnail_url = cover.uri.toString()
} }
val manga = this val manga = this
runBlocking {
val chapters = getChapterList(manga) val chapters = getChapterList(manga)
if (chapters.isNotEmpty()) { if (chapters.isNotEmpty()) {
val chapter = chapters.last() val chapter = chapters.last()
@ -183,14 +185,14 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
} }
} }
} }
} }.awaitAll()
return MangasPage(mangas.toList(), false) MangasPage(mangas.toList(), false)
} }
override suspend fun getLatestUpdates(page: Int) = getSearchManga(page, "", latestFilters) override suspend fun getLatestUpdates(page: Int) = getSearchManga(page, "", latestFilters)
override suspend fun getMangaDetails(manga: SManga): SManga { 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 }
@ -198,7 +200,7 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
val legacyJsonFile = localMangaFiles.firstOrNull { it.extension.orEmpty().equals("json", true) } val legacyJsonFile = localMangaFiles.firstOrNull { it.extension.orEmpty().equals("json", true) }
if (comicInfoFile != null) if (comicInfoFile != null)
return manga.copy().apply { setMangaDetailsFromComicInfoFile(comicInfoFile.openInputStream(), this) } return@withIOContext manga.copy().apply { setMangaDetailsFromComicInfoFile(comicInfoFile.openInputStream(), this) }
// TODO: Remove after awhile // TODO: Remove after awhile
if (legacyJsonFile != null) { if (legacyJsonFile != null) {
@ -206,13 +208,13 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
val comicInfo = rt.toComicInfo() val comicInfo = rt.toComicInfo()
localMangaDir.createFile(COMIC_INFO_FILE) localMangaDir.createFile(COMIC_INFO_FILE)
?.writeText(xml.encodeToString(ComicInfo.serializer(), comicInfo)) { legacyJsonFile.delete() } ?.writeText(xml.encodeToString(ComicInfo.serializer(), comicInfo)) { legacyJsonFile.delete() }
return rt return@withIOContext rt
} }
} catch (e: Exception) { } catch (e: Exception) {
Timber.e(e) Timber.e(e)
} }
return manga return@withIOContext manga
} }
private fun setMangaDetailsFromComicInfoFile(stream: InputStream, manga: SManga) { private fun setMangaDetailsFromComicInfoFile(stream: InputStream, manga: SManga) {
@ -273,7 +275,7 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
} }
} }
override suspend fun getChapterList(manga: SManga): List<SChapter> { 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 ->
@ -302,7 +304,7 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
} }
.toList() .toList()
return chapters chapters
} }
override suspend fun getPageList(chapter: SChapter) = throw Exception("Unused") override suspend fun getPageList(chapter: SChapter) = throw Exception("Unused")