diff --git a/maillogger/main.py b/maillogger/main.py index 5ec960d..99058a4 100644 --- a/maillogger/main.py +++ b/maillogger/main.py @@ -10,9 +10,14 @@ def main() -> None: loader = Loader(options.source_file) contents = loader.handle() + parse_to = True + parse_from = True + if options.fmt in ("csv", "tsv"): + parse_from = False + parsed_contents = [] for c in contents: - result = parse(c) + result = parse(c, parse_to, parse_from) if result: parsed_contents.append(result) diff --git a/maillogger/parser.py b/maillogger/parser.py index f423b12..040b70a 100644 --- a/maillogger/parser.py +++ b/maillogger/parser.py @@ -3,26 +3,34 @@ from datetime import datetime from typing import Dict, Optional +REGEX_PREFIX = r'(?P[A-Z][a-z]{2}) +(?P[0-9]{,2}) ' \ + + r'(?P