FsEntry::*::symlink is now a Option<Box<FsEntry>>; this improved symlinks, which gave errors some times

src/filetransfer/ftp_transfer.rs

@@ -613,7 +613,7 @@ mod tests {
             assert_eq!(file.abs_path, PathBuf::from("/tmp/omar.txt"));
             assert_eq!(file.name, String::from("omar.txt"));
             assert_eq!(file.size, 8192);
-            assert_eq!(file.symlink, None);
+            assert!(file.symlink.is_none());
             assert_eq!(file.user, None);
             assert_eq!(file.group, None);
             assert_eq!(file.unix_pex.unwrap(), (6, 6, 4));
@@ -653,7 +653,7 @@ mod tests {
             assert_eq!(file.abs_path, PathBuf::from("/tmp/omar.txt"));
             assert_eq!(file.name, String::from("omar.txt"));
             assert_eq!(file.size, 4096);
-            assert_eq!(file.symlink, None);
+            assert!(file.symlink.is_none());
             assert_eq!(file.user, Some(0));
             assert_eq!(file.group, Some(9));
             assert_eq!(file.unix_pex.unwrap(), (7, 5, 5));
@@ -692,7 +692,7 @@ mod tests {
         if let FsEntry::Directory(dir) = fs_entry {
             assert_eq!(dir.abs_path, PathBuf::from("/tmp/docs"));
             assert_eq!(dir.name, String::from("docs"));
-            assert_eq!(dir.symlink, None);
+            assert!(dir.symlink.is_none());
             assert_eq!(dir.user, Some(0));
             assert_eq!(dir.group, Some(9));
             assert_eq!(dir.unix_pex.unwrap(), (7, 7, 5));

src/filetransfer/scp_transfer.rs

@@ -68,7 +68,7 @@ impl ScpFileTransfer {
     /// ### parse_ls_output
     ///
     /// Parse a line of `ls -l` output and tokenize the output into a `FsEntry`
-    fn parse_ls_output(&self, path: &Path, line: &str) -> Result<FsEntry, ()> {
+    fn parse_ls_output(&mut self, path: &Path, line: &str) -> Result<FsEntry, ()> {
         // Prepare list regex
         // NOTE: about this damn regex <https://stackoverflow.com/questions/32480890/is-there-a-regex-to-parse-the-values-from-an-ftp-directory-listing>
         lazy_static! {
@@ -179,6 +179,14 @@ impl ScpFileTransfer {
                     true => self.get_name_and_link(metadata.get(8).unwrap().as_str()),
                     false => (String::from(metadata.get(8).unwrap().as_str()), None),
                 };
+                // Get symlink
+                let symlink: Option<Box<FsEntry>> = match symlink_path {
+                    None => None,
+                    Some(p) => match self.stat(p.as_path()) {
+                        Ok(e) => Some(Box::new(e)),
+                        Err(_) => None, // Ignore errors
+                    }
+                };
                 // Check if file_name is '.' or '..'
                 if file_name.as_str() == "." || file_name.as_str() == ".." {
                     return Err(());
@@ -199,7 +207,7 @@ impl ScpFileTransfer {
                         last_access_time: mtime,
                         creation_time: mtime,
                         readonly: false,
-                        symlink: symlink_path,
+                        symlink,
                         user: uid,
                         group: gid,
                         unix_pex: Some(unix_pex),
@@ -213,7 +221,7 @@ impl ScpFileTransfer {
                         size: filesize,
                         ftype: extension,
                         readonly: false,
-                        symlink: symlink_path,
+                        symlink,
                         user: uid,
                         group: gid,
                         unix_pex: Some(unix_pex),

src/filetransfer/sftp_transfer.rs

@@ -121,7 +121,7 @@ impl SftpFileTransfer {
     /// ### make_fsentry
     ///
     /// Make fsentry from path and metadata
-    fn make_fsentry(&self, path: &Path, metadata: &FileStat) -> FsEntry {
+    fn make_fsentry(&mut self, path: &Path, metadata: &FileStat) -> FsEntry {
         // Get common parameters
         let file_name: String = String::from(path.file_name().unwrap().to_str().unwrap_or(""));
         let file_type: Option<String> = match path.extension() {
@@ -149,11 +149,14 @@ impl SftpFileTransfer {
             .unwrap_or(SystemTime::UNIX_EPOCH);
         // Check if symlink
         let is_symlink: bool = metadata.file_type().is_symlink();
-        let symlink: Option<PathBuf> = match is_symlink {
+        let symlink: Option<Box<FsEntry>> = match is_symlink {
             true => {
                 // Read symlink
                 match self.sftp.as_ref().unwrap().readlink(path) {
-                    Ok(p) => Some(p),
+                    Ok(p) => match self.stat(p.as_path()) {
+                        Ok(entry) => Some(Box::new(entry)),
+                        Err(_) => None, // Ignore errors
+                    },
                     Err(_) => None,
                 }
             }