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

fix: choose chafa if ueberzugpp does not exist

Browse source
This commit is contained in:
taoky 2024-08-28 19:14:16 +08:00
parent ddb8ce530f
commit 83894ec22d
1 changed files with 34 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
yazi-adapter/src/adapter.rs
View file

@ -1,4 +1,4 @@
use std::{env, fmt::Display, path::Path, sync::Arc}; use std::{env, fmt::Display, fs, path::Path, sync::Arc};
use anyhow::Result; use anyhow::Result;
use ratatui::layout::Rect; use ratatui::layout::Rect;
@ -95,6 +95,25 @@ impl Adapter {
return *p; return *p;
} }
#[cfg(windows)]
let ueberzugpp_exists = false;
#[cfg(unix)]
let ueberzugpp_exists = {
let paths = env::var_os("PATH").unwrap_or_default();
let mut found = false;
for path in env::split_paths(&paths) {
let full_path = path.join("ueberzugpp");
if fs::metadata(&full_path).map(|m| m.is_file()).unwrap_or(false) {
found = true;
break;
}
}
found
};
if ueberzugpp_exists {
match env::var("XDG_SESSION_TYPE").unwrap_or_default().as_str() { match env::var("XDG_SESSION_TYPE").unwrap_or_default().as_str() {
"x11" => return Self::X11, "x11" => return Self::X11,
"wayland" => return Self::Wayland, "wayland" => return Self::Wayland,
@ -106,6 +125,10 @@ impl Adapter {
if env_exists("DISPLAY") { if env_exists("DISPLAY") {
return Self::X11; return Self::X11;
} }
} else {
#[cfg(unix)]
warn!("[Adapter] Could not find ueberzugpp");
}
if std::fs::symlink_metadata("/proc/sys/fs/binfmt_misc/WSLInterop").is_ok() { if std::fs::symlink_metadata("/proc/sys/fs/binfmt_misc/WSLInterop").is_ok() {
return Self::KittyOld; return Self::KittyOld;
} }