X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;f=sima%2Futils%2Fconfig.py;h=99fb3227b7b69b18f085d513dcefcb99e608c67d;hb=00f3a52f35f709dd4c471cb6ad87dbd09cfd4aaf;hp=5d62505a972d0f9857d27ac55c53c00559e030b4;hpb=7854938788e0af521edd7199e40db796d3256351;p=mpd-sima.git

diff --git a/sima/utils/config.py b/sima/utils/config.py
index 5d62505..99fb322 100644
--- a/sima/utils/config.py
+++ b/sima/utils/config.py
@@ -36,34 +36,41 @@ from stat import (S_IMODE, ST_MODE, S_IRWXO, S_IRWXG)
 from . import utils
 
 # DEFAULTS
-DIRNAME = 'sima'
+DIRNAME = 'mpd_sima'
 CONF_FILE = 'sima.cfg'
 
 DEFAULT_CONF = {
         'MPD': {
             'host': "localhost",
             #'password': "",
-            'port': "6600"},
+            'port': "6600",
+            },
         'sima': {
-            'internal': "Crop, History, MpdOptions, Lastfm, RandomFallBack",
+            'internal': "Crop, Lastfm, RandomFallBack",
             'contrib': "",
             'user_db': "false",
             'history_duration': "8",
             'queue_length': "1",
-            'consume': "0",},
+            },
         'daemon':{
             'daemon': "false",
-            'pidfile': "",},
+            'pidfile': "",
+            },
         'log': {
             'verbosity': "info",
             'logfile': "",
             },
         'echonest': {
+            'queue_mode': "track", #TODO control values
+            'max_art': "15",
+            'single_album': "false",
+            'track_to_add': "1",
+            'album_to_add': "1",
+            'depth': "1",
             },
         'lastfm': {
-            'dynamic': "10",
-            'similarity': "15",
             'queue_mode': "track", #TODO control values
+            'max_art': "10",
             'single_album': "false",
             'track_to_add': "1",
             'album_to_add': "1",