X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fcore.py;h=3710d92f3ac03f991012bef8ec8377872b51d41e;hb=5fe20b6caffe162afe5be18e77fe40004d00c95e;hp=c751e5ba2b63a6bd0cafb2f7c79dd62770bc118a;hpb=204fdd2bea753b024c7253a5830325b81aebbd61;p=mpd-sima.git

diff --git a/sima/core.py b/sima/core.py
index c751e5b..3710d92 100644
--- a/sima/core.py
+++ b/sima/core.py
@@ -7,52 +7,108 @@ __version__ = '0.12.0.b'
 __author__ = 'kaliko jack'
 __url__ = 'git://git.kaliko.me/sima.git'
 
+import sys
+import time
+
 from logging import getLogger
 
-from .client import PlayerClient
+from .client import PlayerClient, Track
+from .client import PlayerError, PlayerUnHandledError
+from .lib.simadb import SimaDB
 
 class Sima(object):
     """Main class, plugin and player management
     """
 
-    def __init__(self):
+    def __init__(self, conf, dbfile):
+        self.config = conf
+        self.sdb = SimaDB(db_path=dbfile)
         self.log = getLogger('sima')
         self.plugins = list()
-        self.player = None
-        self.connect_player()
+        self.player = PlayerClient()  # Player client
+        try:
+            self.player.connect()
+        except (PlayerError, PlayerUnHandledError) as err:
+            self.log.error('Fails to connect player: {}'.format(err))
+            self.shutdown()
         self.current_track = None
 
     def register_plugin(self, plugin_class):
+        """Registers plubin in Sima instance..."""
         self.plugins.append(plugin_class(self))
 
     def foreach_plugin(self, method, *args, **kwds):
+        """Plugin's callbacks dispatcher"""
         for plugin in self.plugins:
             getattr(plugin, method)(*args, **kwds)
 
-    def connect_player(self):
-        """Instanciate player client and connect
+    def reconnect_player(self):
+        """Trying to reconnect cycling through longer timeout
+        cycle : 5s 10s 1m 5m 20m 1h
         """
-        self.player = PlayerClient()  # Player client
-        self.player.connect()
+        sleepfor = [5, 10, 60, 300, 1200, 3600]
+        while True:
+            tmp = sleepfor.pop(0)
+            sleepfor.append(tmp)
+            self.log.info('Trying to reconnect in {:>4d} seconds'.format(tmp))
+            time.sleep(tmp)
+            try:
+                self.player.connect()
+            except PlayerError:
+                continue
+            except PlayerUnHandledError as err:
+                #TODO: unhandled Player exceptions
+                self.log.warning('Unhandled player exception: %s' % err)
+            self.log.info('Got reconnected')
+            break
 
     def shutdown(self):
         """General shutdown method
         """
+        self.log.warning('Starting shutdown.')
         self.player.disconnect()
         self.foreach_plugin('shutdown')
 
+        self.log.info('The way is shut, it was made by those who are dead. '
+                      'And the dead keep it…')
+        self.log.info('bye...')
+        sys.exit(0)
+
     def run(self):
-        """Dispatching callbacks to plugins
         """
-        self.log.debug(self.player.status())
-        self.log.info(self.player.current)
+        """
+        self.current_track = Track()
         while 42:
-            # hanging here untill a monitored event is raised in the player
-            changed = self.player.monitor()
-            if 'playlist' in changed:
-                self.foreach_plugin('callback_playlist')
-            if 'player' in changed:
-                self.log.info(self.player.current)
+            try:
+                self.loop()
+            except PlayerUnHandledError as err:
+                #TODO: unhandled Player exceptions
+                self.log.warning('Unhandled player exception: {}'.format(err))
+                del(self.player)
+                self.player = PlayerClient()
+                time.sleep(10)
+            except PlayerError as err:
+                self.log.warning('Player error: %s' % err)
+                self.reconnect_player()
+
+    def loop(self):
+        """Dispatching callbacks to plugins
+        """
+        # hanging here untill a monitored event is raised in the player
+        if getattr(self, 'changed', False): # first loop detection
+            self.changed = self.player.monitor()
+        else:
+            self.changed = ['playlist', 'player', 'skipped']
+        self.log.debug('changed: {}'.format(', '.join(self.changed)))
+        if 'playlist' in self.changed:
+            self.foreach_plugin('callback_playlist')
+        if 'player' in self.changed:
+            self.foreach_plugin('callback_player')
+        if 'skipped' in self.changed:
+            if self.player.state == 'play':
+                self.log.info('Playing: {}'.format(self.player.current))
+                self.foreach_plugin('callback_next_song')
+                self.current_track = self.player.current
 
 
 # VIM MODLINE