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

Merge pull request #758 from trygveaa/fix/ignore-empty-query-parts

Browse Source 
mpd: Ignore empty parts in query
This commit is contained in:
Stein Magnus Jodal 2014-06-22 09:45:21 +02:00
commit 6b97f0aba8
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mopidy/mpd/protocol/music_db.py
View File

@ -41,7 +41,9 @@ def _query_from_mpd_search_parameters(parameters, mapping):
raise exceptions.MpdArgError('incorrect arguments') raise exceptions.MpdArgError('incorrect arguments')
if not parameters: if not parameters:
raise ValueError raise ValueError
query.setdefault(field, []).append(parameters.pop(0)) value = parameters.pop(0)
if value.strip():
query.setdefault(field, []).append(value)
return query return query

10
tests/mpd/protocol/test_music_db.py
View File

@ -15,6 +15,16 @@ class QueryFromMpdSearchFormatTest(unittest.TestCase):
self.assertEqual(result['date'][0], '1974-01-02') self.assertEqual(result['date'][0], '1974-01-02')
self.assertEqual(result['date'][1], '1975') self.assertEqual(result['date'][1], '1975')
def test_empty_value_is_ignored(self):
result = music_db._query_from_mpd_search_parameters(
['Date', ''], music_db._SEARCH_MAPPING)
self.assertEqual(result, {})
def test_whitespace_value_is_ignored(self):
result = music_db._query_from_mpd_search_parameters(
['Date', ' '], music_db._SEARCH_MAPPING)
self.assertEqual(result, {})
# TODO Test more mappings # TODO Test more mappings