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

feat: add ripgrep-all support for search

Browse source
This commit is contained in:
paperbenni 2025-02-22 17:21:43 +01:00
parent 52a5ab59e9
commit 8b2d89cbaf
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,8 +48,9 @@ impl Tab {
let hidden = self.pref.show_hidden; let hidden = self.pref.show_hidden;
self.search = Some(tokio::spawn(async move { self.search = Some(tokio::spawn(async move {
let rx = if opt.via == SearchOptVia::Rg { let rx = if opt.via == SearchOptVia::Rg || opt.via == SearchOptVia::Rga {
external::rg(external::RgOpt { external::rg(external::RgOpt {
rga: SearchOptVia::Rga == opt.via,
cwd: cwd.clone(), cwd: cwd.clone(),
hidden, hidden,
subject: opt.subject.into_owned(), subject: opt.subject.into_owned(),

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

@ -7,13 +7,15 @@ use yazi_shared::url::Url;
pub struct RgOpt { pub struct RgOpt {
pub cwd: Url, pub cwd: Url,
pub rga: bool,
pub hidden: bool, pub hidden: bool,
pub subject: String, pub subject: String,
pub args: Vec<String>, pub args: Vec<String>,
} }
pub fn rg(opt: RgOpt) -> Result<UnboundedReceiver<File>> { pub fn rg(opt: RgOpt) -> Result<UnboundedReceiver<File>> {
let mut child = Command::new("rg") let commandname = if opt.rga { "rga" } else { "rg" };
let mut child = Command::new(commandname)
.args(["--color=never", "--files-with-matches", "--smart-case"]) .args(["--color=never", "--files-with-matches", "--smart-case"])
.arg(if opt.hidden { "--hidden" } else { "--no-hidden" }) .arg(if opt.hidden { "--hidden" } else { "--no-hidden" })
.args(opt.args) .args(opt.args)

3
yazi-proxy/src/options/search.rs
View file

@ -35,6 +35,7 @@ impl TryFrom<CmdCow> for SearchOpt {
pub enum SearchOptVia { pub enum SearchOptVia {
// TODO: remove `None` in the future // TODO: remove `None` in the future
None, None,
Rga,
Rg, Rg,
Fd, Fd,
} }
@ -44,6 +45,7 @@ impl From<&str> for SearchOptVia {
match value { match value {
"rg" => Self::Rg, "rg" => Self::Rg,
"fd" => Self::Fd, "fd" => Self::Fd,
"rga" => Self::Rga,
_ => Self::None, _ => Self::None,
} }
} }
@ -53,6 +55,7 @@ impl Display for SearchOptVia {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.write_str(match self { f.write_str(match self {
Self::Rg => "rg", Self::Rg => "rg",
Self::Rga => "rga",
Self::Fd => "fd", Self::Fd => "fd",
Self::None => "none", Self::None => "none",
}) })