tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/backup/prune.rs: factor out code into remove_incomplete_snapshots()

Browse Source
This commit is contained in:
Dietmar Maurer 2019-12-06 08:12:08 +01:00
parent dc18849156
commit a8c8366cfa
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/backup/prune.rs
View File

@ -45,20 +45,11 @@ fn mark_selections<F: Fn(DateTime<Local>, &BackupInfo) -> String> (
} }
} }
pub fn compute_prune_info( fn remove_incomplete_snapshots(
mut list: Vec<BackupInfo>, mark: &mut HashMap<PathBuf, PruneMark>,
keep_last: Option<u64>, list: &Vec<BackupInfo>,
keep_daily: Option<u64>, ) {
keep_weekly: Option<u64>,
keep_monthly: Option<u64>,
keep_yearly: Option<u64>,
) -> Result<Vec<(BackupInfo, bool)>, Error> {
let mut mark = HashMap::new();
BackupInfo::sort_list(&mut list, false);
// remove inclomplete snapshots
let mut keep_unfinished = true; let mut keep_unfinished = true;
for info in list.iter() { for info in list.iter() {
// backup is considered unfinished if there is no manifest // backup is considered unfinished if there is no manifest
@ -76,6 +67,22 @@ pub fn compute_prune_info(
keep_unfinished = false; keep_unfinished = false;
} }
} }
}
pub fn compute_prune_info(
mut list: Vec<BackupInfo>,
keep_last: Option<u64>,
keep_daily: Option<u64>,
keep_weekly: Option<u64>,
keep_monthly: Option<u64>,
keep_yearly: Option<u64>,
) -> Result<Vec<(BackupInfo, bool)>, Error> {
let mut mark = HashMap::new();
BackupInfo::sort_list(&mut list, false);
remove_incomplete_snapshots(&mut mark, &list);
if let Some(keep_last) = keep_last { if let Some(keep_last) = keep_last {
mark_selections(&mut mark, &list, keep_last as usize, |_local_time, info| { mark_selections(&mut mark, &list, keep_last as usize, |_local_time, info| {