From 5e64f15f592381a1f36dfdb029790b61b13084e2 Mon Sep 17 00:00:00 2001 From: AidanV Date: Sun, 30 Jun 2024 15:55:41 -0700 Subject: [PATCH] made mlua::Value::Nil only import on windows --- yazi-plugin/preset/components/folder.lua | 2 +- yazi-plugin/src/cha/cha.rs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/yazi-plugin/preset/components/folder.lua b/yazi-plugin/preset/components/folder.lua index 9f25ae28..d5f9a759 100644 --- a/yazi-plugin/preset/components/folder.lua +++ b/yazi-plugin/preset/components/folder.lua @@ -24,7 +24,7 @@ function Folder:linemode(area, files) elseif mode == "owner" then if f.cha.uid and f.cha.gid then local user = ya.user_name(f.cha.uid) - local group = 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 diff --git a/yazi-plugin/src/cha/cha.rs b/yazi-plugin/src/cha/cha.rs index f0874ac4..b343f495 100644 --- a/yazi-plugin/src/cha/cha.rs +++ b/yazi-plugin/src/cha/cha.rs @@ -1,6 +1,8 @@ use std::time::{Duration, SystemTime, UNIX_EPOCH}; -use mlua::{AnyUserData, ExternalError, Lua, Table, UserDataFields, UserDataMethods, UserDataRef, Value::Nil}; +use mlua::{AnyUserData, ExternalError, Lua, Table, UserDataFields, UserDataMethods, UserDataRef}; +#[cfg(windows)] +use mlua::Value::Nil; use yazi_shared::fs::ChaKind; use crate::bindings::Cast;