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

Removed index from explorer

Browse Source
This commit is contained in:
veeso
2021-03-21 15:58:14 +01:00
parent 977becd5c9
commit 3520499289
3 changed files with 10 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ui/activities/filetransfer_activity/mod.rs
View File

@@ -284,8 +284,6 @@ impl Activity for FileTransferActivity {
// Get files at current wd
self.local_scan(pwd.as_path());
self.local.wrkdir = pwd;
// Index at first valid
self.local.index_at_first();
// Configure text editor
self.setup_text_editor();
// init view
@@ -310,10 +308,13 @@ impl Activity for FileTransferActivity {
// Check if connected (popup must be None, otherwise would try reconnecting in loop in case of error)
if !self.client.is_connected() && self.view.get_props(COMPONENT_TEXT_FATAL).is_none() {
// Set init state to connecting popup
self.mount_wait(format!(
"Connecting to {}:{}...",
self.params.address, self.params.port
).as_str());
self.mount_wait(
format!(
"Connecting to {}:{}...",
self.params.address, self.params.port
)
.as_str(),
);
// Force ui draw
self.view();
// Connect to remote

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

@@ -115,8 +115,6 @@ impl FileTransferActivity {
// Get current entries
if let Ok(pwd) = self.client.pwd() {
self.remote_scan(pwd.as_path());
// Set index at first valid
self.remote.index_at_first();
// Set wrkdir
self.remote.wrkdir = pwd;
}
@@ -620,19 +618,7 @@ impl FileTransferActivity {
match self.context.as_ref().unwrap().local.scan_dir(path) {
Ok(files) => {
// Set files and sort (sorting is implicit)
let prev_index: usize = self.local.get_index();
self.local.set_files(files);
// Restore index
self.local.set_abs_index(prev_index);
// Set index; keep if possible, otherwise set to last item
self.local
.set_abs_index(match self.local.get_current_file() {
Some(_) => self.local.get_index(),
None => match self.local.count() {
0 => 0,
_ => self.local.count() - 1,
},
});
}
Err(err) => {
self.log_and_alert(
@@ -650,19 +636,7 @@ impl FileTransferActivity {
match self.client.list_dir(path) {
Ok(files) => {
// Set files and sort (sorting is implicit)
let prev_index: usize = self.remote.get_index();
self.remote.set_files(files);
// Restore index
self.remote.set_abs_index(prev_index);
// Set index; keep if possible, otherwise set to last item
self.remote
.set_abs_index(match self.remote.get_current_file() {
Some(_) => self.remote.get_index(),
None => match self.remote.count() {
0 => 0,
_ => self.remote.count() - 1,
},
});
}
Err(err) => {
self.log_and_alert(
@@ -688,8 +662,6 @@ impl FileTransferActivity {
);
// Reload files
self.local_scan(path);
// Reset index
self.local.set_index(0);
// Set wrkdir
self.local.wrkdir = PathBuf::from(path);
// Push prev_dir to stack
@@ -719,8 +691,6 @@ impl FileTransferActivity {
);
// Update files
self.remote_scan(path);
// Reset index
self.remote.set_index(0);
// Set wrkdir
self.remote.wrkdir = PathBuf::from(path);
// Push prev_dir to stack