diff options
| author | salmonik <raisersoft@proton.me> | 2026-05-16 12:47:43 +0200 |
|---|---|---|
| committer | salmonik <raisersoft@proton.me> | 2026-05-16 12:47:43 +0200 |
| commit | 43562db0804338f2d55dff13439f1165f8dd9d3f (patch) | |
| tree | 134248a95024815194d152de56f9b3f70d24d096 /src/daemon.rs | |
| parent | Add scrobbling support (Last.fm + ListenBrainz) and rsp settings reload (diff) | |
| download | rsplayer-43562db0804338f2d55dff13439f1165f8dd9d3f.tar.gz rsplayer-43562db0804338f2d55dff13439f1165f8dd9d3f.zip | |
first public release.
Diffstat (limited to '')
| -rw-r--r-- | src/daemon.rs | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/daemon.rs b/src/daemon.rs index 06b925e..59fc3d8 100644 --- a/src/daemon.rs +++ b/src/daemon.rs | |||
| @@ -544,10 +544,10 @@ fn process_command( | |||
| 544 | ); | 544 | ); |
| 545 | let result = match temp_scrobbler.validate_listenbrainz_token() { | 545 | let result = match temp_scrobbler.validate_listenbrainz_token() { |
| 546 | Ok(Some(user)) => { | 546 | Ok(Some(user)) => { |
| 547 | notification::notify_change(&format!( | 547 | notification::notify( |
| 548 | "Logged in to ListenBrainz as {}", | 548 | "RSPlayer scrobbler login", |
| 549 | user | 549 | &format!("Logged in to ListenBrainz as {}", user), |
| 550 | )); | 550 | ); |
| 551 | format!("ListenBrainz token valid (user: {})\n", user) | 551 | format!("ListenBrainz token valid (user: {})\n", user) |
| 552 | } | 552 | } |
| 553 | Ok(None) => { | 553 | Ok(None) => { |
| @@ -779,19 +779,19 @@ fn process_command( | |||
| 779 | for file in &files { | 779 | for file in &files { |
| 780 | q.add_track(file.clone()); | 780 | q.add_track(file.clone()); |
| 781 | } | 781 | } |
| 782 | if was_empty | 782 | if was_empty && !was_playing { |
| 783 | && !was_playing | 783 | q.shuffle_initial(); |
| 784 | && let Some(track) = q.current() | 784 | if let Some(track) = q.current() { |
| 785 | { | 785 | audio.play(track.path.clone()); |
| 786 | audio.play(track.path.clone()); | 786 | send_now_playing(scrobbler, track); |
| 787 | send_now_playing(scrobbler, track); | 787 | if let Ok(mut s) = scrobble_state.lock() { |
| 788 | if let Ok(mut s) = scrobble_state.lock() { | 788 | s.start(track.clone()); |
| 789 | s.start(track.clone()); | 789 | } |
| 790 | let fmt = Config::load() | ||
| 791 | .ok() | ||
| 792 | .and_then(|c| c.display_format.clone()); | ||
| 793 | notification::notify_track(track, fmt.as_deref()); | ||
| 790 | } | 794 | } |
| 791 | let fmt = Config::load() | ||
| 792 | .ok() | ||
| 793 | .and_then(|c| c.display_format.clone()); | ||
| 794 | notification::notify_track(track, fmt.as_deref()); | ||
| 795 | } | 795 | } |
| 796 | format!("Queued {} tracks from: {}\n", files.len(), path_str) | 796 | format!("Queued {} tracks from: {}\n", files.len(), path_str) |
| 797 | } | 797 | } |
