benya/whipper-gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch by: Peter Oliver.

Browse Source 
* morituri/common/program.py:
	  Allow using sortName for artist/track using %S/%s.
	  Fixes #19.
This commit is contained in:
Thomas Vander Stichele
2010-04-06 00:17:40 +00:00
parent 98213c4196
commit af0909600d
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2010-04-06 Thomas Vander Stichele <thomas at apestaart dot org>
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 <thomas at apestaart dot org> 2010-04-06 Thomas Vander Stichele <thomas at apestaart dot org>
* doc/release: * doc/release:

5
morituri/common/program.py
View File

@@ -68,16 +68,19 @@ def getMetadata(release):
metadata.title = release.title metadata.title = release.title
# getUniqueName gets disambiguating names like Muse (UK rock band) # getUniqueName gets disambiguating names like Muse (UK rock band)
metadata.artist = release.artist.name metadata.artist = release.artist.name
metadata.sortName = release.artist.sortName
metadata.release = release.getEarliestReleaseDate() metadata.release = release.getEarliestReleaseDate()
for t in release.tracks: for t in release.tracks:
track = TrackMetadata() track = TrackMetadata()
if isSingleArtist: if isSingleArtist:
track.artist = metadata.artist track.artist = metadata.artist
track.sortName = metadata.sortName
track.title = t.title track.title = t.title
else: else:
# various artists discs can have tracks with no artist # various artists discs can have tracks with no artist
track.artist = t.artist and t.artist.name or release.artist.name track.artist = t.artist and t.artist.name or release.artist.name
track.sortName = t.artist.sortName
track.title = t.title track.title = t.title
metadata.tracks.append(track) metadata.tracks.append(track)
@@ -253,10 +256,12 @@ class Program(log.Loggable):
if self.metadata: if self.metadata:
v['A'] = filterForPath(self.metadata.artist) v['A'] = filterForPath(self.metadata.artist)
v['S'] = filterForPath(self.metadata.sortName)
v['d'] = filterForPath(self.metadata.title) v['d'] = filterForPath(self.metadata.title)
if i > 0: if i > 0:
try: try:
v['a'] = filterForPath(self.metadata.tracks[i - 1].artist) 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) v['n'] = filterForPath(self.metadata.tracks[i - 1].title)
except IndexError, e: except IndexError, e:
print 'ERROR: no track %d found, %r' % (i, e) print 'ERROR: no track %d found, %r' % (i, e)