Skip to content

Separate compressed file list in FL hub #205

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

Open
bjk7119 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Separate compressed file list in FL hub #205

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
15 changes: 7 additions & 8 deletions src/fosslight_binary/_simple_mode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@


def is_compressed_file(filename):
if filename.lower().endswith('.jar'):
return False
return zipfile.is_zipfile(filename) or tarfile.is_tarfile(filename)


Expand All @@ -27,13 +25,12 @@ def exclude_bin_for_simple_mode(binary_list):
compressed_list = []

for bin in binary_list:
if is_compressed_file(bin.bin_name_with_path):
compressed_list.append(bin.bin_name_with_path)
continue

if re.search(r".*sources\.jar", bin.bin_name_with_path.lower()) or bin.exclude:
continue

if is_compressed_file(bin.bin_name_with_path):
compressed_list.append(bin.bin_name_with_path)

bin_list.append(bin.bin_name_with_path)
return compressed_list, bin_list

Expand Down Expand Up @@ -91,14 +88,16 @@ def print_simple_mode(compressed_list_txt, simple_bin_list_txt, compressed_list,
msg = ""
output_file = ""
if compressed_list:
success, error = write_txt_file(compressed_list_txt, convert_list_to_str(compressed_list))
content = "\n< Compressed File List >\n" + convert_list_to_str(compressed_list)
success, error = write_txt_file(compressed_list_txt, content)
if success:
output_file = compressed_list_txt
else:
msg = f"Error to write compressed list file for simple mode : {error}"
results.append(tuple([success, msg, output_file]))
if bin_list:
success, error = write_txt_file(simple_bin_list_txt, convert_list_to_str(bin_list))
content = "< Binary List >\n" + convert_list_to_str(bin_list)
success, error = write_txt_file(simple_bin_list_txt, content)
if success:
output_file = simple_bin_list_txt
else:
Expand Down
Loading