fosslight-util 2.1.36__py3-none-any.whl → 2.1.38__py3-none-any.whl

fosslight_util/cover.py

@@ -18,8 +18,8 @@ class CoverItem:
 
     PKG_NAMES = [
         "fosslight_scanner",
-        "fosslight_source",
         "fosslight_dependency",
+        "fosslight_source",
         "fosslight_binary"
     ]
 
@@ -48,6 +48,24 @@ class CoverItem:
     def __del__(self):
         pass
 
+    def get_sort_order(self):
+        for idx, pkg_name in enumerate(self.PKG_NAMES[1:], start=0):
+            if pkg_name in self.tool_name:
+                return idx
+        return 999
+
+    def __lt__(self, other):
+        return self.get_sort_order() < other.get_sort_order()
+
+    def create_merged_comment(self, cover_items):
+        if not cover_items:
+            return ""
+        sorted_items = sorted(cover_items)
+        comments = []
+        for ci in sorted_items:
+            comments.append(f'[{ci.tool_name}] {ci.comment}')
+        return '\n'.join(comments)
+
     def get_print_json(self):
         json_item = {}
         json_item[self.tool_name_key] = self.tool_name

fosslight_util/exclude.py

@@ -7,8 +7,14 @@ import os
 import fnmatch
 from typing import List
 
-EXCLUDE_DIRECTORY = ["test", "tests", "doc", "docs"]
+EXCLUDE_DIRECTORY = ["test", "tests", "doc", "docs", "intermediates"]
 PACKAGE_DIRECTORY = ["node_modules", "venv", "Pods", "Carthage"]
+EXCLUDE_FILENAME = ["changelog", "config.guess", "config.sub", "changes", "ltmain.sh",
+                    "configure", "configure.ac", "depcomp", "compile", "missing", "makefile",
+                    'fosslight_bin', 'fosslight_bin.exe']
+EXCLUDE_FILE_EXTENSION = ['qm', 'xlsx', 'pdf', 'pptx', 'jfif', 'docx', 'doc', 'whl',
+                          'xls', 'xlsm', 'ppt', 'mp4', 'pyc', 'plist', 'dat',
+                          "m4", "in", "po", "class"]
 
 
 def excluding_files(patterns: List[str], path_to_scan: str) -> List[str]:
@@ -98,13 +104,12 @@ def is_exclude_dir(rel_path: str) -> tuple:
     return False, False
 
 
-def get_excluded_paths(path_to_scan: str, custom_excluded_paths: list = [], exclude_file_extension: list = []) -> tuple:
+def get_excluded_paths(path_to_scan: str, custom_excluded_paths: list = [], custom_exclude_extension: list = []) -> tuple:
     path_to_exclude = []
     path_to_exclude_with_dot = []
     excluded_files = set()  # Use set for O(1) operations
     abs_path_to_scan = os.path.abspath(path_to_scan)
     custom_excluded_normalized = [p.replace('\\', '/') for p in custom_excluded_paths]
-    exclude_extensions_lower = [ext.lower().lstrip('.') for ext in exclude_file_extension]
     cnt_file_except_skipped = 0
 
     for root, dirs, files in os.walk(path_to_scan):
@@ -124,23 +129,30 @@ def get_excluded_paths(path_to_scan: str, custom_excluded_paths: list = [], excl
             file_path = os.path.join(root, file_name)
             rel_path = os.path.relpath(file_path, abs_path_to_scan).replace('\\', '/')
             should_exclude = False
-            has_dot = False
+            except_info_sheet = False
             if not _has_parent_in_exclude_list(rel_path, path_to_exclude):
+                file_ext = os.path.splitext(file_name)[1].lstrip('.').lower()
                 if rel_path in custom_excluded_normalized:
                     should_exclude = True
                 elif file_name in custom_excluded_normalized:
                     should_exclude = True
                 elif file_name.startswith('.'):
                     should_exclude = True
-                    has_dot = True
-                elif exclude_extensions_lower:
-                    file_ext = os.path.splitext(file_name)[1].lstrip('.').lower()
-                    if file_ext in exclude_extensions_lower:
-                        should_exclude = True
+                    except_info_sheet = True
+                elif file_ext and file_ext in custom_exclude_extension:
+                    should_exclude = True
+                elif file_name.lower() in EXCLUDE_FILENAME:
+                    should_exclude = True
+                    except_info_sheet = True
+                    cnt_file_except_skipped += 1
+                elif file_ext and file_ext in EXCLUDE_FILE_EXTENSION:
+                    should_exclude = True
+                    except_info_sheet = True
+                    cnt_file_except_skipped += 1
 
                 if should_exclude:
                     path_to_exclude.append(rel_path)
-                    if has_dot:
+                    if except_info_sheet:
                         path_to_exclude_with_dot.append(rel_path)
                     excluded_files.add(rel_path)
             else:

{fosslight_util-2.1.36.dist-info → fosslight_util-2.1.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fosslight_util
-Version: 2.1.36
+Version: 2.1.38
 Summary: FOSSLight Util
 Home-page: https://github.com/fosslight/fosslight_util
 Download-URL: https://github.com/fosslight/fosslight_util

{fosslight_util-2.1.36.dist-info → fosslight_util-2.1.38.dist-info}/RECORD

@@ -3,9 +3,9 @@ fosslight_util/_get_downloadable_url.py,sha256=Komp1ODhqCKbnqGl7T-EDT8KmQuvgOeZ-
 fosslight_util/compare_yaml.py,sha256=eLqqCLgERxRHN5vsnpQVMXIEU862Lx66mD_y4uMgQE4,2916
 fosslight_util/constant.py,sha256=3BzJtyxC0o5IFAhYaUW-DeTKkA6f5tDJFJTb0k5ji9Y,2418
 fosslight_util/correct.py,sha256=1WEAL-9_KhjFPLucPhv0PNN3K7avm0z8mU6sTuSyeHM,3864
-fosslight_util/cover.py,sha256=qqqKzxqFwKimal764FaugRUBcHWdeKt8af6xeK0mH8E,2040
+fosslight_util/cover.py,sha256=yrWwguN5VM7mOllljiDVykPfuLYfI11kcJ6gEs49Bjo,2616
 fosslight_util/download.py,sha256=AWwD3FWhF-bMagWINJ-Dg1VMuycXbe8VXX7qQ09YjYs,23565
-fosslight_util/exclude.py,sha256=oeBwkc4T80mXdt6_0ak3FGwwzvXpSO-P4Wfd1OT2i3Y,6070
+fosslight_util/exclude.py,sha256=a8aEBglvc1Ub5cRtXHqpzbmuyhzgH3O-X1rFDHkOayc,6841
 fosslight_util/get_pom_license.py,sha256=vmh2LG1_4U7ts9SSpN3_UAANWbx5GBAVjremwm62OFY,5639
 fosslight_util/help.py,sha256=VomACZeXEMCiT1nxUwPqQAiVdNaMarwHVz9e10qbFc0,4954
 fosslight_util/oss_item.py,sha256=8890JHb5ZoKQWAwN7Fl8badnlYatJtF4MVJz1rdS4yQ,6938
@@ -25,9 +25,9 @@ fosslight_util/write_yaml.py,sha256=QlEKoIPQsEaYERfbP53TeKgnllYzhLQWm5wYjnWtVjE,
 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-2.1.36.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_util-2.1.36.dist-info/METADATA,sha256=n-reuC9PkPU9QFJWRqn5UheXoG8y7ICNbolRgdcos6E,6365
-fosslight_util-2.1.36.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-fosslight_util-2.1.36.dist-info/entry_points.txt,sha256=0yZggRWNwDaClDG8UmUA10UFG8cVX3Jiy5gG9nW7hJs,68
-fosslight_util-2.1.36.dist-info/top_level.txt,sha256=2qyYWGLakgBRy4BqoBNt-I5C29tBr_e93e5e1pbuTGA,15
-fosslight_util-2.1.36.dist-info/RECORD,,
+fosslight_util-2.1.38.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_util-2.1.38.dist-info/METADATA,sha256=8v1p52zrqs998FTozt23F13UkBRPPQofsD7GlHzbPHQ,6365
+fosslight_util-2.1.38.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+fosslight_util-2.1.38.dist-info/entry_points.txt,sha256=0yZggRWNwDaClDG8UmUA10UFG8cVX3Jiy5gG9nW7hJs,68
+fosslight_util-2.1.38.dist-info/top_level.txt,sha256=2qyYWGLakgBRy4BqoBNt-I5C29tBr_e93e5e1pbuTGA,15
+fosslight_util-2.1.38.dist-info/RECORD,,