list: show symlink targets (for tar and zip)

src/archive/rar.rs

@@ -55,7 +55,11 @@ pub fn list_archive(
         let is_dir = item.is_directory();
         let path = item.filename;
 
-        Ok(FileInArchive { path, is_dir })
+        Ok(FileInArchive {
+            path,
+            is_dir,
+            symlink_target: None,
+        })
     }))
 }
 

src/archive/sevenz.rs

@@ -90,6 +90,7 @@ where
         files.push(Ok(FileInArchive {
             path: entry.name().into(),
             is_dir: entry.is_directory(),
+            symlink_target: None,
         }));
         Ok(true)
     };

src/archive/tar.rs

@@ -103,7 +103,12 @@ pub fn list_archive(mut archive: tar::Archive<impl Read>) -> Result<impl Iterato
         let file = file?;
         let path = file.path()?.into_owned();
         let is_dir = file.header().entry_type().is_dir();
-        Ok(FileInArchive { path, is_dir })
+        let symlink_target = file.link_name()?.map(|p| p.into_owned());
+        Ok(FileInArchive {
+            path,
+            is_dir,
+            symlink_target,
+        })
     });
 
     Ok(entries.collect::<Vec<_>>().into_iter())

src/archive/zip.rs

@@ -118,15 +118,27 @@ where
             None => archive.by_index(idx),
         };
 
-        let file = match zip_result {
+        let mut file = match zip_result {
             Ok(f) => f,
             Err(e) => return Err(e.into()),
         };
 
         let path = file.enclosed_name().unwrap_or_else(|| file.mangled_name()).to_owned();
         let is_dir = file.is_dir();
 
-        Ok(FileInArchive { path, is_dir })
+        let symlink_target = file
+            .unix_mode()
+            .filter(|mode| mode & 0o170000 == 0o120000)
+            .and_then(|_| {
+                let mut s = String::new();
+                file.read_to_string(&mut s).ok().map(|_| PathBuf::from(s))
+            });
+
+        Ok(FileInArchive {
+            path,
+            is_dir,
+            symlink_target,
+        })
     })
 }
 

src/list.rs

@@ -24,6 +24,9 @@ pub struct FileInArchive {
 
     /// Whether this file is a directory
     pub is_dir: bool,
+
+    /// The target of the symlink, if this file is a symlink
+    pub symlink_target: Option<PathBuf>,
 }
 
 /// Actually print the files
@@ -41,21 +44,44 @@ pub fn list_files(
         tree.print(&mut out);
     } else {
         for file in files {
-            let FileInArchive { path, is_dir } = file?;
-            print_entry(&mut out, path.display(), is_dir);
+            let FileInArchive {
+                path,
+                is_dir,
+                symlink_target,
+            } = file?;
+            print_entry(&mut out, path.display(), is_dir, symlink_target);
         }
     }
     Ok(())
 }
 
 /// Print an entry and highlight directories, either by coloring them
 /// if that's supported or by adding a trailing /
-fn print_entry(out: &mut impl Write, name: impl fmt::Display, is_dir: bool) {
+fn print_entry(out: &mut impl Write, name: impl fmt::Display, is_dir: bool, symlink_target: Option<PathBuf>) {
     use crate::utils::colors::*;
 
     if !is_dir {
         // Not a directory -> just print the file name
-        let _ = writeln!(out, "{name}");
+        if let Some(target) = symlink_target {
+            if is_running_in_accessible_mode() {
+                // Accessible mode: use "->" for screen readers
+                let _ = writeln!(out, "{} -> {}", name, target.display());
+            } else {
+                // Normal mode: use "->" with colors
+                let _ = writeln!(
+                    out,
+                    "{}{}{} -> {}{}{}",
+                    *CYAN,
+                    name,
+                    *ALL_RESET,
+                    *CYAN,
+                    target.display(),
+                    *ALL_RESET
+                );
+            }
+        } else {
+            let _ = writeln!(out, "{name}");
+        }
         return;
     }
 
@@ -151,11 +177,18 @@ mod tree {
             };
 
             let _ = write!(out, "{prefix}{final_part}");
-            let is_dir = match self.file {
-                Some(FileInArchive { is_dir, .. }) => is_dir,
-                None => true,
+            let (is_dir, symlink_target) = match &self.file {
+                Some(FileInArchive {
+                    is_dir, symlink_target, ..
+                }) => (*is_dir, symlink_target.clone()),
+                None => (true, None),
             };
-            super::print_entry(out, <Vec<u8> as ByteVec>::from_os_str_lossy(name).as_bstr(), is_dir);
+            super::print_entry(
+                out,
+                <Vec<u8> as ByteVec>::from_os_str_lossy(name).as_bstr(),
+                is_dir,
+                symlink_target,
+            );
 
             // Construct prefix for children, adding either a line if this isn't
             // the last entry in the parent dir or empty space if it is.