Check category order before restoring from backup

Closes #632 Co-authored-by: Cologler <10906962+Cologler@users.noreply.github.com>
mihonapp · Jun 8, 2024 · 119bcbf · 119bcbf
1 parent 87fe644
commit 119bcbf
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesRestorer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesRestorer.kt
@@ -17,14 +17,20 @@ class CategoriesRestorer(
         if (backupCategories.isNotEmpty()) {
             val dbCategories = getCategories.await()
             val dbCategoriesByName = dbCategories.associateBy { it.name }
+            var nextOrder = dbCategories.maxOfOrNull { it.order }?.plus(1) ?: 0
 
-            val categories = backupCategories.map {
-                dbCategoriesByName[it.name]
-                    ?: handler.awaitOneExecutable {
-                        categoriesQueries.insert(it.name, it.order, it.flags)
+            val categories = backupCategories
+                .sortedBy { it.order }
+                .map {
+                    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) }
-            }
+                    }
+                        .let { id -> it.toCategory(id).copy(order = order) }
+                }
 
             libraryPreferences.categorizedDisplaySettings().set(
                 (dbCategories + categories)