mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

chore: clean implementation of --args='...' parameter fir fd and rg`

Browse source
This commit is contained in:
Guillaume Thibault 2024-05-07 16:46:30 -04:00
parent ccde30efd4
commit 9dcfa5c240
3 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
yazi-core/src/tab/commands/search.rs
View file

@ -63,27 +63,24 @@ impl Tab {
let mut input = InputProxy::show(InputCfg::search(&opt.type_.to_string())); let mut input = InputProxy::show(InputCfg::search(&opt.type_.to_string()));
let Some(Ok(subject)) = input.recv().await else { bail!("") }; let Some(Ok(subject)) = input.recv().await else { bail!("") };
let mut arguments = Vec::new();
let mut subjects = Vec::new();
let words = shell_words::split(&subject)?; let words = shell_words::split(&subject)?;
for word in words { let (arguments, subjects): (Vec<String>, Vec<String>) = words
if word.starts_with("--args=") { .into_iter()
let args_string = word.strip_prefix("--args=").unwrap(); .partition(|word| word.starts_with("--args="));
arguments.extend(shell_words::split(args_string)?);
} else {
subjects.push(word);
}
}
if subjects.is_empty() { if subjects.is_empty() {
bail!("No search subject found"); bail!("No search subject found");
} }
let subject = subjects.join(" "); let subject = subjects.join(" ");
let args: Vec<String> = arguments.into_iter()
.flat_map(|arg| shell_words::split(&arg["--args=".len()..]))
.flatten()
.collect();
cwd = cwd.into_search(subject.clone()); cwd = cwd.into_search(subject.clone());
let rx = if opt.type_ == OptType::Rg { let rx = if opt.type_ == OptType::Rg {
external::rg(external::RgOpt { cwd: cwd.clone(), hidden, subject, args: arguments}) external::rg(external::RgOpt { cwd: cwd.clone(), hidden, subject, args})
} else { } else {
external::fd(external::FdOpt { cwd: cwd.clone(), hidden, glob: false, subject, args: arguments }) external::fd(external::FdOpt { cwd: cwd.clone(), hidden, glob: false, subject, args })
}?; }?;
let rx = UnboundedReceiverStream::new(rx).chunks_timeout(1000, Duration::from_millis(300)); let rx = UnboundedReceiverStream::new(rx).chunks_timeout(1000, Duration::from_millis(300));

2
yazi-plugin/src/external/fd.rs vendored
View file

@ -1,4 +1,4 @@
use std::{env::args, process::Stdio}; use std::process::Stdio;
use anyhow::Result; use anyhow::Result;
use tokio::{io::{AsyncBufReadExt, BufReader}, process::Command, sync::mpsc::{self, UnboundedReceiver}}; use tokio::{io::{AsyncBufReadExt, BufReader}, process::Command, sync::mpsc::{self, UnboundedReceiver}};

2
yazi-plugin/src/external/rg.rs vendored
View file

@ -16,7 +16,7 @@ pub fn rg(opt: RgOpt) -> Result<UnboundedReceiver<File>> {
.current_dir(&opt.cwd) .current_dir(&opt.cwd)
.args(["--color=never", "--files-with-matches", "--smart-case"]) .args(["--color=never", "--files-with-matches", "--smart-case"])
.args(if opt.hidden { ["--hidden", "--no-ignore"] } else { ["--no-hidden", "--ignore"] }) .args(if opt.hidden { ["--hidden", "--no-ignore"] } else { ["--no-hidden", "--ignore"] })
.args(opt.args) .args(&opt.args)
.arg(&opt.subject) .arg(&opt.subject)
.kill_on_drop(true) .kill_on_drop(true)
.stdout(Stdio::piped()) .stdout(Stdio::piped())