diff --git a/src/ui/activities/filetransfer/actions/copy.rs b/src/ui/activities/filetransfer/actions/copy.rs index bf28e5a..550c643 100644 --- a/src/ui/activities/filetransfer/actions/copy.rs +++ b/src/ui/activities/filetransfer/actions/copy.rs @@ -41,7 +41,7 @@ impl FileTransferActivity { // Reload entries self.reload_local_dir(); } - SelectedEntry::Multi(entries) => { + SelectedEntry::Many(entries) => { // Try to copy each file to Input/{FILE_NAME} let base_path: PathBuf = PathBuf::from(input); // Iter files @@ -68,7 +68,7 @@ impl FileTransferActivity { // Reload entries self.reload_remote_dir(); } - SelectedEntry::Multi(entries) => { + SelectedEntry::Many(entries) => { // Try to copy each file to Input/{FILE_NAME} let base_path: PathBuf = PathBuf::from(input); // Iter files diff --git a/src/ui/activities/filetransfer/actions/delete.rs b/src/ui/activities/filetransfer/actions/delete.rs index b497d06..3d95a19 100644 --- a/src/ui/activities/filetransfer/actions/delete.rs +++ b/src/ui/activities/filetransfer/actions/delete.rs @@ -37,7 +37,7 @@ impl FileTransferActivity { // Reload self.reload_local_dir(); } - SelectedEntry::Multi(entries) => { + SelectedEntry::Many(entries) => { // Iter files for entry in entries.iter() { // Delete file @@ -58,7 +58,7 @@ impl FileTransferActivity { // Reload self.reload_remote_dir(); } - SelectedEntry::Multi(entries) => { + SelectedEntry::Many(entries) => { // Iter files for entry in entries.iter() { // Delete file diff --git a/src/ui/activities/filetransfer/actions/edit.rs b/src/ui/activities/filetransfer/actions/edit.rs index 6607376..ec88186 100644 --- a/src/ui/activities/filetransfer/actions/edit.rs +++ b/src/ui/activities/filetransfer/actions/edit.rs @@ -32,7 +32,7 @@ impl FileTransferActivity { pub(crate) fn action_edit_local_file(&mut self) { let entries: Vec = match self.get_local_selected_entries() { SelectedEntry::One(entry) => vec![entry], - SelectedEntry::Multi(entries) => entries, + SelectedEntry::Many(entries) => entries, SelectedEntry::None => vec![], }; // Edit all entries @@ -56,7 +56,7 @@ impl FileTransferActivity { pub(crate) fn action_edit_remote_file(&mut self) { let entries: Vec = match self.get_remote_selected_entries() { SelectedEntry::One(entry) => vec![entry], - SelectedEntry::Multi(entries) => entries, + SelectedEntry::Many(entries) => entries, SelectedEntry::None => vec![], }; // Edit all entries diff --git a/src/ui/activities/filetransfer/actions/find.rs b/src/ui/activities/filetransfer/actions/find.rs index 297a3da..7e0a97d 100644 --- a/src/ui/activities/filetransfer/actions/find.rs +++ b/src/ui/activities/filetransfer/actions/find.rs @@ -83,7 +83,7 @@ impl FileTransferActivity { self.filetransfer_recv(&entry.get_realfile(), wrkdir.as_path(), save_as); } }, - SelectedEntry::Multi(entries) => { + SelectedEntry::Many(entries) => { // In case of selection: save multiple files in wrkdir/input let mut dest_path: PathBuf = wrkdir; if let Some(save_as) = save_as { @@ -119,7 +119,7 @@ impl FileTransferActivity { // Delete file self.remove_found_file(&entry); } - SelectedEntry::Multi(entries) => { + SelectedEntry::Many(entries) => { // Iter files for entry in entries.iter() { // Delete file diff --git a/src/ui/activities/filetransfer/actions/mod.rs b/src/ui/activities/filetransfer/actions/mod.rs index 3dc9139..2e13003 100644 --- a/src/ui/activities/filetransfer/actions/mod.rs +++ b/src/ui/activities/filetransfer/actions/mod.rs @@ -42,13 +42,13 @@ pub(crate) mod save; pub(crate) enum SelectedEntry { One(FsEntry), - Multi(Vec), + Many(Vec), None, } enum SelectedEntryIndex { One(usize), - Multi(Vec), + Many(Vec), None, } @@ -63,7 +63,7 @@ impl From> for SelectedEntry { impl From> for SelectedEntry { fn from(files: Vec<&FsEntry>) -> Self { - SelectedEntry::Multi(files.into_iter().cloned().collect()) + SelectedEntry::Many(files.into_iter().cloned().collect()) } } @@ -74,7 +74,7 @@ impl FileTransferActivity { pub(crate) fn get_local_selected_entries(&self) -> SelectedEntry { match self.get_selected_index(super::COMPONENT_EXPLORER_LOCAL) { SelectedEntryIndex::One(idx) => SelectedEntry::from(self.local().get(idx)), - SelectedEntryIndex::Multi(files) => { + SelectedEntryIndex::Many(files) => { let files: Vec<&FsEntry> = files .iter() .map(|x| self.local().get(*x)) // Usize to Option @@ -93,7 +93,7 @@ impl FileTransferActivity { pub(crate) fn get_remote_selected_entries(&self) -> SelectedEntry { match self.get_selected_index(super::COMPONENT_EXPLORER_REMOTE) { SelectedEntryIndex::One(idx) => SelectedEntry::from(self.remote().get(idx)), - SelectedEntryIndex::Multi(files) => { + SelectedEntryIndex::Many(files) => { let files: Vec<&FsEntry> = files .iter() .map(|x| self.remote().get(*x)) // Usize to Option @@ -114,7 +114,7 @@ impl FileTransferActivity { SelectedEntryIndex::One(idx) => { SelectedEntry::from(self.found().as_ref().unwrap().get(idx)) } - SelectedEntryIndex::Multi(files) => { + SelectedEntryIndex::Many(files) => { let files: Vec<&FsEntry> = files .iter() .map(|x| self.found().as_ref().unwrap().get(*x)) // Usize to Option @@ -140,7 +140,7 @@ impl FileTransferActivity { _ => 0, }) .collect(); - SelectedEntryIndex::Multi(list) + SelectedEntryIndex::Many(list) } _ => SelectedEntryIndex::None, } diff --git a/src/ui/activities/filetransfer/actions/rename.rs b/src/ui/activities/filetransfer/actions/rename.rs index 9e18b39..80f3fd5 100644 --- a/src/ui/activities/filetransfer/actions/rename.rs +++ b/src/ui/activities/filetransfer/actions/rename.rs @@ -38,7 +38,7 @@ impl FileTransferActivity { // Reload entries self.reload_local_dir(); } - SelectedEntry::Multi(entries) => { + SelectedEntry::Many(entries) => { // Try to copy each file to Input/{FILE_NAME} let base_path: PathBuf = PathBuf::from(input); // Iter files @@ -62,7 +62,7 @@ impl FileTransferActivity { // Reload entries self.reload_remote_dir(); } - SelectedEntry::Multi(entries) => { + SelectedEntry::Many(entries) => { // Try to copy each file to Input/{FILE_NAME} let base_path: PathBuf = PathBuf::from(input); // Iter files diff --git a/src/ui/activities/filetransfer/actions/save.rs b/src/ui/activities/filetransfer/actions/save.rs index 3956e17..508d99c 100644 --- a/src/ui/activities/filetransfer/actions/save.rs +++ b/src/ui/activities/filetransfer/actions/save.rs @@ -52,7 +52,7 @@ impl FileTransferActivity { SelectedEntry::One(entry) => { self.filetransfer_send(&entry.get_realfile(), wrkdir.as_path(), save_as); } - SelectedEntry::Multi(entries) => { + SelectedEntry::Many(entries) => { // In case of selection: save multiple files in wrkdir/input let mut dest_path: PathBuf = wrkdir; if let Some(save_as) = save_as { @@ -73,7 +73,7 @@ impl FileTransferActivity { SelectedEntry::One(entry) => { self.filetransfer_recv(&entry.get_realfile(), wrkdir.as_path(), save_as); } - SelectedEntry::Multi(entries) => { + SelectedEntry::Many(entries) => { // In case of selection: save multiple files in wrkdir/input let mut dest_path: PathBuf = wrkdir; if let Some(save_as) = save_as {