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

Remove current directory from begginnig of displayed paths

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

15
src/lib/misc.rs
View File

@ -19,13 +19,22 @@
use std;
use std::path::Path;
use std::io::Result;
/// Try to canonicalize a path using std::fs::canonicalize, and returns the
/// unmodified path if it fails (e.g. if the path doesn't exist (yet))
pub fn canonicalize<P: AsRef<Path>>(path: P) -> String {
if let Ok(path) = std::fs::canonicalize(path.as_ref()) {
try_canonicalize(path.as_ref())
.unwrap_or(format!("{}", path.as_ref().display()))
}
fn try_canonicalize<P: AsRef<Path>>(path: P) -> Result<String> {
let path = std::fs::canonicalize(path.as_ref())?;
let cwd = std::env::current_dir()?;
Ok(if let Ok(path) = path.strip_prefix(&cwd) {
format!("{}", path.display())
} else {
format!("{}", path.as_ref().display())
}
format!("{}", path.display())
})
}