fosslight-binary 5.1.1__tar.gz → 5.1.2__tar.gz

{fosslight_binary-5.1.1 → fosslight_binary-5.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight_binary
-Version: 5.1.1
+Version: 5.1.2
 Summary: FOSSLight Binary Scanner
 Home-page: https://github.com/fosslight/fosslight_binary_scanner
 Author: LG Electronics

{fosslight_binary-5.1.1 → fosslight_binary-5.1.2}/requirements.txt

@@ -2,11 +2,11 @@ binaryornot
 numpy
 pandas
 parmap
-psycopg2-binary
+psycopg2-binary==2.9.9
 python-dateutil
 py-tlsh
 pytz
 XlsxWriter
 PyYAML
-fosslight_util>=2.1.0
+fosslight_util>=2.1.6
 dependency-check

{fosslight_binary-5.1.1 → fosslight_binary-5.1.2}/setup.py

@@ -33,7 +33,7 @@ if __name__ == "__main__":
 
     setup(
         name=_PACKAEG_NAME,
-        version='5.1.1',
+        version='5.1.2',
         package_dir={"": "src"},
         packages=find_packages(where='src'),
         description='FOSSLight Binary Scanner',

{fosslight_binary-5.1.1 → fosslight_binary-5.1.2}/src/fosslight_binary/binary_analysis.py

@@ -90,12 +90,15 @@ def init(path_to_find_bin, output_file_name, formats, path_to_exclude=[]):
         for i, output_extension in enumerate(output_extensions):
             if output_files[i] is None or output_files[i] == "":
                 if formats:
-                    if formats[i].startswith('spdx'):
-                        if platform.system() != 'Windows':
-                            output_files[i] = f"fosslight_spdx_bin_{start_time}"
-                        else:
-                            logger.warning('spdx format is not supported on Windows. Please remove spdx from format.')
+                    if formats[i].startswith('spdx') or formats[i].startswith('cyclonedx'):
+                        if platform.system() == 'Windows':
+                            logger.warning(f'{formats[i]} is not supported on Windows. Please remove {formats[i]} from format.')
                             to_remove.append(i)
+                        else:
+                            if formats[i].startswith('spdx'):
+                                output_files[i] = f"fosslight_spdx_bin_{start_time}"
+                            elif formats[i].startswith('cyclonedx'):
+                                output_files[i] = f'fosslight_cyclonedx_bin_{start_time}'
                     else:
                         if output_extension == _json_ext:
                             output_files[i] = f"fosslight_opossum_bin_{start_time}"
@@ -200,12 +203,11 @@ def find_binaries(path_to_find_bin, output_dir, formats, dburl="", simple_mode=F
     writing_msg = ""
     results = []
     bin_list = []
-    base_dir_name = os.path.basename(path_to_find_bin)
     scan_item = ScannerItem(PKG_NAME, "")
-    abs_path_to_exclude = [os.path.abspath(os.path.join(base_dir_name, path)) for path in path_to_exclude if path.strip() != ""]
+    abs_path_to_exclude = [os.path.abspath(path) for path in path_to_exclude if path.strip() != ""]
 
     if not os.path.isdir(path_to_find_bin):
-        error_occured(error_msg=f"Can't find the directory : {path_to_find_bin}",
+        error_occured(error_msg=f"(-p option) Can't find the directory: {path_to_find_bin}",
                       result_log=_result_log,
                       exit=True,
                       mode=mode)

{fosslight_binary-5.1.1 → fosslight_binary-5.1.2}/src/fosslight_binary/cli.py

@@ -5,6 +5,7 @@
 import argparse
 import sys
 import os
+import shutil
 from fosslight_util.help import print_package_version
 from fosslight_binary._help import print_help_msg
 from fosslight_binary.binary_analysis import find_binaries
@@ -13,6 +14,23 @@ from fosslight_util.timer_thread import TimerThread
 _PKG_NAME = "fosslight_binary"
 
 
+def get_terminal_size():
+    size = shutil.get_terminal_size()
+    return size.lines
+
+
+def paginate_file(file_path):
+    lines_per_page = get_terminal_size() - 1
+    with open(file_path, 'r', encoding='utf8') as file:
+        lines = file.readlines()
+
+    for i in range(0, len(lines), lines_per_page):
+        os.system('clear' if os.name == 'posix' else 'cls')
+        print(''.join(lines[i: i + lines_per_page]))
+        if i + lines_per_page < len(lines):
+            input("Press Enter to see the next page...")
+
+
 def main():
     global windows
     path_to_find_bin = ""
@@ -85,8 +103,10 @@ def main():
         data_path = os.path.join(base_path, 'LICENSES')
         print(f"*** {_PKG_NAME} open source license notice ***")
         for ff in os.listdir(data_path):
-            f = open(os.path.join(data_path, ff), 'r', encoding='utf8')
-            print(f.read())
+            source_file = os.path.join(data_path, ff)
+            destination_file = os.path.join(base_path, ff)
+            paginate_file(source_file)
+            shutil.copyfile(source_file, destination_file)
         sys.exit(0)
 
     timer = TimerThread()

{fosslight_binary-5.1.1 → fosslight_binary-5.1.2}/src/fosslight_binary.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-binary
-Version: 5.1.1
+Version: 5.1.2
 Summary: FOSSLight Binary Scanner
 Home-page: https://github.com/fosslight/fosslight_binary_scanner
 Author: LG Electronics

{fosslight_binary-5.1.1 → fosslight_binary-5.1.2}/src/fosslight_binary.egg-info/requires.txt

@@ -2,13 +2,13 @@ binaryornot
 numpy
 pandas
 parmap
-psycopg2-binary
+psycopg2-binary==2.9.9
 python-dateutil
 py-tlsh
 pytz
 XlsxWriter
 PyYAML
-fosslight_util>=2.1.0
+fosslight_util>=2.1.6
 dependency-check
 
 [:"darwin" in sys_platform]