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

Cleanup custom info, fix custom genre not saving if you dont edit it

Browse Source
This commit is contained in:
Jobobby04 2021-01-20 21:00:58 -05:00
parent 0a4fcb480d
commit a17c4c151f
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/eu/kanade/tachiyomi/data/library/CustomMangaManager.kt
View File

@ -14,16 +14,12 @@ class CustomMangaManager(val context: Context) {
private val editJson = File(context.getExternalFilesDir(null), "edits.json") private val editJson = File(context.getExternalFilesDir(null), "edits.json")
private var customMangaMap = mutableMapOf<Long, Manga>() private val customMangaMap = fetchCustomData()
init {
fetchCustomData()
}
fun getManga(manga: Manga): Manga? = customMangaMap[manga.id] fun getManga(manga: Manga): Manga? = customMangaMap[manga.id]
private fun fetchCustomData() { private fun fetchCustomData(): MutableMap<Long, Manga> {
if (!editJson.exists() || !editJson.isFile) return if (!editJson.exists() || !editJson.isFile) return mutableMapOf()
val json = try { val json = try {
Json.decodeFromString<MangaList>( Json.decodeFromString<MangaList>(
@ -31,10 +27,10 @@ class CustomMangaManager(val context: Context) {
) )
} catch (e: Exception) { } catch (e: Exception) {
null null
} ?: return } ?: return mutableMapOf()
val mangasJson = json.mangas ?: return val mangasJson = json.mangas ?: return mutableMapOf()
customMangaMap = mangasJson.mapNotNull { mangaJson -> return mangasJson.mapNotNull { mangaJson ->
val id = mangaJson.id ?: return@mapNotNull null val id = mangaJson.id ?: return@mapNotNull null
val manga = MangaImpl().apply { val manga = MangaImpl().apply {
this.id = id this.id = id

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
View File

@ -317,7 +317,7 @@ class MangaPresenter(
LocalSource(downloadManager.context).updateMangaInfo(manga) LocalSource(downloadManager.context).updateMangaInfo(manga)
db.updateMangaInfo(manga).executeAsBlocking() db.updateMangaInfo(manga).executeAsBlocking()
} else { } else {
val genre = if (!tags.isNullOrEmpty() && tags.joinToString() != manga.genre) { val genre = if (!tags.isNullOrEmpty() && tags.joinToString() != manga.originalGenre) {
tags tags
} else { } else {
null null