fosslight-util 1.4.42__py3-none-any.whl → 1.4.44__py3-none-any.whl

fosslight_util/correct.py

@@ -76,6 +76,12 @@ def correct_with_yaml(correct_filepath, path_to_scan, scanner_oss_list):
                     if matched_oss_item.comment:
                         matched_oss_item.comment += '/'
                     matched_oss_item.comment += 'Loaded from sbom-info.yaml'
+
+                    if sheet_name == 'BIN_FL_Binary':
+                        matched_oss_item.bin_vulnerability = oss_item.bin_vulnerability
+                        matched_oss_item.bin_tlsh = oss_item.bin_tlsh
+                        matched_oss_item.bin_sha1 = oss_item.bin_sha1
+
                     matched_oss_array = matched_oss_item.get_print_array(scanner_name)[0]
                     correct_contents.append(matched_oss_array)
                 oss_item.exclude = True

fosslight_util/cover.py

@@ -14,9 +14,10 @@ class CoverItem:
     start_time_key = "Start time"
     python_ver_key = "Python version"
     analyzed_path_key = "Analyzed path"
+    excluded_path_key = "Excluded path"
     comment_key = "Comment"
 
-    def __init__(self, tool_name="", start_time="", input_path="", comment=""):
+    def __init__(self, tool_name="", start_time="", input_path="", comment="", exclude_path=[]):
         self.tool_name = tool_name
         if start_time:
             date, time = start_time.split('_')
@@ -24,6 +25,7 @@ class CoverItem:
         else:
             self.start_time = ""
         self.input_path = os.path.abspath(input_path)
+        self.exclude_path = ", ".join(exclude_path)
         self.comment = comment
 
         self.tool_version = print_package_version(self.tool_name, "", False)
@@ -39,6 +41,7 @@ class CoverItem:
         json_item[self.start_time_key] = self.start_time
         json_item[self.python_ver_key] = self.python_version
         json_item[self.analyzed_path_key] = self.input_path
+        json_item[self.excluded_path_key] = self.exclude_path
         json_item[self.comment_key] = self.comment
 
         return json_item

fosslight_util/set_log.py

@@ -42,7 +42,7 @@ class CustomAdapter(logging.LoggerAdapter):
 
 
 def init_log(log_file, create_file=True, stream_log_level=logging.INFO,
-             file_log_level=logging.DEBUG, main_package_name="", path_to_analyze=""):
+             file_log_level=logging.DEBUG, main_package_name="", path_to_analyze="", path_to_exclude=[]):
 
     logger = logging.getLogger(constant.LOGGER_NAME)
 
@@ -83,5 +83,7 @@ def init_log(log_file, create_file=True, stream_log_level=logging.INFO,
         _result_log["Tool Info"] = pkg_info
     if path_to_analyze != "":
         _result_log["Path to analyze"] = path_to_analyze
+    if path_to_exclude != []:
+        _result_log["Path to exclude"] = ", ".join(path_to_exclude)
 
     return logger, _result_log

{fosslight_util-1.4.42.dist-info → fosslight_util-1.4.44.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-util
-Version: 1.4.42
+Version: 1.4.44
 Summary: FOSSLight Util
 Home-page: https://github.com/fosslight/fosslight_util
 Author: LG Electronics

{fosslight_util-1.4.42.dist-info → fosslight_util-1.4.44.dist-info}/RECORD

@@ -3,15 +3,15 @@ fosslight_util/_get_downloadable_url.py,sha256=63ZPI4KCpUFgL4oheKm8zvekuCRzpwNkV
 fosslight_util/compare_yaml.py,sha256=0bapoyS0yrzkiK70K57E8-3wZ_D6mZAJ-24Eq9TYBlk,2632
 fosslight_util/constant.py,sha256=j9uhncoC2Fn4j4ATNsjUoS91nVXhyGzU6xLyWFj941A,1834
 fosslight_util/convert_excel_to_yaml.py,sha256=7ZsAMMQJIEXrmcl_28nSHvFpGMi1ZiRZYpEfI5O8vP8,2298
-fosslight_util/correct.py,sha256=v4OL8XssYuatcP9G0YhnLChWUiJP8rwoyWDeMmQGT0E,5334
-fosslight_util/cover.py,sha256=21l-BS3ZJ8nDxMLHKGT9igB3XbCme55A0eQf01jbISM,1436
+fosslight_util/correct.py,sha256=FyR1_aD8mOL7gyFMuVT2EkGFRQtw7s7-7Mhgwyd2LQs,5618
+fosslight_util/cover.py,sha256=GZAeGoQGGCx7OEddErS_Mj6pbMCQrdr5jX-CixU4iAA,1607
 fosslight_util/download.py,sha256=4_s1zPEpxPQ7FNkDo0f6MdrQLMOVdjifDO7Y5psqAq8,14484
 fosslight_util/help.py,sha256=xhAf43fuRLOU3TE7jqaxVTizVn4aANDvHaHYQAdaqYc,2154
 fosslight_util/oss_item.py,sha256=JxGokv79z_6Ca4-Aquc_zZEvRqu-xmBunP8Lvy6AIjY,7268
 fosslight_util/output_format.py,sha256=kJpuTuS3XTrsdUd2gsl5GWto5KtJfSej-qkD9azZFdQ,2982
 fosslight_util/parsing_yaml.py,sha256=R2aecMLDoWR-bBdD8qiW0OTn7F5ZC5YNd1Of0YYEJxU,4514
 fosslight_util/read_excel.py,sha256=21T12bSaB69Yp19n-o2qpHMJNWUFoytneaNneRp3qCA,5294
-fosslight_util/set_log.py,sha256=8cFGpr4HMk4grHo3a5keR4V1xWBscbjowYPxyrh42ks,3140
+fosslight_util/set_log.py,sha256=GsUtbtqmYKgBltHzeaxV3H9gaUWMYQYDJEhr_LdEGoo,3258
 fosslight_util/spdx_licenses.py,sha256=r90hUY4_T-XrHIJHLx1Ox3gWZ3qzdZj9rJFo7AwmkPE,3641
 fosslight_util/timer_thread.py,sha256=5VbZENQPD-N0NUmzEktqGr6Am-e7vxD79K05mmr29g0,433
 fosslight_util/write_excel.py,sha256=FJFmCs6_vJTYNDgp-Cwk0ylkMTjN3u3_Wgxy0yoiGqo,12306
@@ -23,9 +23,9 @@ fosslight_util/write_yaml.py,sha256=iJcG3ItggoBp8p3m8PAZwULehKo3BlH1qW2rZzlDv8g,
 fosslight_util/resources/frequentLicenselist.json,sha256=GUhzK6tu7ok10fekOnmVmUgIGRC-acGABZKTNKfDyYA,4776157
 fosslight_util/resources/frequent_license_nick_list.json,sha256=ryU2C_6ZxHbz90_sUN9OvI9GXkCMLu7oGcmd9W79YYo,5005
 fosslight_util/resources/licenses.json,sha256=mK55z-bhY7Mjpj2KsO1crKGGL-X3F6MBFQJ0zLlx010,240843
-fosslight_util-1.4.42.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_util-1.4.42.dist-info/METADATA,sha256=Gwh1UV3hbzKi2Urxb-w9bJzw9uA1YzrTySAD-7C4ohU,6418
-fosslight_util-1.4.42.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-fosslight_util-1.4.42.dist-info/entry_points.txt,sha256=bzXX5i7HZ13V8BLKvtu_9KO3ZjtRypH-XszOXT6I3bU,69
-fosslight_util-1.4.42.dist-info/top_level.txt,sha256=2qyYWGLakgBRy4BqoBNt-I5C29tBr_e93e5e1pbuTGA,15
-fosslight_util-1.4.42.dist-info/RECORD,,
+fosslight_util-1.4.44.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_util-1.4.44.dist-info/METADATA,sha256=gxClL8pM6mPG4gL3vGsjFiHNo7jmuWdU75enkoSNWFo,6418
+fosslight_util-1.4.44.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+fosslight_util-1.4.44.dist-info/entry_points.txt,sha256=bzXX5i7HZ13V8BLKvtu_9KO3ZjtRypH-XszOXT6I3bU,69
+fosslight_util-1.4.44.dist-info/top_level.txt,sha256=2qyYWGLakgBRy4BqoBNt-I5C29tBr_e93e5e1pbuTGA,15
+fosslight_util-1.4.44.dist-info/RECORD,,