From d7e2e1bc93dc0f0a648a0248c62953896ca08abb Mon Sep 17 00:00:00 2001 From: sxyazi Date: Mon, 28 Aug 2023 13:59:58 +0800 Subject: [PATCH] .. --- app/src/manager/folder.rs | 2 +- core/src/files/file.rs | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/src/manager/folder.rs b/app/src/manager/folder.rs index 7ff7b612..8ccc8e8b 100644 --- a/app/src/manager/folder.rs +++ b/app/src/manager/folder.rs @@ -88,7 +88,7 @@ impl<'a> Widget for Folder<'a> { }; let mut path = format!(" {icon} {}", readable_path(f.path(), &self.folder.cwd)); - if let Some(ref link_to) = f.link_to { + if let Some(link_to) = f.link_to() { if MANAGER.show_symlink { path.push_str(&format!(" -> {}", link_to.display())); } diff --git a/core/src/files/file.rs b/core/src/files/file.rs index e17a2563..d35df960 100644 --- a/core/src/files/file.rs +++ b/core/src/files/file.rs @@ -5,12 +5,12 @@ use tokio::fs; #[derive(Clone, Debug)] pub struct File { - pub(super) path: PathBuf, - pub(super) meta: Metadata, - pub(super) length: Option, - pub link_to: Option, - pub is_link: bool, - pub is_hidden: bool, + pub(super) path: PathBuf, + pub(super) meta: Metadata, + pub(super) length: Option, + pub(super) link_to: Option, + pub(super) is_link: bool, + pub(super) is_hidden: bool, } impl File { @@ -59,4 +59,8 @@ impl File { // --- Length #[inline] pub fn length(&self) -> Option { self.length } + + // --- Link to + #[inline] + pub fn link_to(&self) -> Option<&PathBuf> { self.link_to.as_ref() } }