Use jinja mocros for generation JSON

openscap_report/report_generators/json.py

@@ -3,19 +3,27 @@
 import json
 import logging
 from io import BytesIO
+from pathlib import Path
+
+from jinja2 import Environment, FileSystemLoader
 
 from .report_generator import ReportGenerator
 
 
 class JSONReportGenerator(ReportGenerator):
-    def __init__(self, parser):  # pylint: disable=W0231
-        self.report = parser.parse_report()
+    def __init__(self, parser):
+        super().__init__(parser)
+        self.file_loader = FileSystemLoader(str(Path(__file__).parent / "json_templates"))
+        self.env = Environment(loader=self.file_loader)
+        self.env.trim_blocks = True
+        self.env.lstrip_blocks = True
 
     def generate_report(self, debug_setting):
         logging.warning("JSON Format is experimental output!")
-
+        template = self.env.get_template("base.json")
+        json_data = json.loads(template.render(report=self.report, debug_setting=debug_setting))
         indent = None
         if debug_setting.no_minify:
             indent = "\t"
-        json_data = json.dumps(self.report.as_dict(), indent=indent)
-        return BytesIO(json_data.encode())
+        json_report = json.dumps(json_data, indent=indent)
+        return BytesIO(json_report.encode())

openscap_report/report_generators/report_generator.py

@@ -5,9 +5,8 @@
 
 
 class ReportGenerator(ABC):
-    @abstractmethod
     def __init__(self, parser):
-        raise NotImplementedError
+        self.report = parser.parse_report()
 
     @abstractmethod
     def generate_report(self, debug_setting):