scanoss 1.12.3__py3-none-any.whl → 1.14.0__py3-none-any.whl

scanoss/__init__.py

@@ -22,4 +22,4 @@
    THE SOFTWARE.
 """
 
-__version__ = '1.12.3'
+__version__ = '1.14.0'

scanoss/cli.py

@@ -72,6 +72,7 @@ def setup_args() -> None:
                         help='Use a dependency file instead of a folder (optional)')
     p_scan.add_argument('--stdin', '-s', metavar='STDIN-FILENAME',  type=str,
                         help='Scan the file contents supplied via STDIN (optional)')
+    p_scan.add_argument('--files',    '-e', type=str, nargs="*", help='List of files to scan.')
     p_scan.add_argument('--identify', '-i', type=str, help='Scan and identify components in SBOM file')
     p_scan.add_argument('--ignore',   '-n', type=str, help='Ignore components specified in the SBOM file')
     p_scan.add_argument('--output',   '-o', type=str, help='Output result file name (optional - default stdout).')
@@ -445,8 +446,8 @@ def scan(parser, args):
         args: Namespace
             Parsed arguments
     """
-    if not args.scan_dir and not args.wfp and not args.stdin and not args.dep:
-        print_stderr('Please specify a file/folder, fingerprint (--wfp), dependency (--dep), or STDIN (--stdin)')
+    if not args.scan_dir and not args.wfp and not args.stdin and not args.dep and not args.files:
+        print_stderr('Please specify a file/folder, files (--files), fingerprint (--wfp), dependency (--dep), or STDIN (--stdin)')
         parser.parse_args([args.subparser, '-h'])
         exit(1)
     if args.pac and args.proxy:
@@ -556,6 +557,9 @@ def scan(parser, args):
         contents = sys.stdin.buffer.read()
         if not scanner.scan_contents(args.stdin, contents):
             exit(1)
+    elif args.files:
+        if not scanner.scan_files_with_options(args.files, args.dep, scanner.winnowing.file_map):
+            exit(1)
     elif args.scan_dir:
         if not os.path.exists(args.scan_dir):
             print_stderr(f'Error: File or folder specified does not exist: {args.scan_dir}.')

scanoss/data/build_date.txt

@@ -1 +1 @@
-date: 20240514175754, utime: 1715709474
+date: 20240829161941, utime: 1724948381

scanoss/scanner.py

@@ -25,7 +25,7 @@ import json
 import os
 import sys
 import datetime
-import pkg_resources
+import importlib_resources
 
 from progress.bar import Bar
 from progress.spinner import Spinner
@@ -270,9 +270,10 @@ class Scanner(ScanossBase):
         """
         data = None
         try:
-            f_name = pkg_resources.resource_filename(__name__, 'data/build_date.txt')
-            with open(f_name, 'r') as f:
-                data = f.read().rstrip()
+            f_name = importlib_resources.files(__name__) / 'data/build_date.txt'
+            with importlib_resources.as_file(f_name) as f:
+                with open(f, 'r', encoding='utf-8') as file:
+                    data = file.read().rstrip()
         except Exception as e:
             Scanner.print_stderr(f'Warning: Problem loading build time details: {e}')
         if not data or len(data) == 0:
@@ -522,8 +523,6 @@ class Scanner(ScanossBase):
                             else:
                                 raw_output += ",\n  \"%s\":[%s]" % (file, json.dumps(dep_file, indent=2))
                     # End for loop
-        else:
-            success = False
         raw_output += "\n}"
         parsed_json = None
         try:
@@ -625,7 +624,6 @@ class Scanner(ScanossBase):
         success = True
         if not files:
             raise Exception(f"ERROR: Please provide a non-empty list of filenames to scan")
-        self.print_msg(f'Scanning {len(files)} files...')
         spinner = None
         if not self.quiet and self.isatty:
             spinner = Spinner('Fingerprinting ')
@@ -637,7 +635,23 @@ class Scanner(ScanossBase):
         file_count = 0  # count all files fingerprinted
         wfp_file_count = 0  # count number of files in each queue post
         scan_started = False
+        filtered_files = []
+        # Filter the files to remove anything we shouldn't scan
         for file in files:
+            filename = os.path.basename(file)
+            filtered_filenames = self.__filter_files([filename])
+            if not filtered_filenames or len(filtered_filenames) == 0:
+                self.print_debug(f'Skipping filtered file: {file}')
+                continue
+            paths = os.path.dirname(file).split(os.sep)
+            if len(self.__filter_dirs(paths)) == len(paths):  # Nothing found to filter
+                filtered_files.append(file)
+            else:
+                self.print_debug(f'Skipping filtered (folder) file: {file}')
+        if len(filtered_files) > 0:
+            self.print_debug(f'Scanning {len(filtered_files)} files...')
+        # Process all the requested files
+        for file in filtered_files:
             if self.threaded_scan and self.threaded_scan.stop_scanning():
                 self.print_stderr('Warning: Aborting fingerprinting as the scanning service is not available.')
                 break
@@ -697,7 +711,7 @@ class Scanner(ScanossBase):
             if self.threaded_scan:
                 success = self.__run_scan_threaded(scan_started, file_count)
         else:
-            Scanner.print_stderr(f'Warning: No files found to scan from: {files}')
+            Scanner.print_stderr(f'Warning: No files found to scan from: {filtered_files}')
         return success
     
     def scan_files_with_options(self, files: [], deps_file: str = None, file_map: dict = None) -> bool:

scanoss/spdxlite.py

@@ -28,7 +28,7 @@ import hashlib
 import datetime
 import getpass
 import re
-import pkg_resources
+import importlib_resources
 
 from . import __version__
 
@@ -300,9 +300,10 @@ class SpdxLite:
         :return: True if successful, False otherwise
         """
         try:
-            f_name = pkg_resources.resource_filename(__name__, filename)
-            with open(f_name, 'r') as f:
-                data = json.loads(f.read())
+            f_name = importlib_resources.files(__name__) / filename
+            with importlib_resources.as_file(f_name) as f:
+                with open(f, 'r', encoding='utf-8') as file:
+                    data = json.load(file)
         except Exception as e:
             self.print_stderr(f'ERROR: Problem parsing SPDX license input JSON: {e}')
             return False

scanoss/winnowing.py

@@ -307,7 +307,7 @@ class Winnowing(ScanossBase):
             return ''
         # Print file line
         content_length = len(contents)
-        wfp_filename = file
+        wfp_filename = repr(file).strip("'")  # return a utf-8 compatible version of the filename
         if self.obfuscate:  # hide the real size of the file and its name, but keep the suffix
             wfp_filename = f'{self.ob_count}{pathlib.Path(file).suffix}'
             self.ob_count = self.ob_count + 1

{scanoss-1.12.3.dist-info → scanoss-1.14.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scanoss
-Version: 1.12.3
+Version: 1.14.0
 Summary: Simple Python library to leverage the SCANOSS APIs
 Home-page: https://scanoss.com
 Author: SCANOSS
@@ -17,16 +17,17 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests
-Requires-Dist: crc32c >=2.2
+Requires-Dist: crc32c>=2.2
 Requires-Dist: binaryornot
 Requires-Dist: progress
-Requires-Dist: grpcio >1.42.0
-Requires-Dist: protobuf >3.19.1
+Requires-Dist: grpcio>1.42.0
+Requires-Dist: protobuf>3.19.1
 Requires-Dist: pypac
 Requires-Dist: pyOpenSSL
 Requires-Dist: google-api-core
+Requires-Dist: importlib-resources
 Provides-Extra: fast_winnowing
-Requires-Dist: scanoss-winnowing >=0.5.0 ; extra == 'fast_winnowing'
+Requires-Dist: scanoss-winnowing>=0.5.0; extra == "fast-winnowing"
 
 # SCANOSS Python Package
 The SCANOSS python package provides a simple easy to consume library for interacting with SCANOSS APIs/Engine.

{scanoss-1.12.3.dist-info → scanoss-1.14.0.dist-info}/RECORD

@@ -4,22 +4,22 @@ protoc_gen_swagger/options/annotations_pb2.py,sha256=b25EDD6gssUWnFby9gxgcpLIROT
 protoc_gen_swagger/options/annotations_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
 protoc_gen_swagger/options/openapiv2_pb2.py,sha256=vYElGp8E1vGHszvWqX97zNG9GFJ7u2QcdK9ouq0XdyI,14939
 protoc_gen_swagger/options/openapiv2_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
-scanoss/__init__.py,sha256=vlOicCnYY_eG_8PN2YGbSW8AvmqavyuDcWwpl9F7c4c,1163
-scanoss/cli.py,sha256=o_KZLVPEup6xwCC_vpsbDFooxQ5IkIu6Z7U4fvYshMY,42541
+scanoss/__init__.py,sha256=PYRQO5k_j5mM7XuvgMnHH8E6yu_q0uICKeUgA6to0Mk,1163
+scanoss/cli.py,sha256=rsLtipYmDjAQxEIKwQuf9Y5XAcl0p5hZs6ZQ_TcJ-eA,42812
 scanoss/components.py,sha256=ZHZ1KA69shxOASZK7USD9yPTITpAc_RXL5q5zpDK23o,12590
 scanoss/csvoutput.py,sha256=hBwr_Fc6mBdOdXgyQcdFrockYH-PJ0jblowlExJ6OPg,9925
 scanoss/cyclonedx.py,sha256=G6HxI8z3NJsOjBRuQJ8ApHQaUOP9-lO8PIBjcJMHchg,12167
 scanoss/filecount.py,sha256=o7xb6m387ucnsU4H1OXGzf_AdWsudhAHe49T8uX4Ieo,6660
 scanoss/scancodedeps.py,sha256=dPJsv9BmEsaM1IEzceJCnwLyu6Z0JwPposxdY4q0DAg,10775
-scanoss/scanner.py,sha256=N1fEqsJy11V325_YFdq11EQmeHqdNG6jcCiXnb9n_jU,50377
+scanoss/scanner.py,sha256=VqLjJh7igR59gTA0jFHvueS6hh8JSs3QgEK7rzPuBbA,51210
 scanoss/scanossapi.py,sha256=5OwRQZ23rdPOL4bA5fXI7xdKnJOgRYaL60HuzZPdu-I,12562
 scanoss/scanossbase.py,sha256=WxYlWl6WxRArho4VKGFxEla8qYnjOXtF6EnwsHTrKm4,2319
 scanoss/scanossgrpc.py,sha256=ythZkr6F0P0hl_KPYoHkos_IL97TxLKeYfAouX_CUnM,20491
 scanoss/scantype.py,sha256=R2-ExLGOrYxaJFtIK2AEo2caD0XrN1zpF5q1qT9Zsyc,1326
-scanoss/spdxlite.py,sha256=poLtzD2eaSL5X7adYbH3blxKAFO8Asf_1nIZj3ewXCA,15559
+scanoss/spdxlite.py,sha256=IsWP9o1D8ryT1_5LeobIEhWJXNFbffoWCy1yaeZY2X0,15638
 scanoss/threadeddependencies.py,sha256=JotQC9X3nnviblKe--OPS-7rr1W-cZjuxsxSPL-tbPg,6284
 scanoss/threadedscanning.py,sha256=T0tL8W1IEX_hLY5ksrAl_iQqtxT_KbyDhTDHo6a7xFE,9387
-scanoss/winnowing.py,sha256=lGRTtm5QqLQiu6PUV2lF5qI82g43OKyJ8-QsOV9Xp7w,18664
+scanoss/winnowing.py,sha256=HzMWRYh1XB4so71br-DUPpV6OlmymDfsnU-EOCCObJM,18734
 scanoss/api/__init__.py,sha256=KlDD87JmyZP-10T-fuJo0_v2zt1gxWfTgs70wjky9xg,1139
 scanoss/api/common/__init__.py,sha256=KlDD87JmyZP-10T-fuJo0_v2zt1gxWfTgs70wjky9xg,1139
 scanoss/api/common/v2/__init__.py,sha256=KlDD87JmyZP-10T-fuJo0_v2zt1gxWfTgs70wjky9xg,1139
@@ -47,12 +47,12 @@ scanoss/api/vulnerabilities/__init__.py,sha256=FLQtiDiv85Q1Chk-sJ9ky9WOV1mulZhEK
 scanoss/api/vulnerabilities/v2/__init__.py,sha256=FLQtiDiv85Q1Chk-sJ9ky9WOV1mulZhEKjiBihlwiaM,1139
 scanoss/api/vulnerabilities/v2/scanoss_vulnerabilities_pb2.py,sha256=CFhF80av8tenGvn9AIsGEtRJPuV2dC_syA5JLZb2lDw,5464
 scanoss/api/vulnerabilities/v2/scanoss_vulnerabilities_pb2_grpc.py,sha256=HlS4k4Zmx6RIAqaO9I96jD-eyF5yU6Xx04pVm7pdqOg,6864
-scanoss/data/build_date.txt,sha256=ODvNnGPO33Xb0cy0Xx4LoEouBommhbuBEQ3tLu5UiS0,40
+scanoss/data/build_date.txt,sha256=8feY4PDqu0ixPx9lW8xrv7zGbeOE1zZpaCtdJgPoVKc,40
 scanoss/data/spdx-exceptions.json,sha256=s7UTYxC7jqQXr11YBlIWYCNwN6lRDFTR33Y8rpN_dA4,17953
 scanoss/data/spdx-licenses.json,sha256=A6Z0q82gaTLtnopBfzeIVZjJFxkdRW1g2TuumQc-lII,228794
-scanoss-1.12.3.dist-info/LICENSE,sha256=LLUaXoiyOroIbr5ubAyrxBOwSRLTm35ETO2FmLpy8QQ,1074
-scanoss-1.12.3.dist-info/METADATA,sha256=tG1h6EvFjKWNV1B1Np7oLZplYIrhfUlh-FNCI9v6Eyg,5906
-scanoss-1.12.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-scanoss-1.12.3.dist-info/entry_points.txt,sha256=Uy28xnaDL5KQ7V77sZD5VLDXPNxYYzSr5tsqtiXVzAs,48
-scanoss-1.12.3.dist-info/top_level.txt,sha256=V11PrQ6Pnrc-nDF9xnisnJ8e6-i7HqSIKVNqduRWcL8,27
-scanoss-1.12.3.dist-info/RECORD,,
+scanoss-1.14.0.dist-info/LICENSE,sha256=LLUaXoiyOroIbr5ubAyrxBOwSRLTm35ETO2FmLpy8QQ,1074
+scanoss-1.14.0.dist-info/METADATA,sha256=QjOh1Fz4JLUKb3Za39rv9XAy_Z4vbx84gQKp9EQhuP8,5936
+scanoss-1.14.0.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+scanoss-1.14.0.dist-info/entry_points.txt,sha256=Uy28xnaDL5KQ7V77sZD5VLDXPNxYYzSr5tsqtiXVzAs,48
+scanoss-1.14.0.dist-info/top_level.txt,sha256=V11PrQ6Pnrc-nDF9xnisnJ8e6-i7HqSIKVNqduRWcL8,27
+scanoss-1.14.0.dist-info/RECORD,,

{scanoss-1.12.3.dist-info → scanoss-1.14.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (74.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any