andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mpd:Update protocol to 0.19

Browse Source 
Address issues raised in review:
Fix formatting by shortening function name to concat_multi_values
Change comments and variable names to reflect generic nature of function
Fix typos in tests
Default to single quotes for strings
This commit is contained in:
Mark Greenwood 2015-07-06 09:26:52 +01:00
parent a2f2d5f167
commit f3f140c19f
2 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
mopidy/mpd/translator.py
View File

@ -37,7 +37,7 @@ def track_to_mpd_format(track, position=None, stream_title=None):
# TODO: only show length if not none, see: # TODO: only show length if not none, see:
# https://github.com/mopidy/mopidy/issues/923#issuecomment-79584110 # https://github.com/mopidy/mopidy/issues/923#issuecomment-79584110
('Time', track.length and (track.length // 1000) or 0), ('Time', track.length and (track.length // 1000) or 0),
('Artist', concatenate_multiple_values(track.artists, 'name')), ('Artist', concat_multi_values(track.artists, 'name')),
('Title', track.name or ''), ('Title', track.name or ''),
('Album', track.album and track.album.name or ''), ('Album', track.album and track.album.name or ''),
] ]
@ -61,34 +61,24 @@ def track_to_mpd_format(track, position=None, stream_title=None):
if track.album is not None and track.album.artists: if track.album is not None and track.album.artists:
result.append( result.append(
('AlbumArtist', ('AlbumArtist', concat_multi_values(track.album.artists, 'name')))
concatenate_multiple_values(track.album.artists, 'name'))) musicbrainz_ids = concat_multi_values(
musicbrainz_ids = concatenate_multiple_values(
track.album.artists, 'musicbrainz_id') track.album.artists, 'musicbrainz_id')
if musicbrainz_ids: if musicbrainz_ids:
result.append(('MUSICBRAINZ_ALBUMARTISTID', musicbrainz_ids)) result.append(('MUSICBRAINZ_ALBUMARTISTID', musicbrainz_ids))
if track.artists: if track.artists:
musicbrainz_ids = concatenate_multiple_values( musicbrainz_ids = concat_multi_values(track.artists, 'musicbrainz_id')
track.artists, 'musicbrainz_id')
if musicbrainz_ids: if musicbrainz_ids:
result.append(('MUSICBRAINZ_ARTISTID', musicbrainz_ids)) result.append(('MUSICBRAINZ_ARTISTID', musicbrainz_ids))
if track.composers: if track.composers:
result.append( result.append(
( ('Composer', concat_multi_values(track.composers, 'name')))
'Composer',
concatenate_multiple_values(track.composers, 'name')
)
)
if track.performers: if track.performers:
result.append( result.append(
( ('Performer', concat_multi_values(track.performers, 'name')))
'Performer',
concatenate_multiple_values(track.performers, 'name')
)
)
if track.genre: if track.genre:
result.append(('Genre', track.genre)) result.append(('Genre', track.genre))
@ -101,22 +91,23 @@ def track_to_mpd_format(track, position=None, stream_title=None):
return result return result
def concatenate_multiple_values(artists, attribute): def concat_multi_values(models, attribute):
""" """
Format track artist values for output to MPD client. Format mopidy model values for output to MPD client.
:param artists: the artists :param models: the models
:type track: array of :class:`mopidy.models.Artist` :type models: array of :class:`mopidy.models.Artist`,
:param attribute: the artist attribute to use :class:`mopidy.models.Album` or :class:`mopidy.models.Track`
:type string :param attribute: the attribute to use
:type attribute: string
:rtype: string :rtype: string
""" """
# Don't sort the values. MPD doesn't appear to (or if it does it's not # Don't sort the values. MPD doesn't appear to (or if it does it's not
# strict alphabetical). If we just use them in the order in which they come # strict alphabetical). If we just use them in the order in which they come
# in then the musicbrainz ids have a higher chance of staying in sync # in then the musicbrainz ids have a higher chance of staying in sync
return ';'.join( return ';'.join(
getattr(a, attribute) getattr(m, attribute)
for a in artists if getattr(a, attribute, None) is not None for m in models if getattr(m, attribute, None) is not None
) )

15
tests/mpd/test_translator.py
View File

@ -103,20 +103,19 @@ class TrackMpdFormatTest(unittest.TestCase):
result = translator.track_to_mpd_format(track) result = translator.track_to_mpd_format(track)
self.assertIn(('MUSICBRAINZ_ARTISTID', 'foo'), result) self.assertIn(('MUSICBRAINZ_ARTISTID', 'foo'), result)
def test_concatenate_multiple_values(self): def test_concat_multi_values(self):
artists = [Artist(name='ABBA'), Artist(name='Beatles')] artists = [Artist(name='ABBA'), Artist(name='Beatles')]
translated = translator.concatenate_multiple_values(artists, 'name') translated = translator.concat_multi_values(artists, 'name')
self.assertEqual(translated, 'ABBA;Beatles') self.assertEqual(translated, 'ABBA;Beatles')
def test_concatenate_muultiple_values_artist_with_no_name(self): def test_concat_multi_values_artist_with_no_name(self):
artists = [Artist(name=None)] artists = [Artist(name=None)]
translated = translator.concatenate_multiple_values(artists, 'name') translated = translator.concat_multi_values(artists, 'name')
self.assertEqual(translated, '') self.assertEqual(translated, '')
def test_concatenate_muultiple_values_artist_with_no_musicbrainz_id(self): def test_concat_multi_values_artist_with_no_musicbrainz_id(self):
artists = [Artist(name="Jah Wobble")] artists = [Artist(name='Jah Wobble')]
translated = translator.concatenate_multiple_values( translated = translator.concat_multi_values(artists, 'musicbrainz_id')
artists, 'musicbrainz_id')
self.assertEqual(translated, '') self.assertEqual(translated, '')