Show the better artist name in track name.

[demoscenemusic.git] / data / models.py

diff --git a/data/models.py b/data/models.py
index 33cae30..11bdc59 100644 (file)
--- a/data/models.py
+++ b/data/models.py
@@ -15,7 +15,7 @@ class Artist(models.Model):
        groups = models.ManyToManyField(Group)
 
        def __unicode__(self):
-               return self.name
+               return "%s%s" % (self.name, (" / %s" % (" ^ ".join(g.shortName if (g.shortName != '') else g.name for g in self.groups.all()), )))
 
 class Party(models.Model):
        name = models.CharField(max_length = 80)
@@ -35,23 +35,45 @@ class Release(models.Model):
        year = models.IntegerField()
        compo = models.ForeignKey(Compo)
        place = models.IntegerField()
-       pouetId = models.IntegerField(blank = True)
+       pouetId = models.IntegerField(blank = True, null = True)
 
        def __unicode__(self):
                return self.compo.__unicode__() + ' @ ' + self.party.__unicode__() + ' ' + '%d' % self.year
 
+class TrackArtist(models.Model):
+       track = models.ForeignKey('Track')
+       artist = models.ForeignKey(Artist)
+       order = models.IntegerField()
+
+       def __unicode__(self):
+               return self.artist.__unicode__()
+
+       class Meta:
+               ordering = ['order']
+
+class RemixArtist(models.Model):
+       track = models.ForeignKey('Track')
+       artist = models.ForeignKey(Artist)
+       order = models.IntegerField()
+
+       def __unicode__(self):
+               return self.artist.__unicode__()
+
+       class Meta:
+               ordering = ['order']
+
 class Track(models.Model):
        name = models.CharField(max_length = 150)
-       artists = models.ManyToManyField(Artist)
+       artists = models.ManyToManyField(Artist, through = TrackArtist)
        remix = models.CharField(max_length = 80, blank = True)
-       remixArtists = models.ManyToManyField(Artist, related_name = 'remixTracks', blank = True)
+       remixArtists = models.ManyToManyField(Artist, through = RemixArtist, related_name = 'remixTracks')
        releases = models.ManyToManyField(Release)
        length = models.IntegerField()
        soundcloudLink = models.CharField(max_length = 150, blank = True)
 
        def __unicode__(self):
                #return '%s – %s%s' % (' & '.join(self.artists), self.name, (('%s by %s' % (self.remix, ' & '.join(self.remixArtists) + ')')) if (self.remix != '') else ''))
-               return u'{1} – {0}'.format(self.name, ' & '.join(a.name for a in self.artists.all()))
+               return u'{1} – {0}'.format(self.name, ' & '.join(a.artist.__unicode__() for a in self.trackartist_set.all()))
 
 class File(models.Model):
        track = models.ForeignKey(Track)