Add sima.plugins.core name space for core plugins

diff --git a/doc/examples/all_settings.cfg b/doc/examples/all_settings.cfg
index ab6609fcc34837e709b60d2e3614c47c5df4eb2a..ca097ab9a917d00bbc236ac22fbcb659d189e246 100644 (file)
--- a/doc/examples/all_settings.cfg
+++ b/doc/examples/all_settings.cfg
@@ -16,9 +16,6 @@
 #
 ########################################################################
 
-#
-#######################################################################
-
 ########################## MPD SECTION ################################
 #
 [MPD]
@@ -59,7 +56,6 @@ port = 6600
 verbosity = info
 ##
 
-
 #
 #######################################################################
 
@@ -75,6 +71,9 @@ key = Value
 #  Leave commented to keep all tracks
 #consume = 10
 
+[crop]
+consume = 10
+
 [RandomFallback]
 # random falvour :
 #  * pure:     complete ramdom choice among all tracks available in the player media library

diff --git a/launch b/launch
index a4eb951a1f2ba7fb4fd120deb1b7c9a7f87c4d54..3e88542efee5b6e7d4049479c5940e7800816129 100755 (executable)
--- a/launch
+++ b/launch
@@ -21,6 +21,9 @@ 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
 ##
 
 
@@ -83,6 +86,10 @@ def main():
     logger.info('Starting...')
     sima = core.Sima(config)
 
+    # core plugins
+    sima.register_plugin(History)
+    sima.register_plugin(MpdOptions)
+
     #  Loading internal plugins
     load_plugins(sima, 'internal')
 

diff --git a/sima/plugins/core/__init__.py b/sima/plugins/core/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/sima/plugins/internal/history.py b/sima/plugins/core/history.py
similarity index 100%
rename from sima/plugins/internal/history.py
rename to sima/plugins/core/history.py

diff --git a/sima/plugins/internal/mpdoptions.py b/sima/plugins/core/mpdoptions.py
similarity index 100%
rename from sima/plugins/internal/mpdoptions.py
rename to sima/plugins/core/mpdoptions.py

diff --git a/sima/utils/config.py b/sima/utils/config.py
index 46bddf67954ff39223f89b15dd0d87bf1b409c40..37c662b58df6dc461e304d84abb73192db80896a 100644 (file)
--- a/sima/utils/config.py
+++ b/sima/utils/config.py
@@ -46,7 +46,7 @@ DEFAULT_CONF = {
             'port': "6600",
             },
         'sima': {
-            'internal': "Crop, History, MpdOptions, Lastfm, RandomFallBack",
+            'internal': "Crop, Lastfm, RandomFallBack",
             'contrib': "",
             'user_db': "false",
             'history_duration': "8",