Merge pull request #75 from fosslight/develop

Add yaml format for FOSSLight Report

Author: dd-jy

src/fosslight_source/_help.py

@@ -24,7 +24,7 @@
             -m\t\t\t\t   Print additional information for scan result on separate sheets
             -o <output_path>\t\t   Output path
             \t\t\t\t    (If you want to generate the specific file name, add the output path with file name.)
-            -f <format>\t\t\t   Output file format (excel, csv, opossum)
+            -f <format>\t\t\t   Output file format (excel, csv, opossum, yaml)
             -s <scanner>\t\t   Select which scanner to be run (scancode, scanoss, all)"""
 
 _HELP_MESSAGE_CONVERT = """

src/fosslight_source/cli.py

@@ -120,6 +120,7 @@ def create_report_file(start_time, scanned_result, license_list, selected_scanne
     extended_header = {}
     sheet_list = {}
     _json_ext = ".json"
+    _yaml_ext = ".yaml"
 
     if output_path == "":
         output_path = os.getcwd()
@@ -128,9 +129,11 @@ def create_report_file(start_time, scanned_result, license_list, selected_scanne
 
     if output_file == "":
         if output_extension == _json_ext:
-            output_file = "Opossum_input_" + start_time
+            output_file = f"Opossum_input_{start_time}"
+        if output_extension == _yaml_ext:
+            output_file = f"fosslight-sbom-info_{start_time}"
         else:
-            output_file = "FOSSLight-Report_" + start_time
+            output_file = f"FOSSLight-Report_{start_time}"
 
     scanned_result = sorted(scanned_result, key=lambda row: (''.join(row.licenses)))
 

src/fosslight_source/run_scancode.py

@@ -34,6 +34,7 @@ def run_scan(path_to_scan, output_file_name="",
     result_list = []
     license_list = []
     _json_ext = ".json"
+    _yaml_ext = ".yaml"
 
     start_time = datetime.now().strftime('%Y%m%d_%H%M%S')
 
@@ -48,6 +49,8 @@ def run_scan(path_to_scan, output_file_name="",
             if output_file == "":
                 if output_extension == _json_ext:
                     output_file = f"Opossum_input_{start_time}"
+                elif output_extension == _yaml_ext:
+                    output_file = f"fosslight-sbom-info_{start_time}"
                 else:
                     output_file = f"FOSSLight-Report_{start_time}"