Merge commit 'refs/pull/1528/head' of https://github.com/librespot-org/librespot into mass

Author: marcelveldt

CHANGELOG.md

@@ -16,14 +16,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [connect] Replaced `SpircLoadCommand` with `LoadRequest`, `LoadRequestOptions` and `LoadContextOptions` (breaking)
 - [connect] Moved all public items to the highest level (breaking)
 - [connect] Replaced Mercury usage in `Spirc` with Dealer
+- [metadata] Replaced `AudioFileFormat` with own enum. (breaking)
+- [playback] Changed trait `Mixer::open` to return `Result<Self, Error>` instead of `Self` (breaking)
+- [playback] Changed type alias `MixerFn` to return `Result<Arc<dyn Mixer>, Error>` instead of `Arc<dyn Mixer>` (breaking)
 
 ### Added
 
+- [connect] Add command line parameter for setting volume steps.
 - [connect] Add support for `seek_to`, `repeat_track` and `autoplay` for `Spirc` loading
 - [connect] Add `pause` parameter to `Spirc::disconnect` method (breaking)
 - [connect] Add `volume_steps` to `ConnectConfig` (breaking)
 - [connect] Add and enforce rustdoc
 - [playback] Add `track` field to `PlayerEvent::RepeatChanged` (breaking)
+- [playback] Add `PlayerEvent::PositionChanged` event to notify about the current playback position
 - [core] Add `request_with_options` and `request_with_protobuf_and_options` to `SpClient`
 - [oauth] Add `OAuthClient` and `OAuthClientBuilder` structs to achieve a more customizable login process
 
@@ -39,8 +44,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [connect] Fix "play" command not handled if missing "offset" property
 - [discovery] Fix libmdns zerconf setup errors not propagating to the main task.
 - [metadata] `Show::trailer_uri` is now optional since it isn't always present (breaking)
+- [metadata] Fix incorrect parsing of audio format
 - [connect] Handle transfer of playback with empty "uri" field
 - [connect] Correctly apply playing/paused state when transferring playback
+- [player] Saturate invalid seek positions to track duration
+- [core] Metadata requests failing with 500 Internal Server Error
 
 ### Deprecated
 
@@ -49,6 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 
 - [core] Removed `get_canvases` from SpClient (breaking)
+- [core] DeviceType `homething` removed due to crashes on Android (breaking)
 - [metadata] Removed `genres` from Album (breaking)
 - [metadata] Removed `genre` from Artists (breaking)
 

Cargo.lock

@@ -55,7 +55,7 @@ async fn create_basic_spirc() -> Result<(), Error> {
         session,
         credentials,
         player,
-        mixer(MixerConfig::default())
+        mixer(MixerConfig::default())?
     ).await?;
 
     Ok(())

connect/README.md

@@ -76,7 +76,9 @@ impl ResolveContext {
         // otherwise we might not even check if we need to fallback and just use the fallback uri
         match self.resolve {
             Resolve::Uri(ref uri) => ConnectState::valid_resolve_uri(uri),
-            Resolve::Context(ref ctx) => ConnectState::get_context_uri_from_context(ctx),
+            Resolve::Context(ref ctx) => {
+                ConnectState::find_valid_uri(ctx.uri.as_deref(), ctx.pages.first())
+            }
         }
         .or(self.fallback.as_deref())
     }
@@ -260,7 +262,7 @@ impl ContextResolver {
             ContextAction::Replace => {
                 let remaining = state.update_context(context, next.update);
                 if let Resolve::Context(ref ctx) = next.resolve {
-                    state.merge_context(Some(ctx.clone()));
+                    state.merge_context(ctx.pages.clone().pop());
                 }
 
                 remaining

connect/src/context_resolver.rs

@@ -5,9 +5,9 @@ use crate::{
 use std::ops::Deref;
 
 /// Request for loading playback
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct LoadRequest {
-    pub(super) context_uri: String,
+    pub(super) context: PlayContext,
     pub(super) options: LoadRequestOptions,
 }
 
@@ -19,8 +19,14 @@ impl Deref for LoadRequest {
     }
 }
 
+#[derive(Debug, Clone)]
+pub(super) enum PlayContext {
+    Uri(String),
+    Tracks(Vec<String>),
+}
+
 /// The parameters for creating a load request
-#[derive(Debug, Default)]
+#[derive(Debug, Default, Clone)]
 pub struct LoadRequestOptions {
     /// Whether the given tracks should immediately start playing, or just be initially loaded.
     pub start_playing: bool,
@@ -44,7 +50,7 @@ pub struct LoadRequestOptions {
 ///
 /// Separated into an `enum` to exclude the other variants from being used
 /// simultaneously, as they are not compatible.
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum LoadContextOptions {
     /// Starts the context with options
     Options(Options),
@@ -56,7 +62,7 @@ pub enum LoadContextOptions {
 }
 
 /// The available options that indicate how to start the context
-#[derive(Debug, Default)]
+#[derive(Debug, Default, Clone)]
 pub struct Options {
     /// Start the context in shuffle mode
     pub shuffle: bool,
@@ -80,16 +86,30 @@ impl LoadRequest {
     /// Create a load request from a `context_uri`
     ///
     /// For supported `context_uri` see [`SpClient::get_context`](librespot_core::spclient::SpClient::get_context)
+    ///
+    /// Equivalent to using [`/me/player/play`](https://developer.spotify.com/documentation/web-api/reference/start-a-users-playback)
+    /// and providing `context_uri`
     pub fn from_context_uri(context_uri: String, options: LoadRequestOptions) -> Self {
         Self {
-            context_uri,
+            context: PlayContext::Uri(context_uri),
+            options,
+        }
+    }
+
+    /// Create a load request from a set of `tracks`
+    ///
+    /// Equivalent to using [`/me/player/play`](https://developer.spotify.com/documentation/web-api/reference/start-a-users-playback)
+    /// and providing `uris`
+    pub fn from_tracks(tracks: Vec<String>, options: LoadRequestOptions) -> Self {
+        Self {
+            context: PlayContext::Tracks(tracks),
             options,
         }
     }
 }
 
 /// An item that represent a track to play
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum PlayingTrack {
     /// Represent the track at a given index.
     Index(u32),

connect/src/model.rs

@@ -55,7 +55,7 @@ impl<T> ShuffleVec<T> {
             self.unshuffle()
         }
 
-        let indices = {
+        let indices: Vec<_> = {
             (1..self.vec.len())
                 .rev()
                 .map(|i| rng.gen_range(0..i + 1))