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

Ensure that key does not have uri encoded strings

Browse Source
This commit is contained in:
Thomas Adamcik 2010-10-30 00:40:01 +02:00
parent ca95a510c9
commit 96d4633306
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ def track_to_mpd_format(track, position=None, cpid=None, key=False, mtime=False)
result.append(('Pos', position))
result.append(('Id', cpid))
if key and track.uri:
result.insert(0, ('key', os.path.basename(track.uri)))
result.insert(0, ('key', os.path.basename(uri_to_path(track.uri))))
if mtime and track.uri:
mtime = stat(uri_to_path(track.uri)).st_mtime
result.append(('mtime', int(mtime)))

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

@ -53,6 +53,11 @@ class TrackMpdFormatTest(unittest.TestCase):
result = translator.track_to_mpd_format(track, key=True)
self.assert_(('key', 'file.mp3') in result)
def test_track_to_mpd_format_with_key_not_uri_encoded(self):
track = Track(uri='file:///dir/subdir/file%20test.mp3')
result = translator.track_to_mpd_format(track, key=True)
self.assert_(('key', 'file test.mp3') in result)
def test_track_to_mpd_format_with_mtime(self):
uri = translator.path_to_uri(data_folder('blank.mp3'))
result = translator.track_to_mpd_format(Track(uri=uri), mtime=True)