s0me1newithhand7s/system-manager
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Finish implementation of EtcTree.

Browse source
This commit is contained in:
R-VdP 2023-03-14 11:06:55 +01:00
parent e8e21ee2d5
commit f98bc65631
No known key found for this signature in database
1 changed files with 60 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

99
src/activate/etc_files.rs
View file

@ -221,7 +221,7 @@ impl EtcTree {
) )
} }
fn update_state<F>(self, other: Self, delete_action: &F) -> Self fn update_state<F>(self, other: Self, delete_action: &F) -> Option<Self>
where where
F: Fn(&Path) -> bool, F: Fn(&Path) -> bool,
{ {
@ -229,32 +229,40 @@ impl EtcTree {
.nested .nested
.clone() .clone()
.relative_complement(self.nested.clone()); .relative_complement(self.nested.clone());
let to_merge = other.nested.clone().intersection(self.nested.clone()); let to_merge = other.nested.intersection(self.nested.clone());
let deactivated = to_deactivate.keys().fold(self, |mut new_tree, name| { let deactivated = to_deactivate
new_tree.nested = new_tree.nested.alter( .into_iter()
|subtree| subtree.and_then(|subtree| subtree.deactivate(delete_action)), .fold(self, |mut new_tree, (name, subtree)| {
name.to_owned(), subtree
); .deactivate(delete_action)
new_tree .into_iter()
}); .for_each(|subtree| {
new_tree.nested.insert(name.to_owned(), subtree);
});
new_tree
});
to_merge.keys().fold(deactivated, |mut new_tree, name| { let merged = to_merge
new_tree.nested = new_tree.nested.alter( .into_iter()
|subtree| { .fold(deactivated, |mut new_tree, (name, other_tree)| {
subtree.and_then(|subtree| { new_tree.nested = new_tree.nested.alter(
other.nested.get(name).map(|other_tree| { |subtree| {
let mut new_tree = subtree.and_then(|subtree| {
subtree.update_state(other_tree.clone(), delete_action); subtree.update_state(other_tree.clone(), delete_action).map(
new_tree.status = new_tree.status.merge(&other_tree.status); |mut new_tree| {
new_tree new_tree.status = new_tree.status.merge(&other_tree.status);
new_tree
},
)
}) })
}) },
}, name,
name.to_owned(), );
); new_tree
new_tree });
})
Some(merged)
} }
} }
@ -297,7 +305,7 @@ pub fn activate(store_path: &StorePath, ephemeral: bool) -> Result<()> {
}, },
); );
serialise_state(&new_state)?; serialise_state(&new_state.unwrap_or_else(|| EtcTree::new(PathBuf::from("/"))))?;
log::info!("Done"); log::info!("Done");
Ok(()) Ok(())
@ -546,12 +554,18 @@ mod tests {
.register_managed_entry(&PathBuf::from("/").join("foo2")) .register_managed_entry(&PathBuf::from("/").join("foo2"))
.register_managed_entry(&PathBuf::from("/").join("foo2").join("baz")) .register_managed_entry(&PathBuf::from("/").join("foo2").join("baz"))
.register_managed_entry(&PathBuf::from("/").join("foo2").join("baz").join("bar")) .register_managed_entry(&PathBuf::from("/").join("foo2").join("baz").join("bar"))
.register_managed_entry(&PathBuf::from("/").join("foo2"))
.register_managed_entry(&PathBuf::from("/").join("foo2").join("baz2")) .register_managed_entry(&PathBuf::from("/").join("foo2").join("baz2"))
.register_managed_entry(&PathBuf::from("/").join("foo2").join("baz2").join("bar")) .register_managed_entry(&PathBuf::from("/").join("foo2").join("baz2").join("bar"))
.register_managed_entry(&PathBuf::from("/").join("foo3").join("baz2").join("bar")); .register_managed_entry(&PathBuf::from("/").join("foo3").join("baz2").join("bar"))
.register_managed_entry(&PathBuf::from("/").join("foo4"))
.register_managed_entry(&PathBuf::from("/").join("foo4").join("baz"))
.register_managed_entry(&PathBuf::from("/").join("foo4").join("baz").join("bar"));
let tree2 = tree1 let tree2 = tree1
.clone() .clone()
.deactivate_managed_entry(&PathBuf::from("/").join("foo4"), &|p| {
println!("Deactivating: {}", p.display());
false
})
.deactivate_managed_entry(&PathBuf::from("/").join("foo2"), &|p| { .deactivate_managed_entry(&PathBuf::from("/").join("foo2"), &|p| {
println!("Deactivating: {}", p.display()); println!("Deactivating: {}", p.display());
true true
@ -564,7 +578,7 @@ mod tests {
dbg!(&tree1); dbg!(&tree1);
assert_eq!( assert_eq!(
tree2.nested.keys().sorted().collect::<Vec<_>>(), tree2.nested.keys().sorted().collect::<Vec<_>>(),
["foo", "foo3"] ["foo", "foo3", "foo4"]
); );
assert!(tree2 assert!(tree2
.nested .nested
@ -580,27 +594,34 @@ mod tests {
.is_empty()); .is_empty());
assert_eq!( assert_eq!(
tree1.nested.keys().sorted().collect::<Vec<_>>(), tree1.nested.keys().sorted().collect::<Vec<_>>(),
["foo", "foo2", "foo3"] ["foo", "foo2", "foo3", "foo4"]
); );
} }
#[test] #[test]
fn etc_tree_diff() { fn etc_tree_update_state() {
let tree1 = EtcTree::new(PathBuf::from("/")) let tree1 = EtcTree::new(PathBuf::from("/"))
.register_managed_entry(&PathBuf::from("/").join("foo").join("bar")) .register_managed_entry(&PathBuf::from("/").join("foo").join("bar"))
.register_managed_entry(&PathBuf::from("/").join("foo2"))
.register_managed_entry(&PathBuf::from("/").join("foo2").join("baz"))
.register_managed_entry(&PathBuf::from("/").join("foo2").join("baz").join("bar")) .register_managed_entry(&PathBuf::from("/").join("foo2").join("baz").join("bar"))
.register_managed_entry(&PathBuf::from("/").join("foo2").join("baz2").join("bar")); .register_managed_entry(&PathBuf::from("/").join("foo2").join("baz2"))
.register_managed_entry(&PathBuf::from("/").join("foo2").join("baz2").join("bar"))
.register_managed_entry(&PathBuf::from("/").join("foo3").join("baz2").join("bar"));
let tree2 = EtcTree::new(PathBuf::from("/")) let tree2 = EtcTree::new(PathBuf::from("/"))
.register_managed_entry(&PathBuf::from("/").join("foo").join("bar")) .register_managed_entry(&PathBuf::from("/").join("foo").join("bar"))
.register_managed_entry(&PathBuf::from("/").join("foo3").join("bar")); .register_managed_entry(&PathBuf::from("/").join("foo3").join("bar"))
//tree2.diff(&mut tree1, &|name, _subtree| { .register_managed_entry(&PathBuf::from("/").join("foo4"))
// println!("Deactivating subtree: {name}"); .register_managed_entry(&PathBuf::from("/").join("foo4").join("bar"))
// true .register_managed_entry(&PathBuf::from("/").join("foo5"))
//}); .register_managed_entry(&PathBuf::from("/").join("foo5").join("bar"));
dbg!(&tree1); let new_tree = tree1.update_state(tree2, &|path| {
println!("Deactivating path: {}", path.display());
path != PathBuf::from("/").join("foo5").join("bar").as_path()
});
assert_eq!( assert_eq!(
tree1.nested.keys().sorted().collect::<Vec<_>>(), new_tree.unwrap().nested.keys().sorted().collect::<Vec<_>>(),
["foo", "foo2"] ["foo", "foo2", "foo3", "foo5"]
); );
} }
} }