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

Merge branch 'master' of git://github.com/jodal/mopidy into gstreamer

Browse Source
This commit is contained in:
Johannes Knutsen 2010-08-09 13:17:53 +02:00
commit a02aeb7af6
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mopidy/backends/despotify.py
View File

@ -68,11 +68,12 @@ class DespotifyLibraryController(BaseLibraryController):
for value in values:
if field == u'track':
field = u'title'
if field is u'any':
if field == u'any':
spotify_query.append(value)
else:
spotify_query.append(u'%s:"%s"' % (field, value))
spotify_query = u' '.join(query)
spotify_query = u' '.join(spotify_query)
logger.debug(u'Spotify search query: %s', spotify_query)
result = self.backend.spotify.search(spotify_query.encode(ENCODING))
if (result is None or result.playlist.tracks[0].get_uri() ==
'spotify:track:0000000000000000000000'):

3
mopidy/backends/libspotify.py
View File

@ -76,11 +76,12 @@ class LibspotifyLibraryController(BaseLibraryController):
for value in values:
if field == u'track':
field = u'title'
if field is u'any':
if field == u'any':
spotify_query.append(value)
else:
spotify_query.append(u'%s:"%s"' % (field, value))
spotify_query = u' '.join(spotify_query)
logger.debug(u'Spotify search query: %s', spotify_query)
logger.debug(u'In search method, search for: %s' % spotify_query)
my_end, other_end = multiprocessing.Pipe()
self.backend.spotify.search(spotify_query.encode(ENCODING), other_end)

7
mopidy/mpd/frontend.py
View File

@ -113,10 +113,11 @@ class MpdFrontend(object):
Parses a mpd query string and converts the MPD query to a list of
(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_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))"? '
r'"(?P<what>[^"]+)"')
query = {}
for query_part in query_parts:
@ -124,11 +125,13 @@ class MpdFrontend(object):
field = m.groupdict()['field'].lower()
if field == u'title':
field = u'track'
field = str(field) # Needed for kwargs keys on OS X and Windows
what = m.groupdict()['what'].lower()
if field in query:
query[field].append(what)
else:
query[field] = [what]
logger.debug(u'Search query: %s', query)
return query
@handle_pattern(r'^disableoutput "(?P<outputid>\d+)"$')