maxmustermann/termscp
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Changed Multi variant to Many

Browse source
This commit is contained in:
veeso 2021-05-15 17:46:29 +02:00
parent c43ab28fb0
commit 2c64cd5cce
7 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ui/activities/filetransfer/actions/copy.rs
View file

@ -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

4
src/ui/activities/filetransfer/actions/delete.rs
View file

@ -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

4
src/ui/activities/filetransfer/actions/edit.rs
View file

@ -32,7 +32,7 @@ impl FileTransferActivity {
pub(crate) fn action_edit_local_file(&mut self) {
let entries: Vec<FsEntry> = 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<FsEntry> = 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

4
src/ui/activities/filetransfer/actions/find.rs
View file

@ -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

14
src/ui/activities/filetransfer/actions/mod.rs
View file

@ -42,13 +42,13 @@ pub(crate) mod save;
pub(crate) enum SelectedEntry {
One(FsEntry),
Multi(Vec<FsEntry>),
Many(Vec<FsEntry>),
None,
}
enum SelectedEntryIndex {
One(usize),
Multi(Vec<usize>),
Many(Vec<usize>),
None,
}
@ -63,7 +63,7 @@ impl From<Option<&FsEntry>> for SelectedEntry {
impl From<Vec<&FsEntry>> 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<FsEntry>
@ -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<FsEntry>
@ -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<FsEntry>
@ -140,7 +140,7 @@ impl FileTransferActivity {
_ => 0,
})
.collect();
SelectedEntryIndex::Multi(list)
SelectedEntryIndex::Many(list)
}
_ => SelectedEntryIndex::None,
}

4
src/ui/activities/filetransfer/actions/rename.rs
View file

@ -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

4
src/ui/activities/filetransfer/actions/save.rs
View file

@ -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 {