From 8ccf5eb0bb3ab996bf3696b0b99d930005c37873 Mon Sep 17 00:00:00 2001
From: ChristianVisintin <christian.visintin1997@gmail.com>
Date: Sat, 26 Dec 2020 10:51:01 +0100
Subject: [PATCH] FsEntry::get_name() returns &str

---
 src/fs/mod.rs                                     | 12 ++++++------
 src/ui/activities/filetransfer_activity/input.rs  |  4 ++--
 src/ui/activities/filetransfer_activity/layout.rs |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/fs/mod.rs b/src/fs/mod.rs
index 4ce73f9..468bfe9 100644
--- a/src/fs/mod.rs
+++ b/src/fs/mod.rs
@@ -97,10 +97,10 @@ impl FsEntry {
     /// ### get_name
     ///
     /// Get file name from `FsEntry`
-    pub fn get_name(&self) -> String {
+    pub fn get_name(&self) -> &'_ str {
         match self {
-            FsEntry::Directory(dir) => dir.name.clone(),
-            FsEntry::File(file) => file.name.clone(),
+            FsEntry::Directory(dir) => dir.name.as_ref(),
+            FsEntry::File(file) => file.name.as_ref(),
         }
     }
 
@@ -273,10 +273,10 @@ impl std::fmt::Display for FsEntry {
         // Get date
         let datetime: String = fmt_time(self.get_last_change_time(), "%b %d %Y %H:%M");
         // Set file name (or elide if too long)
-        let name: String = self.get_name();
+        let name: &str = self.get_name();
         let name: String = match name.len() >= 24 {
-            false => name,
-            true => format!("{}...", &name.as_str()[0..20]),
+            false => name.to_string(),
+            true => format!("{}...", &name[0..20]),
         };
         write!(
             f,
diff --git a/src/ui/activities/filetransfer_activity/input.rs b/src/ui/activities/filetransfer_activity/input.rs
index af5b4d7..8b7c224 100644
--- a/src/ui/activities/filetransfer_activity/input.rs
+++ b/src/ui/activities/filetransfer_activity/input.rs
@@ -297,7 +297,7 @@ impl FileTransferActivity {
                         if self.local.files.get(self.local.index).is_some() {
                             let file: FsEntry =
                                 self.local.files.get(self.local.index).unwrap().clone();
-                            let name: String = file.get_name();
+                            let name: String = file.get_name().to_string();
                             // Call upload; pass realfile, keep link name
                             self.filetransfer_send(
                                 &file.get_realfile(),
@@ -519,7 +519,7 @@ impl FileTransferActivity {
                         if self.remote.files.get(self.remote.index).is_some() {
                             let file: FsEntry =
                                 self.remote.files.get(self.remote.index).unwrap().clone();
-                            let name: String = file.get_name();
+                            let name: String = file.get_name().to_string();
                             // Call upload; pass realfile, keep link name
                             let wrkdir: PathBuf = self.local.wrkdir.clone();
                             self.filetransfer_recv(
diff --git a/src/ui/activities/filetransfer_activity/layout.rs b/src/ui/activities/filetransfer_activity/layout.rs
index dddd36b..e611ef1 100644
--- a/src/ui/activities/filetransfer_activity/layout.rs
+++ b/src/ui/activities/filetransfer_activity/layout.rs
@@ -483,7 +483,7 @@ impl FileTransferActivity {
             Some(fsentry) => {
                 // Get name and path
                 let abs_path: PathBuf = fsentry.get_abs_path();
-                let name: String = fsentry.get_name();
+                let name: String = fsentry.get_name().to_string();
                 let ctime: String = fmt_time(fsentry.get_creation_time(), "%b %d %Y %H:%M:%S");
                 let atime: String = fmt_time(fsentry.get_last_access_time(), "%b %d %Y %H:%M:%S");
                 let mtime: String = fmt_time(fsentry.get_creation_time(), "%b %d %Y %H:%M:%S");