X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;f=launch;h=39fac649ba25ebdba7e8fc3e5b1a311ffd39a941;hb=d3a79cbcc874db45b8b5f18101c10a6134a3af0a;hp=618e1bcb980ab99dbc14edaff21019ef7613f23e;hpb=8495a82088dba0b58662338b8ddef870894c9e34;p=mpd-sima.git

diff --git a/launch b/launch
index 618e1bc..39fac64 100755
--- a/launch
+++ b/launch
@@ -3,7 +3,7 @@
 """Sima
 """
 
-# standart library import
+# standard library import
 import logging
 import sys
 
@@ -21,28 +21,23 @@ from sima.lib.simadb import SimaDB
 from sima.utils.config import ConfMan
 from sima.utils.startopt import StartOpt
 from sima.utils.utils import exception_log
+ # core plugins
+from sima.plugins.core.history import History
+from sima.plugins.core.mpdoptions import MpdOptions
 ##
-# internal plugins
-from sima.plugins.crop import Crop
-from sima.plugins.addhist import History
-from sima.plugins.lastfm import Lastfm
-from sima.plugins.mpd import MpdOptions
-from sima.plugins.randomfallback import RandomFallBack
 
-# official plugins to start
-PLUGINS = (Crop, History, MpdOptions,
-           Lastfm, RandomFallBack)
 
-
-def load_contrib_plugins(sima):
-    """Handles contrib/external plugins
+def load_plugins(sima, source):
+    """Handles internal/external plugins
+        sima:   sima.core.Sima instance
+        source: ['internal', 'contrib']
     """
-    if not sima.config.has_option('sima', 'plugins'):
+    if not sima.config.get('sima', source ):
         return
     logger = logging.getLogger('sima')
-    for plugin in sima.config.get('sima','plugins').split(','):
+    for plugin in sima.config.get('sima', source).split(','):
         plugin = plugin.strip(' \n')
-        module = 'sima.plugins.contrib.{}'.format(plugin.lower())
+        module = 'sima.plugins.{0}.{1}'.format(source, plugin.lower())
         try:
             mod_obj = __import__(module, fromlist=[plugin])
         except ImportError as err:
@@ -53,16 +48,10 @@ def load_contrib_plugins(sima):
         except AttributeError as err:
             logger.error('Failed to load plugin {0} ({1})'.format(plugin, err))
             sima.shutdown()
-        logger.info('Loading contrib plugin: {name} ({doc})'.format(**plugin_obj.info()))
+        logger.info('Loading {0} plugin: {name} ({doc})'.format(source, **plugin_obj.info()))
         sima.register_plugin(plugin_obj)
 
 
-def load_internal_plugins(sima):
-    """Handles contrib/external plugins
-    """
-    raise NotImplementedError
-
-
 def main():
     """Entry point, deal w/ CLI and starts application
     """
@@ -97,13 +86,15 @@ def main():
     logger.info('Starting...')
     sima = core.Sima(config)
 
+    # required core plugins
+    sima.register_plugin(History)
+    sima.register_plugin(MpdOptions)
+
     #  Loading internal plugins
-    for plugin in PLUGINS:
-        logger.info('Loading internal plugin: {name} ({doc})'.format(**plugin.info()))
-        sima.register_plugin(plugin)
+    load_plugins(sima, 'internal')
 
     #  Loading contrib plugins
-    load_contrib_plugins(sima)
+    load_plugins(sima, 'contrib')
 
     # Run as a daemon
     if config.getboolean('daemon', 'daemon'):
@@ -113,7 +104,7 @@ def main():
         sima.foreground()
     except KeyboardInterrupt:
         logger.info('Caught KeyboardInterrupt, stopping')
-        #sima.shutdown()
+        sys.exit(0)
 
 
 def run():