fix: generic str for resolve_string

src/client/url_resolver.rs

@@ -25,6 +25,9 @@ impl RustyPipeQuery {
     /// Note that the hostname of the URL is not checked, so this function also accepts URLs
     /// from alternative YouTube frontends like Piped or Invidious.
     ///
+    /// The `resolve_albums` flag enables resolving YTM album URLs (e.g.
+    /// `OLAK5uy_k0yFrZlFRgCf3rLPza-lkRmCrtLPbK9pE`) to their short album id (`MPREb_GyH43gCvdM5`).
+    ///
     /// # Examples
     /// ```
     /// # use rustypipe::client::RustyPipe;
@@ -196,6 +199,9 @@ impl RustyPipeQuery {
     /// Accepted input strings include YouTube URLs (see [`RustyPipeQuery::resolve_url`]),
     /// Video/Channel/Playlist/Album IDs and channel handles / vanity IDs.
     ///
+    /// The `resolve_albums` flag enables resolving YTM album URLs and IDs (e.g.
+    /// `OLAK5uy_k0yFrZlFRgCf3rLPza-lkRmCrtLPbK9pE`) to their short album id (`MPREb_GyH43gCvdM5`).
+    ///
     /// # Examples
     /// ```
     /// # use rustypipe::client::RustyPipe;
@@ -214,51 +220,47 @@ impl RustyPipeQuery {
     /// );
     /// # });
     /// ```
-    pub async fn resolve_string(
+    pub async fn resolve_string<S: AsRef<str>>(
         self,
-        string: &str,
+        s: S,
         resolve_albums: bool,
     ) -> Result<UrlTarget, Error> {
+        let s = s.as_ref();
+
         // URL with protocol
-        if string.starts_with("http://") || string.starts_with("https://") {
+        if s.starts_with("http://") || s.starts_with("https://") {
-            self.resolve_url(string, resolve_albums).await
+            self.resolve_url(s, resolve_albums).await
         }
         // URL without protocol
-        else if string.contains('/') && string.contains('.') {
+        else if s.contains('/') && s.contains('.') {
-            self.resolve_url(&format!("https://{string}"), resolve_albums)
+            self.resolve_url(&format!("https://{s}"), resolve_albums)
                 .await
         }
         // ID only
-        else if util::VIDEO_ID_REGEX.is_match(string) {
+        else if util::VIDEO_ID_REGEX.is_match(s) {
             Ok(UrlTarget::Video {
-                id: string.to_owned(),
+                id: s.to_owned(),
                 start_time: 0,
             })
-        } else if util::CHANNEL_ID_REGEX.is_match(string) {
+        } else if util::CHANNEL_ID_REGEX.is_match(s) {
-            Ok(UrlTarget::Channel {
+            Ok(UrlTarget::Channel { id: s.to_owned() })
-                id: string.to_owned(),
+        } else if util::PLAYLIST_ID_REGEX.is_match(s) {
-            })
+            if resolve_albums && s.starts_with(util::PLAYLIST_ID_ALBUM_PREFIX) {
-        } else if util::PLAYLIST_ID_REGEX.is_match(string) {
-            if resolve_albums && string.starts_with(util::PLAYLIST_ID_ALBUM_PREFIX) {
                 self._navigation_resolve_url(
-                    &format!("/playlist?list={string}"),
+                    &format!("/playlist?list={s}"),
                     ClientType::DesktopMusic,
                 )
                 .await
             } else {
-                Ok(UrlTarget::Playlist {
+                Ok(UrlTarget::Playlist { id: s.to_owned() })
-                    id: string.to_owned(),
-                })
             }
-        } else if util::ALBUM_ID_REGEX.is_match(string) {
+        } else if util::ALBUM_ID_REGEX.is_match(s) {
-            Ok(UrlTarget::Album {
+            Ok(UrlTarget::Album { id: s.to_owned() })
-                id: string.to_owned(),
-            })
         }
         // Channel name only
-        else if util::VANITY_PATH_REGEX.is_match(string) {
+        else if util::VANITY_PATH_REGEX.is_match(s) {
             self._navigation_resolve_url(
-                &format!("/{}", string.trim_start_matches('/')),
+                &format!("/{}", s.trim_start_matches('/')),
                 ClientType::Desktop,
             )
             .await

src/model/convert.rs

@@ -1,6 +1,7 @@
 use super::{
-    AlbumItem, ArtistItem, Channel, ChannelId, ChannelItem, ChannelTag, MusicItem,
+    AlbumItem, ArtistId, ArtistItem, Channel, ChannelId, ChannelItem, ChannelTag, MusicArtist,
-    MusicPlaylistItem, PlaylistItem, TrackItem, VideoItem, YouTubeItem,
+    MusicItem, MusicPlaylistItem, PlaylistItem, PlaylistVideo, TrackItem, VideoId, VideoItem,
+    YouTubeItem,
 };
 
 /// Trait for casting generic YouTube/YouTube music items to a specific kind.
@@ -125,3 +126,53 @@ impl<T> From<Channel<T>> for ChannelId {
         }
     }
 }
+
+impl From<MusicArtist> for ChannelId {
+    fn from(artist: MusicArtist) -> Self {
+        Self {
+            id: artist.id,
+            name: artist.name,
+        }
+    }
+}
+
+impl TryFrom<ArtistId> for ChannelId {
+    type Error = ();
+
+    fn try_from(artist: ArtistId) -> Result<Self, Self::Error> {
+        match artist.id {
+            Some(id) => Ok(Self {
+                id,
+                name: artist.name,
+            }),
+            None => Err(()),
+        }
+    }
+}
+
+impl From<VideoItem> for VideoId {
+    fn from(video: VideoItem) -> Self {
+        Self {
+            id: video.id,
+            name: video.name,
+        }
+    }
+}
+
+impl From<PlaylistVideo> for VideoId {
+    fn from(video: PlaylistVideo) -> Self {
+        Self {
+            id: video.id,
+            name: video.name,
+        }
+    }
+}
+
+impl From<TrackItem> for VideoId {
+    fn from(track: TrackItem) -> Self {
+        Self {
+            id: track.id,
+            name: track.name,
+        }
+    }
+}

src/model/mod.rs

@@ -893,6 +893,16 @@ pub struct PlaylistItem {
     pub video_count: Option<u64>,
 }
 
+/// YouTube video identifier
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[non_exhaustive]
+pub struct VideoId {
+    /// Video ID
+    pub id: String,
+    /// Video title
+    pub name: String,
+}
+
 /*
 #MUSIC
 */