Simplified configuration manager (db_file's no longer a special case)

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

diff --git a/sima/utils/config.py b/sima/utils/config.py
index c11d2e16bb82073dd972f920f5e90e08876b317b..5d79e53a2bbcee6dc34f6fd477f7b79e921f61bf 100644 (file)
--- a/sima/utils/config.py
+++ b/sima/utils/config.py
@@ -53,7 +53,8 @@ DEFAULT_CONF = {
             'daemon': "false",
             'pidfile': "",},
         'log': {
-            'verbosity': "info"},
+            'verbosity': "info",
+            'logfile': "",},
         'lastfm': {
             'dynamic': "10",
             'similarity': "20",
@@ -104,6 +105,7 @@ class ConfMan(object):  # CONFIG MANAGER CLASS
         self.init_config()
         self.control_conf()
         self.supersedes_config_with_cmd_line_options()
+        self.config['sima']['db_file'] = self.db_file
 
     def get_pw(self):
         try:
@@ -233,7 +235,6 @@ class ConfMan(object):  # CONFIG MANAGER CLASS
         self.db_file = join(data_dir, 'sima.db')
 
         config = configparser.SafeConfigParser()
-
         # If no conf file present, uses defaults
         if not isfile(self.conf_file):
             self.config = config