[SCM] morituri/master: Set proper track ids. Fixes #34
js at users.alioth.debian.org
js at users.alioth.debian.org
Sun Oct 19 20:10:09 UTC 2014
The following commit has been merged in the master branch:
commit 7c95e8e0175ea215c3b569ce5f0643a097f40417
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date: Tue Jul 30 13:23:34 2013 +0200
Set proper track ids. Fixes #34
diff --git a/morituri/common/mbngs.py b/morituri/common/mbngs.py
index a31f2f2..88a1ae6 100644
--- a/morituri/common/mbngs.py
+++ b/morituri/common/mbngs.py
@@ -165,6 +165,8 @@ def _getMetadata(releaseShort, release, discid):
# {'sort-name': 'Pixies',
# 'id': 'b6b2bb8d-54a9-491f-9607-7b546023b433', 'name': 'Pixies'}}]
+ # FIXME: we should only use discArtist for determining VA; remove other
+ # uses
discArtist = discCredit[0]['artist']
if len(discCredit) > 1:
@@ -228,8 +230,8 @@ def _getMetadata(releaseShort, release, discid):
else:
# various artists discs can have tracks with no artist
track.artist = trackArtistName
- track.sortName = discArtist['sort-name']
- track.mbidArtist = discArtist['id']
+ track.sortName = trackCredit.getSortName()
+ track.mbidArtist = trackCredit.getIds()
track.title = t['recording']['title']
track.mbid = t['recording']['id']
diff --git a/morituri/test/test_common_mbngs.py b/morituri/test/test_common_mbngs.py
index 4240eb0..830f7bd 100644
--- a/morituri/test/test_common_mbngs.py
+++ b/morituri/test/test_common_mbngs.py
@@ -45,13 +45,12 @@ class MetadataTestCase(unittest.TestCase):
track16 = metadata.tracks[15]
self.assertEquals(track16.artist, 'Tom Jones & Stereophonics')
- # FIXME: this is the disc artist id, and it should be the combo
- # of track artist id's
self.assertEquals(track16.mbidArtist,
- u'89ad4ac3-39f7-470e-963a-56509c546377')
- # FIXME: should not be various artists
+ u'57c6f649-6cde-48a7-8114-2a200247601a'
+ ';0bfba3d3-6a04-4779-bb0a-df07df5b0558'
+ )
self.assertEquals(track16.sortName,
- u'Various Artists')
+ u'Jones, Tom & Stereophonics')
def testBalladOfTheBrokenSeas(self):
# various artists disc
@@ -77,11 +76,10 @@ class MetadataTestCase(unittest.TestCase):
track12 = metadata.tracks[11]
self.assertEquals(track12.artist, u'Isobel Campbell & Mark Lanegan')
- # FIXME: should include Mark Lanegan
self.assertEquals(track12.sortName,
u'Campbell, Isobel'
- # ' & Lanegan, Mark'
+ ' & Lanegan, Mark'
)
- # FIXME: this is only Isobel
self.assertEquals(track12.mbidArtist,
- u'd51f3a15-12a2-41a0-acfa-33b5eae71164')
+ u'd51f3a15-12a2-41a0-acfa-33b5eae71164;'
+ 'a9126556-f555-4920-9617-6e013f8228a7')
--
morituri packaging
More information about the pkg-multimedia-commits
mailing list