Skip to content

Add the package name to result in the missing file #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 20, 2023
Merged

Add the package name to result in the missing file #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/fosslight_source/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def main():
if not success:
logger.error(f"Format error. {msg}")
sys.exit(1)
logger, _result_log = init_log(os.path.join(output_path, f"fosslight_log_{_start_time}.txt"),
logger, _result_log = init_log(os.path.join(output_path, f"fosslight_log_src_{_start_time}.txt"),
True, logging.INFO, logging.DEBUG, _PKG_NAME, path_to_scan)

if os.path.isdir(path_to_scan):
Expand Down Expand Up @@ -151,9 +151,9 @@ def create_report_file(_start_time, scanned_result, license_list, selected_scann

if output_file == "":
if output_extension == _json_ext:
output_file = f"fosslight_opossum_{_start_time}"
output_file = f"fosslight_opossum_src_{_start_time}"
else:
output_file = f"fosslight_report_{_start_time}"
output_file = f"fosslight_report_src_{_start_time}"

if scanned_result:
scanned_result = sorted(scanned_result, key=lambda row: (''.join(row.licenses)))
Expand Down
4 changes: 2 additions & 2 deletions src/fosslight_source/convert_scancode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def convert_json_to_output_report(scancode_json, output_file_name, need_license=
lic_list = {}
msg = ""
success = True
start_time = datetime.now().strftime('%Y%m%d_%H%M%S')
start_time = datetime.now().strftime('%y%m%d_%H%M')
_json_ext = ".json"

success, msg, output_path, output_file, output_extension = check_output_format(output_file_name, format)
Expand All @@ -41,7 +41,7 @@ def convert_json_to_output_report(scancode_json, output_file_name, need_license=

if output_file == "":
if output_extension == _json_ext:
output_file = "fosslight_opossum_" + start_time
output_file = "fosslight_opossum_src_" + start_time
else:
output_file = "fosslight_report_src_" + start_time
else:
Expand Down
2 changes: 1 addition & 1 deletion src/fosslight_source/run_scancode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ 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"fosslight_opossum_{_start_time}"
output_file = f"fosslight_opossum_src_{_start_time}"
else:
output_file = f"fosslight_report_src_{_start_time}"

Expand Down