Merge branch 'sxyazi:main' into enhance-bulk-rename

Author: MikuGeek

Cargo.lock

@@ -37,6 +37,7 @@ regex               = "1.11.1"
 scopeguard          = "1.2.0"
 serde               = { version = "1.0.219", features = [ "derive" ] }
 serde_json          = "1.0.140"
+syntect             = { version = "5.2.0", default-features = false, features = [ "parsing", "plist-load", "regex-onig" ] }
 tokio               = { version = "1.44.1", features = [ "full" ] }
 tokio-stream        = "0.1.17"
 tokio-util          = "0.7.14"

Cargo.toml

@@ -1 +1 @@
-{"version":"0.2","language":"en","words":["Punct","KEYMAP","splitn","crossterm","YAZI","peekable","ratatui","syntect","pbpaste","pbcopy","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","indexmap","indexmap","unwatch","canonicalize","serde","fsevent","Ueberzug","iterm","wezterm","sixel","chafa","ueberzugpp","Konsole","Überzug","pkgs","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","ffprobe","vframes","luma","obase","outln","errln","tmtheme","twox","cfgs","fstype","objc","rdev","runloop","exfat","rclone","DECRQSS","DECSCUSR","libvterm","Uninit","lockin","rposition"],"flagWords":[]}
+{"version":"0.2","language":"en","words":["Punct","KEYMAP","splitn","crossterm","YAZI","peekable","ratatui","syntect","pbpaste","pbcopy","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","indexmap","indexmap","unwatch","canonicalize","serde","fsevent","Ueberzug","iterm","wezterm","sixel","chafa","ueberzugpp","Konsole","Überzug","pkgs","pdftoppm","poppler","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","ffprobe","vframes","luma","obase","outln","errln","tmtheme","twox","cfgs","fstype","objc","rdev","runloop","exfat","rclone","DECRQSS","DECSCUSR","libvterm","Uninit","lockin","rposition"],"flagWords":[]}

cspell.json

@@ -5,7 +5,7 @@ use base64::{Engine, engine::{Config, general_purpose::STANDARD}};
 use crossterm::{cursor::MoveTo, queue};
 use image::{DynamicImage, ExtendedColorType, ImageEncoder, codecs::{jpeg::JpegEncoder, png::PngEncoder}};
 use ratatui::layout::Rect;
-use yazi_config::PREVIEW;
+use yazi_config::YAZI;
 
 use crate::{CLOSE, Emulator, Image, START, adapter::Adapter};
 
@@ -44,7 +44,7 @@ impl Iip {
 			if img.color().has_alpha() {
 				PngEncoder::new(&mut b).write_image(&img.into_rgba8(), w, h, ExtendedColorType::Rgba8)?;
 			} else {
-				JpegEncoder::new_with_quality(&mut b, PREVIEW.image_quality).encode_image(&img)?;
+				JpegEncoder::new_with_quality(&mut b, YAZI.preview.image_quality).encode_image(&img)?;
 			};
 
 			let mut buf = String::with_capacity(

yazi-adapter/src/drivers/iip.rs

@@ -5,7 +5,7 @@ use color_quant::NeuQuant;
 use crossterm::{cursor::MoveTo, queue};
 use image::DynamicImage;
 use ratatui::layout::Rect;
-use yazi_config::PREVIEW;
+use yazi_config::YAZI;
 
 use crate::{CLOSE, ESCAPE, Emulator, Image, START, adapter::Adapter};
 
@@ -44,7 +44,7 @@ impl Sixel {
 
 		tokio::task::spawn_blocking(move || {
 			let img = img.into_rgba8();
-			let nq = NeuQuant::new(PREVIEW.sixel_fraction as i32, 256 - alpha as usize, &img);
+			let nq = NeuQuant::new(YAZI.preview.sixel_fraction as i32, 256 - alpha as usize, &img);
 
 			let mut buf: Vec<u8> = Vec::with_capacity(1 << 16);
 			write!(buf, "{START}P0;1;8q\"1;1;{};{}", img.width(), img.height())?;

yazi-adapter/src/drivers/sixel.rs

@@ -5,7 +5,7 @@ use image::ImageReader;
 use ratatui::layout::Rect;
 use tokio::{io::AsyncWriteExt, process::{Child, Command}, sync::mpsc::{self, UnboundedSender}};
 use tracing::{debug, warn};
-use yazi_config::PREVIEW;
+use yazi_config::YAZI;
 use yazi_shared::{LOG_LEVEL, RoCell, env_exists};
 
 use crate::{Adapter, Dimension};
@@ -57,8 +57,8 @@ impl Ueberzug {
 			.map(|(r1, r2)| Rect {
 				x:      max.x,
 				y:      max.y,
-				width:  max.width.min((w.min(PREVIEW.max_width as _) as f64 / r1).ceil() as _),
-				height: max.height.min((h.min(PREVIEW.max_height as _) as f64 / r2).ceil() as _),
+				width:  max.width.min((w.min(YAZI.preview.max_width as _) as f64 / r1).ceil() as _),
+				height: max.height.min((h.min(YAZI.preview.max_height as _) as f64 / r2).ceil() as _),
 			})
 			.unwrap_or(max);
 
@@ -101,8 +101,8 @@ impl Ueberzug {
 	}
 
 	fn adjust_rect(mut rect: Rect) -> Rect {
-		let scale = PREVIEW.ueberzug_scale;
-		let (x, y, w, h) = PREVIEW.ueberzug_offset;
+		let scale = YAZI.preview.ueberzug_scale;
+		let (x, y, w, h) = YAZI.preview.ueberzug_offset;
 
 		rect.x = 0f32.max(rect.x as f32 * scale + x) as u16;
 		rect.y = 0f32.max(rect.y as f32 * scale + y) as u16;

yazi-adapter/src/drivers/ueberzug.rs

@@ -3,7 +3,7 @@ use std::path::{Path, PathBuf};
 use anyhow::Result;
 use image::{DynamicImage, ExtendedColorType, ImageDecoder, ImageEncoder, ImageError, ImageReader, ImageResult, Limits, codecs::{jpeg::JpegEncoder, png::PngEncoder}, imageops::FilterType, metadata::Orientation};
 use ratatui::layout::Rect;
-use yazi_config::{PREVIEW, TASKS};
+use yazi_config::YAZI;
 
 use crate::Dimension;
 
@@ -12,7 +12,7 @@ pub struct Image;
 impl Image {
 	pub async fn precache(path: &Path, cache: PathBuf) -> Result<()> {
 		let (mut img, orientation, icc) = Self::decode_from(path).await?;
-		let (w, h) = Self::flip_size(orientation, (PREVIEW.max_width, PREVIEW.max_height));
+		let (w, h) = Self::flip_size(orientation, (YAZI.preview.max_width, YAZI.preview.max_height));
 
 		let buf = tokio::task::spawn_blocking(move || {
 			if img.width() > w || img.height() > h {
@@ -29,7 +29,7 @@ impl Image {
 				icc.map(|b| encoder.set_icc_profile(b));
 				encoder.write_image(&rgba, rgba.width(), rgba.height(), ExtendedColorType::Rgba8)?;
 			} else {
-				let mut encoder = JpegEncoder::new_with_quality(&mut buf, PREVIEW.image_quality);
+				let mut encoder = JpegEncoder::new_with_quality(&mut buf, YAZI.preview.image_quality);
 				icc.map(|b| encoder.set_icc_profile(b));
 				encoder.encode_image(&img.into_rgb8())?;
 			}
@@ -68,9 +68,9 @@ impl Image {
 		Dimension::ratio()
 			.map(|(r1, r2)| {
 				let (w, h) = ((rect.width as f64 * r1) as u32, (rect.height as f64 * r2) as u32);
-				(w.min(PREVIEW.max_width), h.min(PREVIEW.max_height))
+				(w.min(YAZI.preview.max_width), h.min(YAZI.preview.max_height))
 			})
-			.unwrap_or((PREVIEW.max_width, PREVIEW.max_height))
+			.unwrap_or((YAZI.preview.max_width, YAZI.preview.max_height))
 	}
 
 	pub(super) fn pixel_area(size: (u32, u32), rect: Rect) -> Rect {
@@ -86,7 +86,7 @@ impl Image {
 
 	#[inline]
 	fn filter() -> FilterType {
-		match PREVIEW.image_filter.as_str() {
+		match YAZI.preview.image_filter.as_str() {
 			"nearest" => FilterType::Nearest,
 			"triangle" => FilterType::Triangle,
 			"catmull-rom" => FilterType::CatmullRom,
@@ -98,14 +98,14 @@ impl Image {
 
 	async fn decode_from(path: &Path) -> ImageResult<(DynamicImage, Orientation, Option<Vec<u8>>)> {
 		let mut limits = Limits::no_limits();
-		if TASKS.image_alloc > 0 {
-			limits.max_alloc = Some(TASKS.image_alloc as u64);
+		if YAZI.tasks.image_alloc > 0 {
+			limits.max_alloc = Some(YAZI.tasks.image_alloc as u64);
 		}
-		if TASKS.image_bound[0] > 0 {
-			limits.max_image_width = Some(TASKS.image_bound[0] as u32);
+		if YAZI.tasks.image_bound[0] > 0 {
+			limits.max_image_width = Some(YAZI.tasks.image_bound[0] as u32);
 		}
-		if TASKS.image_bound[1] > 0 {
-			limits.max_image_height = Some(TASKS.image_bound[1] as u32);
+		if YAZI.tasks.image_bound[1] > 0 {
+			limits.max_image_height = Some(YAZI.tasks.image_bound[1] as u32);
 		}
 
 		let path = path.to_owned();

yazi-adapter/src/image.rs

@@ -21,8 +21,11 @@ regex = { workspace = true }
 serde = { workspace = true }
 
 [build-dependencies]
+yazi-shared = { path = "../yazi-shared", version = "25.3.7" }
+
+# External dependencies
 clap                  = { workspace = true }
-clap_complete         = "4.5.46"
+clap_complete         = "4.5.47"
 clap_complete_fig     = "4.5.2"
 clap_complete_nushell = "4.5.5"
 vergen-gitcl          = { version = "1.0.5", features = [ "build", "rustc" ] }

yazi-boot/Cargo.toml

@@ -1,17 +1,17 @@
-use yazi_config::PREVIEW;
+use yazi_config::YAZI;
 use yazi_fs::Xdg;
 
 use super::Actions;
 
 impl Actions {
 	pub(super) fn clear_cache() {
-		if PREVIEW.cache_dir == Xdg::cache_dir() {
-			println!("Clearing cache directory: \n{:?}", PREVIEW.cache_dir);
-			std::fs::remove_dir_all(&PREVIEW.cache_dir).unwrap();
+		if YAZI.preview.cache_dir == Xdg::cache_dir() {
+			println!("Clearing cache directory: \n{:?}", YAZI.preview.cache_dir);
+			std::fs::remove_dir_all(&YAZI.preview.cache_dir).unwrap();
 		} else {
 			println!(
 				"You've changed the default cache directory, for your data's safety, please clear it manually: \n{:?}",
-				PREVIEW.cache_dir
+				YAZI.preview.cache_dir
 			);
 		}
 	}

yazi-boot/src/actions/clear_cache.rs

@@ -56,17 +56,17 @@ impl Actions {
 		writeln!(
 			s,
 			"    default     : {:?}",
-			yazi_config::OPEN.openers("f75a.txt", "text/plain").and_then(|a| a.first().cloned())
+			yazi_config::YAZI.opener.first(yazi_config::YAZI.open.all("f75a.txt", "text/plain"))
 		)?;
 		writeln!(
 			s,
 			"    block-create: {:?}",
-			yazi_config::OPEN.block_opener("bulk-create.txt", "text/plain")
+			yazi_config::YAZI.opener.block(yazi_config::YAZI.open.all("bulk-create.txt", "text/plain"))
 		)?;
 		writeln!(
 			s,
 			"    block-rename: {:?}",
-			yazi_config::OPEN.block_opener("bulk-rename.txt", "text/plain")
+			yazi_config::YAZI.opener.block(yazi_config::YAZI.open.all("bulk-rename.txt", "text/plain"))
 		)?;
 
 		writeln!(s, "\nMultiplexers")?;