mirror of
https://github.com/sxyazi/yazi.git
synced 2026-07-25 08:41:05 +00:00
feat: add some dependency version information to yazi --debug (#1112)
Co-authored-by: sxyazi <sxyazi@gmail.com>
This commit is contained in:
parent
162218c345
commit
2c84c48208
12 changed files with 61 additions and 34 deletions
1
Cargo.lock
generated
1
Cargo.lock
generated
|
|
@ -2719,6 +2719,7 @@ dependencies = [
|
||||||
"clap_complete",
|
"clap_complete",
|
||||||
"clap_complete_fig",
|
"clap_complete_fig",
|
||||||
"clap_complete_nushell",
|
"clap_complete_nushell",
|
||||||
|
"regex",
|
||||||
"serde",
|
"serde",
|
||||||
"vergen",
|
"vergen",
|
||||||
"yazi-adaptor",
|
"yazi-adaptor",
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ Yazi (means "duck") is a terminal file manager written in Rust, based on non-blo
|
||||||
- 💫 Vim-like input/select/which/notify component, auto-completion for cd paths
|
- 💫 Vim-like input/select/which/notify component, auto-completion for cd paths
|
||||||
- 🏷️ Multi-Tab Support, Cross-directory selection, Scrollable Preview (for videos, PDFs, archives, directories, code, etc.)
|
- 🏷️ Multi-Tab Support, Cross-directory selection, Scrollable Preview (for videos, PDFs, archives, directories, code, etc.)
|
||||||
- 🔄 Bulk Renaming, Visual Mode, File Chooser
|
- 🔄 Bulk Renaming, Visual Mode, File Chooser
|
||||||
- 🎨 Theme System, Custom Layouts, Trash Bin, CSI u
|
- 🎨 Theme System, Mouse Support, Trash Bin, Custom Layouts, CSI u
|
||||||
- ... and more!
|
- ... and more!
|
||||||
|
|
||||||
https://github.com/sxyazi/yazi/assets/17523360/92ff23fa-0cd5-4f04-b387-894c12265cc7
|
https://github.com/sxyazi/yazi/assets/17523360/92ff23fa-0cd5-4f04-b387-894c12265cc7
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@
|
||||||
# Resize logo
|
# Resize logo
|
||||||
for RES in 16 24 32 48 64 128 256; do
|
for RES in 16 24 32 48 64 128 256; do
|
||||||
mkdir -p $out/share/icons/hicolor/"$RES"x"$RES"/apps
|
mkdir -p $out/share/icons/hicolor/"$RES"x"$RES"/apps
|
||||||
convert assets/logo.png -resize "$RES"x"$RES" $out/share/icons/hicolor/"$RES"x"$RES"/apps/yazi.png
|
magick assets/logo.png -resize "$RES"x"$RES" $out/share/icons/hicolor/"$RES"x"$RES"/apps/yazi.png
|
||||||
done
|
done
|
||||||
|
|
||||||
mkdir -p $out/share/applications
|
mkdir -p $out/share/applications
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ homepage = "https://yazi-rs.github.io"
|
||||||
repository = "https://github.com/sxyazi/yazi"
|
repository = "https://github.com/sxyazi/yazi"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
regex = "1.10.4"
|
||||||
yazi-adaptor = { path = "../yazi-adaptor", version = "0.2.5" }
|
yazi-adaptor = { path = "../yazi-adaptor", version = "0.2.5" }
|
||||||
yazi-config = { path = "../yazi-config", version = "0.2.5" }
|
yazi-config = { path = "../yazi-config", version = "0.2.5" }
|
||||||
yazi-shared = { path = "../yazi-shared", version = "0.2.5" }
|
yazi-shared = { path = "../yazi-shared", version = "0.2.5" }
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
use std::{collections::HashSet, env, ffi::OsString, fmt::Write, path::{Path, PathBuf}, process};
|
use std::{collections::HashSet, env, ffi::{OsStr, OsString}, fmt::Write, path::{Path, PathBuf}, process};
|
||||||
|
|
||||||
use clap::Parser;
|
use clap::Parser;
|
||||||
|
use regex::Regex;
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
use yazi_config::PREVIEW;
|
use yazi_config::PREVIEW;
|
||||||
use yazi_shared::{fs::{current_cwd, expand_path}, Xdg};
|
use yazi_shared::{fs::{current_cwd, expand_path}, Xdg};
|
||||||
|
|
@ -37,6 +38,22 @@ impl Boot {
|
||||||
(parent.unwrap().to_owned(), Some(entry.file_name().unwrap().to_owned()))
|
(parent.unwrap().to_owned(), Some(entry.file_name().unwrap().to_owned()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn process_output(name: impl AsRef<OsStr>, arg: impl AsRef<OsStr>) -> String {
|
||||||
|
match std::process::Command::new(name.as_ref()).arg(arg).output() {
|
||||||
|
Ok(out) if out.status.success() => {
|
||||||
|
let line =
|
||||||
|
String::from_utf8_lossy(&out.stdout).trim().lines().next().unwrap_or_default().to_owned();
|
||||||
|
Regex::new(r"\d+\.\d+(\.\d+-\d+|\.\d+|\b)")
|
||||||
|
.unwrap()
|
||||||
|
.find(&line)
|
||||||
|
.map(|m| m.as_str().to_owned())
|
||||||
|
.unwrap_or(line)
|
||||||
|
}
|
||||||
|
Ok(out) => format!("{:?}, {:?}", out.status, String::from_utf8_lossy(&out.stderr)),
|
||||||
|
Err(e) => format!("{e}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn action_version() -> String {
|
fn action_version() -> String {
|
||||||
format!(
|
format!(
|
||||||
"{} ({} {})",
|
"{} ({} {})",
|
||||||
|
|
@ -47,16 +64,16 @@ impl Boot {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn action_debug() -> Result<String, std::fmt::Error> {
|
fn action_debug() -> Result<String, std::fmt::Error> {
|
||||||
use std::{env::consts::{ARCH, FAMILY, OS}, process::Command};
|
use std::env::consts::{ARCH, FAMILY, OS};
|
||||||
let mut s = String::new();
|
let mut s = String::new();
|
||||||
|
|
||||||
writeln!(s, "\nYazi")?;
|
writeln!(s, "\nYazi")?;
|
||||||
writeln!(s, " Version: {}", Self::action_version())?;
|
writeln!(s, " Version: {}", Self::action_version())?;
|
||||||
writeln!(s, " OS: {}-{} ({})", OS, ARCH, FAMILY)?;
|
|
||||||
writeln!(s, " Debug : {}", cfg!(debug_assertions))?;
|
writeln!(s, " Debug : {}", cfg!(debug_assertions))?;
|
||||||
|
writeln!(s, " OS : {}-{} ({})", OS, ARCH, FAMILY)?;
|
||||||
|
|
||||||
writeln!(s, "\nYa")?;
|
writeln!(s, "\nYa")?;
|
||||||
writeln!(s, " Version: {:?}", Command::new("ya").arg("--version").output())?;
|
writeln!(s, " Version: {}", Self::process_output("ya", "--version"))?;
|
||||||
|
|
||||||
writeln!(s, "\nEmulator")?;
|
writeln!(s, "\nEmulator")?;
|
||||||
writeln!(s, " Emulator.via_env: {:?}", yazi_adaptor::Emulator::via_env())?;
|
writeln!(s, " Emulator.via_env: {:?}", yazi_adaptor::Emulator::via_env())?;
|
||||||
|
|
@ -88,13 +105,6 @@ impl Boot {
|
||||||
writeln!(s, " YAZI_FILE_ONE : {:?}", env::var_os("YAZI_FILE_ONE"))?;
|
writeln!(s, " YAZI_FILE_ONE : {:?}", env::var_os("YAZI_FILE_ONE"))?;
|
||||||
writeln!(s, " YAZI_CONFIG_HOME : {:?}", env::var_os("YAZI_CONFIG_HOME"))?;
|
writeln!(s, " YAZI_CONFIG_HOME : {:?}", env::var_os("YAZI_CONFIG_HOME"))?;
|
||||||
|
|
||||||
writeln!(s, "\nfile(1)")?;
|
|
||||||
writeln!(
|
|
||||||
s,
|
|
||||||
" Version: {:?}",
|
|
||||||
Command::new(env::var_os("YAZI_FILE_ONE").unwrap_or("file".into())).arg("--version").output()
|
|
||||||
)?;
|
|
||||||
|
|
||||||
writeln!(s, "\nText Opener")?;
|
writeln!(s, "\nText Opener")?;
|
||||||
writeln!(
|
writeln!(
|
||||||
s,
|
s,
|
||||||
|
|
@ -105,9 +115,24 @@ impl Boot {
|
||||||
|
|
||||||
writeln!(s, "\ntmux")?;
|
writeln!(s, "\ntmux")?;
|
||||||
writeln!(s, " TMUX : {:?}", *yazi_adaptor::TMUX)?;
|
writeln!(s, " TMUX : {:?}", *yazi_adaptor::TMUX)?;
|
||||||
|
writeln!(s, " Version: {}", Self::process_output("tmux", "-V"))?;
|
||||||
|
|
||||||
writeln!(s, "\nUeberzug++")?;
|
writeln!(s, "\nDependencies")?;
|
||||||
writeln!(s, " Version: {:?}", Command::new("ueberzugpp").arg("--version").output())?;
|
writeln!(
|
||||||
|
s,
|
||||||
|
" file : {}",
|
||||||
|
Self::process_output(env::var_os("YAZI_FILE_ONE").unwrap_or("file".into()), "--version")
|
||||||
|
)?;
|
||||||
|
writeln!(s, " ueberzugpp : {}", Self::process_output("ueberzugpp", "--version"))?;
|
||||||
|
writeln!(s, " ffmpegthumbnailer: {}", Self::process_output("ffmpegthumbnailer", "-v"))?;
|
||||||
|
writeln!(s, " magick : {}", Self::process_output("magick", "--version"))?;
|
||||||
|
writeln!(s, " fzf : {}", Self::process_output("fzf", "--version"))?;
|
||||||
|
writeln!(s, " fd : {}", Self::process_output("fd", "--version"))?;
|
||||||
|
writeln!(s, " rg : {}", Self::process_output("rg", "--version"))?;
|
||||||
|
writeln!(s, " chafa : {}", Self::process_output("chafa", "--version"))?;
|
||||||
|
writeln!(s, " zoxide : {}", Self::process_output("zoxide", "--version"))?;
|
||||||
|
writeln!(s, " unar : {}", Self::process_output("unar", "--version"))?;
|
||||||
|
writeln!(s, " jq : {}", Self::process_output("jq", "--version"))?;
|
||||||
|
|
||||||
writeln!(s, "\n\n--------------------------------------------------")?;
|
writeln!(s, "\n\n--------------------------------------------------")?;
|
||||||
writeln!(
|
writeln!(
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ use yazi_plugin::{bindings::{Cast, MouseEvent}, LUA};
|
||||||
pub(crate) struct Current;
|
pub(crate) struct Current;
|
||||||
|
|
||||||
impl Current {
|
impl Current {
|
||||||
pub fn mouse(event: crossterm::event::MouseEvent) -> mlua::Result<()> {
|
pub(crate) fn mouse(event: crossterm::event::MouseEvent) -> mlua::Result<()> {
|
||||||
let evt = MouseEvent::cast(&LUA, event)?;
|
let evt = MouseEvent::cast(&LUA, event)?;
|
||||||
let comp: Table = LUA.globals().raw_get("Current")?;
|
let comp: Table = LUA.globals().raw_get("Current")?;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ impl Widget for Header {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Header {
|
impl Header {
|
||||||
pub fn mouse(event: crossterm::event::MouseEvent) -> mlua::Result<()> {
|
pub(crate) fn mouse(event: crossterm::event::MouseEvent) -> mlua::Result<()> {
|
||||||
let evt = MouseEvent::cast(&LUA, event)?;
|
let evt = MouseEvent::cast(&LUA, event)?;
|
||||||
let comp: Table = LUA.globals().raw_get("Header")?;
|
let comp: Table = LUA.globals().raw_get("Header")?;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ use yazi_plugin::{bindings::{Cast, MouseEvent}, LUA};
|
||||||
pub(crate) struct Parent;
|
pub(crate) struct Parent;
|
||||||
|
|
||||||
impl Parent {
|
impl Parent {
|
||||||
pub fn mouse(event: crossterm::event::MouseEvent) -> mlua::Result<()> {
|
pub(crate) fn mouse(event: crossterm::event::MouseEvent) -> mlua::Result<()> {
|
||||||
let evt = MouseEvent::cast(&LUA, event)?;
|
let evt = MouseEvent::cast(&LUA, event)?;
|
||||||
let comp: Table = LUA.globals().raw_get("Parent")?;
|
let comp: Table = LUA.globals().raw_get("Parent")?;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ impl<'a> Preview<'a> {
|
||||||
#[inline]
|
#[inline]
|
||||||
pub(crate) fn new(cx: &'a Ctx) -> Self { Self { cx } }
|
pub(crate) fn new(cx: &'a Ctx) -> Self { Self { cx } }
|
||||||
|
|
||||||
pub fn mouse(event: crossterm::event::MouseEvent) -> mlua::Result<()> {
|
pub(crate) fn mouse(event: crossterm::event::MouseEvent) -> mlua::Result<()> {
|
||||||
let evt = MouseEvent::cast(&LUA, event)?;
|
let evt = MouseEvent::cast(&LUA, event)?;
|
||||||
let comp: Table = LUA.globals().raw_get("Preview")?;
|
let comp: Table = LUA.globals().raw_get("Preview")?;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ impl Widget for Status {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Status {
|
impl Status {
|
||||||
pub fn mouse(event: crossterm::event::MouseEvent) -> mlua::Result<()> {
|
pub(crate) fn mouse(event: crossterm::event::MouseEvent) -> mlua::Result<()> {
|
||||||
let evt = MouseEvent::cast(&LUA, event)?;
|
let evt = MouseEvent::cast(&LUA, event)?;
|
||||||
let comp: Table = LUA.globals().raw_get("Status")?;
|
let comp: Table = LUA.globals().raw_get("Status")?;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ function M:preload()
|
||||||
return 1
|
return 1
|
||||||
end
|
end
|
||||||
|
|
||||||
local child, code = Command("convert"):args({
|
local child, code = Command("magick"):args({
|
||||||
"-size",
|
"-size",
|
||||||
"800x560",
|
"800x560",
|
||||||
"-gravity",
|
"-gravity",
|
||||||
|
|
@ -41,7 +41,7 @@ function M:preload()
|
||||||
}):spawn()
|
}):spawn()
|
||||||
|
|
||||||
if not child then
|
if not child then
|
||||||
ya.err("spawn `convert` command returns " .. tostring(code))
|
ya.err("spawn `magick` command returns " .. tostring(code))
|
||||||
return 0
|
return 0
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ function M:preload()
|
||||||
return 1
|
return 1
|
||||||
end
|
end
|
||||||
|
|
||||||
local child, code = Command("convert"):args({
|
local child, code = Command("magick"):args({
|
||||||
"-density",
|
"-density",
|
||||||
"200",
|
"200",
|
||||||
"-resize",
|
"-resize",
|
||||||
|
|
@ -32,7 +32,7 @@ function M:preload()
|
||||||
}):spawn()
|
}):spawn()
|
||||||
|
|
||||||
if not child then
|
if not child then
|
||||||
ya.err("spawn `convert` command returns " .. tostring(code))
|
ya.err("spawn `magick` command returns " .. tostring(code))
|
||||||
return 0
|
return 0
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue