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

Canonicalize paths if possible when changing directory

Browse source
This commit is contained in:
Jeremy Soller 2026-01-07 09:28:44 -07:00 • committed by Ashley Wulber
parent 85456983c8
commit 705c881259
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/tab.rs
View file

@ -1457,6 +1457,10 @@ impl Location {
self.clone() self.clone()
} }
} else if let Some(mut path) = self.path_opt().cloned() { } else if let Some(mut path) = self.path_opt().cloned() {
// Canonicalize path, if possible
if let Ok(canonical) = fs::canonicalize(&path) {
path = canonical;
}
// Add trailing slash if location is a path // Add trailing slash if location is a path
path.push(""); path.push("");
self.with_path(path) self.with_path(path)
@ -1580,7 +1584,7 @@ impl Location {
pub fn expand_tilde(path: PathBuf) -> PathBuf { pub fn expand_tilde(path: PathBuf) -> PathBuf {
let mut components = path.components(); let mut components = path.components();
match components.next() { match components.next() {
Some(std::path::Component::Normal(os_str)) if os_str == "~" => { Some(path::Component::Normal(os_str)) if os_str == "~" => {
if let Some(home) = dirs::home_dir() { if let Some(home) = dirs::home_dir() {
home.join(components.as_path()) home.join(components.as_path())
} else { } else {
@ -4210,6 +4214,7 @@ impl Tab {
// Change directory if requested // Change directory if requested
if let Some(mut location) = cd { if let Some(mut location) = cd {
location = location.normalize();
if matches!(self.mode, Mode::Desktop) { if matches!(self.mode, Mode::Desktop) {
match location { match location {
Location::Path(path) => { Location::Path(path) => {