From c7ff7c4e5c1383f9ed16abd573d5adbc0037b850 Mon Sep 17 00:00:00 2001 From: Wonjae Park Date: Wed, 14 Sep 2022 18:20:48 +0900 Subject: [PATCH] Change the output file name --- src/fosslight_source/cli.py | 15 ++++++--------- src/fosslight_source/convert_scancode.py | 6 +++--- src/fosslight_source/run_scancode.py | 12 ++++-------- src/fosslight_source/run_scanoss.py | 4 ++-- tests/cli_test.py | 4 ++-- tests/test_files/run_scancode.py | 8 ++++---- 6 files changed, 21 insertions(+), 28 deletions(-) diff --git a/src/fosslight_source/cli.py b/src/fosslight_source/cli.py index aa70aa0..1757cad 100755 --- a/src/fosslight_source/cli.py +++ b/src/fosslight_source/cli.py @@ -83,12 +83,12 @@ def main(): timer.setDaemon(True) timer.start() - start_time = datetime.now().strftime('%Y%m%d_%H%M%S') + _start_time = datetime.now().strftime('%y%m%d_%H%M') success, msg, output_path, output_file, output_extension = check_output_format(output_file_name, format) if not success: logger.error(f"Format error. {msg}") sys.exit(1) - 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_log_{_start_time}.txt"), True, logging.INFO, logging.DEBUG, _PKG_NAME, path_to_scan) if os.path.isdir(path_to_scan): @@ -107,7 +107,7 @@ def main(): else: print_help_msg_source() sys.exit(1) - create_report_file(start_time, scanned_result, license_list, selected_scanner, print_matched_text, + create_report_file(_start_time, scanned_result, license_list, selected_scanner, print_matched_text, output_path, output_file, output_extension) try: logger.info(yaml.safe_dump(_result_log, allow_unicode=True, sort_keys=True)) @@ -118,7 +118,7 @@ def main(): sys.exit(1) -def create_report_file(start_time, scanned_result, license_list, selected_scanner, need_license=False, +def create_report_file(_start_time, scanned_result, license_list, selected_scanner, need_license=False, output_path="", output_file="", output_extension=""): """ Create report files for given scanned result. @@ -131,7 +131,6 @@ 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() @@ -140,11 +139,9 @@ def create_report_file(start_time, scanned_result, license_list, selected_scanne if output_file == "": if output_extension == _json_ext: - output_file = f"Opossum_input_{start_time}" - if output_extension == _yaml_ext: - output_file = f"fosslight-sbom-info_{start_time}" + output_file = f"fosslight_opossum_{_start_time}" else: - output_file = f"FOSSLight-Report_{start_time}" + output_file = f"fosslight_report_{_start_time}" if scanned_result: scanned_result = sorted(scanned_result, key=lambda row: (''.join(row.licenses))) diff --git a/src/fosslight_source/convert_scancode.py b/src/fosslight_source/convert_scancode.py index 38cba8b..45084c7 100755 --- a/src/fosslight_source/convert_scancode.py +++ b/src/fosslight_source/convert_scancode.py @@ -42,13 +42,13 @@ def convert_json_to_output_report(scancode_json, output_file_name, need_license= if output_file == "": if output_extension == _json_ext: - output_file = "Opossum_input_" + start_time + output_file = "fosslight_opossum_" + start_time else: - output_file = "FOSSLight-Report_" + start_time + output_file = "fosslight_report_" + start_time else: output_path = os.getcwd() - 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, "fosslight_log_" + start_time + ".txt"), True, logging.INFO, logging.DEBUG, _PKG_NAME) if not success: logger.error("Fail to convert scancode: " + msg) diff --git a/src/fosslight_source/run_scancode.py b/src/fosslight_source/run_scancode.py index 3fc3576..9911be3 100755 --- a/src/fosslight_source/run_scancode.py +++ b/src/fosslight_source/run_scancode.py @@ -35,9 +35,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') + _start_time = datetime.now().strftime('%y%m%d_%H%M') success, msg, output_path, output_file, output_extension = check_output_format(output_file_name, format) if success: @@ -49,11 +47,9 @@ def run_scan(path_to_scan, output_file_name="", if not called_by_cli: 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}" + output_file = f"fosslight_opossum_{_start_time}" else: - output_file = f"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") @@ -61,7 +57,7 @@ def run_scan(path_to_scan, output_file_name="", output_json_file = "" if not called_by_cli: - logger, _result_log = init_log(os.path.join(output_path, f"fosslight_src_log_{start_time}.txt"), + logger, _result_log = init_log(os.path.join(output_path, f"fosslight_log_{_start_time}.txt"), True, logging.INFO, logging.DEBUG, _PKG_NAME, path_to_scan) num_cores = multiprocessing.cpu_count() - 1 if num_cores < 0 else num_cores diff --git a/src/fosslight_source/run_scanoss.py b/src/fosslight_source/run_scanoss.py index beec8f5..c98ca1e 100755 --- a/src/fosslight_source/run_scanoss.py +++ b/src/fosslight_source/run_scanoss.py @@ -44,8 +44,8 @@ def run_scanoss_py(path_to_scan, output_file_name="", format="", called_by_cli=F if not called_by_cli: global logger - start_time = datetime.now().strftime('%Y%m%d_%H%M%S') - logger, _result_log = init_log(os.path.join(output_path, f"fosslight_src_log_{start_time}.txt"), + _start_time = datetime.now().strftime('%y%m%d_%H%M') + logger, _result_log = init_log(os.path.join(output_path, f"fosslight_log_{_start_time}.txt"), True, logging.INFO, logging.DEBUG, _PKG_NAME, path_to_scan) scanoss_file_list = [] diff --git a/tests/cli_test.py b/tests/cli_test.py index e00d9cc..8d41e1d 100755 --- a/tests/cli_test.py +++ b/tests/cli_test.py @@ -17,13 +17,13 @@ def main(): global logger path_to_find_bin = os.path.abspath("tests/test_files/test") - start_time = datetime.now().strftime('%Y-%m-%d_%H-%M-%S') + _start_time = datetime.now().strftime('%y%m%d_%H%M') output_file_name = "" fosslight_report_name = "test_result_func_call/result" output_dir = os.path.dirname(os.path.abspath(output_file_name)) - logger, result_item = init_log(os.path.join(output_dir, "fosslight_src_log_"+start_time+".txt")) + logger, result_item = init_log(os.path.join(output_dir, "fosslight_log_"+_start_time+".txt")) ret = run_all_scanners(path_to_find_bin, fosslight_report_name, True, -1, True, "", False) diff --git a/tests/test_files/run_scancode.py b/tests/test_files/run_scancode.py index c0697b7..a04f99e 100755 --- a/tests/test_files/run_scancode.py +++ b/tests/test_files/run_scancode.py @@ -67,18 +67,18 @@ def run_scan(path_to_scan, output_file_name="", result_list = [] _windows = platform.system() == "Windows" - start_time = datetime.now().strftime('%Y%m%d_%H%M%S') + _start_time = datetime.now().strftime('%y%m%d_%H%M') if output_file_name == "": - output_file = f"FOSSLight-Report_{start_time}" - output_json_file = f"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, f"fosslight_src_log_{start_time}.txt"), + logger, _result_log = init_log(os.path.join(output_dir, f"fosslight_log_{_start_time}.txt"), True, logging.INFO, logging.DEBUG, _PKG_NAME, path_to_scan) if path_to_scan == "":