extern/starship
1
0
Fork 0
mirror of https://github.com/starship/starship.git synced 2024-11-07 08:54:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ignore configured commands for cmd_duration notify

Browse Source 
Add a `notify_ignore_commands` option to the `cmd_duration` module,
and configuration for nushell support.

Fixes: #1933
This commit is contained in:
Samuel Allan 2024-08-03 17:55:30 +09:30
parent d1cf5f6456
commit bf540bdbb1
4 changed files with 57 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/configs/cmd_duration.rs
View File

@ -15,6 +15,7 @@ pub struct CmdDurationConfig<'a> {
pub disabled: bool,
pub show_notifications: bool,
pub min_time_to_notify: i64,
pub notify_ignore_commands: Vec<&'a str>,
#[serde(skip_serializing_if = "Option::is_none")]
pub notification_timeout: Option<u32>,
@ -31,6 +32,7 @@ impl<'a> Default for CmdDurationConfig<'a> {
show_notifications: false,
min_time_to_notify: 45_000,
notification_timeout: None,
notify_ignore_commands: vec![],
}
}
}

4
src/context.rs
View File

@ -860,6 +860,9 @@ pub struct Properties {
/// The execution duration of the last command, in milliseconds
#[clap(short = 'd', long)]
pub cmd_duration: Option<String>,
/// The last command
#[clap(short = 'c', long)]
pub cmd: Option<String>,
/// The keymap of fish/zsh/cmd
#[clap(short = 'k', long, default_value = "viins")]
pub keymap: String,
@ -879,6 +882,7 @@ impl Default for Properties {
cmd_duration: None,
keymap: "viins".to_string(),
jobs: 0,
cmd: None,
}
}
}

74
src/init/starship.nu
View File

@ -2,37 +2,53 @@
# - overlay which can be loaded with `overlay use starship.nu`
# - module which can be used with `use starship.nu`
# - script which can be used with `source starship.nu`
export-env { $env.STARSHIP_SHELL = "nu"; load-env {
STARSHIP_SESSION_KEY: (random chars -l 16)
PROMPT_MULTILINE_INDICATOR: (
^::STARSHIP:: prompt --continuation
)
export-env {
$env.STARSHIP_SHELL = "nu"
# Does not play well with default character module.
# TODO: Also Use starship vi mode indicators?
PROMPT_INDICATOR: ""
PROMPT_COMMAND: {||
# jobs are not supported
(
^::STARSHIP:: prompt
--cmd-duration $env.CMD_DURATION_MS
$"--status=($env.LAST_EXIT_CODE)"
--terminal-width (term size).columns
)
$env.config.hooks.pre_execution ++= {||
let cmd = commandline | parse --regex '\s*(:?sudo\s+)?(?<cmd>\w+).*' | get cmd
if ($cmd | is-not-empty) {
export-env {
$env.LAST_CMD = $cmd | first
}
}
}
config: ($env.config? | default {} | merge {
render_right_prompt_on_last_line: true
})
PROMPT_COMMAND_RIGHT: {||
(
^::STARSHIP:: prompt
--right
--cmd-duration $env.CMD_DURATION_MS
$"--status=($env.LAST_EXIT_CODE)"
--terminal-width (term size).columns
load-env {
STARSHIP_SESSION_KEY: (random chars -l 16)
PROMPT_MULTILINE_INDICATOR: (
^::STARSHIP:: prompt --continuation
)
# Does not play well with default character module.
# TODO: Also Use starship vi mode indicators?
PROMPT_INDICATOR: ""
PROMPT_COMMAND: {||
# jobs are not supported
(
^::STARSHIP:: prompt
--cmd-duration $env.CMD_DURATION_MS
--cmd ($env | default '' LAST_CMD | get LAST_CMD)
$"--status=($env.LAST_EXIT_CODE)"
--terminal-width (term size).columns
)
}
config: ($env.config? | default {} | merge {
render_right_prompt_on_last_line: true
})
PROMPT_COMMAND_RIGHT: {||
(
^::STARSHIP:: prompt
--right
--cmd-duration $env.CMD_DURATION_MS
--cmd ($env | default '' LAST_CMD | get LAST_CMD)
$"--status=($env.LAST_EXIT_CODE)"
--terminal-width (term size).columns
)
}
}
}}
}

6
src/modules/cmd_duration.rs
View File

@ -83,6 +83,12 @@ fn undistract_me<'a>(
};
}
if let Some(cmd) = context.properties.cmd.as_deref() {
if config.notify_ignore_commands.contains(&cmd) {
return module;
}
}
let body = format!(
"Command execution {}",
unstyle(&AnsiStrings(&module.ansi_strings()))