Check category order before restoring from backup
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:
parent
239793f7fd
commit
a5522ef732
@ -21,14 +21,15 @@ class CategoriesRestorer(
|
||||
|
||||
val categories = backupCategories
|
||||
.sortedBy { it.order }
|
||||
.distinctBy { it.name }
|
||||
.map {
|
||||
val newOrder = nextOrder++
|
||||
dbCategoriesByName[it.name]
|
||||
?: handler.awaitOneExecutable {
|
||||
categoriesQueries.insert(it.name, newOrder, it.flags)
|
||||
val dbCategory = dbCategoriesByName[it.name]
|
||||
if (dbCategory != null) return@map dbCategory
|
||||
val order = nextOrder++
|
||||
handler.awaitOneExecutable {
|
||||
categoriesQueries.insert(it.name, order, it.flags)
|
||||
categoriesQueries.selectLastInsertedRowId()
|
||||
}.let { id -> it.toCategory(id).copy(order = newOrder) }
|
||||
}
|
||||
.let { id -> it.toCategory(id).copy(order = order) }
|
||||
}
|
||||
|
||||
libraryPreferences.categorizedDisplaySettings().set(
|
||||
|
Loading…
x
Reference in New Issue
Block a user