mirrors/Tachidesk
1
0
Fork 0
mirror of https://github.com/Suwayomi/Tachidesk.git synced 2025-12-10 06:42:07 +01:00
Code Issues Projects Releases Wiki Activity

Restore server settings first (#1637)

Browse Source 
The imported server settings might cause the active database to change.
In case this happens, the backup was restored into the wrong database.
This commit is contained in:
schroda
2025-09-10 00:14:47 +02:00
committed by GitHub
parent 450861d47a
commit 7db947eba2
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupImport.kt
View File

@@ -197,23 +197,23 @@ object ProtoBackupImport : ProtoBackupBase() {
val getRestoreAmount = { size: Int -> size + restoreCategories + restoreMeta + restoreSettings } val getRestoreAmount = { size: Int -> size + restoreCategories + restoreMeta + restoreSettings }
val restoreAmount = getRestoreAmount(backup.backupManga.size) val restoreAmount = getRestoreAmount(backup.backupManga.size)
updateRestoreState(id, BackupRestoreState.RestoringCategories(restoreCategories, restoreAmount)) updateRestoreState(
id,
BackupRestoreState.RestoringSettings(restoreSettings, restoreAmount),
)
BackupSettingsHandler.restore(backup.serverSettings)
updateRestoreState(id, BackupRestoreState.RestoringCategories(restoreSettings + restoreCategories, restoreAmount))
val categoryMapping = restoreCategories(backup.backupCategories) val categoryMapping = restoreCategories(backup.backupCategories)
updateRestoreState(id, BackupRestoreState.RestoringMeta(restoreCategories + restoreMeta, restoreAmount)) updateRestoreState(id, BackupRestoreState.RestoringMeta(restoreSettings + restoreCategories + restoreMeta, restoreAmount))
restoreGlobalMeta(backup.meta) restoreGlobalMeta(backup.meta)
restoreSourceMeta(backup.backupSources) restoreSourceMeta(backup.backupSources)
updateRestoreState(
id,
BackupRestoreState.RestoringSettings(restoreCategories + restoreMeta + restoreSettings, restoreAmount),
)
BackupSettingsHandler.restore(backup.serverSettings)
// Store source mapping for error messages // Store source mapping for error messages
val sourceMapping = backup.getSourceMap() val sourceMapping = backup.getSourceMap()