Handle file selections in activity

src/ui/activities/filetransfer/actions/find.rs

@@ -27,7 +27,7 @@
  */
 // locals
 use super::super::browser::FileExplorerTab;
-use super::{FileTransferActivity, FsEntry, LogLevel};
+use super::{FileTransferActivity, FsEntry, SelectedEntry};
 
 use std::path::PathBuf;
 
@@ -46,12 +46,12 @@ impl FileTransferActivity {
         }
     }
 
-    pub(crate) fn action_find_changedir(&mut self, idx: usize) {
+    pub(crate) fn action_find_changedir(&mut self) {
         // Match entry
-        if let Some(entry) = self.found().as_ref().unwrap().get(idx) {
+        if let SelectedEntry::One(entry) = self.get_found_selected_entries() {
             // Get path: if a directory, use directory path; if it is a File, get parent path
             let path: PathBuf = match entry {
-                FsEntry::Directory(dir) => dir.abs_path.clone(),
+                FsEntry::Directory(dir) => dir.abs_path,
                 FsEntry::File(file) => match file.abs_path.parent() {
                     None => PathBuf::from("."),
                     Some(p) => p.to_path_buf(),
@@ -69,78 +69,60 @@ impl FileTransferActivity {
         }
     }
 
-    pub(crate) fn action_find_transfer(&mut self, idx: usize, name: Option<String>) {
-        let entry: Option<FsEntry> = self.found().as_ref().unwrap().get(idx).cloned();
-        if let Some(entry) = entry {
-            // Download file
-            match self.browser.tab() {
+    pub(crate) fn action_find_transfer(&mut self, save_as: Option<String>) {
+        let wrkdir: PathBuf = match self.browser.tab() {
+            FileExplorerTab::FindLocal | FileExplorerTab::Local => self.remote().wrkdir.clone(),
+            FileExplorerTab::FindRemote | FileExplorerTab::Remote => self.local().wrkdir.clone(),
+        };
+        match self.get_found_selected_entries() {
+            SelectedEntry::One(entry) => match self.browser.tab() {
                 FileExplorerTab::FindLocal | FileExplorerTab::Local => {
-                    let wrkdir: PathBuf = self.remote().wrkdir.clone();
-                    self.filetransfer_send(&entry.get_realfile(), wrkdir.as_path(), name);
+                    self.filetransfer_send(&entry.get_realfile(), wrkdir.as_path(), save_as);
                 }
                 FileExplorerTab::FindRemote | FileExplorerTab::Remote => {
-                    let wrkdir: PathBuf = self.local().wrkdir.clone();
-                    self.filetransfer_recv(&entry.get_realfile(), wrkdir.as_path(), name);
+                    self.filetransfer_recv(&entry.get_realfile(), wrkdir.as_path(), save_as);
+                }
+            },
+            SelectedEntry::Multi(entries) => {
+                // In case of selection: save multiple files in wrkdir/input
+                let mut dest_path: PathBuf = wrkdir;
+                if let Some(save_as) = save_as {
+                    dest_path.push(save_as);
+                }
+                // Iter files
+                for entry in entries.iter() {
+                    self.filetransfer_recv(&entry.get_realfile(), dest_path.as_path(), None);
                 }
             }
+            SelectedEntry::None => {}
         }
     }
 
-    pub(crate) fn action_find_delete(&mut self, idx: usize) {
-        let entry: Option<FsEntry> = self.found().as_ref().unwrap().get(idx).cloned();
-        if let Some(entry) = entry {
-            // Download file
-            match self.browser.tab() {
-                FileExplorerTab::FindLocal | FileExplorerTab::Local => {
-                    let full_path: PathBuf = entry.get_abs_path();
-                    // Delete file or directory and report status as popup
-                    match self.host.remove(&entry) {
-                        Ok(_) => {
-                            // Reload files
-                            let p: PathBuf = self.local().wrkdir.clone();
-                            self.local_scan(p.as_path());
-                            // Log
-                            self.log(
-                                LogLevel::Info,
-                                format!("Removed file \"{}\"", full_path.display()),
-                            );
-                        }
-                        Err(err) => {
-                            self.log_and_alert(
-                                LogLevel::Error,
-                                format!(
-                                    "Could not delete file \"{}\": {}",
-                                    full_path.display(),
-                                    err
-                                ),
-                            );
-                        }
-                    }
-                }
-                FileExplorerTab::FindRemote | FileExplorerTab::Remote => {
-                    let full_path: PathBuf = entry.get_abs_path();
+    pub(crate) fn action_find_delete(&mut self) {
+        match self.get_found_selected_entries() {
+            SelectedEntry::One(entry) => {
+                // Delete file
+                self.remove_found_file(&entry);
+            }
+            SelectedEntry::Multi(entries) => {
+                // Iter files
+                for entry in entries.iter() {
                     // Delete file
-                    match self.client.remove(&entry) {
-                        Ok(_) => {
-                            self.reload_remote_dir();
-                            self.log(
-                                LogLevel::Info,
-                                format!("Removed file \"{}\"", full_path.display()),
-                            );
-                        }
-                        Err(err) => {
-                            self.log_and_alert(
-                                LogLevel::Error,
-                                format!(
-                                    "Could not delete file \"{}\": {}",
-                                    full_path.display(),
-                                    err
-                                ),
-                            );
-                        }
-                    }
+                    self.remove_found_file(entry);
                 }
             }
+            SelectedEntry::None => {}
+        }
+    }
+
+    fn remove_found_file(&mut self, entry: &FsEntry) {
+        match self.browser.tab() {
+            FileExplorerTab::FindLocal | FileExplorerTab::Local => {
+                self.local_remove_file(entry);
+            }
+            FileExplorerTab::FindRemote | FileExplorerTab::Remote => {
+                self.remote_remove_file(entry);
+            }
         }
     }
 }