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

Dirstack implementation for local

Browse Source
This commit is contained in:
ChristianVisintin
2020-11-28 12:11:59 +01:00
parent 55cf883581
commit be18cc426d
1 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,12 +131,12 @@ impl FileExplorer {
FileExplorer {
index: 0,
files: Vec::new(),
dirstack: VecDeque::with_capacity(16)
dirstack: VecDeque::with_capacity(16),
}
}
/// ### pushd
///
///
/// push directory to stack
pub fn pushd(&mut self, dir: &Path) {
// Check if stack overflows the size
@@ -148,12 +148,11 @@ impl FileExplorer {
}
/// ### popd
///
///
/// Pop directory from the stack and return the directory
pub fn popd(&mut self) -> Option<PathBuf> {
self.dirstack.pop_front()
}
}
/// ## FileExplorerTab
@@ -658,14 +657,18 @@ impl FileTransferActivity {
// Match selected file
if let Some(entry) = self.local.files.get(self.local.index) {
if let FsEntry::Directory(dir) = entry {
// Get current directory
let prev_dir: PathBuf = context.local.pwd();
// Change directory
if let Err(err) = context.local.change_wrkdir(dir.abs_path.clone())
{
// Report err
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red,
format!("Could not change working directory: {}", err),
));
match context.local.change_wrkdir(dir.abs_path.clone()) {
Ok(_) => self.local.pushd(prev_dir.as_path()), // Push prev_dir to stack
Err(err) => {
// Report err
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red,
format!("Could not change working directory: {}", err),
));
}
}
// Update files
self.local.files = context.local.list_dir();
@@ -673,20 +676,32 @@ impl FileTransferActivity {
}
}
KeyCode::Backspace => {
// TODO: directory stack
// Go previous directory
let wrkdir: PathBuf = context.local.pwd();
if let Some(parent) = wrkdir.as_path().parent() {
// Change directory
if let Err(err) = context.local.change_wrkdir(PathBuf::from(parent)) {
// Report err
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red,
format!("Could not change working directory: {}", err),
));
// Go to previous directory
loop {
// Till a valid directory is found
match self.local.popd() {
Some(d) => {
match context.local.change_wrkdir(d) {
Ok(_) => {
// Update files
self.local.files = context.local.list_dir();
// Break, directory has changed
break;
}
Err(err) => {
// Report error
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red,
format!(
"Could not change working directory: {}",
err
),
));
}
}
}
None => break, // Break if stack is empty
}
// Update files
self.local.files = context.local.list_dir();
}
}
KeyCode::Delete => {