rework cli

Author: Sven Siegmund

.gitignore

@@ -3,6 +3,9 @@ __pycache__/
 *.py[cod]
 *$py.class
 
+# PowerShell garbage
+Out-Null
+
 # Vim files
 *~
 *.swp

src/rtfparse/__init__.py

@@ -1,10 +1,9 @@
 #!/usr/bin/env python
 
 
-from rtfparse.cli import main
-
 # Towncrier needs version
 from rtfparse.__about__ import __version__
+from rtfparse.cli import main
 
 if __name__ == "__main__":
     main()

src/rtfparse/__main__.py

@@ -1,10 +1,21 @@
 #!/usr/bin/env python
+# PYTHON_ARGCOMPLETE_OK
 
+import io
 import logging
 import logging.config
+from argparse import ArgumentParser, Namespace
 from pathlib import Path
+
+import argcomplete
+import compressed_rtf as cr
+import extract_msg as em
 from provide_dir import provide_dir
+
 from rtfparse import logging_conf
+from rtfparse.__about__ import __version__
+from rtfparse.parser import Rtf_Parser
+from rtfparse.renderers import de_encapsulate_html
 
 
 def setup_logger(directory: Path) -> logging.Logger:
@@ -30,21 +41,24 @@ def setup_logger(directory: Path) -> logging.Logger:
 logger = setup_logger(Path.home() / "rtfparse")
 
 
-def argument_parser() -> argparse.ArgumentParser:
+def argument_parser() -> ArgumentParser:
     """
     Creates an argument parser for command line arguments
     """
-    parser = argparse.ArgumentParser(description="RTF parser")
+    parser = ArgumentParser(description="RTF parser", prog="rtfparse")
     parser.add_argument(
-        "-v", "--version", action="store_true", help="print out rtfparse version and exit"
+        "-v",
+        "--version",
+        action="version",
+        version=" ".join(("%(prog)s", __version__)),
+        help="print out rtfparse version and exit",
     )
-    parser.add_argument("--autoconfig", action="store_true", help="Configure rtfparse automatically")
     parser.add_argument(
-        "-f", "--file", action="store", metavar="PATH", type=Path, help="path to the rtf file"
+        "-r", "--rtf-file", action="store", metavar="PATH", type=Path, help="path to the rtf file"
     )
     parser.add_argument(
         "-m",
-        "--msg",
+        "--msg-file",
         action="store",
         metavar="PATH",
         type=Path,
@@ -56,18 +70,55 @@ def argument_parser() -> argparse.ArgumentParser:
     parser.add_argument(
         "-i", "--embed-img", action="store_true", help="Embed images from email to HTML"
     )
+    parser.add_argument(
+        "-o", "--output-file", metavar="PATH", type=Path, help="path to the desired output file"
+    )
+    parser.add_argument(
+        "-a",
+        "--attachments-dir",
+        metavar="PATH",
+        type=Path,
+        help="path to directory where to save email attachments",
+    )
     return parser
 
 
-def run(cli_args: argparse.Namespace) -> None:
-    logger.info("Program runs")
+def de_encapsulate(rp: Rtf_Parser, target_file: Path) -> None:
+    renderer = de_encapsulate_html.De_encapsulate_HTML()
+    with open(target_file, mode="w", encoding="utf-8") as htmlfile:
+        logger.info(f"Rendering the encapsulated HTML")
+        renderer.render(rp.parsed, htmlfile)
+        logger.info(f"Encapsulated HTML rendered")
+
+
+def run(cli_args: Namespace) -> None:
+    if cli_args.rtf_file and cli_args.rtf_file.exists():
+        with open(cli_args.rtf_file, mode="rb") as rtf_file:
+            rp = Rtf_Parser(rtf_file=rtf_file)
+            rp.parse_file()
+    elif cli_args.msg_file:
+        msg = em.openMsg(f"{cli_args.msg_file}")
+        if cli_args.attachments_dir:
+            for attachment in msg.attachments:
+                with open(
+                    cli_args.attachments_dir / f"{attachment.longFilename}", mode="wb"
+                ) as att_file:
+                    att_file.write(attachment.data)
+        decompressed_rtf = cr.decompress(msg.compressedRtf)
+        with open(cli_args.msg_file.with_suffix(".rtf"), mode="wb") as email_rtf:
+            email_rtf.write(decompressed_rtf)
+        with io.BytesIO(decompressed_rtf) as rtf_file:
+            rp = Rtf_Parser(rtf_file=rtf_file)
+            rp.parse_file()
+    if cli_args.de_encapsulate_html and cli_args.output_file:
+        de_encapsulate(rp, cli_args.output_file.with_suffix(".html"))
 
 
-def main(version) -> None:
+def main() -> None:
     """
     Entry point for any component start from the commmand line
     """
-    logger.debug(f"{utils.program_name} started")
+    logger.debug(f"rtfparse started")
     parser = argument_parser()
     argcomplete.autocomplete(parser)
     cli_args = parser.parse_args()
@@ -76,4 +127,4 @@ def main(version) -> None:
         run(cli_args)
     except Exception as err:
         logger.exception(f"Uncaught exception {repr(err)} occurred.")
-    logger.debug(f"{utils.program_name} ended")
+    logger.debug(f"rtfparse ended")