Skip to content

moved the update scrobbler instance into a function that is called on app startup (once) and can be called when the config file changes (just like before). This fixed Lastfm scrobbler instance is not created on startup #599 #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
marcfusch wants to merge 1 commit into from
Closed

moved the update scrobbler instance into a function that is called on app startup (once) and can be called when the config file changes (just like before). This fixed Lastfm scrobbler instance is not created on startup #599 #600

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 41 additions & 30 deletions psst-gui/src/controller/playback.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,42 @@ pub struct PlaybackController {
media_controls: Option<MediaControls>,
has_scrobbled: bool,
scrobbler: Option<Scrobbler>,
startup: bool,
}
fn init_scrobbler_instance(
data: &AppState
) -> Option<Scrobbler> {
if data.config.lastfm_enable {
if let (Some(api_key), Some(api_secret), Some(session_key)) = (
data.config.lastfm_api_key.as_deref(),
data.config.lastfm_api_secret.as_deref(),
data.config.lastfm_session_key.as_deref(),
) {
match LastFmClient::create_scrobbler(
Some(api_key),
Some(api_secret),
Some(session_key),
) {
Ok(scr) => {
log::info!("Last.fm Scrobbler instance created/updated.");
return Some(scr);
}
Err(e) => {
log::warn!("Failed to create/update Last.fm Scrobbler instance: {}", e);
}
}
} else {
log::info!(
"Last.fm credentials incomplete or removed, clearing Scrobbler instance."
);
}
} else {
log::info!("Last.fm scrobbling is disabled, clearing Scrobbler instance.");
}
None
}


impl PlaybackController {
pub fn new() -> Self {
Self {
Expand All @@ -50,6 +84,7 @@ impl PlaybackController {
media_controls: None,
has_scrobbled: false,
scrobbler: None,
startup: true,
}
}

Expand Down Expand Up @@ -584,6 +619,11 @@ where
}
_ => {}
}
if self.startup {
self.startup = false;
self.scrobbler = init_scrobbler_instance(data);

}
child.lifecycle(ctx, event, data, env);
}

Expand All @@ -605,36 +645,7 @@ where
|| old_data.config.lastfm_enable != data.config.lastfm_enable;

if lastfm_changed {
self.scrobbler = if data.config.lastfm_enable {
if let (Some(api_key), Some(api_secret), Some(session_key)) = (
data.config.lastfm_api_key.as_deref(),
data.config.lastfm_api_secret.as_deref(),
data.config.lastfm_session_key.as_deref(),
) {
match LastFmClient::create_scrobbler(
Some(api_key),
Some(api_secret),
Some(session_key),
) {
Ok(scrobbler) => {
log::info!("Last.fm Scrobbler instance created/updated.");
Some(scrobbler)
}
Err(e) => {
log::warn!("Failed to create/update Last.fm Scrobbler instance: {}", e);
None
}
}
} else {
log::info!(
"Last.fm credentials incomplete or removed, clearing Scrobbler instance."
);
None
}
} else {
log::info!("Last.fm scrobbling is disabled, clearing Scrobbler instance.");
None
};
self.scrobbler = init_scrobbler_instance(data);
}

child.update(ctx, old_data, data, env);
Expand Down