maxmustermann/termscp
1
0
Fork 0
Code Issues Pull requests 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
Show stats 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
.iter()
.map(|x| self.local().get(*x)) // Usize to Option<FsEntry>
.filter(|x| x.is_some()) // Get only some values
.map(|x| x.unwrap()) // Option to FsEntry
.flatten()
.collect();
SelectedEntry::from(files)
}
@ -97,8 +96,7 @@ impl FileTransferActivity {
let files: Vec<&FsEntry> = files
.iter()
.map(|x| self.remote().get(*x)) // Usize to Option<FsEntry>
.filter(|x| x.is_some()) // Get only some values
.map(|x| x.unwrap()) // Option to FsEntry
.flatten()
.collect();
SelectedEntry::from(files)
}
@ -118,8 +116,7 @@ impl FileTransferActivity {
let files: Vec<&FsEntry> = files
.iter()
.map(|x| self.found().as_ref().unwrap().get(*x)) // Usize to Option<FsEntry>
.filter(|x| x.is_some()) // Get only some values
.map(|x| x.unwrap()) // Option to FsEntry
.flatten()
.collect();
SelectedEntry::from(files)
}

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

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