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

Lets try this out for full backup categories

Browse Source
This commit is contained in:
Jobobby04 2020-11-06 14:24:55 -05:00
parent acefd33e2e
commit e987ba8c3e
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
View File

@ -345,15 +345,12 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
internal fun restoreCategoriesForManga(manga: Manga, categories: List<Int>, backupCategories: List<BackupCategory>) { internal fun restoreCategoriesForManga(manga: Manga, categories: List<Int>, backupCategories: List<BackupCategory>) {
val dbCategories = databaseHelper.getCategories().executeAsBlocking() val dbCategories = databaseHelper.getCategories().executeAsBlocking()
val mangaCategoriesToUpdate = mutableListOf<MangaCategory>() val mangaCategoriesToUpdate = mutableListOf<MangaCategory>()
categories.forEach { backupCategoryOrder -> val mappedCategories = categories.mapNotNull { mangaCategory -> backupCategories.firstOrNull { mangaCategory == it.order }?.let { it to mangaCategory } }
backupCategories.firstOrNull { mappedCategories.forEach { mappedCategory ->
it.order == backupCategoryOrder dbCategories.firstOrNull { dbCategory ->
}?.let { backupCategory -> dbCategory.name == mappedCategory.first.name
dbCategories.firstOrNull { dbCategory -> }?.also { dbCategory ->
dbCategory.name == backupCategory.name mangaCategoriesToUpdate += MangaCategory.create(manga, dbCategory)
}?.let { dbCategory ->
mangaCategoriesToUpdate.add(MangaCategory.create(manga, dbCategory))
}
} }
} }
@ -521,7 +518,7 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
preferences.eh_savedSearches() preferences.eh_savedSearches()
.set( .set(
( (
backupSavedSearches.filter { backupSavedSearch -> currentSavedSearches.all { it.name != backupSavedSearch.name || it.source != backupSavedSearch.source } } backupSavedSearches.filter { backupSavedSearch -> currentSavedSearches.none { it.name == backupSavedSearch.name && it.source == backupSavedSearch.source } }
.map { .map {
"${it.source}:" + Json.encodeToString( "${it.source}:" + Json.encodeToString(
JsonSavedSearch( JsonSavedSearch(