From 912da10696e3da8d4e817c7858aa3324c81d415b Mon Sep 17 00:00:00 2001 From: ChristianVisintin Date: Sat, 12 Dec 2020 17:32:49 +0100 Subject: [PATCH] When downloading symlinks, the filename and its size is now known (thanks to the new symlinks management) --- src/ui/activities/filetransfer_activity/input.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/ui/activities/filetransfer_activity/input.rs b/src/ui/activities/filetransfer_activity/input.rs index 4bdd994..791233f 100644 --- a/src/ui/activities/filetransfer_activity/input.rs +++ b/src/ui/activities/filetransfer_activity/input.rs @@ -221,8 +221,9 @@ impl FileTransferActivity { let files: Vec = self.local.files.clone(); // Otherwise self is borrowed both as mutable and immutable... // Get file at index if let Some(entry) = files.get(self.local.index) { - // Call upload - self.filetransfer_send(entry, wrkdir.as_path(), None); + let name: String = entry.get_name(); + // Call upload; pass realfile, keep link name + self.filetransfer_send(&entry.get_realfile(), wrkdir.as_path(), Some(name)); } } _ => { /* Nothing to do */ } @@ -383,11 +384,13 @@ impl FileTransferActivity { let files: Vec = self.remote.files.clone(); // Otherwise self is borrowed both as mutable and immutable... // Get file at index if let Some(entry) = files.get(self.remote.index) { - // Call upload + // Preserve name + let name: String = entry.get_name(); + // Call upload (use entry realfile; pass previous name) self.filetransfer_recv( - entry, + &entry.get_realfile(), self.context.as_ref().unwrap().local.pwd().as_path(), - None, + Some(name), ); } }