Skip to content

Print the extension to the output file of the result log #27

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
Parent: Copy OSS info for same checksum file
merged 1 commit into from
Jan 5, 2022
Merged

Print the extension to the output file of the result log #27

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
29 changes: 22 additions & 7 deletions src/fosslight_binary/binary_analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
_error_logs = []
_root_path = ""
_start_time = ""
windows = False


def init(path_to_find_bin, output_file_name, format):
Expand Down Expand Up @@ -129,6 +130,8 @@ def find_binaries(path_to_find_bin, output_dir, format, dburl=""):
total_bin_cnt = 0
total_file_cnt = 0
db_loaded_cnt = 0
success_to_write = False
writing_msg = ""

try:
if not os.path.isdir(path_to_find_bin):
Expand Down Expand Up @@ -166,14 +169,25 @@ def find_binaries(path_to_find_bin, output_dir, format, dburl=""):

success_to_write, writing_msg = write_output_file(result_report, output_extension,
sheet_list)
logger.info("Writing Output file(" + os.path.basename(result_report) + output_extension
+ "):" + str(success_to_write) + " " + writing_msg)
if success_to_write:
_result_log["Output file"] = result_report + output_extension

except Exception as ex:
error_occured(error_msg=str(ex), exit=False)

# Print Result
try:
output_files = []
if output_extension == "":
output_extension = ".xlsx"
if not windows:
output_files.append(f"{result_report}.csv")
output_files.insert(0, f"{result_report}{output_extension}")

logger.info(f"Writing Output file ({output_files[0]}"
f"):{success_to_write} {writing_msg}")
if success_to_write:
_result_log["Output file"] = output_files
except Exception as ex:
error_occured(error_msg=f"Print log:{ex}", exit=False)

print_result_log(success=True, result_log=_result_log,
file_cnt=str(total_file_cnt), bin_file_cnt=str(total_bin_cnt),
auto_bin_cnt=str(db_loaded_cnt))
Expand Down Expand Up @@ -241,6 +255,7 @@ def print_result_log(success=True, result_log={}, file_cnt="", bin_file_cnt="",


def main():
global windows
argv = sys.argv[1:]
output_dir = ""
path_to_find_bin = ""
Expand All @@ -265,9 +280,9 @@ def main():
except Exception:
print_help_msg()

_windows = platform.system() == "Windows"
windows = platform.system() == "Windows"
if path_to_find_bin == "":
if _windows:
if windows:
path_to_find_bin = os.getcwd()
else:
print_help_msg()
Expand Down