further bugfixing in parsers & clean up formatting.py

diff --git a/logparse/interface.py b/logparse/interface.py
index a9bd2e1125d9e3baa2def24f9600faf6b3b6d797..a4cb5cae2521266b834fe15899ebd37341ed885a 100644 (file)
--- a/logparse/interface.py
+++ b/logparse/interface.py
@@ -135,7 +135,7 @@ def main():
         else:
             dest_path = prefs['output']
         logger.debug("Outputting to {0}".format(dest_path))
-        if (argparser.parse_args().embed_styles or prefs['embed-styles']) and not (argparser.parse_args.plain or prefs['plain']):
+        if (argparser.parse_args().embed_styles or prefs['embed-styles']) and not (argparser.parse_args().plain or prefs['plain']):
             output.embed_css(prefs['css'])
         if (not os.path.isfile(dest_path)) and not (argparser.parse_args().overwrite or config['overwrite']):
             output.write(dest_path)
@@ -151,9 +151,8 @@ def main():
             to = argparser.parse_args().to
         else:
             to = prefs['mail']['to']
-        if argparser.parse_args().plain or prefs['plain']:
-            mail.sendmail(mailbin=prefs['mail']['mailbin'], body=(output.embed_css(prefs['css']) if isinstance(output, formatting.HtmlOutput) else output.content), recipient=to, subject=formatting.fsubject(config.prefs['mail']['subject']))
-    
+        mail.sendmail(mailbin=prefs['mail']['mailbin'], body=(output.embed_css(prefs['css']) if isinstance(output, formatting.HtmlOutput) else output.content), recipient=to, subject=formatting.fsubject(config.prefs['mail']['subject']), html=isinstance(output, formatting.HtmlOutput))
+
     # Print end message
     finish = datetime.now()
     logger.info("Finished parsing logs at {0} {1} (total time: {2})".format(finish.strftime(formatting.DATEFMT), finish.strftime(formatting.TIMEFMT), finish - start))