Fixed blacklisting in track mode

[mpd-sima.git] / sima / utils / config.py

diff --git a/sima/utils/config.py b/sima/utils/config.py
index 46bddf67954ff39223f89b15dd0d87bf1b409c40..4d8d1127c191511b041169823e2bc8077253ecd7 100644 (file)
--- a/sima/utils/config.py
+++ b/sima/utils/config.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
-
-# Copyright (c) 2009, 2010, 2011, 2013 Jack Kaliko <kaliko@azylum.org>
+# Copyright (c) 2009, 2010, 2011, 2013, 2014 Jack Kaliko <kaliko@azylum.org>
 #
 #  This file is part of sima
 #
@@ -36,7 +35,7 @@ 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 = {
@@ -46,7 +45,7 @@ DEFAULT_CONF = {
             'port': "6600",
             },
         'sima': {
-            'internal': "Crop, History, MpdOptions, Lastfm, RandomFallBack",
+            'internal': "Crop, Lastfm, RandomFallBack",
             'contrib': "",
             'user_db': "false",
             'history_duration': "8",
@@ -61,18 +60,23 @@ DEFAULT_CONF = {
             '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",
             'depth': "1",
             },
         'randomfallback': {
-            'flavour': "sensible", # in pure, sensible, genre
+            'flavour': "sensible", # in pure, sensible
             'track_to_add': "1",
             }
         }
@@ -185,8 +189,8 @@ class ConfMan(object):  # CONFIG MANAGER CLASS
                 self.log.debug('[%s] present in conf file' % section)
                 for option in self.defaults[section]:
                     if self.config.has_option(section, option):
-                        #self.log.debug(u'option "%s" set to "%s" in conf. file' %
-                        #              (option, self.config.get(section, option)))
+                        #self.log.debug('option "%s" set to "%s" in conf. file'%
+                        #            (option, self.config.get(section, option)))
                         pass
                     else:
                         self.log.debug(
@@ -211,7 +215,7 @@ class ConfMan(object):  # CONFIG MANAGER CLASS
         elif self.startopt.get('var_dir'):
             # If var folder is provided via CLI set data_dir accordingly
             data_dir = join(self.startopt.get('var_dir'))
-        elif (homedir and isdir(homedir) and homedir not in ['/']):
+        elif homedir and isdir(homedir) and homedir not in ['/']:
             data_dir = join(homedir, '.local', 'share', DIRNAME)
         else:
             self.log.error('Can\'t find a suitable location for data folder (XDG_DATA_HOME)')
@@ -227,7 +231,7 @@ class ConfMan(object):  # CONFIG MANAGER CLASS
             pass
         elif environ.get('XDG_CONFIG_HOME'):
             conf_dir = join(environ.get('XDG_CONFIG_HOME'), DIRNAME)
-        elif (homedir and isdir(homedir) and homedir not in ['/']):
+        elif homedir and isdir(homedir) and homedir not in ['/']:
             conf_dir = join(homedir, '.config', DIRNAME)
             # Create conf_dir if necessary
             if not isdir(conf_dir):