From 5e8b0ac1e9cc42d24a9c6c6d6e1422fdc22eb53b Mon Sep 17 00:00:00 2001 From: sxyazi Date: Fri, 28 Jun 2024 08:54:39 +0800 Subject: [PATCH] .. --- yazi-config/preset/yazi.toml | 2 +- yazi-core/src/manager/commands/remove.rs | 5 ++++- yazi-core/src/manager/commands/rename.rs | 4 ++-- yazi-plugin/preset/plugins/archive.lua | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/yazi-config/preset/yazi.toml b/yazi-config/preset/yazi.toml index d844c0f5..f337e07c 100644 --- a/yazi-config/preset/yazi.toml +++ b/yazi-config/preset/yazi.toml @@ -113,7 +113,7 @@ previewers = [ { mime = "application/pdf", run = "pdf" }, # Archive { mime = "application/{,g}zip", run = "archive" }, - { mime = "application/x-{tar,bzip*,7z-compressed,xz,rar}", run = "archive" }, + { mime = "application/x-{tar,bzip*,7z-compressed,xz,rar,iso9660-image}", run = "archive" }, # Font { mime = "font/*", run = "font" }, { mime = "application/vnd.ms-opentype", run = "font" }, diff --git a/yazi-core/src/manager/commands/remove.rs b/yazi-core/src/manager/commands/remove.rs index 886bd476..e67c135d 100644 --- a/yazi-core/src/manager/commands/remove.rs +++ b/yazi-core/src/manager/commands/remove.rs @@ -27,10 +27,13 @@ impl Manager { if !self.active_mut().try_escape_visual() { return; } + let Some(hovered) = self.hovered().map(|h| &h.url) else { + return; + }; let mut opt = opt.into() as Opt; opt.targets = if opt.hovered { - self.hovered().map(|h| vec![h.clone().url]).unwrap_or_default() + vec![hovered.clone()] } else { self.selected_or_hovered(false).cloned().collect() }; diff --git a/yazi-core/src/manager/commands/rename.rs b/yazi-core/src/manager/commands/rename.rs index c85ce988..41933507 100644 --- a/yazi-core/src/manager/commands/rename.rs +++ b/yazi-core/src/manager/commands/rename.rs @@ -10,8 +10,8 @@ use yazi_shared::{event::Cmd, fs::{maybe_exists, ok_or_not_found, paths_to_same_ use crate::manager::Manager; pub struct Opt { - force: bool, hovered: bool, + force: bool, empty: String, cursor: String, } @@ -19,8 +19,8 @@ pub struct Opt { impl From for Opt { fn from(mut c: Cmd) -> Self { Self { - force: c.bool("force"), hovered: c.bool("hovered"), + force: c.bool("force"), empty: c.take_str("empty").unwrap_or_default(), cursor: c.take_str("cursor").unwrap_or_default(), } diff --git a/yazi-plugin/preset/plugins/archive.lua b/yazi-plugin/preset/plugins/archive.lua index b0d09dce..3827d754 100644 --- a/yazi-plugin/preset/plugins/archive.lua +++ b/yazi-plugin/preset/plugins/archive.lua @@ -45,7 +45,7 @@ function M:peek() if size > 0 then sizes[#sizes + 1] = ui.Line(string.format(" %s ", ya.readable_size(size))) else - sizes[#sizes + 1] = ui.Line(" - ") + sizes[#sizes + 1] = ui.Line("") end ::continue::