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

Check category order before restoring from backup

Browse Source 
Closes #632

Co-authored-by: Cologler <10906962+Cologler@users.noreply.github.com>
(cherry picked from commit 119bcbf8ed2415664922ea77fadf0da1165d1732)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesRestorer.kt
This commit is contained in:
AntsyLich 2024-06-08 06:38:35 +06:00 committed by Jobobby04
parent 239793f7fd
commit a5522ef732
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesRestorer.kt
View File

@ -21,14 +21,15 @@ class CategoriesRestorer(
val categories = backupCategories val categories = backupCategories
.sortedBy { it.order } .sortedBy { it.order }
.distinctBy { it.name }
.map { .map {
val newOrder = nextOrder++ val dbCategory = dbCategoriesByName[it.name]
dbCategoriesByName[it.name] if (dbCategory != null) return@map dbCategory
?: handler.awaitOneExecutable { val order = nextOrder++
categoriesQueries.insert(it.name, newOrder, it.flags) handler.awaitOneExecutable {
categoriesQueries.selectLastInsertedRowId() categoriesQueries.insert(it.name, order, it.flags)
}.let { id -> it.toCategory(id).copy(order = newOrder) } categoriesQueries.selectLastInsertedRowId()
}
.let { id -> it.toCategory(id).copy(order = order) }
} }
libraryPreferences.categorizedDisplaySettings().set( libraryPreferences.categorizedDisplaySettings().set(