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

Use key=True for track_to_mpd_format generation

Browse Source
This commit is contained in:
Thomas Adamcik 2010-10-29 21:36:11 +02:00
parent b2cb3136b2
commit a8a447c47f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,8 +33,8 @@ def track_to_mpd_format(track, position=None, cpid=None, key=None):
if position is not None and cpid is not None:
result.append(('Pos', position))
result.append(('Id', cpid))
if key is not None:
result.insert(0, ('key', key))
if key and track.uri:
result.insert(0, ('key', os.path.basename(track.uri)))
return result
def track_artists_to_mpd_format(track):
@ -111,6 +111,8 @@ def tracks_to_tag_cache_format(tracks):
]
result.append(('songList begin',))
for track in tracks:
result.extend(track_to_mpd_format(track, key=True))
result.append(('songList end',))
return result

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

@ -37,7 +37,8 @@ class TrackMpdFormatTest(unittest.TestCase):
self.assert_(('Id', 2) in result)
def test_track_to_mpd_format_with_key(self):
result = translator.track_to_mpd_format(Track(), key='file.mp3')
track = Track(uri='file:///dir/subdir/file.mp3')
result = translator.track_to_mpd_format(track, key=True)
self.assert_(('key', 'file.mp3') in result)
def test_track_to_mpd_format_track_uses_uri_to_mpd_relative_path(self):
@ -137,16 +138,13 @@ class TracksToTagCacheFormatTest(unittest.TestCase):
result = translator.tracks_to_tag_cache_format([track])
result = self.check_headers(result)
result = self.check_song_list(result)
self.assertEqual(len(result), 0)
def test_simple_tag_cache_has_header(self):
def test_simple_tag_cache_has_formated_track(self):
track = Track(uri='file:///dir/subdir/song.mp3')
formated = translator.track_to_mpd_format(track)
formated.insert(0, ('key', 'song.mp3'))
formated = translator.track_to_mpd_format(track, key=True)
result = translator.tracks_to_tag_cache_format([track])
result = self.check_headers(result)
result = self.check_song_list(result)
for a, b in zip(result, formated):
self.assertEqual(a, b)
self.assertEqual(result, formated)