Skip to content

mainloop: don't panic when discovery stops without credentials #1424

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

Open
Hayao0819 wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −10
Open

mainloop: don't panic when discovery stops without credentials #1424

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
30 changes: 20 additions & 10 deletions src/main_loop.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ use crate::config::{DBusType, MprisConfig};
use crate::dbus_mpris::DbusServer;
use crate::process::spawn_program_on_event;
use crate::utils::Backoff;
use color_eyre::eyre::{self, Context};
use color_eyre::{
Section,
eyre::{self, Context, eyre},
};
use futures::future::Either;
#[cfg(not(feature = "dbus_mpris"))]
use futures::future::Pending;
Expand All @@ -15,8 +18,7 @@ use futures::{
};
use librespot_connect::{ConnectConfig, Spirc};
use librespot_core::{
Error, SessionConfig, authentication::Credentials, cache::Cache, config::DeviceType,
session::Session,
SessionConfig, authentication::Credentials, cache::Cache, config::DeviceType, session::Session,
};
use librespot_discovery::Discovery;
use librespot_playback::{
Expand All @@ -41,20 +43,28 @@ pub(crate) enum CredentialsProvider {
}

impl CredentialsProvider {
async fn get_credentials(&mut self) -> Credentials {
async fn get_credentials(&mut self) -> eyre::Result<Credentials> {
match self {
CredentialsProvider::Discovery {
stream,
last_credentials,
} => {
let new_creds = match last_credentials.take() {
Some(creds) => stream.next().now_or_never().flatten().unwrap_or(creds),
None => stream.next().await.unwrap(),
// librespot also ends the stream on zeroconf errors, without reporting them
None => stream
.next()
.await
.ok_or_else(|| eyre!("Discovery stopped without providing credentials."))
.with_suggestion(|| {
"Check the log for zeroconf errors, or log in with \
`spotifyd authenticate` so that spotifyd doesn't depend on discovery."
})?,
};
*last_credentials = Some(new_creds.clone());
new_creds
Ok(new_creds)
}
CredentialsProvider::CredentialsOnly(creds) => creds.clone(),
CredentialsProvider::CredentialsOnly(creds) => Ok(creds.clone()),
}
}

Expand Down Expand Up @@ -102,8 +112,8 @@ struct ConnectionInfo<SpircTask: Future<Output = ()>> {
impl MainLoop {
async fn get_connection(
&mut self,
) -> Result<ConnectionInfo<impl Future<Output = ()> + use<>>, Error> {
let creds = self.credentials_provider.get_credentials().await;
) -> eyre::Result<ConnectionInfo<impl Future<Output = ()> + use<>>> {
let creds = self.credentials_provider.get_credentials().await?;

let mut connection_backoff = Backoff::default();
loop {
Expand Down Expand Up @@ -146,7 +156,7 @@ impl MainLoop {
}
Err(err) => {
let Ok(backoff) = connection_backoff.next_backoff() else {
break Err(err);
break Err(err.into());
};
error!("connection to spotify failed: {err}");
info!(
Expand Down