fix startup without config

[code/mailplate.git] / mailplate

diff --git a/mailplate b/mailplate
index 7e1a4d498f34ad88519a720c16ea41cd902ea893..e815be92aefe6a5c08594fda8706ae2dae6a0215 100755 (executable)
--- a/mailplate
+++ b/mailplate
@@ -170,7 +170,7 @@ CONFFILE = os.path.expanduser(CONFFILE)
 MAILPLATEDIR = os.path.expanduser(MAILPLATEDIR)
 
 # defaults
 MAILPLATEDIR = os.path.expanduser(MAILPLATEDIR)
 
 # defaults

-config = { 'default_template' : ''
+config = { 'default_template' : None

          , 'template_path' : TEMPLATEDIR
          }
 helpers = { 'get_quote' : 'fortune -s' }
          , 'template_path' : TEMPLATEDIR
          }
 helpers = { 'get_quote' : 'fortune -s' }


@@ -185,7 +185,7 @@ if not os.path.exists(CONFFILE):
         f = file(CONFFILE, 'w')
         f.write('# mailplate configuration\n[%s]\n' % SECTION_GENERAL)
         for kvpair in config.iteritems():
         f = file(CONFFILE, 'w')
         f.write('# mailplate configuration\n[%s]\n' % SECTION_GENERAL)
         for kvpair in config.iteritems():

-            if len(kvpair[1]) > 0:
+            if kvpair[1] and len(kvpair[1]) > 0:

                 f.write('%s = %s\n' % kvpair)
 
         if len(helpers) > 0:
                 f.write('%s = %s\n' % kvpair)
 
         if len(helpers) > 0:


@@ -210,6 +210,8 @@ for key in config.keys():
     except ConfigParser.NoSectionError, ConfigParser.MissingSectionHeaderError:
         err("E: no section '%s' in %s" % (SECTION_GENERAL, CONFFILE))
         sys.exit(posix.EX_CONFIG)
     except ConfigParser.NoSectionError, ConfigParser.MissingSectionHeaderError:
         err("E: no section '%s' in %s" % (SECTION_GENERAL, CONFFILE))
         sys.exit(posix.EX_CONFIG)

+    except ConfigParser.NoOptionError:
+        continue

     except ConfigParser.DuplicateSectionError, ConfigParser.ParseError:
         err('E: parse error on %s' % CONFFILE)
         sys.exit(posix.EX_CONFIG)
     except ConfigParser.DuplicateSectionError, ConfigParser.ParseError:
         err('E: parse error on %s' % CONFFILE)
         sys.exit(posix.EX_CONFIG)


@@ -218,6 +220,8 @@ for key in config.keys():
 helpers.update(parser.items(SECTION_HELPERS))
 
 TPATH = os.path.expanduser(config['template_path'])
 helpers.update(parser.items(SECTION_HELPERS))
 
 TPATH = os.path.expanduser(config['template_path'])

+if not os.path.isdir(TPATH):
+    os.mkdir(TPATH, 0700)

 
 ###
 ### COMMAND LINE PARSING
 
 ###
 ### COMMAND LINE PARSING


@@ -295,7 +299,7 @@ if infname is not None:
 
 # read message into buffer, or preinitialise the buffer if --new is given
 if options.new:
 
 # read message into buffer, or preinitialise the buffer if --new is given
 if options.new:

-    rawmsg = '\n'.join((header + ': ' for k in STD_HEADERS)) + '\n'
+    rawmsg = '\n'.join((header + ': ' for header in STD_HEADERS)) + '\n'

 else:
     rawmsg = ''.join(inf.readlines())
 
 else:
     rawmsg = ''.join(inf.readlines())
 


@@ -325,12 +329,28 @@ if options.auto:
             best_score = (score, tf, vars)
 
     templname = best_score[1]
             best_score = (score, tf, vars)
 
     templname = best_score[1]

+
+    if templname is None:
+        err('E: could not determine a template to use and no default is set')
+        sys.exit(posix.EX_CONFIG)
+

     print >>sys.stderr, \
             'I: Chose profile %s with score %d.' % (templname, best_score[0])
     vars = best_score[2]
 
 # now read in the template
     print >>sys.stderr, \
             'I: Chose profile %s with score %d.' % (templname, best_score[0])
     vars = best_score[2]
 
 # now read in the template

-templ = file(os.path.join(TPATH, templname), 'r', 1)
+templpath = os.path.join(TPATH, templname)
+
+if not os.path.isfile(templpath):
+    err('E: not a template: ' + templpath)
+    sys.exit(posix.EX_OSFILE)
+
+elif not os.access(templpath, os.R_OK):
+    err('E: template ' + templpath + ' could not be read.')
+    sys.exit(posix.EX_OSFILE)
+
+templ = file(templpath, 'r', 1)
+

 for line in templ:
     if not options.auto and line[0] == REGEXPCHAR:
         # obtain variables from the regexps
 for line in templ:
     if not options.auto and line[0] == REGEXPCHAR:
         # obtain variables from the regexps