mirrors/rustic
2
0
Fork 0
mirror of https://github.com/rustic-rs/rustic.git synced 2025-10-26 11:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

snapshots: simplify grouping

Browse Source
This commit is contained in:
Alexander Weiss 2022-11-30 23:23:11 +01:00
parent bfbf850210
commit 793de9725d
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/repo/snapshotfile.rs
View File

@ -7,6 +7,7 @@ use chrono::{DateTime, Local};
use clap::Parser;
use derivative::Derivative;
use indicatif::ProgressBar;
use itertools::Itertools;
use log::*;
use merge::Merge;
use serde::{Deserialize, Serialize};
@ -219,28 +220,13 @@ impl SnapshotFile {
snaps.sort_unstable_by(|sn1, sn2| sn1.cmp_group(crit, sn2));
let mut result = Vec::new();
if snaps.is_empty() {
return Ok(result);
for (group, snaps) in &snaps
.into_iter()
.group_by(|sn| SnapshotGroup::from_sn(&sn, crit))
{
result.push((group, snaps.collect()));
}
let mut iter = snaps.into_iter();
let snap = iter.next().unwrap();
let mut group = SnapshotGroup::from_sn(&snap, crit);
let mut result_group = vec![snap];
for snap in iter {
if snap.has_group(&group) {
result_group.push(snap);
} else {
result.push((group, result_group));
group = SnapshotGroup::from_sn(&snap, crit);
result_group = vec![snap]
}
}
result.push((group, result_group));
Ok(result)
}