From af0909600d1563d0567fcd45ebe7a90bb46fcb43 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Tue, 6 Apr 2010 00:17:40 +0000 Subject: [PATCH] patch by: Peter Oliver. * morituri/common/program.py: Allow using sortName for artist/track using %S/%s. Fixes #19. --- ChangeLog | 8 ++++++++ morituri/common/program.py | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index d7b0a04..ece9a19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-04-06 Thomas Vander Stichele + + patch by: Peter Oliver. + + * morituri/common/program.py: + Allow using sortName for artist/track using %S/%s. + Fixes #19. + 2010-04-06 Thomas Vander Stichele * doc/release: diff --git a/morituri/common/program.py b/morituri/common/program.py index 5f654b2..cc28bda 100644 --- a/morituri/common/program.py +++ b/morituri/common/program.py @@ -68,16 +68,19 @@ def getMetadata(release): metadata.title = release.title # getUniqueName gets disambiguating names like Muse (UK rock band) metadata.artist = release.artist.name + metadata.sortName = release.artist.sortName metadata.release = release.getEarliestReleaseDate() for t in release.tracks: track = TrackMetadata() if isSingleArtist: track.artist = metadata.artist + track.sortName = metadata.sortName track.title = t.title else: # various artists discs can have tracks with no artist track.artist = t.artist and t.artist.name or release.artist.name + track.sortName = t.artist.sortName track.title = t.title metadata.tracks.append(track) @@ -253,10 +256,12 @@ class Program(log.Loggable): if self.metadata: v['A'] = filterForPath(self.metadata.artist) + v['S'] = filterForPath(self.metadata.sortName) v['d'] = filterForPath(self.metadata.title) if i > 0: try: v['a'] = filterForPath(self.metadata.tracks[i - 1].artist) + v['s'] = filterForPath(self.metadata.tracks[i - 1].sortName) v['n'] = filterForPath(self.metadata.tracks[i - 1].title) except IndexError, e: print 'ERROR: no track %d found, %r' % (i, e)