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

src/backup/datastore.rs: add helper to sort backup lists

This commit is contained in:
Dietmar Maurer 2019-03-04 18:20:57 +01:00
parent 875fb1c01a
commit 2b01a22507
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api2/admin/datastore.rs
View File

@ -70,7 +70,7 @@ fn list_groups(
for (_group_id, mut list) in group_hash { for (_group_id, mut list) in group_hash {
list.sort_unstable_by(|a, b| b.backup_dir.backup_time().cmp(&a.backup_dir.backup_time())); // new backups first BackupInfo::sort_list(&mut list, false);
let info = &list[0]; let info = &list[0];
let group = info.backup_dir.group(); let group = info.backup_dir.group();
@ -130,7 +130,7 @@ fn list_snapshots (
let group_snapshots = match group_hash.get_mut(&group_id) { let group_snapshots = match group_hash.get_mut(&group_id) {
Some(data) => { Some(data) => {
// new backups first // new backups first
data.sort_unstable_by(|a, b| b.backup_dir.backup_time().cmp(&a.backup_dir.backup_time())); BackupInfo::sort_list(data, false);
data data
} }
None => bail!("Backup group '{}' does not exists.", group_id), None => bail!("Backup group '{}' does not exists.", group_id),
@ -173,7 +173,7 @@ fn prune(
let mut mark = HashSet::new(); let mut mark = HashSet::new();
list.sort_unstable_by(|a, b| b.backup_dir.backup_time().cmp(&a.backup_dir.backup_time())); // new backups first BackupInfo::sort_list(&mut list, false);
if let Some(keep_last) = param["keep-last"].as_u64() { if let Some(keep_last) = param["keep-last"].as_u64() {
list.iter().take(keep_last as usize).for_each(|info| { list.iter().take(keep_last as usize).for_each(|info| {
@ -205,10 +205,10 @@ fn prune(
}); });
} }
let mut remove_list: Vec<&BackupInfo> = list.iter() let mut remove_list: Vec<BackupInfo> = list.into_iter()
.filter(|info| !mark.contains(&info.backup_dir.relative_path())).collect(); .filter(|info| !mark.contains(&info.backup_dir.relative_path())).collect();
remove_list.sort_unstable_by(|a, b| a.backup_dir.backup_time().cmp(&b.backup_dir.backup_time())); // oldest backups first BackupInfo::sort_list(&mut remove_list, true);
for info in remove_list { for info in remove_list {
datastore.remove_backup_dir(&info.backup_dir)?; datastore.remove_backup_dir(&info.backup_dir)?;

10
src/backup/datastore.rs
View File

@ -131,6 +131,16 @@ pub struct BackupInfo {
pub files: Vec<String>, pub files: Vec<String>,
} }
impl BackupInfo {
pub fn sort_list(list: &mut Vec<BackupInfo>, ascendending: bool) {
if ascendending { // oldest first
list.sort_unstable_by(|a, b| a.backup_dir.backup_time.cmp(&b.backup_dir.backup_time));
} else { // newest first
list.sort_unstable_by(|a, b| b.backup_dir.backup_time.cmp(&a.backup_dir.backup_time));
}
}
}
macro_rules! BACKUP_ID_RE { () => (r"[A-Za-z0-9][A-Za-z0-9_-]+") } macro_rules! BACKUP_ID_RE { () => (r"[A-Za-z0-9][A-Za-z0-9_-]+") }
macro_rules! BACKUP_TYPE_RE { () => (r"(?:host|vm|ct)") } macro_rules! BACKUP_TYPE_RE { () => (r"(?:host|vm|ct)") }