mirror of
https://github.com/sxyazi/yazi.git
synced 2026-07-25 08:41:05 +00:00
feat: preview image over SSH (#585)
This commit is contained in:
parent
68ffd82c0d
commit
0f48fd58c7
3 changed files with 57 additions and 8 deletions
1
Cargo.lock
generated
1
Cargo.lock
generated
|
|
@ -2623,6 +2623,7 @@ dependencies = [
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
"base64",
|
"base64",
|
||||||
"color_quant",
|
"color_quant",
|
||||||
|
"crossterm",
|
||||||
"image",
|
"image",
|
||||||
"imagesize",
|
"imagesize",
|
||||||
"kamadak-exif",
|
"kamadak-exif",
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ anyhow = "^1"
|
||||||
arc-swap = "^1"
|
arc-swap = "^1"
|
||||||
base64 = "^0"
|
base64 = "^0"
|
||||||
color_quant = "^1"
|
color_quant = "^1"
|
||||||
|
crossterm = "^0"
|
||||||
image = "^0"
|
image = "^0"
|
||||||
imagesize = "^0"
|
imagesize = "^0"
|
||||||
kamadak-exif = "0"
|
kamadak-exif = "0"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
use std::{env, path::Path, sync::Arc};
|
use std::{env, io::{Read, Write}, path::Path, sync::Arc};
|
||||||
|
|
||||||
use anyhow::{anyhow, Result};
|
use anyhow::{anyhow, Result};
|
||||||
|
use crossterm::terminal::{disable_raw_mode, enable_raw_mode};
|
||||||
use ratatui::layout::Rect;
|
use ratatui::layout::Rect;
|
||||||
use tracing::warn;
|
use tracing::warn;
|
||||||
use yazi_shared::{env_exists, term::Term};
|
use yazi_shared::{env_exists, term::Term};
|
||||||
|
|
@ -21,9 +22,9 @@ pub enum Adaptor {
|
||||||
Chafa,
|
Chafa,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy)]
|
#[derive(Clone)]
|
||||||
enum Emulator {
|
enum Emulator {
|
||||||
Unknown,
|
Unknown(Vec<Adaptor>),
|
||||||
Kitty,
|
Kitty,
|
||||||
Konsole,
|
Konsole,
|
||||||
Iterm2,
|
Iterm2,
|
||||||
|
|
@ -58,7 +59,7 @@ impl Adaptor {
|
||||||
None => warn!("[Adaptor] No special environment variables detected"),
|
None => warn!("[Adaptor] No special environment variables detected"),
|
||||||
}
|
}
|
||||||
|
|
||||||
let (term, program) = Self::term_program();
|
let (term, program) = Self::via_env();
|
||||||
match program.as_str() {
|
match program.as_str() {
|
||||||
"iTerm.app" => return Emulator::Iterm2,
|
"iTerm.app" => return Emulator::Iterm2,
|
||||||
"WezTerm" => return Emulator::WezTerm,
|
"WezTerm" => return Emulator::WezTerm,
|
||||||
|
|
@ -77,12 +78,13 @@ impl Adaptor {
|
||||||
"xterm-ghostty" => return Emulator::Ghostty,
|
"xterm-ghostty" => return Emulator::Ghostty,
|
||||||
_ => warn!("[Adaptor] Unknown TERM: {term}"),
|
_ => warn!("[Adaptor] Unknown TERM: {term}"),
|
||||||
}
|
}
|
||||||
Emulator::Unknown
|
|
||||||
|
Self::via_csi().unwrap_or(Emulator::Unknown(vec![]))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(super) fn detect() -> Self {
|
pub(super) fn detect() -> Self {
|
||||||
let mut protocols = match Self::emulator() {
|
let mut protocols = match Self::emulator() {
|
||||||
Emulator::Unknown => vec![],
|
Emulator::Unknown(adapters) => adapters,
|
||||||
Emulator::Kitty => vec![Self::Kitty],
|
Emulator::Kitty => vec![Self::Kitty],
|
||||||
Emulator::Konsole => vec![Self::KittyOld, Self::Iterm2, Self::Sixel],
|
Emulator::Konsole => vec![Self::KittyOld, Self::Iterm2, Self::Sixel],
|
||||||
Emulator::Iterm2 => vec![Self::Iterm2, Self::Sixel],
|
Emulator::Iterm2 => vec![Self::Iterm2, Self::Sixel],
|
||||||
|
|
@ -128,13 +130,13 @@ impl Adaptor {
|
||||||
Self::Chafa
|
Self::Chafa
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(super) fn term_program() -> (String, String) {
|
fn via_env() -> (String, String) {
|
||||||
fn tmux_env(name: &str) -> Result<String> {
|
fn tmux_env(name: &str) -> Result<String> {
|
||||||
let output = std::process::Command::new("tmux").args(["show-environment", name]).output()?;
|
let output = std::process::Command::new("tmux").args(["show-environment", name]).output()?;
|
||||||
|
|
||||||
String::from_utf8(output.stdout)?
|
String::from_utf8(output.stdout)?
|
||||||
.trim()
|
.trim()
|
||||||
.strip_prefix(&format!("{}=", name))
|
.strip_prefix(&format!("{name}="))
|
||||||
.map_or_else(|| Err(anyhow!("")), |s| Ok(s.to_string()))
|
.map_or_else(|| Err(anyhow!("")), |s| Ok(s.to_string()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -148,6 +150,51 @@ impl Adaptor {
|
||||||
|
|
||||||
(term, program)
|
(term, program)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn via_csi() -> Result<Emulator> {
|
||||||
|
enable_raw_mode()?;
|
||||||
|
std::io::stdout().write_all(b"\x1b[>q\x1b_Gi=31,s=1,v=1,a=q,t=d,f=24;AAAA\x1b\\\x1b[c")?;
|
||||||
|
std::io::stdout().flush()?;
|
||||||
|
|
||||||
|
let mut stdin = std::io::stdin().lock();
|
||||||
|
let mut buf = String::with_capacity(200);
|
||||||
|
loop {
|
||||||
|
let mut c = [0; 1];
|
||||||
|
if stdin.read(&mut c)? == 0 {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if c[0] == b'c' && buf.contains("\x1b[?") {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
buf.push(c[0] as char);
|
||||||
|
}
|
||||||
|
|
||||||
|
disable_raw_mode().ok();
|
||||||
|
let names = [
|
||||||
|
("kitty", Emulator::Kitty),
|
||||||
|
("Konsole", Emulator::Konsole),
|
||||||
|
("iTerm2", Emulator::Iterm2),
|
||||||
|
("WezTerm", Emulator::WezTerm),
|
||||||
|
("foot", Emulator::Foot),
|
||||||
|
("ghostty", Emulator::Ghostty),
|
||||||
|
];
|
||||||
|
|
||||||
|
for (name, emulator) in names.iter() {
|
||||||
|
if buf.contains(name) {
|
||||||
|
return Ok(emulator.clone());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut adapters = Vec::with_capacity(2);
|
||||||
|
if buf.contains("\x1b_Gi=31;OK") {
|
||||||
|
adapters.push(Adaptor::KittyOld);
|
||||||
|
}
|
||||||
|
if ["?4;", "?4c", ";4;", ";4c"].iter().any(|s| buf.contains(s)) {
|
||||||
|
adapters.push(Adaptor::Sixel);
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(Emulator::Unknown(adapters))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ToString for Adaptor {
|
impl ToString for Adaptor {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue