From 168d6ea434852b1214c4c6b26985601955a6fc3f Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Wed, 23 Mar 2011 23:05:20 +0100 Subject: [PATCH] Replace last multiprocessing.Connection with Queue.Queue --- mopidy/backends/spotify/library.py | 10 ++++------ mopidy/backends/spotify/session_manager.py | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/mopidy/backends/spotify/library.py b/mopidy/backends/spotify/library.py index 5e2f66ae..2e7dbab1 100644 --- a/mopidy/backends/spotify/library.py +++ b/mopidy/backends/spotify/library.py @@ -1,5 +1,5 @@ import logging -import multiprocessing +import Queue from spotify import Link, SpotifyError @@ -54,8 +54,6 @@ class SpotifyLibraryProvider(BaseLibraryProvider): spotify_query.append(u'%s:"%s"' % (field, value)) spotify_query = u' '.join(spotify_query) logger.debug(u'Spotify search query: %s' % spotify_query) - my_end, other_end = multiprocessing.Pipe() - self.backend.spotify.search(spotify_query.encode(ENCODING), other_end) - my_end.poll(None) - playlist = my_end.recv() - return playlist + queue = Queue.Queue() + self.backend.spotify.search(spotify_query.encode(ENCODING), queue) + return queue.get() diff --git a/mopidy/backends/spotify/session_manager.py b/mopidy/backends/spotify/session_manager.py index ed4d665c..64d2b338 100644 --- a/mopidy/backends/spotify/session_manager.py +++ b/mopidy/backends/spotify/session_manager.py @@ -126,13 +126,13 @@ class SpotifySessionManager(BaseThread, PyspotifySessionManager): self.backend.stored_playlists = playlists logger.debug(u'Refreshed %d stored playlist(s)', len(playlists)) - def search(self, query, connection): + def search(self, query, queue): """Search method used by Mopidy backend""" def callback(results, userdata=None): # TODO Include results from results.albums(), etc. too playlist = Playlist(tracks=[ SpotifyTranslator.to_mopidy_track(t) for t in results.tracks()]) - connection.send(playlist) + queue.put(playlist) self.connected.wait() self.session.search(query, callback)