initialize SettingsManager at startup

1 files changed, 14 insertions, 15 deletions

diff --git a/alot/init.py b/alot/init.py
index d3df252e..125f8877 100755
--- a/alot/init.py
+++ b/alot/init.py
@@ -3,7 +3,7 @@ import sys
 import logging
 import os
 
-import settings
+from settings import settings, ConfigError
 import ConfigParser
 from db import DBManager
 from ui import UI
@@ -127,19 +127,19 @@ def main():
         configfiles.insert(0, expanded_path)
 
     # locate notmuch config
-    notmuchfile = os.path.expanduser(args['notmuch-config'])
+    notmuchconfig = os.path.expanduser(args['notmuch-config'])
 
-    try:
-        # read the first alot config file we find
-        for configfilename in configfiles:
-            if os.path.exists(configfilename):
-                settings.config.read(configfilename)
-                break  # use only the first
-
-        # read notmuch config
-        settings.notmuchconfig.read(notmuchfile)
+    alotconfig = None
+    # read the first alot config file we find
+    for configfilename in configfiles:
+        if os.path.exists(configfilename):
+            alotconfig = configfilename
+            break  # use only the first
 
-    except ConfigParser.Error, e:  # exit on parse errors
+    try:
+        settings.read_config(alotconfig)
+        settings.read_config(notmuchconfig)
+    except ConfigError, e:  # exit on parse errors
         sys.exit(e)
 
     # logging
@@ -155,11 +155,10 @@ def main():
     logging.basicConfig(level=numeric_loglevel, filename=logfilename,
                         format=logformat)
 
-    #logging.debug(commands.COMMANDS)
     # get ourselves a database manager
     dbman = DBManager(path=args['mailindex-path'], ro=args['read-only'])
 
-    # get initial searchstring
+    # determine what to do
     try:
         if args.subCommand == 'search':
             query = ' '.join(args.subOptions.args)
@@ -170,7 +169,7 @@ def main():
             cmdstring = 'compose %s' % args.subOptions.as_argparse_opts()
             cmd = commands.commandfactory(cmdstring, 'global')
         else:
-            default_commandline = settings.settings.get('initial_command')
+            default_commandline = settings.get('initial_command')
             cmd = commands.commandfactory(default_commandline, 'global')
     except CommandParseError, e:
         sys.exit(e)