refactored main and report

Author: sacca97

prospector/client/cli/main.py

@@ -7,14 +7,15 @@
 
 from dotenv import load_dotenv
 
+from util.http import ping_backend
+
 path_root = os.getcwd()
 if path_root not in sys.path:
     sys.path.append(path_root)
 
 
 import client.cli.report as report  # noqa: E402
 from client.cli.console import ConsoleWriter, MessageStatus  # noqa: E402
-from client.cli.prospector_client import DEFAULT_BACKEND  # noqa: E402
 from client.cli.prospector_client import TIME_LIMIT_AFTER  # noqa: E402
 from client.cli.prospector_client import TIME_LIMIT_BEFORE  # noqa: E402
 from client.cli.prospector_client import prospector  # noqa: E402; noqa: E402
@@ -51,7 +52,7 @@ def main(argv):  # noqa: C901
             )
             return
 
-        # if args.get("ping"):
+        # if config.ping:
         #     return ping_backend(backend, get_level() < logging.INFO)
 
         config.pub_date = (
@@ -62,55 +63,32 @@ def main(argv):  # noqa: C901
         pretty_log(logger, config.__dict__)
 
         logger.debug("Vulnerability ID: " + config.cve_id)
-        logger.debug(f"time-limit before: {TIME_LIMIT_BEFORE}")
-        logger.debug(f"time-limit after: {TIME_LIMIT_AFTER}")
 
     results, advisory_record = prospector(
         vulnerability_id=config.cve_id,
         repository_url=config.repository,
         publication_date=config.pub_date,
         vuln_descr=config.description,
-        tag_interval=config.tag_interval,
+        # tag_interval=config.tag_interval,
         version_interval=config.version_interval,
         modified_files=config.modified_files,
         advisory_keywords=config.keywords,
-        time_limit_before=TIME_LIMIT_BEFORE,
-        time_limit_after=TIME_LIMIT_AFTER,
         use_nvd=config.use_nvd,
-        nvd_rest_endpoint="",
         fetch_references=config.fetch_references,
         backend_address=config.backend,
         use_backend=config.use_backend,
         git_cache=config.git_cache,
         limit_candidates=config.max_candidates,
-        rules=["ALL"],
     )
 
     if config.preprocess_only:
         return
 
-    with ConsoleWriter("Generating report\n") as console:
-        match config.report:
-            case "console":
-                report.console_(results, advisory_record, get_level() < logging.INFO)
-            case "json":
-                report.json_(results, advisory_record, config.report_filename)
-            case "html":
-                report.html_(results, advisory_record, config.report_filename)
-            case "all":
-                report.json_(results, advisory_record, config.report_filename)
-                report.html_(results, advisory_record, config.report_filename)
-            case _:
-                logger.warning("Invalid report type specified, using 'console'")
-                console.set_status(MessageStatus.WARNING)
-                console.print(
-                    f"{config.report} is not a valid report type, 'console' will be used instead",
-                )
-                report.console_(results, advisory_record, get_level() < logging.INFO)
-
-        logger.info("\n" + execution_statistics.generate_console_tree())
-        execution_time = execution_statistics["core"]["execution time"][0]
-        console.print(f"Report saved in {config.report_filename}")
+    report.generate_report(
+        results, advisory_record, config.report, config.report_filename
+    )
+
+    execution_time = execution_statistics["core"]["execution time"][0]
     ConsoleWriter.print(f"Execution time: {execution_time:.3f}s")
 
     return

prospector/client/cli/report.py

@@ -1,13 +1,15 @@
 import json
+import logging
 import os
 from pathlib import Path
 from typing import List
 
 import jinja2
 
+from client.cli.console import ConsoleWriter, MessageStatus
 from datamodel.advisory import AdvisoryRecord
 from datamodel.commit import Commit
-from log.logger import logger
+from log.logger import get_level, logger
 from stats.execution import execution_statistics
 
 
@@ -98,3 +100,27 @@ def format_annotations(commit: Commit) -> str:
         )
 
     print(f"Found {count} candidates\nAdvisory record\n{advisory_record}")
+
+
+def generate_report(results, advisory_record, report_type, report_filename):
+    with ConsoleWriter("Generating report\n") as console:
+        match report_type:
+            case "console":
+                console_(results, advisory_record, get_level() < logging.INFO)
+            case "json":
+                json_(results, advisory_record, report_filename)
+            case "html":
+                html_(results, advisory_record, report_filename)
+            case "all":
+                json_(results, advisory_record, report_filename)
+                html_(results, advisory_record, report_filename)
+            case _:
+                logger.warning("Invalid report type specified, using 'console'")
+                console.set_status(MessageStatus.WARNING)
+                console.print(
+                    f"{report_type} is not a valid report type, 'console' will be used instead",
+                )
+                console_(results, advisory_record, get_level() < logging.INFO)
+
+        logger.info("\n" + execution_statistics.generate_console_tree())
+        console.print(f"Report saved in {report_filename}")