diff --git a/mopidy/backends/despotify.py b/mopidy/backends/despotify.py index 79724600..c88e0dda 100644 --- a/mopidy/backends/despotify.py +++ b/mopidy/backends/despotify.py @@ -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) + 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'): diff --git a/mopidy/backends/libspotify.py b/mopidy/backends/libspotify.py index 4f1b2049..711cf0a6 100644 --- a/mopidy/backends/libspotify.py +++ b/mopidy/backends/libspotify.py @@ -77,11 +77,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) diff --git a/mopidy/mpd/frontend.py b/mopidy/mpd/frontend.py index 946b0bae..041603ba 100644 --- a/mopidy/mpd/frontend.py +++ b/mopidy/mpd/frontend.py @@ -117,7 +117,7 @@ class MpdFrontend(object): r'"?(?:[Aa]lbum|[Aa]rtist|[Ff]ilename|[Tt]itle|[Aa]ny)"? "[^"]+"') query_parts = re.findall(query_pattern, mpd_query) query_part_pattern = ( - r'"?(?P([Aa]lbum|[Aa]rtist|[Ff]ilename|[Tt]itle|[Aa]ny))"?\s' + r'"?(?P([Aa]lbum|[Aa]rtist|[Ff]ilename|[Tt]itle|[Aa]ny))"? ' r'"(?P[^"]+)"') query = {} for query_part in query_parts: @@ -131,6 +131,7 @@ class MpdFrontend(object): query[field].append(what) else: query[field] = [what] + logger.debug(u'Search query: %s', query) return query @handle_pattern(r'^disableoutput "(?P\d+)"$')