Mr_Steppy/multi-ssh
1
0
Fork 0
Code Issues 8 Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

Use replace action instead of explicit delete action where possible

Browse Source
This commit is contained in:
Leonard Steppy 2024-12-13 13:07:52 +01:00
parent 4f08fabd34
commit 9e8214d742
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main.rs
View File

@ -161,14 +161,29 @@ fn main() -> Result<(), String> {
})
.chain(once(add_action))
.collect(),
OldVersionPolicy::Delete => files
.filter(|file| file_matcher.matches(file))
.map(|file| FileAction {
file: PathBuf::from(file),
kind: Action::Delete,
})
.chain(once(add_action))
.collect(),
OldVersionPolicy::Delete => {
let mut actions: Vec<_> = files
.filter(|file| file_matcher.matches(file))
.map(|file| {
//special case -> file has the same name as current file, then we just need to replace it
if file == file_name {
FileAction {
file: PathBuf::from(file),
kind: Action::Replace,
}
} else {
FileAction {
file: PathBuf::from(file),
kind: Action::Delete,
}
}
})
.collect();
if !actions.iter().any(|action| action.kind == Action::Replace) {
actions.push(add_action);
}
actions
},
}
},
})