mirror/crowbook
1
0
Fork 0
mirror of https://github.com/lise-henry/crowbook synced 2024-09-22 09:10:43 +02:00
Code Issues

Fix behaviour of canonicalize at cost of unreadability

Browse Source
This commit is contained in:
Elisabeth Henry 2016-12-16 01:32:49 +01:00
parent 9758f93d93
commit dd1325d74a
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/lib/misc.rs
View File

@ -18,7 +18,7 @@
//! Misc utility functions used across crowbook //! Misc utility functions used across crowbook
use std; use std;
use std::path::Path; use std::path::{Path, PathBuf};
use std::io::Result; use std::io::Result;
/// Try to canonicalize a path using std::fs::canonicalize, and returns the /// Try to canonicalize a path using std::fs::canonicalize, and returns the
@ -30,11 +30,24 @@ pub fn canonicalize<P: AsRef<Path>>(path: P) -> String {
fn try_canonicalize<P: AsRef<Path>>(path: P) -> Result<String> { fn try_canonicalize<P: AsRef<Path>>(path: P) -> Result<String> {
let path = std::fs::canonicalize(path.as_ref())?; let full_path = std::fs::canonicalize(path.as_ref())?;
let cwd = std::env::current_dir()?; let mut cwd = std::env::current_dir()?;
Ok(if let Ok(path) = path.strip_prefix(&cwd) { let mut ups = 0;
format!("{}", path.display())
} else { loop {
format!("{}", path.display()) if let Ok(path) = full_path.strip_prefix(&cwd.clone()) {
}) let mut new_path = PathBuf::new();
for _ in 0..ups {
new_path.push("../");
}
new_path.push(path);
return Ok(format!("{}", new_path.display()));
} else {
if !cwd.pop() {
return Ok(format!("{}", full_path.display()));
} else {
ups += 1;
}
}
}
} }