feat: add CmdPlugin for executing terminal commands and update workspace configuration

This commit is contained in:
2026-03-15 16:53:30 +01:00
parent c059961854
commit f5dd303b79
6 changed files with 185 additions and 0 deletions

11
Cargo.lock generated
View File

@@ -1767,6 +1767,7 @@ dependencies = [
"k-launcher-ui", "k-launcher-ui",
"plugin-apps", "plugin-apps",
"plugin-calc", "plugin-calc",
"plugin-cmd",
"tokio", "tokio",
] ]
@@ -2750,6 +2751,16 @@ dependencies = [
"tokio", "tokio",
] ]
[[package]]
name = "plugin-cmd"
version = "0.1.0"
dependencies = [
"async-trait",
"k-launcher-kernel",
"libc",
"tokio",
]
[[package]] [[package]]
name = "plugin-files" name = "plugin-files"
version = "0.1.0" version = "0.1.0"

View File

@@ -6,6 +6,7 @@ members = [
"crates/k-launcher-ui", "crates/k-launcher-ui",
"crates/plugins/plugin-apps", "crates/plugins/plugin-apps",
"crates/plugins/plugin-calc", "crates/plugins/plugin-calc",
"crates/plugins/plugin-cmd",
"crates/plugins/plugin-files", "crates/plugins/plugin-files",
] ]
resolver = "2" resolver = "2"

View File

@@ -14,4 +14,5 @@ k-launcher-kernel = { path = "../k-launcher-kernel" }
k-launcher-ui = { path = "../k-launcher-ui" } k-launcher-ui = { path = "../k-launcher-ui" }
plugin-apps = { path = "../plugins/plugin-apps" } plugin-apps = { path = "../plugins/plugin-apps" }
plugin-calc = { path = "../plugins/plugin-calc" } plugin-calc = { path = "../plugins/plugin-calc" }
plugin-cmd = { path = "../plugins/plugin-cmd" }
tokio = { workspace = true } tokio = { workspace = true }

View File

@@ -3,9 +3,11 @@ use std::sync::Arc;
use k_launcher_kernel::Kernel; use k_launcher_kernel::Kernel;
use plugin_apps::{AppsPlugin, FsDesktopEntrySource}; use plugin_apps::{AppsPlugin, FsDesktopEntrySource};
use plugin_calc::CalcPlugin; use plugin_calc::CalcPlugin;
use plugin_cmd::CmdPlugin;
fn main() -> iced::Result { fn main() -> iced::Result {
let kernel = Arc::new(Kernel::new(vec![ let kernel = Arc::new(Kernel::new(vec![
Arc::new(CmdPlugin::new()),
Arc::new(CalcPlugin::new()), Arc::new(CalcPlugin::new()),
Arc::new(AppsPlugin::new(FsDesktopEntrySource::new())), Arc::new(AppsPlugin::new(FsDesktopEntrySource::new())),
])); ]));

View File

@@ -0,0 +1,16 @@
[package]
name = "plugin-cmd"
version = "0.1.0"
edition = "2024"
[lib]
name = "plugin_cmd"
path = "src/lib.rs"
[dependencies]
async-trait = { workspace = true }
k-launcher-kernel = { path = "../../k-launcher-kernel" }
libc = "0.2"
[dev-dependencies]
tokio = { workspace = true }

View File

@@ -0,0 +1,154 @@
use std::{process::{Command, Stdio}, sync::Arc};
use std::os::unix::process::CommandExt;
use async_trait::async_trait;
use k_launcher_kernel::{Plugin, PluginName, ResultId, ResultTitle, Score, SearchResult};
fn parse_term_cmd(s: &str) -> (String, Vec<String>) {
let mut parts = s.split_whitespace();
let bin = parts.next().unwrap_or("").to_string();
let args = parts.map(str::to_string).collect();
(bin, args)
}
fn which(bin: &str) -> bool {
Command::new("which")
.arg(bin)
.stdout(Stdio::null())
.stderr(Stdio::null())
.status()
.map(|s| s.success())
.unwrap_or(false)
}
fn resolve_terminal() -> Option<(String, Vec<String>)> {
if let Ok(val) = std::env::var("TERM_CMD") {
let val = val.trim().to_string();
if !val.is_empty() {
let (bin, args) = parse_term_cmd(&val);
if !bin.is_empty() {
return Some((bin, args));
}
}
}
if let Ok(val) = std::env::var("TERMINAL") {
let bin = val.trim().to_string();
if !bin.is_empty() {
return Some((bin, vec!["-e".to_string()]));
}
}
for (bin, flag) in &[
("foot", "-e"),
("kitty", "-e"),
("alacritty", "-e"),
("wezterm", "start"),
("konsole", "-e"),
("xterm", "-e"),
] {
if which(bin) {
return Some((bin.to_string(), vec![flag.to_string()]));
}
}
None
}
pub struct CmdPlugin;
impl CmdPlugin {
pub fn new() -> Self {
Self
}
}
impl Default for CmdPlugin {
fn default() -> Self {
Self::new()
}
}
#[async_trait]
impl Plugin for CmdPlugin {
fn name(&self) -> PluginName {
"cmd"
}
async fn search(&self, query: &str) -> Vec<SearchResult> {
let Some(rest) = query.strip_prefix('>') else {
return vec![];
};
let cmd = rest.trim();
if cmd.is_empty() {
return vec![];
}
let cmd_owned = cmd.to_string();
vec![SearchResult {
id: ResultId::new(format!("cmd-{cmd}")),
title: ResultTitle::new(format!("Run: {cmd}")),
description: None,
icon: None,
score: Score::new(95),
on_execute: Arc::new(move || {
let Some((term_bin, term_args)) = resolve_terminal() else { return };
let _ = unsafe {
Command::new(&term_bin)
.args(&term_args)
.arg("sh").arg("-c").arg(&cmd_owned)
.stdin(Stdio::null())
.stdout(Stdio::null())
.stderr(Stdio::null())
.pre_exec(|| { libc::setsid(); Ok(()) })
.spawn()
};
}),
}]
}
}
#[cfg(test)]
mod tests {
use super::*;
#[tokio::test]
async fn cmd_prefix_triggers() {
let p = CmdPlugin::new();
let results = p.search("> echo hello").await;
assert_eq!(results.len(), 1);
assert_eq!(results[0].title.as_str(), "Run: echo hello");
assert_eq!(results[0].score.value(), 95);
}
#[tokio::test]
async fn cmd_empty_remainder_returns_empty() {
let p = CmdPlugin::new();
assert!(p.search(">").await.is_empty());
assert!(p.search("> ").await.is_empty());
}
#[tokio::test]
async fn cmd_no_prefix_returns_empty() {
let p = CmdPlugin::new();
assert!(p.search("echo hello").await.is_empty());
assert!(p.search("firefox").await.is_empty());
}
#[test]
fn parse_term_cmd_single_flag() {
let (bin, args) = parse_term_cmd("foot -e");
assert_eq!(bin, "foot");
assert_eq!(args, vec!["-e"]);
}
#[test]
fn parse_term_cmd_multiword() {
let (bin, args) = parse_term_cmd("wezterm start");
assert_eq!(bin, "wezterm");
assert_eq!(args, vec!["start"]);
}
#[test]
fn parse_term_cmd_no_args() {
let (bin, args) = parse_term_cmd("xterm");
assert_eq!(bin, "xterm");
assert!(args.is_empty());
}
}