Merge pull request #111 from sindrig/connection-state

Pause if we are disconnected

Author: sindrig

spoppy/lifecycle.py

@@ -92,15 +92,35 @@ def on_connection_state_updated(session):
                 'OFFLINE',
                 'UNDEFINED',
             )
+            logger.debug(
+                'Checking connection state %s' % session.connection.state
+            )
             for state in KNOWN_STATES:
                 if (
                     session.connection.state == getattr(
                         spotify.ConnectionState, state
                     )
                 ):
                     logger.debug('Received connection state %s' % state)
-            if session.connection.state is spotify.ConnectionState.LOGGED_IN:
+            if session.connection.state == spotify.ConnectionState.LOGGED_IN:
                 logged_in.set()
+            disconnect_state = spotify.ConnectionState.DISCONNECTED
+            if session.connection.state == disconnect_state:
+                if self.player.is_playing():
+                    self.player.play_pause()
+                self.player.state = self.player.DISCONNECTED_INDICATOR
+                logger.warning(
+                    'Spoppy has been disconnected. DO YOU HAVE INTERNET?'
+                )
+
+            else:
+                if (
+                    self.player.state == self.player.DISCONNECTED_INDICATOR and
+                    not self.player.is_playing()
+                ):
+                    logger.debug('We got internet back, playing!')
+                    self.player.play_pause()
+                self.player.state = None
 
         def on_lost_play_token(session):
             if self.player.is_playing():
@@ -124,7 +144,7 @@ def on_lost_play_token(session):
         logger.debug('Actually logging in now...')
         self._pyspotify_session.login(self.username, self.password)
 
-        logged_in.wait(6)
+        logged_in.wait(5)
         if logged_in.is_set():
             logger.debug('PySpotify logged in!')
             return True

spoppy/players.py

@@ -21,6 +21,7 @@
 class Player(object):
 
     REPEAT_OPTIONS = ['all', 'one']
+    DISCONNECTED_INDICATOR = 'disconnected'
 
     shuffle = False
     repeat = REPEAT_OPTIONS[0]
@@ -71,6 +72,7 @@ def __init__(self, navigator):
             self.reversed_actions[action_name].append(
                 key_names.get(key) or key.decode('utf-8')
             )
+        self.state = None
 
     def clear(self):
         '''
@@ -158,7 +160,7 @@ def get_progress(self):
         mins_played = get_duration_from_s(seconds_played)
 
         return (
-            self.player.state,
+            self.state or self.player.state,
             mins_played,
             percent_played,
             self.current_track_duration
@@ -608,7 +610,7 @@ def play_current_song(self, start_playing=True):
         )
 
         self.player.load(self.current_track)
-        if start_playing:
+        if start_playing and not self.state == self.DISCONNECTED_INDICATOR:
             self.play_pause()
 
         self.seconds_played = 0