mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Format

Browse source
This commit is contained in:
sxyazi 2024-01-13 21:18:27 +08:00
parent 9c098166fb
commit 1aedb9e2a6
No known key found for this signature in database
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
yazi-config/src/theme/filetype.rs
View file

@ -1,7 +1,7 @@
use std::{path::Path, str::FromStr}; use std::{path::Path, str::FromStr};
use serde::{Deserialize, Deserializer}; use serde::{Deserialize, Deserializer};
use yazi_shared::{MIME_DIR, fs::File}; use yazi_shared::{fs::File, MIME_DIR};
use super::{Color, Style, StyleShadow}; use super::{Color, Style, StyleShadow};
use crate::Pattern; use crate::Pattern;
@ -20,7 +20,7 @@ impl FromStr for FileKind {
match s { match s {
"executable" => Ok(Self::Executable), "executable" => Ok(Self::Executable),
"symlink" => Ok(Self::Symlink), "symlink" => Ok(Self::Symlink),
_ => Err(anyhow::anyhow!("invalid file kind")) _ => Err(anyhow::anyhow!("invalid file kind")),
} }
} }
} }

8
yazi-fm/src/lives/folder.rs
View file

@ -87,13 +87,7 @@ impl<'a, 'b> Folder<'a, 'b> {
cx.manager.mimetype.get(&file.url).map(|x| &**x) cx.manager.mimetype.get(&file.url).map(|x| &**x)
}; };
Ok( Ok(THEME.filetypes.iter().find(|&x| x.matches(&file, mime)).map(|x| Style::from(x.style)))
THEME
.filetypes
.iter()
.find(|&x| x.matches(&file, mime))
.map(|x| Style::from(x.style)),
)
}); });
reg.add_function("is_hovered", |_, me: AnyUserData| { reg.add_function("is_hovered", |_, me: AnyUserData| {
let folder = me.named_user_value::<FolderRef>("folder")?; let folder = me.named_user_value::<FolderRef>("folder")?;