feat: spotter

Cargo.toml

@@ -14,20 +14,20 @@ ansi-to-tui   = "7.0.0"
 anyhow        = "1.0.93"
 base64        = "0.22.1"
 bitflags      = "2.6.0"
-clap          = { version = "4.5.20", features = [ "derive" ] }
+clap          = { version = "4.5.21", features = [ "derive" ] }
 crossterm     = { version = "0.28.1", features = [ "event-stream" ] }
 dirs          = "5.0.1"
 futures       = "0.3.31"
 globset       = "0.4.15"
-libc          = "0.2.162"
+libc          = "0.2.164"
 md-5          = "0.10.6"
 mlua          = { version = "0.10.1", features = [ "anyhow", "async", "error-send", "lua54", "macros", "serialize" ] }
 parking_lot   = "0.12.3"
 ratatui       = { version = "0.29.0", features = [ "unstable-rendered-line-info" ] }
 regex         = "1.11.1"
 scopeguard    = "1.2.0"
-serde         = { version = "1.0.214", features = [ "derive" ] }
-serde_json    = "1.0.132"
+serde         = { version = "1.0.215", features = [ "derive" ] }
+serde_json    = "1.0.133"
 shell-words   = "1.1.0"
 tokio         = { version = "1.41.1", features = [ "full" ] }
 tokio-stream  = "0.1.16"

cspell.json

@@ -1 +1 @@
-{"flagWords":[],"words":["Punct","KEYMAP","splitn","crossterm","YAZI","unar","peekable","ratatui","syntect","pbpaste","pbcopy","ffmpegthumbnailer","oneshot","Posix","Lsar","XADDOS","zoxide","cands","Deque","precache","imageops","IFBLK","IFCHR","IFDIR","IFIFO","IFLNK","IFMT","IFSOCK","IRGRP","IROTH","IRUSR","ISGID","ISUID","ISVTX","IWGRP","IWOTH","IWUSR","IXGRP","IXOTH","IXUSR","libc","winsize","TIOCGWINSZ","xpixel","ypixel","ioerr","appender","Catppuccin","macchiato","gitmodules","Dotfiles","bashprofile","vimrc","flac","webp","exiftool","mediainfo","ripgrep","nvim","indexmap","indexmap","unwatch","canonicalize","serde","fsevent","Ueberzug","iterm","wezterm","sixel","chafa","ueberzugpp","️ Überzug","️ Überzug","Konsole","Alacritty","Überzug","pkgs","paru","unarchiver","pdftoppm","poppler","prebuild","singlefile","jpegopt","EXIF","rustfmt","mktemp","nanos","xclip","xsel","natord","Mintty","nixos","nixpkgs","SIGTSTP","SIGCONT","SIGCONT","mlua","nonstatic","userdata","metatable","natsort","backstack","luajit","Succ","Succ","cand","fileencoding","foldmethod","lightgreen","darkgray","lightred","lightyellow","lightcyan","nushell","msvc","aarch","linemode","sxyazi","rsplit","ZELLIJ","bitflags","bitflags","USERPROFILE","Neovim","vergen","gitcl","Renderable","preloaders","prec","imagesize","Upserting","prio","Ghostty","Catmull","Lanczos","cmds","unyank","scrolloff","headsup","unsub","uzers","scopeguard","SPDLOG","globset","filetime","magick","magick","prefetcher","Prework","prefetchers","PREWORKERS","conds","translit","rxvt","Urxvt","realpath","realname","REPARSE","hardlink","hardlinking","nlink","nlink","linemodes","SIGSTOP","sevenzip","rsplitn","replacen","DECSET","DECRQM","repeek","cwds","tcsi","Hyprland","Wayfire","SWAYSOCK","btime","nsec","codegen","gethostname","fchmod","fdfind","Rustc","rustc","Sysinfo"],"language":"en","version":"0.2"}
+{"flagWords":[],"words":["Punct","KEYMAP","splitn","crossterm","YAZI","unar","peekable","ratatui","syntect","pbpaste","pbcopy","ffmpegthumbnailer","oneshot","Posix","Lsar","XADDOS","zoxide","cands","Deque","precache","imageops","IFBLK","IFCHR","IFDIR","IFIFO","IFLNK","IFMT","IFSOCK","IRGRP","IROTH","IRUSR","ISGID","ISUID","ISVTX","IWGRP","IWOTH","IWUSR","IXGRP","IXOTH","IXUSR","libc","winsize","TIOCGWINSZ","xpixel","ypixel","ioerr","appender","Catppuccin","macchiato","gitmodules","Dotfiles","bashprofile","vimrc","flac","webp","exiftool","mediainfo","ripgrep","nvim","indexmap","indexmap","unwatch","canonicalize","serde","fsevent","Ueberzug","iterm","wezterm","sixel","chafa","ueberzugpp","️ Überzug","️ Überzug","Konsole","Alacritty","Überzug","pkgs","paru","unarchiver","pdftoppm","poppler","prebuild","singlefile","jpegopt","EXIF","rustfmt","mktemp","nanos","xclip","xsel","natord","Mintty","nixos","nixpkgs","SIGTSTP","SIGCONT","SIGCONT","mlua","nonstatic","userdata","metatable","natsort","backstack","luajit","Succ","Succ","cand","fileencoding","foldmethod","lightgreen","darkgray","lightred","lightyellow","lightcyan","nushell","msvc","aarch","linemode","sxyazi","rsplit","ZELLIJ","bitflags","bitflags","USERPROFILE","Neovim","vergen","gitcl","Renderable","preloaders","prec","Upserting","prio","Ghostty","Catmull","Lanczos","cmds","unyank","scrolloff","headsup","unsub","uzers","scopeguard","SPDLOG","globset","filetime","magick","magick","prefetcher","Prework","prefetchers","PREWORKERS","conds","translit","rxvt","Urxvt","realpath","realname","REPARSE","hardlink","hardlinking","nlink","nlink","linemodes","SIGSTOP","sevenzip","rsplitn","replacen","DECSET","DECRQM","repeek","cwds","tcsi","Hyprland","Wayfire","SWAYSOCK","btime","nsec","codegen","gethostname","fchmod","fdfind","Rustc","rustc","Sysinfo"],"language":"en","version":"0.2"}

yazi-adapter/Cargo.toml

@@ -21,7 +21,6 @@ color_quant = "1.1.0"
 crossterm   = { workspace = true }
 futures     = { workspace = true }
 image       = { version = "0.25.5", default-features = false, features = [ "avif", "bmp", "dds", "exr", "ff", "gif", "hdr", "ico", "jpeg", "png", "pnm", "qoi", "tga", "webp" ] }
-imagesize   = "0.13.0"
 ratatui     = { workspace = true }
 scopeguard  = { workspace = true }
 tokio       = { workspace = true }

yazi-adapter/src/info.rs

@@ -0,0 +1,44 @@
+use std::path::Path;
+
+use image::{ImageDecoder, ImageError};
+
+pub type ImageFormat = image::ImageFormat;
+pub type ImageColor = image::ColorType;
+pub type ImageOrientation = image::metadata::Orientation;
+
+#[derive(Clone, Copy)]
+pub struct ImageInfo {
+	pub format:      ImageFormat,
+	pub width:       u32,
+	pub height:      u32,
+	pub color:       ImageColor,
+	pub orientation: Option<ImageOrientation>,
+}
+
+impl ImageInfo {
+	pub async fn new(path: &Path) -> image::ImageResult<Self> {
+		let path = path.to_owned();
+		tokio::task::spawn_blocking(move || {
+			let reader = image::ImageReader::open(path)?.with_guessed_format()?;
+
+			let Some(format) = reader.format() else {
+				return Err(ImageError::IoError(std::io::Error::new(
+					std::io::ErrorKind::InvalidData,
+					"unknown image format",
+				)));
+			};
+
+			let mut decoder = reader.into_decoder()?;
+			let (width, height) = decoder.dimensions();
+			Ok(Self {
+				format,
+				width,
+				height,
+				color: decoder.color_type(),
+				orientation: decoder.orientation().ok(),
+			})
+		})
+		.await
+		.map_err(|e| ImageError::IoError(e.into()))?
+	}
+}

yazi-adapter/src/lib.rs

@@ -1,7 +1,7 @@
 #![allow(clippy::unit_arg)]
 
 yazi_macro::mod_flat!(
-	adapter chafa dimension emulator iip image kgp kgp_old mux sixel ueberzug
+	adapter chafa dimension emulator iip image info kgp kgp_old mux sixel ueberzug
 );
 
 use yazi_shared::{RoCell, SyncCell, env_exists, in_wsl};

yazi-adapter/src/ueberzug.rs

@@ -1,7 +1,6 @@
 use std::{path::{Path, PathBuf}, process::Stdio};
 
 use anyhow::{Result, bail};
-use imagesize::ImageSize;
 use ratatui::layout::Rect;
 use tokio::{io::AsyncWriteExt, process::{Child, Command}, sync::mpsc::{self, UnboundedSender}};
 use tracing::{debug, warn};
@@ -48,8 +47,7 @@ impl Ueberzug {
 		};
 
 		let p = path.to_owned();
-		let ImageSize { width: w, height: h } =
-			tokio::task::spawn_blocking(move || imagesize::size(p)).await??;
+		let (w, h) = tokio::task::spawn_blocking(move || image::image_dimensions(p)).await??;
 
 		let area = Dimension::ratio()
 			.map(|(r1, r2)| Rect {

yazi-boot/Cargo.toml

@@ -21,7 +21,7 @@ serde = { workspace = true }
 
 [build-dependencies]
 clap                  = { workspace = true }
-clap_complete         = "4.5.37"
+clap_complete         = "4.5.38"
 clap_complete_fig     = "4.5.2"
 clap_complete_nushell = "4.5.4"
 vergen-gitcl          = { version = "1.0.1", features = [ "build", "rustc" ] }

yazi-cli/Cargo.toml

@@ -27,7 +27,7 @@ toml_edit  = "0.22.22"
 # External build dependencies
 anyhow                = { workspace = true }
 clap                  = { workspace = true }
-clap_complete         = "4.5.37"
+clap_complete         = "4.5.38"
 clap_complete_fig     = "4.5.2"
 clap_complete_nushell = "4.5.4"
 serde_json            = { workspace = true }

yazi-config/preset/keymap.toml

@@ -42,10 +42,6 @@ keymap = [
 	{ on = "H", run = "back",    desc = "Go back to the previous directory" },
 	{ on = "L", run = "forward", desc = "Go forward to the next directory" },
 
-	# Seeking
-	{ on = "K", run = "seek -5", desc = "Seek up 5 units in the preview" },
-	{ on = "J", run = "seek 5",  desc = "Seek down 5 units in the preview" },
-
 	# Toggle
 	{ on = "<Space>", run = [ "toggle", "arrow 1" ], desc = "Toggle the current selection state" },
 	{ on = "<C-a>",   run = "toggle_all on",         desc = "Select all files" },
@@ -55,6 +51,13 @@ keymap = [
 	{ on = "v", run = "visual_mode",         desc = "Enter visual mode (selection mode)" },
 	{ on = "V", run = "visual_mode --unset", desc = "Enter visual mode (unset mode)" },
 
+	# Seeking
+	{ on = "K", run = "seek -5", desc = "Seek up 5 units in the preview" },
+	{ on = "J", run = "seek 5",  desc = "Seek down 5 units in the preview" },
+
+	# Spotting
+	{ on = "<Tab>", run = "spot", desc = "Spot hovered file" },
+
 	# Operation
 	{ on = "o",         run = "open",                        desc = "Open selected files" },
 	{ on = "O",         run = "open --interactive",          desc = "Open selected files interactively" },
@@ -175,6 +178,32 @@ keymap = [
 	{ on = "<F1>", run = "help", desc = "Open help" },
 ]
 
+[spot]
+
+keymap = [
+	{ on = "<Esc>", run = "close", desc = "Close the spot" },
+	{ on = "<C-[>", run = "close", desc = "Close the spot" },
+	{ on = "<C-c>", run = "close", desc = "Close the spot" },
+	{ on = "<Tab>", run = "close", desc = "Close the spot" },
+
+	{ on = "k", run = "arrow -1", desc = "Move cursor up" },
+	{ on = "j", run = "arrow 1",  desc = "Move cursor down" },
+	{ on = "h", run = "swipe -1", desc = "Swipe to the next file" },
+	{ on = "l", run = "swipe 1",  desc = "Swipe to the previous file" },
+
+	{ on = "<Up>",    run = "arrow -1", desc = "Move cursor up" },
+	{ on = "<Down>",  run = "arrow 1",  desc = "Move cursor down" },
+	{ on = "<Left>",  run = "swipe -1", desc = "Swipe to the next file" },
+	{ on = "<Right>", run = "swipe 1",  desc = "Swipe to the previous file" },
+
+	# Copy
+	{ on = [ "c", "c" ], run = "copy cell", desc = "Copy selected cell" },
+
+	# Help
+	{ on = "~",    run = "help", desc = "Open help" },
+	{ on = "<F1>", run = "help", desc = "Open help" },
+]
+
 [pick]
 
 keymap = [

yazi-config/preset/yazi.toml

@@ -92,6 +92,19 @@ fetchers = [
 	# Mimetype
 	{ id = "mime", name = "*", run = "mime", if = "!mime", prio = "high" },
 ]
+spotters = [
+	{ name = "*/", run = "folder" },
+	# Code
+	{ mime = "text/*", run = "code" },
+	{ mime = "*/{xml,javascript,x-wine-extension-ini}", run = "code" },
+	# Image
+	{ mime = "image/{avif,hei?,jxl,svg+xml}", run = "magick" },
+	{ mime = "image/*", run = "image" },
+	# Video
+	{ mime = "video/*", run = "video" },
+	# Fallback
+	{ name = "*", run = "file" },
+]
 preloaders = [
 	# Image
 	{ mime = "image/{avif,hei?,jxl,svg+xml}", run = "magick" },

yazi-config/src/keymap/keymap.rs

@@ -12,6 +12,7 @@ use crate::Preset;
 pub struct Keymap {
 	pub manager:    Vec<Chord>,
 	pub tasks:      Vec<Chord>,
+	pub spot:       Vec<Chord>,
 	pub pick:       Vec<Chord>,
 	pub input:      Vec<Chord>,
 	pub confirm:    Vec<Chord>,
@@ -26,6 +27,7 @@ impl Keymap {
 			Layer::App => unreachable!(),
 			Layer::Manager => &self.manager,
 			Layer::Tasks => &self.tasks,
+			Layer::Spot => &self.spot,
 			Layer::Pick => &self.pick,
 			Layer::Input => &self.input,
 			Layer::Confirm => &self.confirm,
@@ -53,6 +55,7 @@ impl<'de> Deserialize<'de> for Keymap {
 		struct Shadow {
 			manager:    Inner,
 			tasks:      Inner,
+			spot:       Inner,
 			pick:       Inner,
 			input:      Inner,
 			confirm:    Inner,
@@ -90,7 +93,9 @@ impl<'de> Deserialize<'de> for Keymap {
 			#[rustfmt::skip]
 			tasks:      mix(shadow.tasks.prepend_keymap, shadow.tasks.keymap, shadow.tasks.append_keymap),
 			#[rustfmt::skip]
-			pick:     mix(shadow.pick.prepend_keymap, shadow.pick.keymap, shadow.pick.append_keymap),
+			spot:       mix(shadow.spot.prepend_keymap, shadow.spot.keymap, shadow.spot.append_keymap),
+			#[rustfmt::skip]
+			pick:       mix(shadow.pick.prepend_keymap, shadow.pick.keymap, shadow.pick.append_keymap),
 			#[rustfmt::skip]
 			input:      mix(shadow.input.prepend_keymap, shadow.input.keymap, shadow.input.append_keymap),
 			#[rustfmt::skip]

yazi-config/src/plugin/fetcher.rs

@@ -32,12 +32,12 @@ impl Fetcher {
 #[derive(Debug, Clone)]
 pub struct FetcherProps {
 	pub id:   u8,
-	pub name: String,
+	pub name: &'static str,
 	pub prio: Priority,
 }
 
-impl From<&Fetcher> for FetcherProps {
-	fn from(fetcher: &Fetcher) -> Self {
-		Self { id: fetcher.idx, name: fetcher.run.name.to_owned(), prio: fetcher.prio }
+impl From<&'static Fetcher> for FetcherProps {
+	fn from(fetcher: &'static Fetcher) -> Self {
+		Self { id: fetcher.idx, name: &fetcher.run.name, prio: fetcher.prio }
 	}
 }

yazi-config/src/plugin/mod.rs

@@ -1,3 +1,3 @@
-yazi_macro::mod_flat!(fetcher plugin preloader previewer);
+yazi_macro::mod_flat!(fetcher plugin preloader previewer spotter);
 
 pub const MAX_PREWORKERS: u8 = 32;