Store year and party as a tuple.

[demoscenemusic.git] / data / views.py

diff --git a/data/views.py b/data/views.py
index bb3b52c..3a08a7a 100644 (file)
--- a/data/views.py
+++ b/data/views.py
@@ -7,13 +7,13 @@ from DemosceneMusic.data.models import Track
 
 def home(request):
        tracks = Track.objects.all().annotate().order_by('releases__party', 'trackartist__artist__name', 'name', 'remix')
-       partyCompoTracks = defaultdict(lambda: defaultdict(list))
+       partyYearCompoTracks = defaultdict(lambda: defaultdict(list))
        for track in tracks:
                for release in track.releases.all():
-                       partyCompoTracks[release.party][release.compo].append(track)
-       for party, compoTracks in partyCompoTracks.iteritems():
-               partyCompoTracks[party] = dict(compoTracks)
-       return render_to_response('templates/home.html', {'partyTracks': dict(partyCompoTracks)})
+                       partyYearCompoTracks[(release.party, release.year)][release.compo].append(track)
+       for partyYear, compoTracks in partyYearCompoTracks.iteritems():
+               partyYearCompoTracks[partyYear] = dict(compoTracks)
+       return render_to_response('templates/home.html', {'partyTracks': dict(partyYearCompoTracks)})
 
 def track(request, trackId):
        return HttpResponse('Track: %s' % trackId)