thePR0M3TH3AN/Marlin
1
0
Fork 0
mirror of https://github.com/PR0M3TH3AN/Marlin.git synced 2025-09-08 07:08:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta' into codex/fix-failing-workflow-tests

Browse Source
This commit is contained in:
thePR0M3TH3AN
2025-05-21 19:48:56 -04:00
committed by GitHub
parent 15e892055f 0a020111fa
commit ff861d63b6
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cli-bin/src/main.rs
View File

@@ -107,10 +107,10 @@ fn main() -> Result<()> {
Commands::Restore { backup_path } => {
drop(conn);
if backup_path.exists() {
db::restore(&backup_path, &cfg.db_path).with_context(|| {
format!("Failed to restore DB from {}", backup_path.display())
})?;
if backup_path.exists() { db::restore(&backup_path, &cfg.db_path)
.with_context(|| {
format!("Failed to restore DB from {}", backup_path.display())
})?;
} else {
let backups_dir = cfg.db_path.parent().unwrap().join("backups");
let manager = BackupManager::new(&cfg.db_path, &backups_dir)?;
@@ -118,9 +118,12 @@ fn main() -> Result<()> {
.file_name()
.and_then(|n| n.to_str())
.context("invalid backup file name")?;
manager.restore_from_backup(name).with_context(|| {
format!("Failed to restore DB from {}", backup_path.display())
})?;
manager
.restore_from_backup(name)
.with_context(|| {
format!("Failed to restore DB from {}", backup_path.display())
})?;
}
println!("Restored DB from {}", backup_path.display());
db::open(&cfg.db_path).with_context(|| {