Skip to content

Commit b69b8e1

Browse files
authored
Merge pull request #98 from fosslight/develop
Change output report file name
2 parents 37a392a + 7131997 commit b69b8e1

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

src/fosslight_dependency/run_dependency_scanner.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
7272
sheet_list = {}
7373
sheet_list[_sheet_name] = []
7474
_json_ext = ".json"
75-
_yaml_ext = ".yaml"
76-
_start_time = datetime.now().strftime('%y%m%d_%H%M%S')
75+
_start_time = datetime.now().strftime('%y%m%d_%H%M')
7776

7877
success, msg, output_path, output_file, output_extension = check_output_format(output_dir_file, format)
7978
if success:
@@ -84,16 +83,14 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
8483

8584
if output_file == "":
8685
if output_extension == _json_ext:
87-
output_file = f"Opossum_input_{_start_time}"
88-
elif output_extension == _yaml_ext:
89-
output_file = f"fosslight-sbom-info_{_start_time}"
86+
output_file = f"fosslight_opossum_{_start_time}"
9087
else:
91-
output_file = f"FOSSLight-Report_{_start_time}"
88+
output_file = f"fosslight_report_{_start_time}"
9289
else:
9390
logger.error(msg)
9491
sys.exit(1)
9592

96-
logger, _result_log = init_log(os.path.join(output_path, "fosslight_dependency_log_" + _start_time + ".txt"),
93+
logger, _result_log = init_log(os.path.join(output_path, "fosslight_dep_log_" + _start_time + ".txt"),
9794
True, logging.INFO, logging.DEBUG, _PKG_NAME)
9895

9996
logger.info(f"Tool Info : {_result_log['Tool Info']}")

0 commit comments

Comments
 (0)