Sulkta-OSS/rustypipe
Archived
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: accept user-specific playlist ids (LL, WL)

Browse source
This commit is contained in:
ThetaDev 2025-01-05 03:56:38 +01:00
parent 9fa18acb04
commit 82be4a77bf
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/client/url_resolver.rs
View file

@ -260,7 +260,7 @@ impl RustyPipeQuery {
}) })
} else if util::CHANNEL_ID_REGEX.is_match(s) { } else if util::CHANNEL_ID_REGEX.is_match(s) {
Ok(UrlTarget::Channel { id: s.to_owned() }) Ok(UrlTarget::Channel { id: s.to_owned() })
} else if util::PLAYLIST_ID_REGEX.is_match(s) { } else if util::PLAYLIST_ID_REGEX.is_match(s) || util::USER_PLAYLIST_IDS.contains(&s) {
if resolve_albums && s.starts_with(util::PLAYLIST_ID_ALBUM_PREFIX) { if resolve_albums && s.starts_with(util::PLAYLIST_ID_ALBUM_PREFIX) {
self._navigation_resolve_url( self._navigation_resolve_url(
&format!("/playlist?list={s}"), &format!("/playlist?list={s}"),

2
src/util/mod.rs
View file

@ -43,6 +43,8 @@ pub const PLAYLIST_ID_ALBUM_PREFIX: &str = "OLAK";
pub const ARTIST_DISCOGRAPHY_PREFIX: &str = "MPAD"; pub const ARTIST_DISCOGRAPHY_PREFIX: &str = "MPAD";
pub const PODCAST_PLAYLIST_PREFIX: &str = "MPSP"; pub const PODCAST_PLAYLIST_PREFIX: &str = "MPSP";
pub const PODCAST_EPISODE_PREFIX: &str = "MPED"; pub const PODCAST_EPISODE_PREFIX: &str = "MPED";
/// Builtin user-specific playlists (Watch later, Liked videos, Liked tracks, Episodes for later)
pub static USER_PLAYLIST_IDS: [&str; 4] = ["WL", "LL", "LM", "SE"];
const CONTENT_PLAYBACK_NONCE_ALPHABET: &[u8; 64] = const CONTENT_PLAYBACK_NONCE_ALPHABET: &[u8; 64] =
b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"; b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";

3
src/validate.rs
View file

@ -71,8 +71,9 @@ pub fn channel_id<S: AsRef<str>>(channel_id: S) -> Result<(), Error> {
/// assert!(validate::playlist_id("Abcd").is_err()); /// assert!(validate::playlist_id("Abcd").is_err());
/// ``` /// ```
pub fn playlist_id<S: AsRef<str>>(playlist_id: S) -> Result<(), Error> { pub fn playlist_id<S: AsRef<str>>(playlist_id: S) -> Result<(), Error> {
let id = playlist_id.as_ref();
check( check(
util::PLAYLIST_ID_REGEX.is_match(playlist_id.as_ref()), util::PLAYLIST_ID_REGEX.is_match(id) || util::USER_PLAYLIST_IDS.contains(&id),
"invalid playlist id", "invalid playlist id",
) )
} }