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

Code enhancements

Browse Source
This commit is contained in:
veeso
2021-06-18 14:22:35 +02:00
parent 48483a5c99
commit 0175cfbfb6
2 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ui/activities/filetransfer/actions/mod.rs
View File

@@ -78,8 +78,7 @@ impl FileTransferActivity {
let files: Vec<&FsEntry> = files let files: Vec<&FsEntry> = files
.iter() .iter()
.map(|x| self.local().get(*x)) // Usize to Option<FsEntry> .map(|x| self.local().get(*x)) // Usize to Option<FsEntry>
.filter(|x| x.is_some()) // Get only some values .flatten()
.map(|x| x.unwrap()) // Option to FsEntry
.collect(); .collect();
SelectedEntry::from(files) SelectedEntry::from(files)
} }
@@ -97,8 +96,7 @@ impl FileTransferActivity {
let files: Vec<&FsEntry> = files let files: Vec<&FsEntry> = files
.iter() .iter()
.map(|x| self.remote().get(*x)) // Usize to Option<FsEntry> .map(|x| self.remote().get(*x)) // Usize to Option<FsEntry>
.filter(|x| x.is_some()) // Get only some values .flatten()
.map(|x| x.unwrap()) // Option to FsEntry
.collect(); .collect();
SelectedEntry::from(files) SelectedEntry::from(files)
} }
@@ -118,8 +116,7 @@ impl FileTransferActivity {
let files: Vec<&FsEntry> = files let files: Vec<&FsEntry> = files
.iter() .iter()
.map(|x| self.found().as_ref().unwrap().get(*x)) // Usize to Option<FsEntry> .map(|x| self.found().as_ref().unwrap().get(*x)) // Usize to Option<FsEntry>
.filter(|x| x.is_some()) // Get only some values .flatten()
.map(|x| x.unwrap()) // Option to FsEntry
.collect(); .collect();
SelectedEntry::from(files) SelectedEntry::from(files)
} }

32
src/ui/activities/filetransfer/session.rs
View File

@@ -252,18 +252,17 @@ impl FileTransferActivity {
// Reset states // Reset states
self.transfer.reset(); self.transfer.reset();
// Calculate total size of transfer // Calculate total size of transfer
let mut total_transfer_size: usize = 0; let total_transfer_size: usize = entries
for entry in entries.iter() { .iter()
total_transfer_size += self.get_total_transfer_size_local(entry); .map(|x| self.get_total_transfer_size_local(x))
} .sum();
self.transfer.full.init(total_transfer_size); self.transfer.full.init(total_transfer_size);
// Mount progress bar // Mount progress bar
self.mount_progress_bar(format!("Uploading {} entries...", entries.len())); self.mount_progress_bar(format!("Uploading {} entries...", entries.len()));
// Send recurse // Send recurse
for entry in entries.iter() { entries
// Send .iter()
self.filetransfer_send_recurse(entry, curr_remote_path, None); .for_each(|x| self.filetransfer_send_recurse(x, curr_remote_path, None));
}
// Umount progress bar // Umount progress bar
self.umount_progress_bar(); self.umount_progress_bar();
Ok(()) Ok(())
@@ -569,18 +568,17 @@ impl FileTransferActivity {
// Reset states // Reset states
self.transfer.reset(); self.transfer.reset();
// Calculate total size of transfer // Calculate total size of transfer
let mut total_transfer_size: usize = 0; let total_transfer_size: usize = entries
for entry in entries.iter() { .iter()
total_transfer_size += self.get_total_transfer_size_remote(entry); .map(|x| self.get_total_transfer_size_remote(x))
} .sum();
self.transfer.full.init(total_transfer_size); self.transfer.full.init(total_transfer_size);
// Mount progress bar // Mount progress bar
self.mount_progress_bar(format!("Uploading {} entries...", entries.len())); self.mount_progress_bar(format!("Downloading {} entries...", entries.len()));
// Send recurse // Send recurse
for entry in entries.iter() { entries
// Send .iter()
self.filetransfer_recv_recurse(entry, curr_remote_path, None); .for_each(|x| self.filetransfer_recv_recurse(x, curr_remote_path, None));
}
// Umount progress bar // Umount progress bar
self.umount_progress_bar(); self.umount_progress_bar();
Ok(()) Ok(())