# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1337304878 18000
# Node ID 3c5c1269e037c1fccb909a5429efd6ceffa157be
# Parent  479badee55ceef3dc8eccf42231f721ae6cbc1fc
Further refining args & config file parsing.

diff -r 479badee55ce -r 3c5c1269e037 weighmail/config.py
--- a/weighmail/config.py	Wed May 16 20:52:51 2012 -0500
+++ b/weighmail/config.py	Thu May 17 20:34:38 2012 -0500
@@ -8,7 +8,7 @@
 
 
 DEFAULTS = dict(
-    username=None,
+    user=None,
     password=None,
     host='imap.gmail.com',
     ssl='True',
@@ -29,7 +29,6 @@
 }
 
 Label = collections.namedtuple('Label', 'name min max')
-Options = collections.namedtuple('Options', DEFAULTS.keys() + ['labels'])
 
 
 def parse_config_file(path):
@@ -39,8 +38,11 @@
     # Parse options file
     parser = SafeConfigParser(defaults=DEFAULTS)
 
-    with open(path, 'r') as fp:
-        parser.readfp(fp)
+    try:
+        with open(path, 'r') as fp:
+            parser.readfp(fp)
+    except IOError, ex:
+        raise ConfigError(ex)
 
     # Build a list of label named tuples
 
@@ -61,8 +63,8 @@
 
     # Build an options object and return it
 
-    opts = Options(
-        username=parser.get('auth', 'username'),
+    opts = dict(
+        user=parser.get('auth', 'user'),
         password=parser.get('auth', 'password'),
         host=parser.get('connection', 'host'),
         ssl=parser.getboolean('connection', 'ssl'),
diff -r 479badee55ce -r 3c5c1269e037 weighmail/main.py
--- a/weighmail/main.py	Wed May 16 20:52:51 2012 -0500
+++ b/weighmail/main.py	Thu May 17 20:34:38 2012 -0500
@@ -1,7 +1,9 @@
 from argparse import ArgumentParser
+import getpass
 import os.path
+import sys
 
-from config import parse_config_file
+from config import parse_config_file, ConfigError
 
 
 PROG_DESC = "Adds labels to your Gmail according to message size"
@@ -15,26 +17,48 @@
         '.weighmail.ini'))
     parser.add_argument('-c', '--config', default=default_config_file,
             help="path to configuration file [default=%(default)s]")
-    parser.add_argument('-u', '--user', default=None,
-            help="Gmail username")
-    parser.add_argument('-p', '--password', default=None,
-            help="Gmail password")
-    parser.add_argument('-H', '--host', default='imap.gmail.com',
-            help="Gmail server name [default=%(default)s]")
-    parser.add_argument('-P', '--port', default=993, type=int,
-            help="Gmail server port [default=%(default)s]")
-    parser.add_argument('-n', '--nossl', action='store_true',
-            help="do not use SSL [default=%(default)s]")
+    parser.add_argument('-u', '--user', help="user name")
+    parser.add_argument('-p', '--password', help="password")
+    parser.add_argument('-H', '--host', help="server name")
+    parser.add_argument('-P', '--port', type=int, help="server port")
+    parser.add_argument('-n', '--nossl', default=None, action='store_true',
+            help="do not use SSL")
 
     args = parser.parse_args()
-    print args
-    print
+
+    # Remove items with a value of None, which indicates the user didn't specify
+    # the option; this makes updating options from the config file easier:
+
+    args = { k : v for k, v in vars(args).items() if v is not None }
+    return args
+
 
 def main():
-    parse_args()
-    opts = parse_config_file('weighmail.ini')
+    # Parse command-line arguments
+    args = parse_args()
+
+    config_file = args.pop('config')
+    no_ssl = args.pop('nossl', False)
+
+    # Read config file:
+    opts = parse_config_file(config_file)
+
+    # Command-line arguments override config file settings
+    opts.update(args)
+
+    if no_ssl:
+        opts['ssl'] = False
+
+    # If the user or password is not specified, prompt for them now
+    for opt in ('user', 'password'):
+        if opts[opt] is None:
+            opts[opt] = getpass.getpass(opt + ': ')
+
     print opts
 
 
 if __name__ == '__main__':
-    main()
+    try:
+        main()
+    except ConfigError, ex:
+        sys.stderr.write("Configuration error: %s\n" % ex)