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

Try to fix non-string kwargs keys on OSX/Windows

Browse Source
This commit is contained in:
Stein Magnus Jodal 2010-08-09 12:29:58 +02:00
parent 53f2e89f8f
commit 4a3c2476fa
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mopidy/mpd/frontend.py
View File

@ -113,7 +113,8 @@ class MpdFrontend(object):
Parses a mpd query string and converts the MPD query to a list of Parses a mpd query string and converts the MPD query to a list of
(field, what) tuples. (field, what) tuples.
""" """
query_pattern = r'"?(?:[Aa]lbum|[Aa]rtist|[Ff]ilename|[Tt]itle|[Aa]ny)"? "[^"]+"' query_pattern = (
r'"?(?:[Aa]lbum|[Aa]rtist|[Ff]ilename|[Tt]itle|[Aa]ny)"? "[^"]+"')
query_parts = re.findall(query_pattern, mpd_query) query_parts = re.findall(query_pattern, mpd_query)
query_part_pattern = ( query_part_pattern = (
r'"?(?P<field>([Aa]lbum|[Aa]rtist|[Ff]ilename|[Tt]itle|[Aa]ny))"?\s' r'"?(?P<field>([Aa]lbum|[Aa]rtist|[Ff]ilename|[Tt]itle|[Aa]ny))"?\s'
@ -122,8 +123,8 @@ class MpdFrontend(object):
for query_part in query_parts: for query_part in query_parts:
m = re.match(query_part_pattern, query_part) m = re.match(query_part_pattern, query_part)
field = m.groupdict()['field'].lower() field = m.groupdict()['field'].lower()
if field == u'title': if field == 'title':
field = u'track' field = 'track'
what = m.groupdict()['what'].lower() what = m.groupdict()['what'].lower()
if field in query: if field in query:
query[field].append(what) query[field].append(what)