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

Move play state from SpotifyBackend to BaseBackend

Browse Source
This commit is contained in:
Stein Magnus Jodal 2009-12-25 21:06:55 +01:00
parent 18f2f01236
commit 837ef248d9
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mopidy/backends/base.py
View File

@ -1,5 +1,11 @@
class BaseBackend(object): class BaseBackend(object):
PLAY = u'play'
PAUSE = u'pause'
STOP = u'stop'
def __init__(self):
self.state = self.STOP
def current_song(self): def current_song(self):
return None return None
@ -29,7 +35,7 @@ class BaseBackend(object):
return 0 return 0
def status_state(self): def status_state(self):
return 'stop' return self.state
# Control methods # Control methods
def stop(self): def stop(self):

11
mopidy/backends/spotify.py
View File

@ -8,10 +8,6 @@ from mopidy.backends.base import BaseBackend
logger = logging.getLogger(u'backends.spotify') logger = logging.getLogger(u'backends.spotify')
PLAY = u'play'
PAUSE = u'pause'
STOP = u'stop'
def encode(string): def encode(string):
return string.encode('utf-8') return string.encode('utf-8')
@ -21,7 +17,6 @@ def decode(string):
class SpotifyBackend(BaseBackend): class SpotifyBackend(BaseBackend):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(SpotifyBackend, self).__init__(*args, **kwargs) super(SpotifyBackend, self).__init__(*args, **kwargs)
self.mode = STOP
logger.info(u'Connecting to Spotify') logger.info(u'Connecting to Spotify')
self.spotify = spytify.Spytify(self._username, self._password) self.spotify = spytify.Spytify(self._username, self._password)
logger.info(u'Preloading data') logger.info(u'Preloading data')
@ -96,11 +91,11 @@ class SpotifyBackend(BaseBackend):
def current_song(self): def current_song(self):
track = self.spotify.current_track track = self.spotify.current_track
if track is not None and self.mode in (PLAY, PAUSE): if track is not None and self.state in (self.PLAY, self.PAUSE):
return self._format_track(track) return self._format_track(track)
def play_id(self, songid): def play_id(self, songid):
self.mode = PLAY self.state = self.PLAY
track = self._current_playlist[songid] track = self._current_playlist[songid]
self.spotify.play(track) self.spotify.play(track)
@ -131,7 +126,7 @@ class SpotifyBackend(BaseBackend):
return self._format_playlist(self._current_playlist) return self._format_playlist(self._current_playlist)
def stop(self): def stop(self):
self.mode = STOP self.state = self.STOP
self.spotify.stop() self.spotify.stop()
def status_playlist(self): def status_playlist(self):