X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fdemoscenemusic%2Fdata%2FDataManager.java;h=928eebcf2223d0dfda7910443554792f8ef89494;hb=f533deea6ecc3f1bd59ca8926c31dd7667ee572a;hp=e6d58bfe128a2c45051c3bcd031d13d7a923db40;hpb=1f783aa9e2f7cad0ab22c49c472211f7136dbb32;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 e6d58bf..928eebc 100644
--- a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
+++ b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
@@ -23,7 +23,9 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+import java.util.concurrent.Callable;
 
+import net.pterodactylus.util.collection.Memoizer;
 import net.pterodactylus.util.database.Database;
 import net.pterodactylus.util.database.DatabaseException;
 import net.pterodactylus.util.database.Field;
@@ -138,7 +140,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);
 			}
@@ -171,7 +173,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);
 			}
 
@@ -181,4 +183,26 @@ public class DataManager {
 
 	}
 
+	private class LazyArtist extends DefaultArtist {
+
+		private final Memoizer<Void> tracks = new Memoizer<Void>(new Callable<Void>() {
+			public Void call() throws DatabaseException {
+				if (!hasValue("tracks")) {
+					value("tracks", Collection.class).set(getTracksByArtist(id()));
+				}
+				return null;
+			}
+		});
+
+		public LazyArtist(String id) {
+			super(id);
+		}
+
+		public Collection<Track> tracks() {
+			tracks.get();
+			return super.tracks();
+		}
+
+	}
+
 }