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

Fix uri_to_mpd_relative_path so that it handles None

Browse Source
This commit is contained in:
Thomas Adamcik 2010-10-29 21:15:32 +02:00
parent 8240dbbb55
commit 014e29ffa2
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,6 +87,8 @@ def uri_to_mpd_relative_path(uri):
:type uri: string
:rtype: string
"""
if uri is None:
return ''
path = path_to_uri(settings.LOCAL_MUSIC_FOLDER)
return re.sub('^' + re.escape(path), '', uri)

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

@ -67,6 +67,11 @@ class UriToMpdRelativePathTest(unittest.TestCase):
def tearDown(self):
settings.runtime.clear()
def test_none_file_returns_empty_string(self):
uri = 'file:///dir/subdir/music/album/song.mp3'
result = translator.uri_to_mpd_relative_path(None)
self.assertEqual('', result)
def test_file_gets_stripped(self):
uri = 'file:///dir/subdir/music/album/song.mp3'
result = translator.uri_to_mpd_relative_path(uri)