diff --git a/src/backend/common/transforms/MusicbrainzTransformer.ts b/src/backend/common/transforms/MusicbrainzTransformer.ts index 5a8ce1ae..bf500347 100644 --- a/src/backend/common/transforms/MusicbrainzTransformer.ts +++ b/src/backend/common/transforms/MusicbrainzTransformer.ts @@ -407,7 +407,7 @@ export default class MusicbrainzTransformer extends AtomicPartsTransformer 0 ? 'mbidartist' : 'artist'); @@ -511,7 +511,7 @@ export default class MusicbrainzTransformer extends AtomicPartsTransformer { - if(play.data.meta?.brainz?.track !== undefined) { + if(play.data.meta?.brainz?.recording !== undefined) { this.logger.debug({labels: ['MBID Search']},'Searching with Recording MBID'); return await this.api.searchByRecording(play, {using: ['mbidrecording']}); } diff --git a/src/backend/common/vendor/LastfmApiClient.ts b/src/backend/common/vendor/LastfmApiClient.ts index c4faa6f0..040863c2 100644 --- a/src/backend/common/vendor/LastfmApiClient.ts +++ b/src/backend/common/vendor/LastfmApiClient.ts @@ -448,7 +448,7 @@ export const scrobblePayloadToPlay = (obj: LastFMScrobbleRequestPayload): PlayOb if(nonEmptyStringOrDefault(mbid) !== undefined) { play.data.meta = { brainz: { - track: mbid + recording: mbid } }; } @@ -467,7 +467,7 @@ export const playToClientPayload = (playObj: PlayObject): LastFMScrobblePayload playDate, meta: { brainz: { - track: mbid + recording: mbid } = {}, } = {} } = {} @@ -553,7 +553,7 @@ export const formatPlayObj = (obj: LastFMTrackObject, options: FormatPlayObjectO const brainz: BrainzMeta = removeUndefinedKeys({ album: nonEmptyStringOrDefault(albumMbid), artist: splitByFirstFound(artistMbid, [',',';'], undefined), - track: nonEmptyStringOrDefault(mbid) + recording: nonEmptyStringOrDefault(mbid) }); const play: PlayObject = { diff --git a/src/backend/common/vendor/ListenbrainzApiClient.ts b/src/backend/common/vendor/ListenbrainzApiClient.ts index 37f5b5ad..c308bc55 100644 --- a/src/backend/common/vendor/ListenbrainzApiClient.ts +++ b/src/backend/common/vendor/ListenbrainzApiClient.ts @@ -777,8 +777,8 @@ export const playToListenPayload = (play: PlayObject): ListenPayload => { ...minTrackData, additional_info: { duration: play.data.duration !== undefined ? Math.round(duration) : undefined, - track_mbid: brainz.track, - recording_mbid: brainz.track, + track_mbid: brainz.recording, + recording_mbid: brainz.recording, artist_mbids: brainz.artist, release_mbid: brainz.album, release_group_mbid: brainz.releaseGroup, diff --git a/src/backend/common/vendor/bluesky/AbstractBlueSkyApiClient.ts b/src/backend/common/vendor/bluesky/AbstractBlueSkyApiClient.ts index 10b15c0c..64c1d84b 100644 --- a/src/backend/common/vendor/bluesky/AbstractBlueSkyApiClient.ts +++ b/src/backend/common/vendor/bluesky/AbstractBlueSkyApiClient.ts @@ -69,7 +69,7 @@ export const playToRecord = (play: PlayObject): ScrobbleRecord => { submissionClientAgent: `multi-scrobbler/${getRoot().items.version}`, musicServiceBaseDomain: musicServiceToCononical(play.meta.musicService) ?? play.meta.musicService, isrc: play.data.isrc, - recordingMbId: play.data.meta?.brainz?.track, + recordingMbId: play.data.meta?.brainz?.recording, releaseMbId: play.data.meta?.brainz?.album }; diff --git a/src/backend/common/vendor/koito/KoitoApiClient.ts b/src/backend/common/vendor/koito/KoitoApiClient.ts index 3991826a..5b0c8ce8 100644 --- a/src/backend/common/vendor/koito/KoitoApiClient.ts +++ b/src/backend/common/vendor/koito/KoitoApiClient.ts @@ -200,7 +200,7 @@ export const listenObjectResponseToPlay = (obj: ListenObjectResponse, options: { if (obj.track.musicbrainz_id !== null) { play.data.meta = { brainz: { - track: obj.track.musicbrainz_id + recording: obj.track.musicbrainz_id } } } diff --git a/src/backend/common/vendor/musicbrainz/MusicbrainzApiClient.ts b/src/backend/common/vendor/musicbrainz/MusicbrainzApiClient.ts index 10be2ff8..3204b7ed 100644 --- a/src/backend/common/vendor/musicbrainz/MusicbrainzApiClient.ts +++ b/src/backend/common/vendor/musicbrainz/MusicbrainzApiClient.ts @@ -213,8 +213,8 @@ export class MusicbrainzApiClient extends AbstractApiClient { const query: Record = { }; - if(play.data?.meta?.brainz?.track !== undefined && using.includes('mbidrecording')) { - query.recording_mbid = play.data.meta.brainz.track + if(play.data?.meta?.brainz?.recording !== undefined && using.includes('mbidrecording')) { + query.recording_mbid = play.data.meta.brainz.recording } if(play.data?.meta?.brainz?.album !== undefined && using.includes('mbidrelease')) { query.release_mbid = play.data.meta.brainz.album @@ -375,7 +375,7 @@ export const recordingToPlay = (data: IRecording, options?: {ignoreVA?: boolean} isrc: data.isrcs !== undefined && data.isrcs.length > 0 ? data.isrcs[0] : undefined, meta: { brainz: { - track: data.id, + recording: data.id, artist: data["artist-credit"] !== undefined ? data["artist-credit"].map(x => x.artist.id) : undefined, albumArtist: albumArtistIds, album: album !== undefined ? album.id : undefined, diff --git a/src/backend/sources/JellyfinApiSource.ts b/src/backend/sources/JellyfinApiSource.ts index 03594be4..6063d834 100644 --- a/src/backend/sources/JellyfinApiSource.ts +++ b/src/backend/sources/JellyfinApiSource.ts @@ -429,10 +429,10 @@ export default class JellyfinApiSource extends MemoryPositionalSource { meta.album = ProviderIds.MusicBrainzAlbum; } if(ProviderIds.MusicBrainzTrack !== undefined) { - meta.track = ProviderIds.MusicBrainzTrack; + meta.recording = ProviderIds.MusicBrainzTrack; } if(ProviderIds.MusicBrainzTrack !== undefined) { - meta.track = ProviderIds.MusicBrainzTrack; + meta.recording = ProviderIds.MusicBrainzTrack; } if(ProviderIds.MusicBrainzArtist !== undefined) { meta.artist = [ProviderIds.MusicBrainzArtist]; diff --git a/src/backend/sources/MPDSource.ts b/src/backend/sources/MPDSource.ts index 9ddbfa5b..6dc16c67 100644 --- a/src/backend/sources/MPDSource.ts +++ b/src/backend/sources/MPDSource.ts @@ -181,7 +181,7 @@ export class MPDSource extends MemoryPositionalSource { const brainz: BrainzMeta = { albumArtist: [musicbrainz_albumartistid], album: musicbrainz_albumid, - track: musicbrainz_trackid, + recording: musicbrainz_trackid, }; if(musicbrainz_artistid !== undefined) { brainz.artist = [musicbrainz_artistid]; diff --git a/src/backend/sources/PlexApiSource.ts b/src/backend/sources/PlexApiSource.ts index 35e56d99..700b079d 100644 --- a/src/backend/sources/PlexApiSource.ts +++ b/src/backend/sources/PlexApiSource.ts @@ -418,7 +418,7 @@ export default class PlexApiSource extends MemoryPositionalSource { const prevBrainzMeta = sessionData[0].play.data.meta.brainz ?? {}; sessionData[0].play.data.meta.brainz = { ...prevBrainzMeta, - track: trackMbId, + recording: trackMbId, album: albumMbId, // Plex doesn't track MBIDs for track artists, so we use the // album artist MBID instead. diff --git a/src/backend/tests/lastfm/lastfm.test.ts b/src/backend/tests/lastfm/lastfm.test.ts index 83304af7..3f4ec76e 100644 --- a/src/backend/tests/lastfm/lastfm.test.ts +++ b/src/backend/tests/lastfm/lastfm.test.ts @@ -27,7 +27,7 @@ describe('#LFM Track to Play', function() { expect(play.data.meta?.brainz?.album).to.be.undefined; expect(play.data.meta?.brainz?.artist).to.be.undefined; - expect(play.data.meta?.brainz?.track).to.be.undefined; + expect(play.data.meta?.brainz?.recording).to.be.undefined; }); it('Sets brainz if any mbid is not undefined', function() { @@ -42,7 +42,7 @@ describe('#LFM Track to Play', function() { const toTrack = generateLastfmTrackObject(); toTrack.mbid = generateMbid(); - expect(formatPlayObj(toTrack).data.meta?.brainz?.track).to.not.be.undefined; + expect(formatPlayObj(toTrack).data.meta?.brainz?.recording).to.not.be.undefined; }); it('Sets artist correctly from #text or name', function() { diff --git a/src/backend/tests/listenbrainz/listenbrainz.test.ts b/src/backend/tests/listenbrainz/listenbrainz.test.ts index a7e92693..2f27506b 100644 --- a/src/backend/tests/listenbrainz/listenbrainz.test.ts +++ b/src/backend/tests/listenbrainz/listenbrainz.test.ts @@ -136,7 +136,7 @@ describe('Listenbrainz Response Behavior', function() { // @ts-expect-error wrong on purpose artist: 'fad8967c-a327-4af5-a64a-d4de66ece652;100846a7-06f6-4129-97ce-4409b9a9a311', album: '2eb6a8fb-14f6-436e-9bdf-2f9d0d8cbae0', - track: '677862e0-3603-4120-8c44-ee9a70893647', + recording: '677862e0-3603-4120-8c44-ee9a70893647', releaseGroup: 'bd3bb964-6da7-4d59-b0aa-f8bf639cd419' } } diff --git a/src/backend/tests/musicbrainz/musicbrainz.test.ts b/src/backend/tests/musicbrainz/musicbrainz.test.ts index aebc8305..05c9882d 100644 --- a/src/backend/tests/musicbrainz/musicbrainz.test.ts +++ b/src/backend/tests/musicbrainz/musicbrainz.test.ts @@ -117,7 +117,7 @@ describe('Musicbrainz API', function () { album: "Fake", meta: { brainz: { - track: '026fa041-3917-4c73-9079-ed16e36f20f8' + recording: '026fa041-3917-4c73-9079-ed16e36f20f8' } } }, diff --git a/src/backend/tests/tealfm/tealfm.test.ts b/src/backend/tests/tealfm/tealfm.test.ts index 807170d4..5aa59148 100644 --- a/src/backend/tests/tealfm/tealfm.test.ts +++ b/src/backend/tests/tealfm/tealfm.test.ts @@ -31,7 +31,7 @@ describe('#tealfm Record to Play', function() { expect(play.data.meta.brainz).to.not.be.undefined; expect(play.data.meta.brainz.album).eq(rec.value.releaseMbId); - expect(play.data.meta.brainz.track).eq(rec.value.recordingMbId); + expect(play.data.meta.brainz.recording).eq(rec.value.recordingMbId); expect(play.data.meta.brainz.artist).eql(rec.value.artists.map(x => x.artistMbId)); expect(play.data.isrc).eq(rec.value.isrc); }); diff --git a/src/backend/tests/utils/PlayTestUtils.ts b/src/backend/tests/utils/PlayTestUtils.ts index 96cc37cc..54f1682e 100644 --- a/src/backend/tests/utils/PlayTestUtils.ts +++ b/src/backend/tests/utils/PlayTestUtils.ts @@ -176,12 +176,12 @@ export const withBrainz = (play: PlayObject, include: ('track' | 'artist' | 'alb for(const i of include) { switch(i) { case 'track': - if(play.data.meta?.brainz?.track === undefined) { + if(play.data.meta?.brainz?.recording === undefined) { play.data.meta = { ...(play.data.meta ?? {}), brainz: { ...(play.data.meta?.brainz ?? {}), - track: generateMbid() + recording: generateMbid() } } } diff --git a/src/backend/utils.ts b/src/backend/utils.ts index a8a78b52..e0793126 100644 --- a/src/backend/utils.ts +++ b/src/backend/utils.ts @@ -604,7 +604,7 @@ export const missingMbidTypes = (play: PlayObject): MissingMbidType[] => { return missing; } const { - track, + recording: track, album, artist } = play.data.meta.brainz; diff --git a/src/core/Atomic.ts b/src/core/Atomic.ts index a3a31730..f172ce93 100644 --- a/src/core/Atomic.ts +++ b/src/core/Atomic.ts @@ -124,7 +124,7 @@ export interface BrainzMeta { * */ album?: string /** Unique track id, recording_mbid */ - track?: string + recording?: string /** * * The "consolidated" album like --> "The Wall" by "Pink Floyd" */