Re-Add ability to handle/play tracks (#1468)

* re-add support to play a set of tracks

* connect: reduce some cloning

* connect: derive clone for LoadRequest

* apply review, improve function naming

* clippy fix

Author: photovoltex

connect/src/context_resolver.rs

@@ -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/model.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),