Skip to content

Fix a bug that returns even if there is no result file. #82

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
Jul 29, 2022
Merged

Fix a bug that returns even if there is no result file. #82

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
31 changes: 18 additions & 13 deletions src/fosslight_util/output_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,25 @@ def check_output_format(output='', format='', customized_format={}):
def write_output_file(output_file_without_ext, file_extension, sheet_list, extended_header={}):
success = True
msg = ''
if file_extension == '':
file_extension = '.xlsx'
result_file = output_file_without_ext + file_extension

if file_extension == '.xlsx':
success, msg = write_result_to_excel(result_file, sheet_list, extended_header)
elif file_extension == '.csv':
success, msg, result_file = write_result_to_csv(result_file, sheet_list)
elif file_extension == '.json':
success, msg = write_opossum(result_file, sheet_list)
elif file_extension == '.yaml':
success, msg, result_file = write_yaml(result_file, sheet_list, False)
if sheet_list:
if file_extension == '':
file_extension = '.xlsx'
result_file = output_file_without_ext + file_extension

if file_extension == '.xlsx':
success, msg = write_result_to_excel(result_file, sheet_list, extended_header)
elif file_extension == '.csv':
success, msg, result_file = write_result_to_csv(result_file, sheet_list)
elif file_extension == '.json':
success, msg = write_opossum(result_file, sheet_list)
elif file_extension == '.yaml':
success, msg, result_file = write_yaml(result_file, sheet_list, False)
else:
success = False
msg = f'Not supported file extension({file_extension})'
else:
success = False
msg = f'Not supported file extension({file_extension})'
result_file = ""
msg = "Nothing is detected from the scanner so output file is not generated."

return success, msg, result_file