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

Merge remote-tracking branch 'grunskis/develop' into develop

Browse Source
This commit is contained in:
Stein Magnus Jodal 2011-04-05 21:37:21 +02:00
commit dec1643e7f
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mopidy/backends/local/translator.py
View File

@ -100,8 +100,11 @@ def _convert_mpd_data(data, tracks, music_dir):
albumartist_kwargs = {} albumartist_kwargs = {}
if 'track' in data: if 'track' in data:
album_kwargs['num_tracks'] = int(data['track'].split('/')[1]) if '/' in data['track']:
track_kwargs['track_no'] = int(data['track'].split('/')[0]) album_kwargs['num_tracks'] = int(data['track'].split('/')[1])
track_kwargs['track_no'] = int(data['track'].split('/')[0])
else:
track_kwargs['track_no'] = int(data['track'])
if 'artist' in data: if 'artist' in data:
artist_kwargs['name'] = data['artist'] artist_kwargs['name'] = data['artist']

2
mopidy/frontends/mpd/translator.py
View File

@ -85,7 +85,7 @@ def artists_to_mpd_format(artists):
:rtype: string :rtype: string
""" """
artists.sort(key=lambda a: a.name) artists.sort(key=lambda a: a.name)
return u', '.join([a.name for a in artists]) return u', '.join([a.name for a in artists if a.name])
def tracks_to_mpd_format(tracks, start=0, end=None, cpids=None): def tracks_to_mpd_format(tracks, start=0, end=None, cpids=None):
""" """

5
tests/frontends/mpd/serializer_test.py
View File

@ -95,6 +95,11 @@ class TrackMpdFormatTest(unittest.TestCase):
translated = translator.artists_to_mpd_format(artists) translated = translator.artists_to_mpd_format(artists)
self.assertEqual(translated, u'ABBA, Beatles') self.assertEqual(translated, u'ABBA, Beatles')
def test_artists_to_mpd_format_artist_with_no_name(self):
artists = [Artist(name=None)]
translated = translator.artists_to_mpd_format(artists)
self.assertEqual(translated, u'')
class PlaylistMpdFormatTest(unittest.TestCase): class PlaylistMpdFormatTest(unittest.TestCase):
def test_mpd_format(self): def test_mpd_format(self):