fixed json report generation to handle sets and file extensions when default is set

Author: sacca97

prospector/client/cli/json_report.py

@@ -6,18 +6,24 @@
 
 _logger = log.util.init_local_logger()
 
+class SetEncoder(json.JSONEncoder):
+    def default(self, obj):
+        if isinstance(obj, set):
+            return list(obj)
+        return json.JSONEncoder.default(self, obj)
+
 
 def report_as_json(
     results: "list[Commit]",
     advisory_record: AdvisoryRecord,
     filename: str = "prospector-report.json",
 ):
-
+    # Need to convert the Sets to Lists for JSON serialization
     data = {
         "advisory_record": advisory_record.dict(),
         "commits": [r.dict() for r in results],
     }
     _logger.info("Writing results to " + filename)
     with open(filename, "w", encoding="utf8") as json_file:
-        json.dump(data, json_file, ensure_ascii=True, indent=4)
+        json.dump(data, json_file, ensure_ascii=True, indent=4, cls=SetEncoder)
     return filename

prospector/client/cli/main.py

@@ -135,7 +135,7 @@ def parseArguments(args):
 
     parser.add_argument(
         "--report-filename",
-        default="prospector-report.html",
+        default="prospector-report",
         type=str,
         help="File where to save the report",
     )
@@ -311,11 +311,11 @@ def main(argv):  # noqa: C901
             report_on_console(results, advisory_record, log.config.level < logging.INFO)
         elif report == "json":
             report_file = report_as_json(
-                results, advisory_record, str(args.report_filename)
+                results, advisory_record, args.report_filename + ".json"
             )
         elif report == "html":
             report_file = report_as_html(
-                results, advisory_record, str(args.report_filename)
+                results, advisory_record, args.report_filename + ".html"
             )
         else:
             _logger.warning("Invalid report type specified, using 'console'")