Merge pull request #64 from fosslight/develop

Change the scanoss-related packages

Author: bjk7119

setup.py

@@ -31,7 +31,8 @@
                      "Programming Language :: Python :: 3.8",
                      "Programming Language :: Python :: 3.9", ],
         install_requires=required,
-        extras_require={":python_version>'3.6'": ["scanoss>=0.7.0"]},
+        extras_require={":python_version>'3.6'": ["scanoss>=0.7.0"],
+                        ":python_version<'3.7'": ["dataclasses", "scanoss"]},
         entry_points={
             "console_scripts": [
                 "fosslight_convert = fosslight_source.convert_scancode:main",

src/fosslight_source/_parsing_scancode_file_item.py

@@ -35,7 +35,7 @@ def get_error_from_header(header_item):
                     str_error = '{}...({})'.format(errors[0], error_cnt)
                     break
     except Exception as ex:
-        logger.debug("error_parsing_header:"+str(ex))
+        logger.debug(f"Error_parsing_header: {ex}")
     return has_error, str_error
 
 
@@ -44,7 +44,7 @@ def parsing_file_item(scancode_file_list, has_error, need_matched_license=False)
     rc = True
     scancode_file_item = []
     license_list = {}  # Key :[license]+[matched_text], value: MatchedLicense()
-    msg = "TOTAL FILE COUNT: " + str(len(scancode_file_list)) + "\n"
+    msg = f"TOTAL FILE COUNT: {len(scancode_file_list)} \n"
 
     prev_dir = ""
     prev_dir_value = False
@@ -73,7 +73,7 @@ def parsing_file_item(scancode_file_list, has_error, need_matched_license=False)
                 if has_error and "scan_errors" in file:
                     error_msg = file["scan_errors"]
                     if len(error_msg) > 0:
-                        logger.debug("test_msg" + file_path + ":" + str(error_msg))
+                        logger.debug(f"Test_msg {file_path}:{error_msg}")
                         result_item.set_comment(",".join(error_msg))
                         scancode_file_item.append(result_item)
                         continue
@@ -153,7 +153,7 @@ def parsing_file_item(scancode_file_list, has_error, need_matched_license=False)
                     scancode_file_item.append(result_item)
 
         except Exception as ex:
-            msg += "* Error Parsing item:"+str(ex)
+            msg += f"* Error Parsing item: {ex}"
             rc = False
             logger.debug(msg)
 

src/fosslight_source/_parsing_scanoss_file.py

@@ -49,11 +49,11 @@ def parsing_scanResult(scanoss_report):
             result_item.set_fileURL(findings[0]['file_url'])
         if 'matched' in findings[0]:
             if 'lines' in findings[0]:
-                result_item.set_matched_lines(findings[0]['matched'] + " (" + findings[0]['lines'] + ")")
+                result_item.set_matched_lines(f"{findings[0]['matched']} ({findings[0]['lines']})")
             else:
-                result_item.set_matched_lines(findings[0]['matched'])
+                result_item.set_matched_lines(f"{findings[0]['matched']}")
         elif 'lines' in findings[0]:
-            result_item.set_matched_lines("(" + findings[0]['lines'] + ")")
+            result_item.set_matched_lines(f"({findings[0]['lines']})")
 
         scanoss_file_item.append(result_item)
 

src/fosslight_source/run_scancode.py

@@ -50,17 +50,17 @@ def run_scan(path_to_scan, output_file_name="",
         if not called_by_cli:
             if output_file == "":
                 if output_extension == _json_ext:
-                    output_file = "Opossum_input_" + start_time
+                    output_file = f"Opossum_input_{start_time}"
                 else:
-                    output_file = "FOSSLight-Report_" + start_time
+                    output_file = f"FOSSLight-Report_{start_time}"
 
         if _write_json_file:
             output_json_file = os.path.join(output_path, "scancode_raw_result.json")
         else:
             output_json_file = ""
 
         if not called_by_cli:
-            logger, _result_log = init_log(os.path.join(output_path, "fosslight_src_log_"+start_time+".txt"),
+            logger, _result_log = init_log(os.path.join(output_path, f"fosslight_src_log_{start_time}.txt"),
                                            True, logging.INFO, logging.DEBUG, _PKG_NAME, path_to_scan)
 
         if path_to_scan == "":
@@ -116,23 +116,23 @@ def run_scan(path_to_scan, output_file_name="",
             except Exception as ex:
                 success = False
                 msg = str(ex)
-                logger.error("Analyze " + path_to_scan + ":" + msg)
+                logger.error(f"Analyze {path_to_scan}: {msg}")
         else:
             success = False
             msg = "Check the path to scan. :" + path_to_scan
 
         if not return_results:
             result_list = []
 
-    scan_result_msg = str(success) if msg == "" else str(success) + ", " + msg
+    scan_result_msg = str(success) if msg == "" else f"{success}, {msg}"
     _result_log["Scan Result"] = scan_result_msg
     _result_log["Output Directory"] = output_path
     try:
         _str_final_result_log = yaml.safe_dump(_result_log, allow_unicode=True, sort_keys=True)
         logger.info(_str_final_result_log)
     except Exception as ex:
-        logger.warning("Failed to print result log. " + str(ex))
+        logger.warning(f"Failed to print result log. {ex}")
 
     if not success:
-        logger.error("Failed to run:" + str(scan_result_msg))
+        logger.error(f"Failed to run: {scan_result_msg}")
     return success, _result_log["Scan Result"], result_list, license_list

src/fosslight_source/run_scanoss.py

@@ -59,7 +59,7 @@ def run_scanoss_py(path_to_scan, output_file_name="", format="", called_by_cli=F
 
     output_json_file = os.path.join(output_path, output_file)
 
-    scan_command += output_json_file + " " + path_to_scan
+    scan_command += f"{output_json_file} {path_to_scan}"
 
     if num_threads > 0:
         scan_command += " -T " + str(num_threads)
@@ -69,24 +69,24 @@ def run_scanoss_py(path_to_scan, output_file_name="", format="", called_by_cli=F
     try:
         os.system(scan_command)
         st_json = open(output_json_file, "r")
-        logger.info("SCANOSS Start parsing " + path_to_scan)
+        logger.info(f"SCANOSS Start parsing {path_to_scan}")
         with open(output_json_file, "r") as st_json:
             st_python = json.load(st_json)
             scanoss_file_list = parsing_scanResult(st_python)
     except Exception as error:
-        logger.warning("Parsing " + path_to_scan + ":" + str(error))
-    logger.info("|---Number of files detected with SCANOSS: " + str(len(scanoss_file_list)))
+        logger.warning(f"Parsing {path_to_scan}: {error}")
+    logger.info(f"|---Number of files detected with SCANOSS: {(len(scanoss_file_list))}")
 
     if not write_json_file:
         try:
-            os.system("rm " + output_json_file)
+            os.system(f"rm {output_json_file}")
             os.system("rm scanner_output.wfp")
         except Exception as error:
-            logger.debug("Deleting scanoss result failed.:" + str(error))
+            logger.debug(f"Deleting scanoss result failed.: {error}")
     else:
         try:
-            os.system("mv scanner_output.wfp " + output_path + "/scanoss_fingerprint.wfp")
+            os.system(f"mv scanner_output.wfp {output_path}/scanoss_fingerprint.wfp")
         except Exception as error:
-            logger.debug("Moving scanoss fingerprint file failed.:" + str(error))
+            logger.debug(f"Moving scanoss fingerprint file failed.: {error}")
 
     return scanoss_file_list

tests/test_files/run_scancode.py

@@ -70,15 +70,15 @@ def run_scan(path_to_scan, output_file_name="",
     start_time = datetime.now().strftime('%Y%m%d_%H%M%S')
 
     if output_file_name == "":
-        output_file = "FOSSLight-Report_" + start_time
-        output_json_file = "scancode_" + start_time
+        output_file = f"FOSSLight-Report_{start_time}"
+        output_json_file = f"scancode_{start_time}"
         output_dir = os.getcwd()
     else:
         output_file = output_file_name
         output_json_file = output_file_name
         output_dir = os.path.dirname(os.path.abspath(output_file_name))
 
-    logger, _result_log = init_log(os.path.join(output_dir, "fosslight_src_log_"+start_time+".txt"),
+    logger, _result_log = init_log(os.path.join(output_dir, f"fosslight_src_log_{start_time}.txt"),
                                    True, logging.INFO, logging.DEBUG, _PKG_NAME, path_to_scan)
 
     if path_to_scan == "":
@@ -91,7 +91,7 @@ def run_scan(path_to_scan, output_file_name="",
 
     if os.path.isdir(path_to_scan):
         try:
-            output_json_file = output_json_file+".json" if _write_json_file\
+            output_json_file = f"{output_json_file}.json" if _write_json_file\
                 else ""
 
             rc, results = cli.run_scan(path_to_scan, max_depth=100,
@@ -127,16 +127,16 @@ def run_scan(path_to_scan, output_file_name="",
 
                         success_to_write, writing_msg = write_excel_and_csv(
                             output_file, sheet_list)
-                        logger.info("Writing excel :" + str(success_to_write) + " " + writing_msg)
+                        logger.info(f"Writing excel : {success_to_write} {writing_msg}")
                         if success_to_write:
-                            _result_log["FOSSLight Report"] = output_file + ".xlsx"
+                            _result_log["FOSSLight Report"] = f"{output_file}.xlsx"
         except Exception as ex:
             success = False
             msg = str(ex)
-            logger.error("Analyze " + path_to_scan + ":" + msg)
+            logger.error(f"Analyze {path_to_scan}: {msg}")
     else:
         success = False
-        msg = "Check the path to scan. :" + path_to_scan
+        msg = f"Check the path to scan. : {path_to_scan}"
 
     if not return_results:
         result_list = []
@@ -148,7 +148,7 @@ def run_scan(path_to_scan, output_file_name="",
         _str_final_result_log = yaml.safe_dump(_result_log, allow_unicode=True, sort_keys=True)
         logger.info(_str_final_result_log)
     except Exception as ex:
-        logger.warning("Failed to print result log. " + str(ex))
+        logger.warning(f"Failed to print result log. {ex}")
     return success, _result_log["Scan Result"], result_list