anas-elgarhy
/
cmus-notify
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases 1 Wiki Activity

[update/improve] Create macro to build the notification and use it inestad of methods mess

This commit is contained in:
Anas Elgarhy 2023-04-22 06:49:15 +02:00
parent f87f71fbb9
commit 31946b66ca
No known key found for this signature in database
GPG Key ID: 0501802A1D496528
2 changed files with 51 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
src/cmus/events.rs
View File

@ -13,144 +13,68 @@ pub enum CmusEvent {
PositionChanged(Track, PlayerSettings), PositionChanged(Track, PlayerSettings),
ShuffleChanged(Track, PlayerSettings), ShuffleChanged(Track, PlayerSettings),
RepeatChanged(Track, PlayerSettings), RepeatChanged(Track, PlayerSettings),
AAAMode(Track, PlayerSettings), AAAModeChanged(Track, PlayerSettings),
} }
impl CmusEvent { impl CmusEvent {
pub fn build_notification( pub fn build_notification(
&self, &self,
settings: &Settings, settings: &Settings,
notification: &mut notify_rust::Notification, _notification: &mut notify_rust::Notification,
) -> Action { ) -> Action {
macro_rules! build_the_notification {
($body_template: expr, $summary_template: expr, $track: expr, $player_settings: expr) => {
_notification.body(&process_template_placeholders(
$body_template,
$track,
$player_settings,
))
.summary(&process_template_placeholders(
$summary_template,
$track,
$player_settings,
));
};
}
use CmusEvent::*; use CmusEvent::*;
match self { match self {
StatusChanged(_, _) | TrackChanged(_, _) => { StatusChanged(track, player_settings) => {
let (body, body_action) = self.build_notification_body(settings); build_the_notification!(settings.status_notification_body(), settings.status_notification_summary(), track, player_settings);
let (summary, summary_action) = self.build_notification_summary(settings);
notification.body(&body).summary(&summary); Action::Show
body_action.max(summary_action)
} }
VolumeChanged(_, _) TrackChanged(track, player_settings) => {
| PositionChanged(_, _) build_the_notification!(settings.body(), settings.summary(), track, player_settings);
| ShuffleChanged(_, _)
| RepeatChanged(_, _) Action::Show
| AAAMode(_, _) }
if settings.show_player_notifications => VolumeChanged(track, player_settings) if settings.show_player_notifications => {
{ build_the_notification!(settings.volume_notification_body(), settings.volume_notification_summary(), track, player_settings);
let (body, body_action) = self.build_notification_body(settings);
let (summary, summary_action) = self.build_notification_summary(settings); Action::Show
notification.body(&body).summary(&summary); }
body_action.max(summary_action) PositionChanged(_track, _player_settings) if settings.show_player_notifications => {
//build_the_notification!(settings.volume_notification_body(), settings.volume_notification_summary(), track, player_settings);
//TODO: Implement this
Action::None
}
ShuffleChanged(track, player_settings) if settings.show_player_notifications => {
build_the_notification!(settings.shuffle_notification_body(), settings.shuffle_notification_summary(), track, player_settings);
Action::Show
}
RepeatChanged(track, player_settings) if settings.show_player_notifications => {
build_the_notification!(settings.repeat_notification_body(), settings.repeat_notification_summary(), track, player_settings);
Action::Show
}
AAAModeChanged(track, player_settings) if settings.show_player_notifications => {
build_the_notification!(settings.aaa_mode_notification_body(), settings.aaa_mode_notification_summary(), track, player_settings);
Action::Show
} }
_ => Action::None, _ => Action::None,
} }
} }
#[inline]
fn build_notification_body(&self, settings: &Settings) -> (String, Action) {
use CmusEvent::*;
match self {
StatusChanged(track, player_settings) => (
process_template_placeholders(
settings.status_notification_body(),
track,
player_settings,
),
Action::Show,
),
TrackChanged(track, player_settings) => (
process_template_placeholders(settings.body(), track, player_settings),
Action::Show,
),
VolumeChanged(track, player_settings) => (
process_template_placeholders(
settings.volume_notification_body(),
track,
player_settings,
),
Action::Show,
),
PositionChanged(_track, _player_settings) => {
(String::new(), Action::None) // TODO: Implement this
}
ShuffleChanged(track, player_settings) => (
process_template_placeholders(
settings.shuffle_notification_body(),
track,
player_settings,
),
Action::Show,
),
RepeatChanged(track, player_settings) => (
process_template_placeholders(
settings.repeat_notification_body(),
track,
player_settings,
),
Action::Show,
),
AAAMode(track, player_settings) => (
process_template_placeholders(
settings.aaa_mode_notification_body(),
track,
player_settings,
),
Action::Show,
),
}
}
#[inline]
fn build_notification_summary(&self, settings: &Settings) -> (String, Action) {
use CmusEvent::*;
match self {
StatusChanged(track, player_settings) => (
process_template_placeholders(
settings.status_notification_summary(),
track,
player_settings,
),
Action::Show,
),
TrackChanged(track, player_settings) => (
process_template_placeholders(settings.summary(), track, player_settings),
Action::Show,
),
VolumeChanged(track, player_settings) => (
process_template_placeholders(
settings.volume_notification_summary(),
track,
player_settings,
),
Action::Show,
),
PositionChanged(_track, _player_settings) => {
(String::new(), Action::None) // TODO: Implement this
}
ShuffleChanged(track, player_settings) => (
process_template_placeholders(
settings.shuffle_notification_summary(),
track,
player_settings,
),
Action::Show,
),
RepeatChanged(track, player_settings) => (
process_template_placeholders(
settings.repeat_notification_summary(),
track,
player_settings,
),
Action::Show,
),
AAAMode(track, player_settings) => (
process_template_placeholders(
settings.aaa_mode_notification_summary(),
track,
player_settings,
),
Action::Show,
),
}
}
} }

2
src/cmus/query.rs
View File

@ -141,7 +141,7 @@ impl CmusQueryResponse {
other_player_settings.aaa_mode, player_settings.aaa_mode other_player_settings.aaa_mode, player_settings.aaa_mode
); );
events.push(CmusEvent::AAAMode( events.push(CmusEvent::AAAModeChanged(
other_track.clone(), other_track.clone(),
other_player_settings.clone(), other_player_settings.clone(),
)); ));