From a7722f5f9d8c4a3e990dd3cff72d75afffcb03c5 Mon Sep 17 00:00:00 2001
From: sxyazi <sxyazi@gmail.com>
Date: Tue, 2 Jul 2024 23:07:25 +0800
Subject: [PATCH] ..

---
 yazi-plugin/preset/components/folder.lua |  9 ++-------
 yazi-plugin/src/cha/cha.rs               | 19 +++----------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/yazi-plugin/preset/components/folder.lua b/yazi-plugin/preset/components/folder.lua
index d5f9a759..b172d419 100644
--- a/yazi-plugin/preset/components/folder.lua
+++ b/yazi-plugin/preset/components/folder.lua
@@ -22,13 +22,8 @@ function Folder:linemode(area, files)
 		elseif mode == "permissions" then
 			spans[#spans + 1] = ui.Span(f.cha:permissions() or "")
 		elseif mode == "owner" then
-			if f.cha.uid and f.cha.gid then
-				local user = ya.user_name(f.cha.uid)
-				local group = ya.group_name(f.cha.gid)
-				if user and group then
-					spans[#spans + 1] = ui.Span(user .. ":" .. group)
-				end
-			end
+			spans[#spans + 1] = ya.user_name and ui.Span(ya.user_name(f.cha.uid) .. ":" .. ya.group_name(f.cha.gid))
+				or ui.Span("")
 		end
 
 		spans[#spans + 1] = ui.Span(" ")
diff --git a/yazi-plugin/src/cha/cha.rs b/yazi-plugin/src/cha/cha.rs
index c470e2d4..af3e4813 100644
--- a/yazi-plugin/src/cha/cha.rs
+++ b/yazi-plugin/src/cha/cha.rs
@@ -1,7 +1,5 @@
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
-#[cfg(windows)]
-use mlua::Value::Nil;
 use mlua::{AnyUserData, ExternalError, Lua, Table, UserDataFields, UserDataMethods, UserDataRef};
 use yazi_shared::fs::ChaKind;
 
@@ -25,20 +23,10 @@ impl Cha {
 			reg.add_field_method_get("is_exec", |_, me| Ok(me.is_exec()));
 			reg.add_field_method_get("is_sticky", |_, me| Ok(me.is_sticky()));
 
-			#[allow(unused_variables)]
+			#[cfg(unix)]
 			{
-				reg.add_field_method_get("uid", |_, me| {
-					#[cfg(unix)]
-					return Ok(me.uid);
-					#[cfg(windows)]
-					return Ok(Nil);
-				});
-				reg.add_field_method_get("gid", |_, me| {
-					#[cfg(unix)]
-					return Ok(me.gid);
-					#[cfg(windows)]
-					return Ok(Nil);
-				});
+				reg.add_field_method_get("uid", |_, me| Ok(me.uid));
+				reg.add_field_method_get("gid", |_, me| Ok(me.gid));
 			}
 
 			reg.add_field_method_get("length", |_, me| Ok(me.len));
@@ -51,7 +39,6 @@ impl Cha {
 			reg.add_field_method_get("accessed", |_, me| {
 				Ok(me.accessed.and_then(|t| t.duration_since(UNIX_EPOCH).map(|d| d.as_secs_f64()).ok()))
 			});
-			#[allow(unused_variables)]
 			reg.add_method("permissions", |_, me, ()| {
 				Ok(
 					#[cfg(unix)]