fix: ensure that LINK and ORPHAN cannot coexist

yuann3 · Jan 15, 2024 · 8533445 · 8533445
1 parent a1c963a
commit 8533445
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/yazi-shared/src/fs/cha.rs b/yazi-shared/src/fs/cha.rs
@@ -38,8 +38,6 @@ impl From<Metadata> for Cha {
 		let mut ck = ChaKind::empty();
 		if m.is_dir() {
 			ck |= ChaKind::DIR;
-		} else if m.is_symlink() {
-			ck |= ChaKind::LINK;
 		}
 
 		#[cfg(unix)]

diff --git a/yazi-shared/src/fs/file.rs b/yazi-shared/src/fs/file.rs
@@ -31,13 +31,14 @@ impl File {
 		let (is_link, mut link_to) = (meta.is_symlink(), None);
 
 		if is_link {
-			ck |= ChaKind::LINK;
 			meta = fs::metadata(&url).await.unwrap_or(meta);
 			link_to = fs::read_link(&url).await.map(Url::from).ok();
 		}
 
 		if is_link && meta.is_symlink() {
 			ck |= ChaKind::ORPHAN;
+		} else if is_link {
+			ck |= ChaKind::LINK;
 		}
 
 		if url.is_hidden() {