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

Convert LibspotifySessionManager to a subclass of BaseThread

Browse Source
This commit is contained in:
Stein Magnus Jodal 2010-08-22 19:31:18 +02:00
parent ce7f4339ac
commit 2850a760ce
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mopidy/backends/libspotify/session_manager.py
View File

@ -5,12 +5,13 @@ import threading
from spotify.manager import SpotifySessionManager from spotify.manager import SpotifySessionManager
from mopidy import get_version, settings from mopidy import get_version, settings
from mopidy.models import Playlist
from mopidy.backends.libspotify.translator import LibspotifyTranslator from mopidy.backends.libspotify.translator import LibspotifyTranslator
from mopidy.models import Playlist
from mopidy.utils.process import BaseThread
logger = logging.getLogger('mopidy.backends.libspotify.session_manager') logger = logging.getLogger('mopidy.backends.libspotify.session_manager')
class LibspotifySessionManager(SpotifySessionManager, threading.Thread): class LibspotifySessionManager(SpotifySessionManager, BaseThread):
cache_location = os.path.expanduser(settings.SPOTIFY_LIB_CACHE) cache_location = os.path.expanduser(settings.SPOTIFY_LIB_CACHE)
settings_location = os.path.expanduser(settings.SPOTIFY_LIB_CACHE) settings_location = os.path.expanduser(settings.SPOTIFY_LIB_CACHE)
appkey_file = os.path.join(os.path.dirname(__file__), 'spotify_appkey.key') appkey_file = os.path.join(os.path.dirname(__file__), 'spotify_appkey.key')
@ -18,7 +19,8 @@ class LibspotifySessionManager(SpotifySessionManager, threading.Thread):
def __init__(self, username, password, core_queue, output_queue): def __init__(self, username, password, core_queue, output_queue):
SpotifySessionManager.__init__(self, username, password) SpotifySessionManager.__init__(self, username, password)
threading.Thread.__init__(self, name='LibspotifySessionManagerThread') BaseThread.__init__(self)
self.name = 'LibspotifySessionManagerThread'
# Run as a daemon thread, so Mopidy won't wait for this thread to exit # Run as a daemon thread, so Mopidy won't wait for this thread to exit
# before Mopidy exits. # before Mopidy exits.
self.daemon = True self.daemon = True
@ -27,7 +29,7 @@ class LibspotifySessionManager(SpotifySessionManager, threading.Thread):
self.connected = threading.Event() self.connected = threading.Event()
self.session = None self.session = None
def run(self): def run_inside_try(self):
self.connect() self.connect()
def logged_in(self, session, error): def logged_in(self, session, error):