Implement show symlink destination

Add option `show_symlink_info` to represent show symlink info or not.
(Default to no)

Show symlink destination after symlink symbol in directory listing
Resemble `ls -l` and also the short argument select for this feature
is also `-l`.

Basic testing is included.

Related to #499

5 files changed, 43 insertions, 18 deletions

diff --git a/src/args.rs b/src/args.rs
index 9569ca3..5467573 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -135,6 +135,10 @@ pub struct CliArgs {
     )]
     pub header: Vec<HeaderMap>,
 
+    /// Show symlink info
+    #[clap(short = 'l', long = "show-symlink-info")]
+    pub show_symlink_info: bool,
+
     /// Hide version footer
     #[clap(short = 'F', long = "hide-version-footer")]
     pub hide_version_footer: bool,
diff --git a/src/config.rs b/src/config.rs
index e47ffc1..86fe314 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -95,6 +95,9 @@ pub struct MiniserveConfig {
     /// If specified, header will be added
     pub header: Vec<HeaderMap>,
 
+    /// If specified, symlink destination will be shown
+    pub show_symlink_info: bool,
+
     /// If enabled, version footer is hidden
     pub hide_version_footer: bool,
 
@@ -187,6 +190,7 @@ impl MiniserveConfig {
             dirs_first: args.dirs_first,
             title: args.title,
             header: args.header,
+            show_symlink_info: args.show_symlink_info,
             hide_version_footer: args.hide_version_footer,
             tls_rustls_config: tls_rustls_server_config,
         })
diff --git a/src/listing.rs b/src/listing.rs
index 33a0342..8147113 100644
--- a/src/listing.rs
+++ b/src/listing.rs
@@ -84,9 +84,6 @@ pub struct Entry {
     /// Type of the entry
     pub entry_type: EntryType,
 
-    /// Entry is symlink. Not mutually exclusive with entry_type
-    pub is_symlink: bool,
-
     /// URL of the entry
     pub link: String,
 
@@ -95,24 +92,27 @@ pub struct Entry {
 
     /// Last modification date
     pub last_modification_date: Option<SystemTime>,
+
+    /// Path of symlink pointed to
+    pub symlink_info: Option<String>,
 }
 
 impl Entry {
     fn new(
         name: String,
         entry_type: EntryType,
-        is_symlink: bool,
         link: String,
         size: Option<bytesize::ByteSize>,
         last_modification_date: Option<SystemTime>,
+        symlink_info: Option<String>,
     ) -> Self {
         Entry {
             name,
             entry_type,
-            is_symlink,
             link,
             size,
             last_modification_date,
+            symlink_info,
         }
     }
 
@@ -168,6 +168,7 @@ pub fn directory_listing(
     zip_enabled: bool,
     dirs_first: bool,
     hide_version_footer: bool,
+    show_symlink_info: bool,
     title: Option<String>,
 ) -> io::Result<ServiceResponse> {
     use actix_web::dev::BodyEncoding;
@@ -252,6 +253,11 @@ pub fn directory_listing(
                 }
                 res => (false, res),
             };
+            let symlink_dest = if is_symlink && show_symlink_info {
+                Some(std::fs::read_link(entry.path())?)
+            } else {
+                None
+            };
             let file_url = base
                 .join(&utf8_percent_encode(&file_name, PATH_SEGMENT).to_string())
                 .to_string_lossy()
@@ -271,19 +277,19 @@ pub fn directory_listing(
                     entries.push(Entry::new(
                         file_name,
                         EntryType::Directory,
-                        is_symlink,
                         file_url,
                         None,
                         last_modification_date,
+                        symlink_dest.and_then(|s| s.into_os_string().into_string().ok()),
                     ));
                 } else if metadata.is_file() {
                     entries.push(Entry::new(
                         file_name,
                         EntryType::File,
-                        is_symlink,
                         file_url,
                         Some(ByteSize::b(metadata.len())),
                         last_modification_date,
+                        symlink_dest.and_then(|s| s.into_os_string().into_string().ok()),
                     ));
                 }
             } else {
diff --git a/src/main.rs b/src/main.rs
index 882fd08..5f68cd2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -315,6 +315,7 @@ fn configure_app(app: &mut web::ServiceConfig, conf: &MiniserveConfig) {
         let zip_enabled = conf.zip_enabled;
         let dirs_first = conf.dirs_first;
         let hide_version_footer = conf.hide_version_footer;
+        let cmd_enable_symlink_dest = conf.show_symlink_info;
         let title = conf.title.clone();
 
         if path.is_file() {
@@ -353,6 +354,7 @@ fn configure_app(app: &mut web::ServiceConfig, conf: &MiniserveConfig) {
                         zip_enabled,
                         dirs_first,
                         hide_version_footer,
+                        cmd_enable_symlink_dest,
                         title.clone(),
                     )
                 })
diff --git a/src/renderer.rs b/src/renderer.rs
index 901bf66..3360504 100644
--- a/src/renderer.rs
+++ b/src/renderer.rs
@@ -328,24 +328,33 @@ fn entry_row(
             td {
                 p {
                     @if entry.is_dir() {
-                        a.directory href=(parametrized_link(&entry.link, sort_method, sort_order)) {
-                            (entry.name) "/"
-                            @if entry.is_symlink {
+                        @if let Some(symlink_dest) = entry.symlink_info {
+                            a.symlink href=(parametrized_link(&entry.link, sort_method, sort_order)) {
+                                (entry.name) "/"
                                 span.symlink-symbol { }
+                                a.directory {(symlink_dest) "/"}
+                            }
+                        }@else {
+                            a.directory href=(parametrized_link(&entry.link, sort_method, sort_order)) {
+                                (entry.name) "/"
                             }
                         }
                     } @else if entry.is_file() {
-                        div.file-entry {
+                        @if let Some(symlink_dest) = entry.symlink_info {
+                            a.symlink href=(&entry.link) {
+                                (entry.name)
+                                span.symlink-symbol { }
+                                a.file {(symlink_dest)}
+                            }
+                        }@else {
                             a.file href=(&entry.link) {
                                 (entry.name)
-                                @if entry.is_symlink {
-                                    span.symlink-symbol { }
-                                }
                             }
-                            @if let Some(size) = entry.size {
-                                span.mobile-info.size {
-                                    (size)
-                                }
+                        }
+
+                        @if let Some(size) = entry.size {
+                            span.mobile-info.size {
+                                (size)
                             }
                         }
                     }