fix: add page_index to SkipTo and handle it

Author: photovoltex

connect/src/model.rs

@@ -1,5 +1,6 @@
 use crate::{
-    core::dealer::protocol::SkipTo, protocol::context_player_options::ContextPlayerOptionOverrides,
+    core::dealer::protocol::SkipTo,
+    protocol::{context_page::ContextPage, context_player_options::ContextPlayerOptionOverrides},
 };
 
 use std::ops::Deref;
@@ -129,22 +130,33 @@ pub enum PlayingTrack {
     Uid(String),
 }
 
-impl TryFrom<SkipTo> for PlayingTrack {
-    type Error = ();
-
-    fn try_from(value: SkipTo) -> Result<Self, Self::Error> {
+impl PlayingTrack {
+    pub(crate) fn from_skip_to(value: SkipTo, pages: &[ContextPage]) -> Result<Self, ()> {
         // order of checks is important, as the index can be 0, but still has an uid or uri provided,
         // so we only use the index as last resort
         if let Some(uri) = value.track_uri {
             Ok(PlayingTrack::Uri(uri))
         } else if let Some(uid) = value.track_uid {
             Ok(PlayingTrack::Uid(uid))
-        } else if let Some(index) = value.track_index {
-            Ok(PlayingTrack::Index(index))
+        } else if value.track_index.is_some() || value.page_index.is_some() {
+            Ok(PlayingTrack::Index(
+                PlayingTrack::from_index(&value, pages) as u32
+            ))
         } else {
             Err(())
         }
     }
+
+    pub(crate) fn from_index(value: &SkipTo, pages: &[ContextPage]) -> usize {
+        let page_index = value.track_index.unwrap_or_default() as usize;
+        let track_index = value.page_index.unwrap_or_default() as usize;
+
+        (0..page_index).fold(track_index, |t, p| {
+            let page_size = pages.get(p).map(|p| p.tracks.len()).unwrap_or_default();
+
+            t + page_size
+        })
+    }
 }
 
 #[derive(Debug)]

connect/src/spirc.rs

@@ -1002,16 +1002,17 @@ impl SpircTask {
                     .options
                     .skip_to
                     .as_ref()
-                    .and_then(|s| s.track_index)
-                    .map(|i| i as usize);
+                    .map(|skip| PlayingTrack::from_index(skip, &play.context.pages));
 
                 self.handle_load(
                     LoadRequest {
                         context,
                         options: LoadRequestOptions {
                             start_playing: true,
                             seek_to: play.options.seek_to.unwrap_or_default(),
-                            playing_track: play.options.skip_to.and_then(|s| s.try_into().ok()),
+                            playing_track: play.options.skip_to.and_then(|s| {
+                                PlayingTrack::from_skip_to(s, &play.context.pages).ok()
+                            }),
                             context_options,
                         },
                     },

core/src/dealer/protocol/request.rs

@@ -200,6 +200,7 @@ pub struct OptionsOptions {
 pub struct SkipTo {
     pub track_uid: Option<String>,
     pub track_uri: Option<String>,
+    pub page_index: Option<u32>,
     pub track_index: Option<u32>,
 }