Skip to content

Fix bug when receiving repeated excludes from restic #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 17, 2024
Merged

Fix bug when receiving repeated excludes from restic #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions benches/cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ pub fn criterion_benchmark(c: &mut Criterion) {
"/home/user".to_string(),
"/etc".to_string(),
"/var".to_string(),
],
]
.into_iter()
.collect(),
hostname: Some("foo.com".to_string()),
username: Some("user".to_string()),
uid: Some(123),
Expand All @@ -34,8 +36,12 @@ pub fn criterion_benchmark(c: &mut Criterion) {
".cache".to_string(),
"Cache".to_string(),
"/home/user/Downloads".to_string(),
],
tags: vec!["foo_machine".to_string(), "rewrite".to_string()],
]
.into_iter()
.collect(),
tags: vec!["foo_machine".to_string(), "rewrite".to_string()]
.into_iter()
.collect(),
original_id: Some("fefwfwew".to_string()),
program_version: Some("restic 0.16.0".to_string()),
};
Expand Down Expand Up @@ -63,7 +69,9 @@ pub fn criterion_benchmark(c: &mut Criterion) {
"/home/user".to_string(),
"/etc".to_string(),
"/var".to_string(),
],
]
.into_iter()
.collect(),
hostname: Some("foo.com".to_string()),
username: Some("user".to_string()),
uid: Some(123),
Expand All @@ -72,8 +80,12 @@ pub fn criterion_benchmark(c: &mut Criterion) {
".cache".to_string(),
"Cache".to_string(),
"/home/user/Downloads".to_string(),
],
tags: vec!["foo_machine".to_string(), "rewrite".to_string()],
]
.into_iter()
.collect(),
tags: vec!["foo_machine".to_string(), "rewrite".to_string()]
.into_iter()
.collect(),
original_id: Some("fefwfwew".to_string()),
program_version: Some("restic 0.16.0".to_string()),
}
Expand Down
51 changes: 32 additions & 19 deletions src/cache/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::{
cmp::Reverse, convert::Infallible, env, fs, iter, mem, path::PathBuf,
cmp::Reverse, collections::HashSet, convert::Infallible, env, fs, iter,
mem, path::PathBuf,
};

use camino::{Utf8Path, Utf8PathBuf};
Expand Down Expand Up @@ -323,21 +324,23 @@ fn cache_snapshots_entries() {
assert_eq!(s0.original_id, s1.original_id);
assert_eq!(s0.program_version, s1.program_version);

let mut s0_paths: Vec<String> = s0.paths.to_vec();
let mut s0_paths: Vec<String> = s0.paths.iter().cloned().collect();
s0_paths.sort();
let mut s1_paths: Vec<String> = s1.paths.to_vec();
let mut s1_paths: Vec<String> = s1.paths.iter().cloned().collect();
s1_paths.sort();
assert_eq!(s0_paths, s1_paths);

let mut s0_excludes: Vec<String> = s0.excludes.to_vec();
let mut s0_excludes: Vec<String> =
s0.excludes.iter().cloned().collect();
s0_excludes.sort();
let mut s1_excludes: Vec<String> = s1.excludes.to_vec();
let mut s1_excludes: Vec<String> =
s1.excludes.iter().cloned().collect();
s1_excludes.sort();
assert_eq!(s0_excludes, s1_excludes);

let mut s0_tags: Vec<String> = s0.tags.to_vec();
let mut s0_tags: Vec<String> = s0.tags.iter().cloned().collect();
s0_tags.sort();
let mut s1_tags: Vec<String> = s1.tags.to_vec();
let mut s1_tags: Vec<String> = s1.tags.iter().cloned().collect();
s1_tags.sort();
assert_eq!(s0_tags, s1_tags);
}
Expand All @@ -355,7 +358,9 @@ fn cache_snapshots_entries() {
"/home/user".to_string(),
"/etc".to_string(),
"/var".to_string(),
],
]
.into_iter()
.collect(),
hostname: Some("foo.com".to_string()),
username: Some("user".to_string()),
uid: Some(123),
Expand All @@ -364,8 +369,12 @@ fn cache_snapshots_entries() {
".cache".to_string(),
"Cache".to_string(),
"/home/user/Downloads".to_string(),
],
tags: vec!["foo_machine".to_string(), "rewrite".to_string()],
]
.into_iter()
.collect(),
tags: vec!["foo_machine".to_string(), "rewrite".to_string()]
.into_iter()
.collect(),
original_id: Some("fefwfwew".to_string()),
program_version: Some("restic 0.16.0".to_string()),
};
Expand All @@ -375,7 +384,7 @@ fn cache_snapshots_entries() {
time: mk_datetime(2025, 5, 12, 17, 00, 00),
parent: Some("wat".to_string()),
tree: "anothertree".to_string(),
paths: vec!["/home/user".to_string()],
paths: vec!["/home/user".to_string()].into_iter().collect(),
hostname: Some("foo.com".to_string()),
username: Some("user".to_string()),
uid: Some(123),
Expand All @@ -384,8 +393,12 @@ fn cache_snapshots_entries() {
".cache".to_string(),
"Cache".to_string(),
"/home/user/Downloads".to_string(),
],
tags: vec!["foo_machine".to_string(), "rewrite".to_string()],
]
.into_iter()
.collect(),
tags: vec!["foo_machine".to_string(), "rewrite".to_string()]
.into_iter()
.collect(),
original_id: Some("fefwfwew".to_string()),
program_version: Some("restic 0.16.0".to_string()),
};
Expand All @@ -395,13 +408,13 @@ fn cache_snapshots_entries() {
time: mk_datetime(2023, 5, 12, 17, 00, 00),
parent: None,
tree: "fwefwfwwefwefwe".to_string(),
paths: vec![],
paths: HashSet::new(),
hostname: None,
username: None,
uid: None,
gid: None,
excludes: vec![],
tags: vec![],
excludes: HashSet::new(),
tags: HashSet::new(),
original_id: None,
program_version: None,
};
Expand Down Expand Up @@ -460,13 +473,13 @@ fn lots_of_snapshots() {
time: timestamp_to_datetime(i as i64).unwrap(),
parent: None,
tree: i.to_string(),
paths: vec![],
paths: HashSet::new(),
hostname: None,
username: None,
uid: None,
gid: None,
excludes: vec![],
tags: vec![],
excludes: HashSet::new(),
tags: HashSet::new(),
original_id: None,
program_version: None,
};
Expand Down
7 changes: 4 additions & 3 deletions src/restic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use core::str;
use std::os::unix::process::CommandExt;
use std::{
borrow::Cow,
collections::HashSet,
ffi::OsStr,
fmt::{self, Display, Formatter},
io::{self, BufRead, BufReader, Lines, Read},
Expand Down Expand Up @@ -313,7 +314,7 @@ pub struct Snapshot {
#[serde(default)]
pub parent: Option<String>,
pub tree: String,
pub paths: Vec<String>,
pub paths: HashSet<String>,
#[serde(default)]
pub hostname: Option<String>,
#[serde(default)]
Expand All @@ -323,9 +324,9 @@ pub struct Snapshot {
#[serde(default)]
pub gid: Option<u32>,
#[serde(default)]
pub excludes: Vec<String>,
pub excludes: HashSet<String>,
#[serde(default)]
pub tags: Vec<String>,
pub tags: HashSet<String>,
#[serde(default)]
pub original_id: Option<String>,
#[serde(default)]
Expand Down