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

fix: check order before restore from backup (#1156)

Browse Source
This commit is contained in:
Cologler 2024-04-15 09:24:38 +08:00 committed by GitHub
parent ed20d25452
commit 03f32ebffd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,14 +17,19 @@ class CategoriesRestorer(
if (backupCategories.isNotEmpty()) { if (backupCategories.isNotEmpty()) {
val dbCategories = getCategories.await() val dbCategories = getCategories.await()
val dbCategoriesByName = dbCategories.associateBy { it.name } val dbCategoriesByName = dbCategories.associateBy { it.name }
var nextOrder = dbCategories.maxOfOrNull { it.order }?.plus(1) ?: 0
val categories = backupCategories.map { val categories = backupCategories
dbCategoriesByName[it.name] .sortedBy { it.order }
?: handler.awaitOneExecutable { .distinctBy { it.name }
categoriesQueries.insert(it.name, it.order, it.flags) .map {
categoriesQueries.selectLastInsertedRowId() val newOrder = nextOrder++
}.let { id -> it.toCategory(id) } dbCategoriesByName[it.name]
} ?: handler.awaitOneExecutable {
categoriesQueries.insert(it.name, newOrder, it.flags)
categoriesQueries.selectLastInsertedRowId()
}.let { id -> it.toCategory(id).copy(order = newOrder) }
}
libraryPreferences.categorizedDisplaySettings().set( libraryPreferences.categorizedDisplaySettings().set(
(dbCategories + categories) (dbCategories + categories)