ThetaDev/bandcamp
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Compare commits

base: ThetaDev:f328062ed0fdd8565df5d5f4c5178605532af416
Branches Tags
ThetaDev:main
ThetaDev:v0.3.2
..
compare: ThetaDev:60082fda8c6239ea889688d30e728d9dfc59cd87
Branches Tags
ThetaDev:main
ThetaDev:v0.3.2

No commits in common. "f328062ed0fdd8565df5d5f4c5178605532af416" and "60082fda8c6239ea889688d30e728d9dfc59cd87" have entirely different histories.
f328062ed0 ... 60082fda8c

7 changed files with 163 additions and 157 deletions
Show stats Expand all files Collapse all files

2
Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "bandcamp"
version = "0.3.1"
version = "0.2.0"
edition = "2021"
authors = ["ThetaDev <thetadev@magenta.de>"]
license = "MIT"

22
src/models.rs
View file

@ -3,7 +3,7 @@
use std::collections::BTreeMap;
use serde::{Deserialize, Serialize};
use serde_with::{serde_as, DefaultOnNull, NoneAsEmptyString, VecSkipError};
use serde_with::{serde_as, NoneAsEmptyString, VecSkipError};
use time::OffsetDateTime;
use crate::util;
@ -78,7 +78,6 @@ pub struct Album {
pub release_date: OffsetDateTime,
/// List of album tags (genres and locations)
#[serde(default)]
#[serde_as(deserialize_as = "DefaultOnNull")]
pub tags: Vec<Tag>,
/// List of album tracks
pub tracks: Vec<Track>,
@ -93,11 +92,14 @@ pub struct Track {
pub track_id: u64,
/// Track title
pub title: String,
/// Track album ID
///
/// Is None for single tracks
pub album_id: Option<u64>,
/// Track artist name (may differ from band name)
/// Numeric album id
pub album_id: u64,
/// Album title
#[serde_as(deserialize_as = "NoneAsEmptyString")]
pub album_title: Option<String>,
/// Numeric band id
pub band_id: u64,
/// Band name
#[serde_as(deserialize_as = "NoneAsEmptyString")]
pub band_name: Option<String>,
/// Duration in seconds
@ -110,10 +112,9 @@ pub struct Track {
///
/// `mp3-128` => `https://bandcamp.com/stream_redirect?enc=mp3-128&track_id=4173325157&ts=1686871135&t=a1f7904205e6caca970009ca6744ef0b512f353a`
#[serde(default)]
#[serde_as(deserialize_as = "DefaultOnNull")]
pub streaming_url: BTreeMap<String, String>,
/// Album track number
pub track_num: Option<u16>,
pub track_num: u16,
}
/// Discograph (album or track)
@ -244,7 +245,6 @@ pub struct SearchBand {
pub location: Option<String>,
/// List of tag names associated with the
#[serde(default)]
#[serde_as(deserialize_as = "DefaultOnNull")]
pub tag_names: Vec<String>,
/// Bandcamp URL
///
@ -314,7 +314,6 @@ pub struct FeedStories {
}
/// Bandcamp feed item
#[serde_as]
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[non_exhaustive]
pub struct FeedItem {
@ -358,7 +357,6 @@ pub struct FeedItem {
pub num_streamable_tracks: u16,
/// List of tags
#[serde(default)]
#[serde_as(deserialize_as = "DefaultOnNull")]
pub tags: Vec<Tag>,
}

54
tests/snapshots/tests__album1.snap
View file

@ -71,83 +71,101 @@ Album(
Track(
track_id: 2221991469,
title: "Sommarfågel",
album_id: Some(2572654767),
album_id: 2572654767,
album_title: None,
band_id: 2464198920,
band_name: Some("Wintergatan"),
duration: 232.642,
streaming_url: "[streaming_url]",
track_num: Some(1),
track_num: 1,
),
Track(
track_id: 1593213040,
title: "The Rocket",
album_id: Some(2572654767),
album_id: 2572654767,
album_title: None,
band_id: 2464198920,
band_name: Some("Wintergatan"),
duration: 211.491,
streaming_url: "[streaming_url]",
track_num: Some(2),
track_num: 2,
),
Track(
track_id: 2806652396,
title: "Valentine",
album_id: Some(2572654767),
album_id: 2572654767,
album_title: None,
band_id: 2464198920,
band_name: Some("Wintergatan"),
duration: 238.538,
streaming_url: "[streaming_url]",
track_num: Some(3),
track_num: 3,
),
Track(
track_id: 4173325157,
title: "Slottskogen Disc Golf Club",
album_id: Some(2572654767),
album_id: 2572654767,
album_title: None,
band_id: 2464198920,
band_name: Some("Wintergatan"),
duration: 212.65,
streaming_url: "[streaming_url]",
track_num: Some(4),
track_num: 4,
),
Track(
track_id: 3038199534,
title: "Biking Is Better",
album_id: Some(2572654767),
album_id: 2572654767,
album_title: None,
band_id: 2464198920,
band_name: Some("Wintergatan"),
duration: 208.27,
streaming_url: "[streaming_url]",
track_num: Some(5),
track_num: 5,
),
Track(
track_id: 3487050701,
title: "Västanberg",
album_id: Some(2572654767),
album_id: 2572654767,
album_title: None,
band_id: 2464198920,
band_name: Some("Wintergatan"),
duration: 265.692,
streaming_url: "[streaming_url]",
track_num: Some(6),
track_num: 6,
),
Track(
track_id: 1604303190,
title: "Starmachine2000",
album_id: Some(2572654767),
album_id: 2572654767,
album_title: None,
band_id: 2464198920,
band_name: Some("Wintergatan"),
duration: 243.139,
streaming_url: "[streaming_url]",
track_num: Some(7),
track_num: 7,
),
Track(
track_id: 716010980,
title: "All Was Well",
album_id: Some(2572654767),
album_id: 2572654767,
album_title: None,
band_id: 2464198920,
band_name: Some("Wintergatan"),
duration: 183.224,
streaming_url: "[streaming_url]",
track_num: Some(8),
track_num: 8,
),
Track(
track_id: 2322125757,
title: "Paradis",
album_id: Some(2572654767),
album_id: 2572654767,
album_title: None,
band_id: 2464198920,
band_name: Some("Wintergatan"),
duration: 850.6,
streaming_url: "[streaming_url]",
track_num: Some(9),
track_num: 9,
),
],
)

168
tests/snapshots/tests__album2.snap
View file

@ -76,254 +76,310 @@ Album(
Track(
track_id: 3886649117,
title: "Skyjacks",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 263.262,
streaming_url: "[streaming_url]",
track_num: Some(1),
track_num: 1,
),
Track(
track_id: 3353751902,
title: "Bound for the Cutting Stone",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 126.905,
streaming_url: "[streaming_url]",
track_num: Some(2),
track_num: 2,
),
Track(
track_id: 814453490,
title: "Harmony",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 109.548,
streaming_url: "[streaming_url]",
track_num: Some(3),
track_num: 3,
),
Track(
track_id: 3751525198,
title: "Lighthouse",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 187.492,
streaming_url: "[streaming_url]",
track_num: Some(4),
track_num: 4,
),
Track(
track_id: 461427875,
title: "Dark Magic",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 67.5178,
streaming_url: "[streaming_url]",
track_num: Some(5),
track_num: 5,
),
Track(
track_id: 694400627,
title: "Way Hay Ho",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 179.318,
streaming_url: "[streaming_url]",
track_num: Some(6),
track_num: 6,
),
Track(
track_id: 1856437095,
title: "Toast the Axel",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 101.507,
streaming_url: "[streaming_url]",
track_num: Some(7),
track_num: 7,
),
Track(
track_id: 1961563423,
title: "Ring the Bell",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 113.478,
streaming_url: "[streaming_url]",
track_num: Some(8),
track_num: 8,
),
Track(
track_id: 405906043,
title: "Call of the Sky",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 201.026,
streaming_url: "[streaming_url]",
track_num: Some(9),
track_num: 9,
),
Track(
track_id: 3751492440,
title: "Johnny Forgot His Square Knot",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 58.7233,
streaming_url: "[streaming_url]",
track_num: Some(10),
track_num: 10,
),
Track(
track_id: 3046284392,
title: "Dance",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 48.9229,
streaming_url: "[streaming_url]",
track_num: Some(11),
track_num: 11,
),
Track(
track_id: 1075587078,
title: "Skyjacks (Instrumental)",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 263.348,
streaming_url: "[streaming_url]",
track_num: Some(12),
track_num: 12,
),
Track(
track_id: 3865632006,
title: "Bound for the Cutting Stone (Instrumental)",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 125.76,
streaming_url: "[streaming_url]",
track_num: Some(13),
track_num: 13,
),
Track(
track_id: 951718157,
title: "Lighthouse (Instrumental)",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 187.492,
streaming_url: "[streaming_url]",
track_num: Some(14),
track_num: 14,
),
Track(
track_id: 1384316860,
title: "Way Hay Ho (Instrumental)",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 179.318,
streaming_url: "[streaming_url]",
track_num: Some(15),
track_num: 15,
),
Track(
track_id: 1215251403,
title: "Toast the Axel (Instrumental)",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 101.507,
streaming_url: "[streaming_url]",
track_num: Some(16),
track_num: 16,
),
Track(
track_id: 1871038324,
title: "Ring the Bell (Instrumental)",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 111.769,
streaming_url: "[streaming_url]",
track_num: Some(17),
track_num: 17,
),
Track(
track_id: 2289302029,
title: "Call of the Sky (Instrumental)",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 201.026,
streaming_url: "[streaming_url]",
track_num: Some(18),
track_num: 18,
),
Track(
track_id: 1290369552,
title: "Way Hay Ho (Show Cut)",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 129.01,
streaming_url: "[streaming_url]",
track_num: Some(19),
track_num: 19,
),
Track(
track_id: 1453689011,
title: "Call of the Sky (Acoustic)",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 196.0,
streaming_url: "[streaming_url]",
track_num: Some(20),
track_num: 20,
),
Track(
track_id: 3921099822,
title: "Lighthouse (Cabin Cut)",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 113.751,
streaming_url: "[streaming_url]",
track_num: Some(21),
track_num: 21,
),
Track(
track_id: 2006464954,
title: "Otto Van Von Veen",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 128.545,
streaming_url: "[streaming_url]",
track_num: Some(22),
track_num: 22,
),
Track(
track_id: 3157042890,
title: "Lighthouse (Duet)",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 166.898,
streaming_url: "[streaming_url]",
track_num: Some(23),
track_num: 23,
),
Track(
track_id: 3031409543,
title: "Call of the Sky (Fan Edition)",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 201.143,
streaming_url: "[streaming_url]",
track_num: Some(24),
track_num: 24,
),
Track(
track_id: 3451672807,
title: "Call of the Sky 2: The Sequel to Call of the Sky (Instrumental)",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 78.7156,
streaming_url: "[streaming_url]",
track_num: Some(25),
track_num: 25,
),
Track(
track_id: 2232966671,
title: "Skyjacks: Call of the Sky Behind the Music Part 1",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 1957.24,
streaming_url: "[streaming_url]",
track_num: Some(26),
track_num: 26,
),
Track(
track_id: 3477530801,
title: "Skyjacks: Call of the Sky Behind the Music Part 2",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 3668.83,
streaming_url: "[streaming_url]",
track_num: Some(27),
track_num: 27,
),
Track(
track_id: 3005668857,
title: "Skyjacks: Call of the Sky Behind the Music Part 3",
album_id: Some(1493086082),
album_id: 1493086082,
album_title: None,
band_id: 3760769193,
band_name: Some("Arne Parrott"),
duration: 3876.74,
streaming_url: "[streaming_url]",
track_num: Some(28),
track_num: 28,
),
],
)

6
tests/snapshots/tests__album_track.snap
View file

@ -31,11 +31,13 @@ Album(
Track(
track_id: 716010980,
title: "All Was Well",
album_id: Some(2572654767),
album_id: 2572654767,
album_title: None,
band_id: 2464198920,
band_name: Some("Wintergatan"),
duration: 183.224,
streaming_url: "[streaming_url]",
track_num: Some(8),
track_num: 8,
),
],
)

56
tests/snapshots/tests__album_track2.snap
View file

@ -1,56 +0,0 @@
---
source: tests/tests.rs
expression: "&album"
---
Album(
id: 3835153004,
title: "Test Me",
art_id: Some(269941427),
type: t,
tralbum_artist: "Cydnee with a C",
band: BandInfo(
band_id: 3453236550,
name: "Cydnee with a C",
bio: None,
image_id: Some(30619318),
location: Some("Los Angeles, California"),
),
bandcamp_url: "https://cydneewithac.bandcamp.com/track/test-me",
credits: Some("Cydnee Jazmere Butler \nJackson Renauld"),
about: None,
featured_track_id: 3835153004,
release_date: 1654905600,
tags: [
Tag(
name: "R&B/Soul",
norm_name: "r-b-soul",
isloc: false,
),
Tag(
name: "drum and bass",
norm_name: "drum-and-bass",
isloc: false,
),
Tag(
name: "k-pop",
norm_name: "k-pop",
isloc: false,
),
Tag(
name: "Los Angeles",
norm_name: "los-angeles",
isloc: true,
),
],
tracks: [
Track(
track_id: 3835153004,
title: "Test Me",
album_id: None,
band_name: Some("Cydnee with a C"),
duration: 106.667,
streaming_url: "[streaming_url]",
track_num: None,
),
],
)

12
tests/tests.rs
View file

@ -81,18 +81,6 @@ async fn album_track() {
check_image(&album.img_url().unwrap()).await;
}
#[tokio::test]
async fn album_track2() {
let bc = Bandcamp::new();
let album = bc.album_uid("3453236550t3835153004").await.unwrap();
insta::assert_ron_snapshot!(&album, {
".tracks[].streaming_url" => "[streaming_url]"
});
check_stream_urls(&album.tracks);
check_image(&album.img_url().unwrap()).await;
}
#[tokio::test]
async fn search() {
let bc = Bandcamp::new();