Typer statt plac

c11.py

@@ -1,7 +1,7 @@
 import config
 import cognos11
 from pdf import pdf_merge, pdf_test
-import plac
+import typer
 from enum import Enum
 
 
@@ -10,54 +10,56 @@ class ExportFormat(Enum):
     XML = "XML"
 
 
-class C11:
-    commands = [
-        "export",
-        "reportoutput",
-        "errors",
-        "create",
-        "merge",
-        "template",
-        "mailtemplate",
-    ]
+app = typer.Typer()
+cfg = config.Config()
 
-    def __init__(self):
-        self.cfg = config.Config()
 
-    def export(self, folder=""):
-        exp = cognos11.c11_export(self.cfg)
-        exp.export_folder(folder)
+@app.command()
+def export(folder=""):
+    exp = cognos11.c11_export(cfg)
+    exp.export_folder(folder)
 
-    def reportoutput(self, folder=""):
-        exp = cognos11.c11_export(self.cfg)
-        # folder2 = exp.get_folder(folder)
-        req_plan = exp.get_folder_pdf_request_plan(folder)
-        exp.execute_request_plan(req_plan)
-        pdf_test.missing_data(self.cfg.cognos11.reportoutput_dir + "/" + folder)
-        merge_group = exp.get_merge_group(req_plan)
-        pdf_merge.pdf_merge_files(merge_group)
-        # pdf_merge.merge_reports_in_folder(self.cfg, folder2)
 
-    def merge(self, folder="", config=""):
-        folder2 = cognos11.c11_export.get_folder(folder)
-        config_json = pdf_merge.get_config_json(config, self.cfg.cognos11.config_dir)
-        pdf_merge.merge_reports_in_folder(self.cfg, folder2, config_json)
+@app.command()
+def reportoutput(folder=""):
+    exp = cognos11.c11_export(cfg)
+    # folder2 = exp.get_folder(folder)
+    req_plan = exp.get_folder_pdf_request_plan(folder)
+    exp.execute_request_plan(req_plan)
+    pdf_test.missing_data(cfg.cognos11.reportoutput_dir + "/" + folder)
+    merge_group = exp.get_merge_group(req_plan)
+    pdf_merge.pdf_merge_files(merge_group)
+    # pdf_merge.merge_reports_in_folder(self.cfg, folder2)
 
-    def errors(self):
-        exp = cognos11.c11_export(self.cfg)
-        exp.export_errors()
 
-    def create(self, path: str):
-        cognos11.c11_create(self.cfg).create_path(path)
+@app.command()
+def merge(folder="", config=""):
+    folder2 = cognos11.c11_export.get_folder(folder)
+    config_json = pdf_merge.get_config_json(config, cfg.cognos11.config_dir)
+    pdf_merge.merge_reports_in_folder(cfg, folder2, config_json)
 
-    def template(self):
-        exp = cognos11.c11_export(self.cfg)
-        exp.mail_template("")
 
-    def mailtemplate(self):
-        return self.template()
+@app.command()
+def errors():
+    exp = cognos11.c11_export(cfg)
+    exp.export_errors()
+
+
+@app.command()
+def create(path: str):
+    cognos11.c11_create(cfg).create_path(path)
+
+
+@app.command()
+def template():
+    exp = cognos11.c11_export(cfg)
+    exp.mail_template("")
+
+
+@app.command()
+def mailtemplate():
+    return template()
 
 
 if __name__ == "__main__":
-    plac.Interpreter.call(C11)
-    # C11().export()
+    app()