X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fdemoscenemusic%2Fdata%2FDataManager.java;h=85f35faf3cea00034d17651c3a950e303584a9c1;hb=10561cf7c1b437433d58eaa13e32c3ee6156fa76;hp=518322637ce7b4b61af873b53c4904c83dbc1060;hpb=ccdb2ab4b84f960ec67561227692f6e694a7f260;p=demoscenemusic.git

diff --git a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
index 5183226..85f35fa 100644
--- a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
+++ b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
@@ -118,6 +118,14 @@ public class DataManager {
 		return trackLoader.all();
 	}
 
+	public Collection<Group> getGroupsByArtist(String artistId) throws DatabaseException {
+		Query query = new Query(Type.SELECT, "GROUPS");
+		query.addField(new Field("GROUPS.*"));
+		query.addJoin(new Join(JoinType.INNER, "GROUP_ARTISTS", new Field("GROUPS.ID"), new Field("GROUP_ARTISTS.GROUP_")));
+		query.addWhereClause(new ValueFieldWhereClause(new ValueField("GROUP_ARTISTS.ARTIST", new StringParameter(artistId))));
+		return database.getMultiple(query, DefaultGroup.CREATOR);
+	}
+
 	private class TrackLoader implements ResultProcessor {
 
 		private final List<Track> loadedTracks = new ArrayList<Track>();
@@ -140,7 +148,7 @@ public class DataManager {
 				track = new DefaultTrack(trackId).name(resultSet.getString("TRACKS.NAME")).artists(new ArrayList<Artist>()).styles(new HashSet<Style>());
 				loadedTracks.add(track);
 			}
-			Artist artist = new DefaultArtist(resultSet.getString("ARTISTS.ID")).name(resultSet.getString("ARTISTS.NAME"));
+			Artist artist = new LazyArtist(resultSet.getString("ARTISTS.ID")).name(resultSet.getString("ARTISTS.NAME"));
 			if (!track.artists().contains(artist)) {
 				track.artists().add(artist);
 			}
@@ -173,7 +181,7 @@ public class DataManager {
 		public void processResult(ResultSet resultSet) throws SQLException {
 			String artistId = resultSet.getString("ARTISTS.ID");
 			if ((artist == null) || (!artist.id().equals(artistId))) {
-				artist = new DefaultArtist(artistId).name(resultSet.getString("ARTISTS.NAME")).groups(new HashSet<Group>());
+				artist = new LazyArtist(artistId).name(resultSet.getString("ARTISTS.NAME")).groups(new HashSet<Group>());
 				artists.add(artist);
 			}
 
@@ -185,7 +193,7 @@ public class DataManager {
 
 	private class LazyArtist extends DefaultArtist {
 
-		private final Memoizer<Void> tracks = new Memoizer<Void>(new Callable<Void>() {
+		private final Memoizer<Void> tracksMemoizer = new Memoizer<Void>(new Callable<Void>() {
 			public Void call() throws DatabaseException {
 				if (!hasValue("tracks")) {
 					value("tracks", Collection.class).set(getTracksByArtist(id()));
@@ -199,8 +207,8 @@ public class DataManager {
 		}
 
 		public Collection<Track> tracks() {
-			tracks.get();
-			return value("tracks", Collection.class).get();
+			tracksMemoizer.get();
+			return super.tracks();
 		}
 
 	}