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

* morituri/common/program.py:

Browse Source 
Rename some vars to start with mbid.  Fix pychecker issues.
This commit is contained in:
Thomas Vander Stichele
2010-04-13 22:09:22 +00:00
parent e596023fd0
commit 25ed7459b1
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2010-04-14 Thomas Vander Stichele <thomas at apestaart dot org>
* morituri/common/program.py:
Rename some vars to start with mbid. Fix pychecker issues.
2010-04-13 Thomas Vander Stichele <thomas at apestaart dot org> 2010-04-13 Thomas Vander Stichele <thomas at apestaart dot org>
* morituri/common/program.py: * morituri/common/program.py:

23
morituri/common/program.py
View File

@@ -53,6 +53,9 @@ class DiscMetadata(object):
tracks = None tracks = None
release = None release = None
mbid = None
mbidArtist = None
def __init__(self): def __init__(self):
self.tracks = [] self.tracks = []
@@ -73,7 +76,7 @@ def getMetadata(release):
metadata.sortName = release.artist.sortName metadata.sortName = release.artist.sortName
metadata.release = release.getEarliestReleaseDate() metadata.release = release.getEarliestReleaseDate()
metadata.mbid = urlparse.urlparse(release.id)[2].split("/")[-1] metadata.mbid = urlparse.urlparse(release.id)[2].split("/")[-1]
metadata.artistMBID = urlparse.urlparse(release.artist.id)[2].split("/")[-1] metadata.mbidArtist = urlparse.urlparse(release.artist.id)[2].split("/")[-1]
for t in release.tracks: for t in release.tracks:
@@ -81,7 +84,7 @@ def getMetadata(release):
if isSingleArtist: if isSingleArtist:
track.artist = metadata.artist track.artist = metadata.artist
track.sortName = metadata.sortName track.sortName = metadata.sortName
track.artistMBID = metadata.artistMBID track.mbidArtist = metadata.mbidArtist
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
@@ -326,15 +329,15 @@ class Program(log.Loggable):
if self.metadata: if self.metadata:
artist = self.metadata.artist artist = self.metadata.artist
disc = self.metadata.title disc = self.metadata.title
albumMBID = self.metadata.mbid mbidAlbum = self.metadata.mbid
albumArtistMBID = self.metadata.artistMBID mbidTrackAlbum = self.metadata.mbidArtist
if number > 0: if number > 0:
try: try:
artist = self.metadata.tracks[number - 1].artist artist = self.metadata.tracks[number - 1].artist
title = self.metadata.tracks[number - 1].title title = self.metadata.tracks[number - 1].title
trackMBID = self.metadata.tracks[number - 1].mbid mbidTrack = self.metadata.tracks[number - 1].mbid
trackArtistMBID = self.metadata.tracks[number - 1].artistMBID mbidTrackArtist = self.metadata.tracks[number - 1].mbidArtist
except IndexError, e: except IndexError, e:
print 'ERROR: no track %d found, %r' % (number, e) print 'ERROR: no track %d found, %r' % (number, e)
raise raise
@@ -381,10 +384,10 @@ class Program(log.Loggable):
str(date)) str(date))
ret[gst.TAG_DATE] = s['date'] ret[gst.TAG_DATE] = s['date']
ret["musicbrainz-trackid"] = trackMBID ret["musicbrainz-trackid"] = mbidTrack
ret["musicbrainz-artistid"] = trackArtistMBID ret["musicbrainz-artistid"] = mbidTrackArtist
ret["musicbrainz-albumid"] = albumMBID ret["musicbrainz-albumid"] = mbidAlbum
ret["musicbrainz-albumartistid"] = albumArtistMBID ret["musicbrainz-albumartistid"] = mbidTrackAlbum
# FIXME: gst.TAG_ISRC # FIXME: gst.TAG_ISRC