vh/termscp
1
0
Fork 0
mirror of https://github.com/veeso/termscp.git synced 2025-12-07 09:36:00 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Goto command: support for relative paths

Browse Source
This commit is contained in:
ChristianVisintin
2020-11-30 11:24:14 +01:00
parent abf2124b09
commit a7253e8082
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/ui/activities/filetransfer_activity.rs
View File

@@ -1347,12 +1347,38 @@ impl FileTransferActivity {
/// ///
/// Callback for GOTO command /// Callback for GOTO command
fn callback_change_directory(&mut self, input: String) { fn callback_change_directory(&mut self, input: String) {
let dir_path: PathBuf = PathBuf::from(input);
match self.tab { match self.tab {
FileExplorerTab::Local => { FileExplorerTab::Local => {
self.local_changedir(PathBuf::from(input.as_str()).as_path(), true); // If path is relative, concat pwd
let abs_dir_path: PathBuf = match dir_path.is_relative() {
true => {
let mut d: PathBuf = self.context.as_ref().unwrap().local.pwd();
d.push(dir_path);
d
},
false => dir_path
};
self.local_changedir(abs_dir_path.as_path(), true);
} }
FileExplorerTab::Remote => { FileExplorerTab::Remote => {
self.remote_changedir(PathBuf::from(input.as_str()).as_path(), true); // If path is relative, concat pwd
let abs_dir_path: PathBuf = match dir_path.is_relative() {
true => {
match self.client.pwd() {
Ok(mut wkrdir) => {
wkrdir.push(dir_path);
wkrdir
}
Err(err) => {
self.input_mode = InputMode::Popup(PopupType::Alert(Color::Red, format!("Could not retrieve current directory: {}", err)));
return;
}
}
},
false => dir_path
};
self.remote_changedir(abs_dir_path.as_path(), true);
} }
} }
} }