haskal
/
starship
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: don't attempt to display cmd_duration notification if in TTY (#4535) 

Disables the display of notifications from cmd_duration on Linux if
none of DISPLAY, WAYLAND_DISPLAY, or MIR_SOCKET are set.
This prevents starship from attempting to create notifications in tty 
environments, which was previously causing hangs.
This commit is contained in:
Gabriel Victor 2022-11-28 10:23:03 -03:00 committed by GitHub
parent c2c2eecf7e
commit 0427863168
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/cmd_duration.rs
View File

@ -48,13 +48,14 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
} }
}); });
Some(undistract_me(module, &config, elapsed)) Some(undistract_me(module, &config, context, elapsed))
} }
#[cfg(not(feature = "notify"))] #[cfg(not(feature = "notify"))]
fn undistract_me<'a, 'b>( fn undistract_me<'a, 'b>(
module: Module<'a>, module: Module<'a>,
_config: &'b CmdDurationConfig, _config: &'b CmdDurationConfig,
_context: &'a Context,
_elapsed: u128, _elapsed: u128,
) -> Module<'a> { ) -> Module<'a> {
module module
@ -64,12 +65,24 @@ fn undistract_me<'a, 'b>(
fn undistract_me<'a, 'b>( fn undistract_me<'a, 'b>(
module: Module<'a>, module: Module<'a>,
config: &'b CmdDurationConfig, config: &'b CmdDurationConfig,
context: &'a Context,
elapsed: u128, elapsed: u128,
) -> Module<'a> { ) -> Module<'a> {
use notify_rust::{Notification, Timeout}; use notify_rust::{Notification, Timeout};
use nu_ansi_term::{unstyle, AnsiStrings}; use nu_ansi_term::{unstyle, AnsiStrings};
if config.show_notifications && config.min_time_to_notify as u128 <= elapsed { if config.show_notifications && config.min_time_to_notify as u128 <= elapsed {
if cfg!(target_os = "linux") {
let in_graphical_session = ["DISPLAY", "WAYLAND_DISPLAY", "MIR_SOCKET"]
.iter()
.find_map(|&var| context.get_env(var).filter(|val| !val.is_empty()))
.is_some();
if !in_graphical_session {
return module;
};
}
let body = format!( let body = format!(
"Command execution {}", "Command execution {}",
unstyle(&AnsiStrings(&module.ansi_strings())) unstyle(&AnsiStrings(&module.ansi_strings()))