From c7a2a7834a30b7efb442c6798d98f758325ccf66 Mon Sep 17 00:00:00 2001 From: Jiyeong Seok Date: Tue, 19 Jul 2022 17:58:10 +0900 Subject: [PATCH 1/2] Fix not to create csv if format is empty Signed-off-by: Jiyeong Seok --- src/fosslight_util/output_format.py | 8 ++++---- src/fosslight_util/write_excel.py | 7 +------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/fosslight_util/output_format.py b/src/fosslight_util/output_format.py index d780de1..23b9fc7 100644 --- a/src/fosslight_util/output_format.py +++ b/src/fosslight_util/output_format.py @@ -3,7 +3,7 @@ # Copyright (c) 2021 LG Electronics Inc. # SPDX-License-Identifier: Apache-2.0 import os -from fosslight_util.write_excel import write_result_to_excel, write_excel_and_csv, write_result_to_csv +from fosslight_util.write_excel import write_result_to_excel, write_result_to_csv from fosslight_util.write_opossum import write_opossum from fosslight_util.write_yaml import write_yaml @@ -62,11 +62,11 @@ 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 == '': - success, msg, result_file = write_excel_and_csv(output_file_without_ext, sheet_list, False, extended_header) - elif file_extension == '.xlsx': + 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) diff --git a/src/fosslight_util/write_excel.py b/src/fosslight_util/write_excel.py index c36ccfa..5588a2b 100755 --- a/src/fosslight_util/write_excel.py +++ b/src/fosslight_util/write_excel.py @@ -196,7 +196,7 @@ def create_worksheet(workbook, sheet_name, header_row): return worksheet -def merge_excels(find_excel_dir, final_out, csv=True): +def merge_excels(find_excel_dir, final_out): success = True msg = "" output_files = [] @@ -204,7 +204,6 @@ def merge_excels(find_excel_dir, final_out, csv=True): added_sheet_names = [] try: files = os.listdir(find_excel_dir) - out_dir = os.path.dirname(final_out) if len([name for name in files if name.endswith(FIND_EXTENSION)]) > 0: writer = pd.ExcelWriter(final_out) @@ -220,10 +219,6 @@ def merge_excels(find_excel_dir, final_out, csv=True): sheet_name_to_copy = f"{f_short_name}_{sheet_name}" df_excel = pd.read_excel( file, sheet_name=sheet_name, engine='openpyxl') - if csv: - csv_file = os.path.join(out_dir, f"{sheet_name_to_copy}.csv") - df_excel.to_csv(csv_file, index=False) - output_files.append(csv_file) if sheet_name not in added_sheet_names: sheet_name_to_copy = sheet_name df_excel.to_excel(writer, sheet_name_to_copy, From e31fb8b0694aa8c96ea13459c16803f2f8e1349f Mon Sep 17 00:00:00 2001 From: Jiyeong Seok Date: Tue, 19 Jul 2022 17:58:10 +0900 Subject: [PATCH 2/2] Fix not to create csv if format is empty Signed-off-by: Jiyeong Seok --- src/fosslight_util/output_format.py | 8 ++++---- src/fosslight_util/write_excel.py | 12 ++---------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/fosslight_util/output_format.py b/src/fosslight_util/output_format.py index d780de1..23b9fc7 100644 --- a/src/fosslight_util/output_format.py +++ b/src/fosslight_util/output_format.py @@ -3,7 +3,7 @@ # Copyright (c) 2021 LG Electronics Inc. # SPDX-License-Identifier: Apache-2.0 import os -from fosslight_util.write_excel import write_result_to_excel, write_excel_and_csv, write_result_to_csv +from fosslight_util.write_excel import write_result_to_excel, write_result_to_csv from fosslight_util.write_opossum import write_opossum from fosslight_util.write_yaml import write_yaml @@ -62,11 +62,11 @@ 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 == '': - success, msg, result_file = write_excel_and_csv(output_file_without_ext, sheet_list, False, extended_header) - elif file_extension == '.xlsx': + 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) diff --git a/src/fosslight_util/write_excel.py b/src/fosslight_util/write_excel.py index c36ccfa..6131568 100755 --- a/src/fosslight_util/write_excel.py +++ b/src/fosslight_util/write_excel.py @@ -196,15 +196,13 @@ def create_worksheet(workbook, sheet_name, header_row): return worksheet -def merge_excels(find_excel_dir, final_out, csv=True): +def merge_excels(find_excel_dir, final_out): success = True msg = "" - output_files = [] FIND_EXTENSION = '.xlsx' added_sheet_names = [] try: files = os.listdir(find_excel_dir) - out_dir = os.path.dirname(final_out) if len([name for name in files if name.endswith(FIND_EXTENSION)]) > 0: writer = pd.ExcelWriter(final_out) @@ -220,19 +218,13 @@ def merge_excels(find_excel_dir, final_out, csv=True): sheet_name_to_copy = f"{f_short_name}_{sheet_name}" df_excel = pd.read_excel( file, sheet_name=sheet_name, engine='openpyxl') - if csv: - csv_file = os.path.join(out_dir, f"{sheet_name_to_copy}.csv") - df_excel.to_csv(csv_file, index=False) - output_files.append(csv_file) if sheet_name not in added_sheet_names: sheet_name_to_copy = sheet_name df_excel.to_excel(writer, sheet_name_to_copy, index=False) writer.save() - output_files.append(final_out) except Exception as ex: msg = str(ex) success = False - if success: - msg = ",".join(output_files) + return success, msg