Skip to content
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
4 changes: 2 additions & 2 deletions harmonizer/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { EntityType } from '@kellnerd/musicbrainz';
import type { ReleasePackaging, ReleaseStatus } from '@kellnerd/musicbrainz/data/release';
import type { ReleaseGroupType } from '@kellnerd/musicbrainz/data/release-group';
export type { ReleaseGroupType } from '@kellnerd/musicbrainz/data/release-group';
import type { PartialDate } from '../utils/date.ts';
import type { ReleaseDate } from '../utils/date.ts';
import type { ScriptFrequency } from '../utils/script.ts';

/** MusicBrainz entity types which Harmony supports. */
Expand Down Expand Up @@ -52,7 +52,7 @@ export type HarmonyRelease = {
script?: ScriptFrequency;
status?: ReleaseStatus;
types?: ReleaseGroupType[];
releaseDate?: PartialDate;
releaseDate?: ReleaseDate;
labels?: Label[];
packaging?: ReleasePackaging;
images?: Artwork[];
Expand Down
2 changes: 1 addition & 1 deletion musicbrainz/seeding.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export function createReleaseSeed(release: HarmonyRelease, options: ReleaseSeedO
release_group: release.releaseGroup?.mbid,
barcode: release.gtin?.toString(),
events: countries.map<ReleaseEventSeed>((country) => ({
date: release.releaseDate,
date: release.releaseDate?.date,
country,
})),
labels: release.labels?.map<ReleaseLabelSeed>((label) => ({
Expand Down
81 changes: 54 additions & 27 deletions providers/Bandcamp/__snapshots__/mod.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,12 @@ suika.love",
],
packaging: "None",
releaseDate: {
day: 17,
month: 7,
year: 2019,
date: {
day: 17,
month: 7,
year: 2019,
},
quality: "assumed-valid",
},
status: "Official",
title: "and it was a burned into my mind! yet i faltered like a broken record",
Expand Down Expand Up @@ -220,9 +223,12 @@ snapshot[`Bandcamp provider > release lookup > subscriber-only release 1`] = `
],
packaging: "None",
releaseDate: {
day: 30,
month: 4,
year: 2025,
date: {
day: 30,
month: 4,
year: 2025,
},
quality: "assumed-valid",
},
status: "Official",
title: "Des papiers II",
Expand Down Expand Up @@ -320,9 +326,12 @@ All the things, Steve. Cover model: Flapjack.",
],
packaging: "None",
releaseDate: {
day: 4,
month: 7,
year: 2025,
date: {
day: 4,
month: 7,
year: 2025,
},
quality: "assumed-valid",
},
status: "Official",
title: "Ambiguous Hands",
Expand Down Expand Up @@ -416,9 +425,12 @@ Artwork by David Rundlöf",
],
packaging: "None",
releaseDate: {
day: 27,
month: 9,
year: 2024,
date: {
day: 27,
month: 9,
year: 2024,
},
quality: "assumed-valid",
},
status: "Official",
title: "Mr. Florida '81",
Expand Down Expand Up @@ -605,9 +617,12 @@ snapshot[`Bandcamp provider > release lookup > release with name your price (non
],
packaging: "None",
releaseDate: {
day: 7,
month: 4,
year: 2023,
date: {
day: 7,
month: 4,
year: 2023,
},
quality: "assumed-valid",
},
status: "Official",
title: "demo",
Expand Down Expand Up @@ -776,9 +791,12 @@ snapshot[`Bandcamp provider > release lookup > release with name your price (non
],
packaging: "None",
releaseDate: {
day: 8,
month: 9,
year: 2013,
date: {
day: 8,
month: 9,
year: 2013,
},
quality: "assumed-valid",
},
status: "Official",
title: "Ambient Energy (Name your price)",
Expand Down Expand Up @@ -918,9 +936,12 @@ snapshot[`Bandcamp provider > release lookup > release with some download only t
],
packaging: "None",
releaseDate: {
day: 22,
month: 9,
year: 2023,
date: {
day: 22,
month: 9,
year: 2023,
},
quality: "assumed-valid",
},
status: "Official",
title: "Futon Feels",
Expand Down Expand Up @@ -1112,9 +1133,12 @@ snapshot[`Bandcamp provider > release lookup > release with a hidden track 1`] =
],
packaging: "None",
releaseDate: {
day: 12,
month: 5,
year: 2022,
date: {
day: 12,
month: 5,
year: 2022,
},
quality: "assumed-valid",
},
status: "Official",
title: "Do You Like Acid EP",
Expand Down Expand Up @@ -1424,9 +1448,12 @@ LM005",
],
packaging: "None",
releaseDate: {
day: 26,
month: 9,
year: 2025,
date: {
day: 26,
month: 9,
year: 2025,
},
quality: "assumed-valid",
},
status: "Official",
title: "Bear Creek",
Expand Down
14 changes: 11 additions & 3 deletions providers/Bandcamp/mod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type {
} from '@/harmonizer/types.ts';
import { type CacheEntry, MetadataProvider, ReleaseLookup } from '@/providers/base.ts';
import { DurationPrecision, FeatureQuality, FeatureQualityMap } from '@/providers/features.ts';
import { parseISODateTime, PartialDate } from '@/utils/date.ts';
import { parseISODateTime, PartialDate, type ReleaseDate } from '@/utils/date.ts';
import { ProviderError, ResponseError } from '@/utils/errors.ts';
import { extractDataAttribute, extractMetadataTag, extractTextFromHtml } from '@/utils/html.ts';
import { plural, pluralWithCount } from '@/utils/plural.ts';
Expand Down Expand Up @@ -436,7 +436,7 @@ export class BandcampReleaseLookup extends ReleaseLookup<BandcampProvider, Relea
};
}

getReleaseDate(current: AlbumCurrent | TrackCurrent): PartialDate | undefined {
getReleaseDate(current: AlbumCurrent | TrackCurrent): ReleaseDate | undefined {
let date = current.release_date ? parseISODateTime(current.release_date) : undefined;

// Use publish date if release date is before Bandcamp launch (2008-09)
Expand All @@ -445,9 +445,17 @@ export class BandcampReleaseLookup extends ReleaseLookup<BandcampProvider, Relea
!date?.year || date.year < launchDate.year! || (date.year === launchDate.year && date.month! < launchDate.month!)
) {
date = current.publish_date ? parseISODateTime(current.publish_date) : undefined;
return {
date,
quality: date === undefined ? 'none-found' : 'assumed-valid',
note: 'Release predates platform launch. Using publish date instead.',
};
}

return date;
return {
date,
quality: date === undefined ? 'none-found' : 'assumed-valid',
};
}

async getEmbeddedPlayerRelease(albumId: number): Promise<PlayerData> {
Expand Down
2 changes: 1 addition & 1 deletion providers/Beatport/mod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ export class BeatportReleaseLookup extends ReleaseLookup<BeatportProvider, Relea
}),
}],
gtin: rawRelease.upc ?? undefined,
releaseDate: parseHyphenatedDate(rawRelease.new_release_date),
releaseDate: this.convertReleaseDate(parseHyphenatedDate(rawRelease.new_release_date)),
media: [{
format: 'Digital Media',
tracklist: rawRelease.track_objects.map(this.convertRawTrack.bind(this)),
Expand Down
9 changes: 6 additions & 3 deletions providers/Deezer/__snapshots__/mod.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -513,9 +513,12 @@ snapshot[`Deezer provider > release lookup > single by two artists 1`] = `
],
packaging: "None",
releaseDate: {
day: 16,
month: 8,
year: 2024,
date: {
day: 16,
month: 8,
year: 2024,
},
quality: "assumed-valid",
},
status: "Official",
title: "Die With A Smile",
Expand Down
2 changes: 1 addition & 1 deletion providers/Deezer/mod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ export class DeezerReleaseLookup extends ReleaseApiLookup<DeezerProvider, Releas
types: this.provider.getLinkTypesForEntity(),
}],
media,
releaseDate: parseHyphenatedDate(rawRelease.release_date),
releaseDate: this.convertReleaseDate(parseHyphenatedDate(rawRelease.release_date)),
labels: splitLabels(rawRelease.label),
status: 'Official',
types: [this.convertReleaseType(rawRelease.record_type)],
Expand Down
27 changes: 18 additions & 9 deletions providers/Mora/__snapshots__/mod.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,12 @@ snapshot[`Mora provider > release lookup > release with GTIN in distPartNo 1`] =
],
packaging: "None",
releaseDate: {
day: 31,
month: 10,
year: 2025,
date: {
day: 31,
month: 10,
year: 2025,
},
quality: "assumed-valid",
},
status: "Official",
title: "MAGIC",
Expand Down Expand Up @@ -673,9 +676,12 @@ snapshot[`Mora provider > release lookup > release with GTIN in cdPartNo 1`] = `
],
packaging: "None",
releaseDate: {
day: 15,
month: 10,
year: 2025,
date: {
day: 15,
month: 10,
year: 2025,
},
quality: "assumed-valid",
},
status: "Official",
title: "バンドリ! ガールズバンドパーティ! カバーコレクションVol.10",
Expand Down Expand Up @@ -767,9 +773,12 @@ snapshot[`Mora provider > release lookup > video release 1`] = `
],
packaging: "None",
releaseDate: {
day: 22,
month: 11,
year: 2025,
date: {
day: 22,
month: 11,
year: 2025,
},
quality: "assumed-valid",
},
status: "Official",
title: "Woman is a Tree",
Expand Down
2 changes: 1 addition & 1 deletion providers/Mora/mod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ export class MoraReleaseLookup extends ReleaseLookup<MoraProvider, PackageMeta>
artists: [this.makeArtistCreditName(albumPage.artistName, albumPage.artistNo)],
labels: [label],
gtin,
releaseDate: parseISODateTime(albumPage.startDate + ' +0'),
releaseDate: this.convertReleaseDate(parseISODateTime(albumPage.startDate + ' +0')),
availableIn: ['JP'],
media: [{
format: 'Digital Media',
Expand Down
2 changes: 1 addition & 1 deletion providers/MusicBrainz/mod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ export class MusicBrainzReleaseLookup extends ReleaseApiLookup<MusicBrainzProvid
type: track.recording.video ? 'video' : 'audio',
})) ?? [],
})),
releaseDate: parseHyphenatedDate(rawRelease.date ?? ''),
releaseDate: this.convertReleaseDate(parseHyphenatedDate(rawRelease.date ?? '')),
labels: rawRelease['label-info'].map((info) => ({
name: info.label?.name,
catalogNumber: info['catalog-number'] ?? undefined,
Expand Down
Loading
Loading