fixup! [Discogs] Adapt to new artists

nukeop · Aug 22, 2024 · 506af29 · 506af29
1 parent bcfc355
commit 506af29
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/packages/core/src/plugins/meta/discogs.ts b/packages/core/src/plugins/meta/discogs.ts
@@ -44,7 +44,7 @@ class DiscogsMetaProvider extends MetaProvider {
 
   getCoverImage(entity: DiscogsReleaseInfo | DiscogsArtistInfo) {
     return _.get(
-      _.find(entity.images, { type: 'primary' }), 
+      _.find(entity.images, { type: 'primary' }),
       'resource_url',
       _.get(_.find(entity.images, { type: 'secondary' }), 'resource_url')
     );
@@ -64,7 +64,7 @@ class DiscogsMetaProvider extends MetaProvider {
       source: SearchResultsSource.Discogs
     };
   }
-  
+
   discogsArtistReleaseSearchResultToGeneric(release: DiscogsArtistReleaseSearchResult): SearchResultsAlbum {
     return {
       id: `${release.id}`,
@@ -85,9 +85,9 @@ class DiscogsMetaProvider extends MetaProvider {
 
     release.tracklist.forEach(track => {
       if (track.sub_tracks) {
-        track.sub_tracks.forEach(subTrack => tracklist.push(this.discogsTrackToGeneric(subTrack, artist)));
+        track.sub_tracks.forEach(subTrack => tracklist.push(this.discogsTrackToGeneric(subTrack)));
       } else {
-        tracklist.push(this.discogsTrackToGeneric(track, artist));
+        tracklist.push(this.discogsTrackToGeneric(track));
       }
     });
 
@@ -106,13 +106,13 @@ class DiscogsMetaProvider extends MetaProvider {
     };
   }
 
-  discogsTrackToGeneric(discogsTrack: DiscogsTrack, artist: string): Track {
+  discogsTrackToGeneric(discogsTrack: DiscogsTrack): Track {
     const track = new Track();
-    track.artists = [artist];
+    track.artists = discogsTrack.artists.map(artist => artist.name);
     track.title = discogsTrack.title;
     track.duration = discogsTrack.duration;
     track.position = discogsTrack.position;
-    track.artists.push(...discogsTrack.extraartists?.map(artist => artist.name));
+    discogsTrack.extraartists?.forEach(artist => track.artists.push(artist.name));
     track.type = discogsTrack.type_;
     return track;
   }
@@ -153,19 +153,19 @@ class DiscogsMetaProvider extends MetaProvider {
       .then(response => response.json())
       .then(json => {
         if (json.results) {
-          const artists = json.results.flatMap(item => 
+          const artists = json.results.flatMap(item =>
             (item.type === 'artist') ?
               [this.discogsArtistSearchResultToGeneric(item)] : []
           );
-      
+
           const releases = json.results.flatMap(item =>
             (item.type === 'master' || item.type === 'release' ) ?
               [this.discogsReleaseSearchResultToGeneric(item)] : []
           );
-      
+
           return Promise.resolve({ artists, releases, tracks: [] });
         }
-      
+
         return Promise.resolve({ artists: [], releases: [], tracks: [] });
       });
   }
@@ -225,7 +225,7 @@ class DiscogsMetaProvider extends MetaProvider {
       albumType,
       { resource_url: resourceUrl }
     )).json();
-    
+
     return Promise.resolve(
       this.discogsReleaseInfoToGeneric(
         albumData,

diff --git a/packages/core/src/rest/Discogs.types.ts b/packages/core/src/rest/Discogs.types.ts
@@ -104,6 +104,10 @@ export type DiscogsTrack = {
   duration: string;
   position: string;
   title: string;
+  artists: {
+    name: string;
+    id: number;
+  }[];
   extraartists?: {
     name: string;
   }[];