leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up LocationUp

Browse source 
Path doesn't need to be canonicalized.
This commit is contained in:
Josh Megnauth 2024-02-07 21:11:57 -05:00 • committed by Jeremy Soller
parent 2814834251
commit c636ca8b23
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/tab.rs
View file

@ -627,15 +627,8 @@ impl Tab {
// Sets location to the path's parent
// Does nothing if path is root or location is Trash
if let Location::Path(ref path) = self.location {
// Canonicalize is needed because parent() can return an empty path for
// relative paths which would fail to open.
// Canonicalizing the path should do the right thing of evaluating the path
// so that the parent successfully moves up the hierarchy.
// If it fails (i.e. the path doesn't exist for some reason) then it returns
// to home.
let mut path = path.canonicalize().unwrap_or_else(|_| home_dir());
if path.pop() {
cd = Some(Location::Path(path));
if let Some(parent) = path.parent() {
cd = Some(Location::Path(parent.to_owned()));
}
}
}