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

type: Option<String> -> kind: Option<FileKind>

Browse source
This commit is contained in:
Akmadan23 2024-01-13 11:07:06 +01:00 • committed by sxyazi
parent a765d23fc9
commit 71880a6dcd
No known key found for this signature in database
1 changed files with 33 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
use std::path::Path; use std::{path::Path, str::FromStr};
use serde::{Deserialize, Deserializer}; use serde::{Deserialize, Deserializer};
use yazi_shared::MIME_DIR; use yazi_shared::MIME_DIR;
@ -6,20 +6,45 @@ use yazi_shared::MIME_DIR;
use super::{Color, Style, StyleShadow}; use super::{Color, Style, StyleShadow};
use crate::Pattern; use crate::Pattern;
#[derive(Deserialize)]
#[serde(try_from = "String")]
pub enum FileKind {
Executable,
Symlink,
}
impl FromStr for FileKind {
type Err = anyhow::Error;
fn from_str(s: &str) -> Result<Self, Self::Err> {
match s {
"executable" => Ok(Self::Executable),
"symlink" => Ok(Self::Symlink),
_ => Err(anyhow::anyhow!("invalid file kind"))
}
}
}
impl TryFrom<String> for FileKind {
type Error = anyhow::Error;
fn try_from(s: String) -> Result<Self, Self::Error> { Self::from_str(&s) }
}
pub struct Filetype { pub struct Filetype {
pub name: Option<Pattern>, pub name: Option<Pattern>,
pub mime: Option<Pattern>, pub mime: Option<Pattern>,
pub typ: Option<String>, pub kind: Option<FileKind>,
pub style: Style, pub style: Style,
} }
impl Filetype { impl Filetype {
pub fn matches(&self, path: &Path, mime: Option<&str>) -> bool { pub fn matches(&self, path: &Path, mime: Option<&str>) -> bool {
let is_dir = mime == Some(MIME_DIR); let is_dir = mime == Some(MIME_DIR);
let special_types = self.typ.as_ref().is_some_and(|t| match t.as_str() { let kind_check = self.kind.as_ref().is_some_and(|t| match t {
"symlink" => path.is_symlink(), FileKind::Symlink => path.is_symlink(),
#[cfg(unix)] #[cfg(unix)]
"executable" => { FileKind::Executable => {
use std::os::unix::fs::PermissionsExt; use std::os::unix::fs::PermissionsExt;
let Ok(metadata) = path.metadata() else { let Ok(metadata) = path.metadata() else {
return false; return false;
@ -31,10 +56,9 @@ impl Filetype {
_ => false, _ => false,
} }
}, },
_ => false
}); });
special_types kind_check
|| self.name.as_ref().is_some_and(|n| n.match_path(path, is_dir)) || self.name.as_ref().is_some_and(|n| n.match_path(path, is_dir))
|| self.mime.as_ref().zip(mime).map_or(false, |(m, s)| m.matches(s)) || self.mime.as_ref().zip(mime).map_or(false, |(m, s)| m.matches(s))
} }
@ -53,8 +77,7 @@ impl Filetype {
struct FiletypeRule { struct FiletypeRule {
name: Option<Pattern>, name: Option<Pattern>,
mime: Option<Pattern>, mime: Option<Pattern>,
#[serde(rename = "type")] kind: Option<FileKind>,
typ: Option<String>,
fg: Option<Color>, fg: Option<Color>,
bg: Option<Color>, bg: Option<Color>,
@ -85,7 +108,7 @@ impl Filetype {
.map(|r| Filetype { .map(|r| Filetype {
name: r.name, name: r.name,
mime: r.mime, mime: r.mime,
typ: r.typ, kind: r.kind,
style: StyleShadow { style: StyleShadow {
fg: r.fg, fg: r.fg,
bg: r.bg, bg: r.bg,