fix!: open command doesn't work under empty directories (#3226)

Author: sxyazi

Cargo.lock

@@ -35,9 +35,9 @@ hashbrown           = { version = "0.16.0", features = [ "serde" ] }
 indexmap            = { version = "2.11.4", features = [ "serde" ] }
 libc                = "0.2.176"
 lru                 = "0.16.1"
-mlua                = { version = "0.11.3", features = [ "anyhow", "async", "error-send", "lua54", "macros", "serde" ] }
+mlua                = { version = "0.11.4", features = [ "anyhow", "async", "error-send", "lua54", "macros", "serde" ] }
 objc                = "0.2.7"
-ordered-float       = { version = "5.0.0", features = [ "serde" ] }
+ordered-float       = { version = "5.1.0", features = [ "serde" ] }
 parking_lot         = "0.12.4"
 paste               = "1.0.15"
 ratatui             = { version = "0.29.0", features = [ "unstable-rendered-line-info", "unstable-widget-ref" ] }

Cargo.toml

@@ -4,7 +4,7 @@ use yazi_fs::File;
 use yazi_macro::{act, succ};
 use yazi_parser::mgr::{OpenDoOpt, OpenOpt};
 use yazi_proxy::MgrProxy;
-use yazi_shared::{data::Data, url::UrlCow};
+use yazi_shared::data::Data;
 use yazi_vfs::VfsFile;
 
 use crate::{Actor, Ctx, mgr::Quit};
@@ -17,27 +17,28 @@ impl Actor for Open {
 	const NAME: &str = "open";
 
 	fn act(cx: &mut Ctx, mut opt: Self::Options) -> Result<Data> {
-		act!(mgr:escape_visual, cx)?;
-
-		let Some(hovered) = cx.hovered().map(|h| h.url_owned()).map(UrlCow::from) else { succ!() };
-
 		if !opt.interactive && ARGS.chooser_file.is_some() {
 			succ!(if !opt.targets.is_empty() {
 				Quit::with_selected(opt.targets)
 			} else if opt.hovered {
-				Quit::with_selected([hovered])
+				Quit::with_selected(cx.hovered().map(|h| &h.url))
 			} else {
+				act!(mgr:escape_visual, cx)?;
 				Quit::with_selected(cx.tab().selected_or_hovered())
 			});
 		}
 
 		if opt.targets.is_empty() {
 			opt.targets = if opt.hovered {
-				vec![hovered.clone()]
+				cx.hovered().map(|h| vec![h.url.clone().into()]).unwrap_or_default()
 			} else {
+				act!(mgr:escape_visual, cx)?;
 				cx.tab().selected_or_hovered().cloned().map(Into::into).collect()
 			};
 		}
+		if opt.targets.is_empty() {
+			succ!();
+		}
 
 		let todo: Vec<_> = opt
 			.targets
@@ -49,7 +50,7 @@ impl Actor for Open {
 
 		let cwd = cx.cwd().clone();
 		if todo.is_empty() {
-			return act!(mgr:open_do, cx, OpenDoOpt { cwd, hovered, targets: opt.targets, interactive: opt.interactive });
+			return act!(mgr:open_do, cx, OpenDoOpt { cwd, targets: opt.targets, interactive: opt.interactive });
 		}
 
 		let scheduler = cx.tasks.scheduler.clone();
@@ -61,12 +62,7 @@ impl Actor for Open {
 				}
 			}
 			if scheduler.fetch_mimetype(files).await {
-				MgrProxy::open_do(OpenDoOpt {
-					cwd,
-					hovered,
-					targets: opt.targets,
-					interactive: opt.interactive,
-				});
+				MgrProxy::open_do(OpenDoOpt { cwd, targets: opt.targets, interactive: opt.interactive });
 			}
 		});
 		succ!();

yazi-actor/src/mgr/open.rs

@@ -5,7 +5,7 @@ use yazi_config::{YAZI, popup::PickCfg};
 use yazi_macro::succ;
 use yazi_parser::mgr::OpenDoOpt;
 use yazi_proxy::{PickProxy, TasksProxy};
-use yazi_shared::data::Data;
+use yazi_shared::{data::Data, url::UrlCow};
 
 use crate::{Actor, Ctx};
 
@@ -30,7 +30,7 @@ impl Actor for OpenDo {
 		if targets.is_empty() {
 			succ!();
 		} else if !opt.interactive {
-			succ!(cx.tasks.process_from_files(opt.cwd, opt.hovered, targets));
+			succ!(cx.tasks.process_with_selected(opt.cwd, targets));
 		}
 
 		let openers: Vec<_> = YAZI.opener.all(YAZI.open.common(&targets).into_iter());
@@ -39,10 +39,10 @@ impl Actor for OpenDo {
 		}
 
 		let pick = PickProxy::show(PickCfg::open(openers.iter().map(|o| o.desc()).collect()));
-		let urls = [opt.hovered].into_iter().chain(targets.into_iter().map(|(u, _)| u)).collect();
+		let urls = [UrlCow::default()].into_iter().chain(targets.into_iter().map(|(u, _)| u)).collect();
 		tokio::spawn(async move {
 			if let Ok(choice) = pick.await {
-				TasksProxy::open_with(Cow::Borrowed(openers[choice]), opt.cwd, urls);
+				TasksProxy::file_open(Cow::Borrowed(openers[choice]), opt.cwd, urls);
 			}
 		});
 		succ!();

yazi-actor/src/mgr/open_do.rs

@@ -77,6 +77,8 @@ impl Quit {
 			s
 		});
 
-		emit!(Quit(EventQuit { selected: Some(paths), ..Default::default() }));
+		if !paths.is_empty() {
+			emit!(Quit(EventQuit { selected: Some(paths), ..Default::default() }));
+		}
 	}
 }

yazi-actor/src/mgr/quit.rs

@@ -111,7 +111,7 @@ impl Actor for SearchStop {
 			succ!();
 		}
 
-		let rep = tab.history.remove_or(&tab.cwd().to_regular());
+		let rep = tab.history.remove_or(tab.cwd().to_regular());
 		drop(mem::replace(&mut tab.current, rep));
 
 		act!(mgr:hidden, cx)?;

yazi-actor/src/mgr/search.rs

@@ -37,7 +37,7 @@ impl Actor for Shell {
 				return;
 			}
 
-			TasksProxy::open_with(
+			TasksProxy::file_open(
 				Cow::Owned(OpenerRule {
 					run:    opt.run.into_owned(),
 					block:  opt.block,

yazi-actor/src/mgr/shell.rs

@@ -5,15 +5,15 @@ use yazi_shared::data::Data;
 
 use crate::{Actor, Ctx};
 
-pub struct OpenWith;
+pub struct FileOpen;
 
-impl Actor for OpenWith {
+impl Actor for FileOpen {
 	type Options = OpenWithOpt;
 
-	const NAME: &str = "open_with";
+	const NAME: &str = "file_open";
 
 	fn act(cx: &mut Ctx, opt: Self::Options) -> Result<Data> {
-		succ!(cx.tasks.process_from_opener(
+		succ!(cx.tasks.process_with_opener(
 			opt.cwd,
 			opt.opener,
 			opt.targets.into_iter().map(|u| u.into_os_str2()).collect(),

yazi-actor/src/tasks/open_with.rs renamed to yazi-actor/src/tasks/file_open.rs

@@ -1 +1 @@
-yazi_macro::mod_flat!(arrow cancel close inspect open_with process_exec show update_succeed);
+yazi_macro::mod_flat!(arrow cancel close file_open inspect process_open show update_succeed);

yazi-actor/src/tasks/mod.rs

@@ -1,16 +1,16 @@
 use anyhow::Result;
 use yazi_macro::succ;
-use yazi_parser::tasks::ProcessExecOpt;
+use yazi_parser::tasks::ProcessOpenOpt;
 use yazi_shared::data::Data;
 
 use crate::{Actor, Ctx};
 
-pub struct ProcessExec;
+pub struct ProcessOpen;
 
-impl Actor for ProcessExec {
-	type Options = ProcessExecOpt;
+impl Actor for ProcessOpen {
+	type Options = ProcessOpenOpt;
 
-	const NAME: &str = "process_exec";
+	const NAME: &str = "process_open";
 
 	fn act(cx: &mut Ctx, opt: Self::Options) -> Result<Data> {
 		succ!(cx.tasks.scheduler.process_open(opt));