meli
/
meli
9
Fork 13
Code Issues 13 Pull Requests 11 Actions Packages Projects 1 Releases 19 Wiki Activity

notifications.rs: show notifications in terminal if no alternative 

If no alternative (dbus or notification command) show notifications
inside the terminal.
pull/144/head
Manos Pitsidianakis 2022-08-28 17:34:53 +03:00
parent bde87af387
commit a42a6ca868
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/components/notifications.rs
View File

@ -190,6 +190,15 @@ impl Component for NotificationCommand {
fn process_event(&mut self, event: &mut UIEvent, context: &mut Context) -> bool { fn process_event(&mut self, event: &mut UIEvent, context: &mut Context) -> bool {
if let UIEvent::Notification(ref title, ref body, ref kind) = event { if let UIEvent::Notification(ref title, ref body, ref kind) = event {
if context.settings.notifications.enable { if context.settings.notifications.enable {
if *kind == Some(NotificationType::NewMail) {
if let Some(ref path) = context.settings.notifications.xbiff_file_path {
if let Err(err) = update_xbiff(path) {
debug!("Could not update xbiff file: {:?}", &err);
melib::log(format!("Could not update xbiff file: {}.", err), ERROR);
}
}
}
if let Some(ref bin) = context.settings.notifications.script { if let Some(ref bin) = context.settings.notifications.script {
match Command::new(bin) match Command::new(bin)
.arg(&kind.map(|k| k.to_string()).unwrap_or_default()) .arg(&kind.map(|k| k.to_string()).unwrap_or_default())
@ -223,6 +232,7 @@ impl Component for NotificationCommand {
{ {
Ok(child) => { Ok(child) => {
context.children.push(child); context.children.push(child);
return false;
} }
Err(err) => { Err(err) => {
log( log(
@ -233,18 +243,19 @@ impl Component for NotificationCommand {
} }
} }
} }
}
}
if *kind == Some(NotificationType::NewMail) { context
if let Some(ref path) = context.settings.notifications.xbiff_file_path { .replies
if let Err(err) = update_xbiff(path) { .push_back(UIEvent::StatusEvent(StatusEvent::DisplayMessage(format!(
debug!("Could not update xbiff file: {:?}", &err); "{title}{}{body}",
melib::log(format!("Could not update xbiff file: {}.", err), ERROR); if title.is_some() { " " } else { "" },
} title = title.as_deref().unwrap_or_default(),
body = body,
))));
} }
} }
} }
false false
} }
fn id(&self) -> ComponentId { fn id(&self) -> ComponentId {