Skip to content

Add Beatport metadata provider #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"cSpell.words": [
"Audiobook",
"Bandcamp",
"Beatport",
"brainz",
"Brainz",
"deezer",
Expand Down
2 changes: 1 addition & 1 deletion harmonizer/properties.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ export const immutableReleaseProperties = [
/** Track properties which have to be taken from one provider and can not be combined from data of multiple providers. */
export const immutableTrackProperties = [
'isrc',
'duration',
'length',
] as const;
4 changes: 2 additions & 2 deletions harmonizer/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ export type HarmonyTrack = {
title: string;
artists?: ArtistCredit;
number?: number | string;
/** Track duration in milliseconds. */
duration?: number;
/** Track length in milliseconds. */
length?: number;
isrc?: string;
availableIn?: CountryCode[];
};
Expand Down
2 changes: 1 addition & 1 deletion musicbrainz/seeding.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export function createReleaseSeed(release: HarmonyRelease, options: ReleaseSeedO
name: track.title,
artist_credit: convertArtistCredit(track.artists),
number: track.number?.toString(),
length: track.duration,
length: track.length,
})),
})),
language: release.language?.code,
Expand Down
2 changes: 1 addition & 1 deletion providers/Bandcamp/mod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ export class BandcampReleaseLookup extends ReleaseLookup<BandcampProvider, Album
number: 'track_num' in rawTrack ? rawTrack.track_num : rawTrack.tracknum + 1,
title: rawTrack.title,
artists: rawTrack.artist ? [this.makeArtistCreditName(rawTrack.artist)] : undefined,
duration: rawTrack.duration * 1000,
length: rawTrack.duration * 1000,
};
}

Expand Down
172 changes: 172 additions & 0 deletions providers/Beatport/json_types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
export interface BeatportNextData {
props: {
pageProps: {
dehydratedState: {
queries:
| Array<ScalarQueryResult<Release> | ArrayQueryResult<Track>>
| Array<ScalarQueryResult<SearchResult>>;
};
release?: Release;
};
};
}

export interface QueryResult {
queryHash: string;
queryKey: Array<string | Record<string, number>>;
}

export interface ScalarQueryResult<T> extends QueryResult {
state: {
data: T;
status: string;
};
}

export interface ArrayQueryResult<T> extends QueryResult {
state: {
data: {
next: string | null;
previous: string | null;
count: number;
page: string;
per_page: number;
results: Array<T>;
};
status: string;
};
}

export interface ReleaseSearchResult {
release_id: number;
upc: string;
}

export interface SearchResult {
releases: {
data: ReleaseSearchResult[];
};
}

export interface Entity {
id: number;
name: string;
}

export interface EntityWithUrl extends Entity {
url: string;
}

export interface Artist extends EntityWithUrl {
image: Image;
slug: string;
}

export interface Image {
id: number;
uri: string;
dynamic_uri: string;
}

export interface Label extends Entity {
image: Image;
slug: string;
}

export interface BpmRange {
min: number;
max: number;
}

export interface Price {
code: string;
symbol: string;
value: number;
display: string;
}

export interface MinimalRelease extends Entity {
image: Image;
label: Label;
slug: string;
}

export interface Release extends MinimalRelease {
artists: Artist[];
bpm_range: BpmRange;
catalog_number: string;
desc: string | null;
enabled: boolean;
encoded_date: string;
exclusive: boolean;
grid: null;
is_available_for_streaming: boolean;
is_hype: boolean;
new_release_date: string;
override_price: boolean;
pre_order: boolean;
pre_order_date: string | null;
price: Price;
price_override_firm: boolean;
publish_date: string;
remixers: Artist[];
tracks: string[];
track_count: number;
type: Entity;
upc: string;
updated: string;
}

export interface Genre extends EntityWithUrl {
slug: string;
}

export interface Key extends EntityWithUrl {
camelot_number: number;
camelot_letter: string;
chord_type: EntityWithUrl;
is_sharp: boolean;
is_flat: boolean;
letter: string;
}

export interface Track extends EntityWithUrl {
artists: Artist[];
publish_status: string;
available_worldwide: boolean;
bpm: number;
catalog_number: string;
current_status: EntityWithUrl;
encoded_date: string;
exclusive: boolean;
// @todo find tracks where this is not empty
free_downloads: [];
free_download_start_date: null;
free_download_end_date: null;
genre: Genre;
is_available_for_streaming: boolean;
is_hype: boolean;
isrc: string;
key: Key;
label_track_identifier: string;
length: string;
length_ms: number;
mix_name: string;
new_release_date: string;
pre_order: boolean;
price: Price;
publish_date: string;
release: MinimalRelease;
remixers: Artist[];
sale_type: EntityWithUrl;
sample_url: string;
sample_start_ms: number;
sample_end_ms: number;
slug: string;
// @todo find examples where this is set
sub_genre: null;
}

export interface BeatportRelease extends Release {
track_objects: Track[];
}
Loading