cafkafk/seidr
cafkafk/seidr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(link): add error handling for linking

Browse source 
Signed-off-by: Christina Sørensen <christina@cafkafk.com>
This commit is contained in:
Christina Sørensen 2023-10-17 06:47:18 +02:00
parent 08f234d85a
commit 7a333b53bd
Signed by: cafkafk
GPG key ID: 26C542FD97F965CE
1 changed files with 40 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/git.rs
View file

@ -128,6 +128,8 @@ pub enum LinkError {
AlreadyLinked(String, String), AlreadyLinked(String, String),
DifferentLink(String, String), DifferentLink(String, String),
FileExists(String, String), FileExists(String, String),
BrokenSymlinkExists(String, String),
FailedCreatingLink(String, String),
} }
impl std::fmt::Display for LinkError { impl std::fmt::Display for LinkError {
@ -141,6 +143,10 @@ impl std::fmt::Display for LinkError {
"Linking {tx} -> {rx} failed: link to different file exists" "Linking {tx} -> {rx} failed: link to different file exists"
), ),
LinkError::FileExists(tx, rx) => write!(f, "Linking {tx} -> {rx} failed: file exists"), LinkError::FileExists(tx, rx) => write!(f, "Linking {tx} -> {rx} failed: file exists"),
LinkError::BrokenSymlinkExists(tx, rx) => {
write!(f, "Linking {tx} -> {rx} failed: broken symlink")
}
LinkError::FailedCreatingLink(tx, rx) => write!(f, "Linking {tx} -> {rx} failed"),
} }
} }
} }
@ -193,26 +199,35 @@ fn handle_file_exists(selff: &Link, tx_path: &Path, rx_path: &Path) -> Result<bo
impl Link { impl Link {
/// Creates the link from the link struct /// Creates the link from the link struct
pub fn link(&self) -> bool { pub fn link(&self) -> Result<bool, LinkError> {
let tx_path: &Path = std::path::Path::new(&self.tx); let tx_path: &Path = std::path::Path::new(&self.tx);
let rx_path: &Path = std::path::Path::new(&self.rx); let rx_path: &Path = std::path::Path::new(&self.rx);
match rx_path.try_exists() { match rx_path.try_exists() {
// TODO: unwrap defeats the purpose here. // TODO: unwrap defeats the purpose here.
Ok(true) => handle_file_exists(self, tx_path, rx_path).unwrap(), Ok(true) => handle_file_exists(self, tx_path, rx_path),
Ok(false) if rx_path.is_symlink() => { Ok(false) if rx_path.is_symlink() => {
error!( error!(
"Linking {} -> {} failed: broken symlink", "Linking {} -> {} failed: broken symlink",
&self.tx, &self.rx &self.tx, &self.rx
); );
false Err(LinkError::FileExists(
tx_path.to_string_lossy().to_string(),
rx_path.to_string_lossy().to_string(),
))
} }
Ok(false) => { Ok(false) => {
symlink(&self.tx, &self.rx).expect("failed to create link"); symlink(&self.tx, &self.rx).expect("failed to create link");
true Err(LinkError::FailedCreatingLink(
tx_path.to_string_lossy().to_string(),
rx_path.to_string_lossy().to_string(),
))
} }
Err(error) => { Err(error) => {
error!("Linking {} -> {} failed: {}", &self.tx, &self.rx, error); error!("Linking {} -> {} failed: {}", &self.tx, &self.rx, error);
false Err(LinkError::FailedCreatingLink(
tx_path.to_string_lossy().to_string(),
rx_path.to_string_lossy().to_string(),
))
} }
} }
} }
@ -594,7 +609,7 @@ impl Config {
/// Runs associated function on all links in config /// Runs associated function on all links in config
fn on_all_links_spinner<F>(&self, op: &str, f: F) fn on_all_links_spinner<F>(&self, op: &str, f: F)
where where
F: Fn(&Link) -> bool, F: Fn(&Link) -> Result<bool, LinkError>,
{ {
for category in self.categories.values() { for category in self.categories.values() {
match category.links.as_ref() { match category.links.as_ref() {
@ -603,16 +618,27 @@ impl Config {
if !settings::QUIET.load(std::sync::atomic::Ordering::Relaxed) { if !settings::QUIET.load(std::sync::atomic::Ordering::Relaxed) {
let mut sp = let mut sp =
Spinner::new(Spinners::Dots10, format!("{}: {}", link.name, op)); Spinner::new(Spinners::Dots10, format!("{}: {}", link.name, op));
if f(link) { match f(link) {
sp.stop_and_persist( Err(e @ LinkError::AlreadyLinked(_, _)) => {
success_str(), sp.stop_and_persist(success_str(), format!("{e}"))
format!("{}: {}", link.name, op), }
); Err(e @ LinkError::DifferentLink(_, _)) => {
} else { sp.stop_and_persist(failure_str(), format!("{e}"))
sp.stop_and_persist( }
Err(e @ LinkError::FileExists(_, _)) => {
sp.stop_and_persist(failure_str(), format!("{e}"))
}
Err(e @ LinkError::BrokenSymlinkExists(_, _)) => {
sp.stop_and_persist(failure_str(), format!("{e}"))
}
Err(e @ LinkError::FailedCreatingLink(_, _)) => {
sp.stop_and_persist(failure_str(), format!("{e}"))
}
Err(e) => sp.stop_and_persist(failure_str(), format!("{e}")),
_ => sp.stop_and_persist(
failure_str(), failure_str(),
format!("{}: {}", link.name, op), format!("{}: {}", link.name, op),
); ),
} }
} else { } else {
f(link); f(link);