simon987/music-graph-api
1
0
Fork 0
mirror of https://github.com/simon987/music-graph-api.git synced 2025-04-04 06:42:59 +00:00
Code Issues Projects Releases Wiki Activity

Return preview URLs

Browse Source
This commit is contained in:
simon987 2020-08-08 14:37:12 -04:00
parent ef69a07812
commit 87a55c53b7
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/simon987/musicgraph/entities/ArtistDetails.java
View File

@ -11,11 +11,12 @@ public class ArtistDetails {
public List<Release> releases; public List<Release> releases;
public List<WeightedTag> tags; public List<WeightedTag> tags;
public List<Label> labels; public List<Label> labels;
public SpotifyPreviewUrl[] spotifyPreviewUrls; public List<SpotifyPreviewUrl> tracks;
public ArtistDetails() { public ArtistDetails() {
releases = new ArrayList<>(); releases = new ArrayList<>();
tags = new ArrayList<>(); tags = new ArrayList<>();
labels = new ArrayList<>(); labels = new ArrayList<>();
tracks = new ArrayList<>();
} }
} }

6
src/main/java/net/simon987/musicgraph/entities/SpotifyPreviewUrl.java
View File

@ -4,4 +4,10 @@ public class SpotifyPreviewUrl {
public String url; public String url;
public String release; public String release;
public String name; public String name;
public SpotifyPreviewUrl(String release, String name, String url) {
this.url = url;
this.release = release;
this.name = name;
}
} }

24
src/main/java/net/simon987/musicgraph/io/MusicDatabase.java
View File

@ -1,6 +1,5 @@
package net.simon987.musicgraph.io; package net.simon987.musicgraph.io;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import net.simon987.musicgraph.entities.*; import net.simon987.musicgraph.entities.*;
import net.simon987.musicgraph.logging.LogManager; import net.simon987.musicgraph.logging.LogManager;
@ -12,7 +11,6 @@ import org.neo4j.driver.types.Node;
import org.neo4j.driver.types.Relationship; import org.neo4j.driver.types.Relationship;
import javax.inject.Singleton; import javax.inject.Singleton;
import javax.validation.constraints.Max;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -88,9 +86,11 @@ public class MusicDatabase extends AbstractBinder {
"WITH collect(DISTINCT {id: ID(r), mbid:r.id, name:r.name, year:r.year, labels:labels(r)}) as releases, a " + "WITH collect(DISTINCT {id: ID(r), mbid:r.id, name:r.name, year:r.year, labels:labels(r)}) as releases, a " +
"OPTIONAL MATCH (a)-[r:IS_TAGGED]->(t:Tag) " + "OPTIONAL MATCH (a)-[r:IS_TAGGED]->(t:Tag) " +
"WITH collect({weight: r.weight, name: t.name, id:ID(t), tagid:t.id}) as tags, a, releases " + "WITH collect({weight: r.weight, name: t.name, id:ID(t), tagid:t.id}) as tags, a, releases " +
"OPTIONAL MATCH (a)-[:REL_TRACK]->(tr:Track) " +
"WITH collect({release:tr.album, name:tr.track, url:tr.url}) as tracks, a, releases, tags " +
"OPTIONAL MATCH (a)-[r:CREDITED_FOR]->(:Release)-[]-(l:Label) " + "OPTIONAL MATCH (a)-[r:CREDITED_FOR]->(:Release)-[]-(l:Label) " +
"RETURN a {name:a.name, year:a.year, comment:a.comment, releases:releases, tags:tags," + "RETURN a {name:a.name, year:a.year, comment:a.comment, releases:releases, tags:tags," +
" track_previews:a.track_previews, labels:collect(DISTINCT {id:ID(l),mbid:l.id,name:l.name})} " + " tracks:tracks, labels:collect(DISTINCT {id:ID(l),mbid:l.id,name:l.name})} " +
"LIMIT 1", "LIMIT 1",
params); params);
@ -140,13 +140,17 @@ public class MusicDatabase extends AbstractBinder {
)) ))
.collect(Collectors.toList()) .collect(Collectors.toList())
); );
String preview_urls = (String) map.get("track_previews"); details.tracks.addAll(
if (preview_urls != null) { ((List<Map>) map.get("tracks"))
ObjectMapper mapper = new ObjectMapper(); .stream()
details.spotifyPreviewUrls = mapper.readValue(preview_urls, SpotifyPreviewUrl[].class); .filter(x -> x.get("release") != null)
} else { .map(x -> new SpotifyPreviewUrl(
details.spotifyPreviewUrls = new SpotifyPreviewUrl[0]; (String) x.get("release"),
} (String) x.get("name"),
(String) x.get("url")
))
.collect(Collectors.toList())
);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();