github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'dev' into more_metadata

Browse source
This commit is contained in:
Roderick van Domburg 2022-08-01 11:29:52 +02:00 committed by GitHub
commit 9f0185eb42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/test.yml vendored
View file

@ -3,7 +3,7 @@ name: test
on: on:
push: push:
branches: [dev, master, new-api] branches: [dev, master]
paths: paths:
[ [
"**.rs", "**.rs",

4
metadata/src/album.rs
View file

@ -41,7 +41,7 @@ pub struct Album {
pub availability: Availabilities, pub availability: Availabilities,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct Albums(pub Vec<SpotifyId>); pub struct Albums(pub Vec<SpotifyId>);
impl Deref for Albums { impl Deref for Albums {
@ -58,7 +58,7 @@ pub struct Disc {
pub tracks: Tracks, pub tracks: Tracks,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct Discs(pub Vec<Disc>); pub struct Discs(pub Vec<Disc>);
impl Deref for Discs { impl Deref for Discs {

6
metadata/src/artist.rs
View file

@ -20,7 +20,7 @@ pub struct Artist {
pub top_tracks: CountryTopTracks, pub top_tracks: CountryTopTracks,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct Artists(pub Vec<Artist>); pub struct Artists(pub Vec<Artist>);
impl Deref for Artists { impl Deref for Artists {
@ -37,7 +37,7 @@ pub struct ArtistWithRole {
pub role: ArtistRole, pub role: ArtistRole,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct ArtistsWithRole(pub Vec<ArtistWithRole>); pub struct ArtistsWithRole(pub Vec<ArtistWithRole>);
impl Deref for ArtistsWithRole { impl Deref for ArtistsWithRole {
@ -53,7 +53,7 @@ pub struct TopTracks {
pub tracks: Tracks, pub tracks: Tracks,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct CountryTopTracks(pub Vec<TopTracks>); pub struct CountryTopTracks(pub Vec<TopTracks>);
impl Deref for CountryTopTracks { impl Deref for CountryTopTracks {

2
metadata/src/audio/file.rs
View file

@ -6,7 +6,7 @@ use librespot_protocol as protocol;
use protocol::metadata::AudioFile as AudioFileMessage; use protocol::metadata::AudioFile as AudioFileMessage;
pub use protocol::metadata::AudioFile_Format as AudioFileFormat; pub use protocol::metadata::AudioFile_Format as AudioFileFormat;
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct AudioFiles(pub HashMap<AudioFileFormat, FileId>); pub struct AudioFiles(pub HashMap<AudioFileFormat, FileId>);
impl Deref for AudioFiles { impl Deref for AudioFiles {

2
metadata/src/availability.rs
View file

@ -21,7 +21,7 @@ pub struct Availability {
pub start: Date, pub start: Date,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct Availabilities(pub Vec<Availability>); pub struct Availabilities(pub Vec<Availability>);
impl Deref for Availabilities { impl Deref for Availabilities {

2
metadata/src/content_rating.rs
View file

@ -11,7 +11,7 @@ pub struct ContentRating {
pub tags: Vec<String>, pub tags: Vec<String>,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct ContentRatings(pub Vec<ContentRating>); pub struct ContentRatings(pub Vec<ContentRating>);
impl Deref for ContentRatings { impl Deref for ContentRatings {

2
metadata/src/copyright.rs
View file

@ -12,7 +12,7 @@ pub struct Copyright {
pub text: String, pub text: String,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct Copyrights(pub Vec<Copyright>); pub struct Copyrights(pub Vec<Copyright>);
impl Deref for Copyrights { impl Deref for Copyrights {

2
metadata/src/episode.rs
View file

@ -52,7 +52,7 @@ pub struct Episode {
pub is_audiobook_chapter: bool, pub is_audiobook_chapter: bool,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct Episodes(pub Vec<SpotifyId>); pub struct Episodes(pub Vec<SpotifyId>);
impl Deref for Episodes { impl Deref for Episodes {

2
metadata/src/external_id.rs
View file

@ -11,7 +11,7 @@ pub struct ExternalId {
pub id: String, // this can be anything from a URL to a ISRC, EAN or UPC pub id: String, // this can be anything from a URL to a ISRC, EAN or UPC
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct ExternalIds(pub Vec<ExternalId>); pub struct ExternalIds(pub Vec<ExternalId>);
impl Deref for ExternalIds { impl Deref for ExternalIds {

4
metadata/src/image.rs
View file

@ -22,7 +22,7 @@ pub struct Image {
pub height: i32, pub height: i32,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct Images(pub Vec<Image>); pub struct Images(pub Vec<Image>);
impl Deref for Images { impl Deref for Images {
@ -38,7 +38,7 @@ pub struct PictureSize {
pub url: String, pub url: String,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct PictureSizes(pub Vec<PictureSize>); pub struct PictureSizes(pub Vec<PictureSize>);
impl Deref for PictureSizes { impl Deref for PictureSizes {

6
metadata/src/playlist/attribute.rs
View file

@ -34,7 +34,7 @@ pub struct PlaylistAttributes {
pub picture_sizes: PictureSizes, pub picture_sizes: PictureSizes,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct PlaylistAttributeKinds(pub Vec<PlaylistAttributeKind>); pub struct PlaylistAttributeKinds(pub Vec<PlaylistAttributeKind>);
impl Deref for PlaylistAttributeKinds { impl Deref for PlaylistAttributeKinds {
@ -46,7 +46,7 @@ impl Deref for PlaylistAttributeKinds {
from_repeated_enum!(PlaylistAttributeKind, PlaylistAttributeKinds); from_repeated_enum!(PlaylistAttributeKind, PlaylistAttributeKinds);
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct PlaylistFormatAttribute(pub HashMap<String, String>); pub struct PlaylistFormatAttribute(pub HashMap<String, String>);
impl Deref for PlaylistFormatAttribute { impl Deref for PlaylistFormatAttribute {
@ -66,7 +66,7 @@ pub struct PlaylistItemAttributes {
pub item_id: Vec<u8>, pub item_id: Vec<u8>,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct PlaylistItemAttributeKinds(pub Vec<PlaylistItemAttributeKind>); pub struct PlaylistItemAttributeKinds(pub Vec<PlaylistItemAttributeKind>);
impl Deref for PlaylistItemAttributeKinds { impl Deref for PlaylistItemAttributeKinds {

4
metadata/src/playlist/item.rs
View file

@ -24,7 +24,7 @@ pub struct PlaylistItem {
pub attributes: PlaylistItemAttributes, pub attributes: PlaylistItemAttributes,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct PlaylistItems(pub Vec<PlaylistItem>); pub struct PlaylistItems(pub Vec<PlaylistItem>);
impl Deref for PlaylistItems { impl Deref for PlaylistItems {
@ -53,7 +53,7 @@ pub struct PlaylistMetaItem {
pub capabilities: Capabilities, pub capabilities: Capabilities,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct PlaylistMetaItems(pub Vec<PlaylistMetaItem>); pub struct PlaylistMetaItems(pub Vec<PlaylistMetaItem>);
impl Deref for PlaylistMetaItems { impl Deref for PlaylistMetaItems {

4
metadata/src/playlist/list.rs
View file

@ -26,7 +26,7 @@ use librespot_core::{
use librespot_protocol as protocol; use librespot_protocol as protocol;
use protocol::playlist4_external::GeoblockBlockingType as Geoblock; use protocol::playlist4_external::GeoblockBlockingType as Geoblock;
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct Geoblocks(Vec<Geoblock>); pub struct Geoblocks(Vec<Geoblock>);
impl Deref for Geoblocks { impl Deref for Geoblocks {
@ -55,7 +55,7 @@ pub struct Playlist {
pub geoblocks: Geoblocks, pub geoblocks: Geoblocks,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct Playlists(pub Vec<SpotifyId>); pub struct Playlists(pub Vec<SpotifyId>);
impl Deref for Playlists { impl Deref for Playlists {

2
metadata/src/playlist/operation.rs
View file

@ -29,7 +29,7 @@ pub struct PlaylistOperation {
pub update_list_attributes: PlaylistUpdateAttributes, pub update_list_attributes: PlaylistUpdateAttributes,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct PlaylistOperations(pub Vec<PlaylistOperation>); pub struct PlaylistOperations(pub Vec<PlaylistOperation>);
impl Deref for PlaylistOperations { impl Deref for PlaylistOperations {

2
metadata/src/playlist/permission.rs
View file

@ -16,7 +16,7 @@ pub struct Capabilities {
pub can_cancel_membership: bool, pub can_cancel_membership: bool,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct PermissionLevels(pub Vec<PermissionLevel>); pub struct PermissionLevels(pub Vec<PermissionLevel>);
impl Deref for PermissionLevels { impl Deref for PermissionLevels {

2
metadata/src/restriction.rs
View file

@ -17,7 +17,7 @@ pub struct Restriction {
pub countries_forbidden: Option<Vec<String>>, pub countries_forbidden: Option<Vec<String>>,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct Restrictions(pub Vec<Restriction>); pub struct Restrictions(pub Vec<Restriction>);
impl Deref for Restrictions { impl Deref for Restrictions {

2
metadata/src/sale_period.rs
View file

@ -18,7 +18,7 @@ pub struct SalePeriod {
pub end: Date, pub end: Date,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct SalePeriods(pub Vec<SalePeriod>); pub struct SalePeriods(pub Vec<SalePeriod>);
impl Deref for SalePeriods { impl Deref for SalePeriods {

2
metadata/src/track.rs
View file

@ -53,7 +53,7 @@ pub struct Track {
pub artists_with_role: ArtistsWithRole, pub artists_with_role: ArtistsWithRole,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct Tracks(pub Vec<SpotifyId>); pub struct Tracks(pub Vec<SpotifyId>);
impl Deref for Tracks { impl Deref for Tracks {

2
metadata/src/video.rs
View file

@ -7,7 +7,7 @@ use librespot_core::FileId;
use librespot_protocol as protocol; use librespot_protocol as protocol;
use protocol::metadata::VideoFile as VideoFileMessage; use protocol::metadata::VideoFile as VideoFileMessage;
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct VideoFiles(pub Vec<FileId>); pub struct VideoFiles(pub Vec<FileId>);
impl Deref for VideoFiles { impl Deref for VideoFiles {