diff options
| author | Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com> | 2021-03-27 04:19:59 +0000 |
|---|---|---|
| committer | Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com> | 2021-03-27 04:19:59 +0000 |
| commit | 81e65554b4da37399ef9b0ac6c647198a6e81ebf (patch) | |
| tree | 67639cfba21a486852000d95641c292af36bf877 /src | |
| parent | Resolve symlinks when listing (diff) | |
| download | miniserve-81e65554b4da37399ef9b0ac6c647198a6e81ebf.tar.gz miniserve-81e65554b4da37399ef9b0ac6c647198a6e81ebf.zip | |
Bring back the symlink symbol
Diffstat (limited to '')
| -rw-r--r-- | src/listing.rs | 11 | ||||
| -rw-r--r-- | src/renderer.rs | 6 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/listing.rs b/src/listing.rs index 2fe583c..c5eefe6 100644 --- a/src/listing.rs +++ b/src/listing.rs @@ -75,6 +75,9 @@ 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, @@ -89,6 +92,7 @@ impl Entry { fn new( name: String, entry_type: EntryType, + is_symlink: bool, link: String, size: Option<bytesize::ByteSize>, last_modification_date: Option<SystemTime>, @@ -96,6 +100,7 @@ impl Entry { Entry { name, entry_type, + is_symlink, link, size, last_modification_date, @@ -250,6 +255,10 @@ pub fn directory_listing( // show file url as relative to static path let file_url = utf8_percent_encode(&p.to_string_lossy(), FRAGMENT).to_string(); let file_name = entry.file_name().to_string_lossy().to_string(); + let is_symlink = match entry.metadata() { + Ok(metadata) => metadata.file_type().is_symlink(), + Err(_) => continue, + }; // if file is a directory, add '/' to the end of the name if let Ok(metadata) = std::fs::metadata(entry.path()) { @@ -265,6 +274,7 @@ pub fn directory_listing( entries.push(Entry::new( file_name, EntryType::Directory, + is_symlink, file_url, None, last_modification_date, @@ -273,6 +283,7 @@ pub fn directory_listing( entries.push(Entry::new( file_name, EntryType::File, + is_symlink, file_url, Some(ByteSize::b(metadata.len())), last_modification_date, diff --git a/src/renderer.rs b/src/renderer.rs index 2487696..266f035 100644 --- a/src/renderer.rs +++ b/src/renderer.rs @@ -329,11 +329,17 @@ fn entry_row( @if entry.is_dir() { a.directory href=(parametrized_link(&entry.link, sort_method, sort_order)) { (entry.name) "/" + @if entry.is_symlink { + span.symlink-symbol { "⇢" } + } } } @else if entry.is_file() { div.file-entry { a.file href=(&entry.link) { (entry.name) + @if entry.is_symlink { + span.symlink-symbol { "⇢" } + } } @if let Some(size) = entry.size { span.mobile-info.size { |