Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Jobobby04 2021-03-11 22:39:46 -05:00
parent 5b8b10a96b
commit 21240cad06
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
View File

@ -41,7 +41,7 @@ import eu.kanade.tachiyomi.util.system.createFileInCacheDir
import eu.kanade.tachiyomi.util.system.isServiceRunning import eu.kanade.tachiyomi.util.system.isServiceRunning
import exh.md.utils.FollowStatus import exh.md.utils.FollowStatus
import exh.md.utils.MdUtil import exh.md.utils.MdUtil
import exh.metadata.metadata.base.insertFlatMetadata import exh.metadata.metadata.base.insertFlatMetadataAsync
import exh.source.LIBRARY_UPDATE_EXCLUDED_SOURCES import exh.source.LIBRARY_UPDATE_EXCLUDED_SOURCES
import exh.source.MERGED_SOURCE_ID import exh.source.MERGED_SOURCE_ID
import exh.source.getMainSource import exh.source.getMainSource
@ -569,7 +569,7 @@ class LibraryUpdateService(
val id = db.insertManga(dbManga).executeOnIO().insertedId() val id = db.insertManga(dbManga).executeOnIO().insertedId()
if (id != null) { if (id != null) {
metadata.mangaId = id metadata.mangaId = id
db.insertFlatMetadata(metadata.flatten()).await() db.insertFlatMetadataAsync(metadata.flatten()).await()
} }
} }

10
app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
View File

@ -156,11 +156,11 @@ class ExtensionManager(
// EXH --> // EXH -->
private fun <T : Extension> Iterable<T>.filterNotBlacklisted(): List<T> { private fun <T : Extension> Iterable<T>.filterNotBlacklisted(): List<T> {
val blacklistEnabled = preferences.enableSourceBlacklist().get() val blacklistEnabled = preferences.enableSourceBlacklist().get()
return filter { return filterNot { extension ->
if (it.isBlacklisted(blacklistEnabled)) { extension.isBlacklisted(blacklistEnabled)
xLogD("Removing blacklisted extension: (name: %s, pkgName: %s)!", it.name, it.pkgName) .also {
false if (it) xLogD("Removing blacklisted extension: (name: %s, pkgName: %s)!", extension.name, extension.pkgName)
} else true }
} }
} }

4
app/src/main/java/exh/md/handlers/FollowsHandler.kt
View File

@ -203,15 +203,11 @@ class FollowsHandler(val client: OkHttpClient, val headers: Headers, val prefere
*/ */
suspend fun fetchAllFollows(forceHd: Boolean): List<Pair<SManga, MangaDexSearchMetadata>> { suspend fun fetchAllFollows(forceHd: Boolean): List<Pair<SManga, MangaDexSearchMetadata>> {
return withIOContext { return withIOContext {
val listManga = mutableListOf<Pair<SManga, MangaDexSearchMetadata>>()
val response = client.newCall(followsListRequest()).await() val response = client.newCall(followsListRequest()).await()
val mangasPage = followsParseMangaPage(response, forceHd) val mangasPage = followsParseMangaPage(response, forceHd)
listManga.addAll(
mangasPage.mangas.mapIndexed { index, sManga -> mangasPage.mangas.mapIndexed { index, sManga ->
sManga to mangasPage.mangasMetadata[index] as MangaDexSearchMetadata sManga to mangasPage.mangasMetadata[index] as MangaDexSearchMetadata
} }
)
listManga
} }
} }