Skip to content

Commit 1c49810

Browse files
committed
Do not print text file
1 parent 4ef8a8d commit 1c49810

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

src/fosslight_android/_write_excel.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import sys
66
import xlsxwriter
77
import logging
8-
from fosslight_util.write_txt import write_txt_file
98
from fosslight_util.constant import LOGGER_NAME
109
from fosslight_util.write_excel import hide_column, write_cover_sheet
1110

@@ -47,21 +46,17 @@ def create_worksheet(workbook, sheet_name, header_row):
4746
return worksheet
4847

4948

50-
def write_result_to_txt_and_excel(out_excel_file, final_bin_info, out_txt_file, cover=''):
49+
def write_result(out_excel_file, final_bin_info, cover=''):
5150
excel_list = []
52-
final_str = ['Binary Name\tSource Code Path\tNOTICE.html\tOSS Name\tOSS Version\tLicense\tNeed '
53-
'Check\tComment\ttlsh\tchecksum']
51+
5452
if final_bin_info:
5553
for item in sorted(final_bin_info, key=lambda binary: (binary.source_code_path, binary.bin_name)):
5654
try:
5755
print_row, print_excel = item.get_print_items()
58-
final_str.append('\n'.join(print_row))
5956
excel_list.extend(print_excel)
6057
except Exception as error:
6158
logger.error(f"Get results to print:{error}")
6259
sys.exit(1)
63-
64-
success, error_msg = write_txt_file(out_txt_file, '\n'.join(final_str))
6560
write_result_to_excel(out_excel_file, excel_list, cover)
6661
else:
6762
logger.warning("Nothing is detected from the scanner so output file is not generated.")

src/fosslight_android/android_binary_analysis.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import numpy as np
2424
from functools import partial
2525
from fosslight_util.set_log import init_log
26-
from ._write_excel import write_result_to_txt_and_excel
26+
from ._write_excel import write_result
2727
from ._util import (
2828
read_file,
2929
write_txt_file,
@@ -770,7 +770,6 @@ def main():
770770

771771
python_script_dir = os.getcwd()
772772
now = datetime.now().strftime('%y%m%d_%H%M')
773-
result_txt_file = os.path.join(python_script_dir, f"fosslight_binary_android_{now}.txt")
774773
log_txt_file = os.path.join(python_script_dir, f"fosslight_log_android_{now}.txt")
775774
result_excel_file = os.path.join(python_script_dir, f"fosslight_report_android_{now}.xlsx")
776775
remove_list_file = ""
@@ -861,9 +860,8 @@ def main():
861860
start_time=now,
862861
input_path=python_script_dir)
863862
cover.comment = f"Total number of binaries: {len(final_bin_info)}"
864-
write_result_to_txt_and_excel(result_excel_file, final_bin_info, result_txt_file, cover)
863+
write_result(result_excel_file, final_bin_info, cover)
865864
result_log["Output FOSSLight Report"] = result_excel_file
866-
result_log["Output result text file"] = result_txt_file
867865

868866
if _create_additial_notice:
869867
create_additional_notice(final_bin_info, python_script_dir)

0 commit comments

Comments
 (0)