Mirrors/rip
2
0
Fork 0
mirror of https://github.com/nivekuil/rip synced 2025-02-16 12:08:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor to get rid of all unwraps

Browse source
This commit is contained in:
Kevin Liu 2016-11-04 10:22:51 -07:00
parent 33299946aa
commit 98f5008728
2 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main.rs
View file

@ -100,7 +100,8 @@ Send files to the graveyard (/tmp/.graveyard by default) instead of unlinking th
// the graves_to_exhume.
if matches.is_present("seance") {
if let Ok(f) = fs::File::open(record) {
let gravepath = &graveyard.join(cwd.strip_prefix("/").unwrap());
let gravepath = join_absolute(graveyard, cwd).to_string_lossy()
.into_owned();
for grave in seance(f, gravepath) {
graves_to_exhume.push(grave);
}
@ -140,8 +141,8 @@ Send files to the graveyard (/tmp/.graveyard by default) instead of unlinking th
}
if matches.is_present("seance") {
// Can't join absolute paths, so we need to strip the leading "/"
let gravepath = &graveyard.join(cwd.strip_prefix("/").unwrap());
let gravepath = join_absolute(graveyard, cwd).to_string_lossy()
.into_owned();
if let Ok(f) = fs::File::open(record) {
for grave in seance(f, gravepath) {
println!("{}", grave);
@ -216,8 +217,7 @@ Send files to the graveyard (/tmp/.graveyard by default) instead of unlinking th
}
let dest: &Path = &{
// Can't join absolute paths, so strip the leading "/"
let dest = graveyard.join(source.strip_prefix("/").unwrap());
let dest = join_absolute(graveyard, source);
// Resolve a name conflict if necessary
if symlink_exists(&dest) {
rename_grave(dest)
@ -271,7 +271,7 @@ fn bury<S: AsRef<Path>, D: AsRef<Path>>(source: S, dest: D) -> io::Result<()> {
// Walk the source, creating directories and copying files as needed
for entry in WalkDir::new(source).into_iter().filter_map(|e| e.ok()) {
// Path without the top-level directory
let orphan: &Path = entry.path().strip_prefix(source).unwrap();
let orphan: &Path = &join_absolute(entry.path(), source);
if entry.file_type().is_dir() {
let mode = entry.metadata()?.permissions().mode();
if let Err(e) = fs::DirBuilder::new()
@ -391,12 +391,12 @@ fn lines_of_graves(f: &fs::File, graves: &[String]) -> Vec<String> {
}
/// Returns an iterator over all graves in the record that are under gravepath
fn seance<'a>(f: fs::File, gravepath: &'a Path) -> impl Iterator<Item=String> {
fn seance<T: AsRef<str>>(f: fs::File, gravepath: T) -> impl Iterator<Item=String> {
BufReader::new(f)
.lines()
.filter_map(|l| l.ok())
.map(|l| record_entry(&l).dest.to_string())
.filter(move |d| d.starts_with(gravepath.to_str().unwrap()))
.filter(move |d| d.starts_with(gravepath.as_ref()))
}
/// Takes a vector of grave paths and removes the respective lines from the record

17
src/util.rs
View file

@ -1,3 +1,15 @@
/// Concatenate two paths, even if the right argument is an absolute path.
fn join_absolute<A: AsRef<Path>, B: AsRef<Path>>(left: A, right: B) -> PathBuf {
let (left, right) = (left.as_ref(), right.as_ref());
left.join(
if let Ok(stripped) = right.strip_prefix("/") {
stripped
} else {
right
}
)
}
fn symlink_exists<P: AsRef<Path>>(path: P) -> bool {
fs::symlink_metadata(path).is_ok()
}
@ -9,7 +21,10 @@ fn get_user() -> String {
/// Prompt for user input, returning True if the first character is 'y' or 'Y'
fn prompt_yes<T: AsRef<str>>(prompt: T) -> bool {
print!("{} (y/N) ", prompt.as_ref());
io::stdout().flush().unwrap();
if io::stdout().flush().is_err() {
// If stdout wasn't flushed properly, fallback to println
println!("{} (y/N)", prompt.as_ref());
}
let stdin = BufReader::new(io::stdin());
if let Some(c) = stdin.chars().next() {
if let Ok(c) = c {