fosslight-source 2.1.5__py3-none-any.whl → 2.1.7__py3-none-any.whl

fosslight_source/cli.py

@@ -12,6 +12,7 @@ from datetime import datetime
 import fosslight_util.constant as constant
 from fosslight_util.set_log import init_log
 from fosslight_util.timer_thread import TimerThread
+from fosslight_util.exclude import excluding_files
 from ._help import print_version, print_help_msg_source_scanner
 from ._license_matched import get_license_list_to_print
 from fosslight_util.output_format import check_output_formats_v2, write_output_file
@@ -147,7 +148,7 @@ def create_report_file(
     output_path: str = "", output_files: list = [],
     output_extensions: list = [], correct_mode: bool = True,
     correct_filepath: str = "", path_to_scan: str = "", path_to_exclude: list = [],
-    formats: list = []
+    formats: list = [], excluded_file_list: list = [], api_limit_exceed: bool = False
 ) -> 'ScannerItem':
     """
     Create report files for given scanned result.
@@ -211,6 +212,9 @@ def create_report_file(
     scan_item.set_cover_comment(f"Total number of files : {files_count}")
     scan_item.set_cover_comment(f"Removed files : {removed_files_count}")
 
+    if api_limit_exceed:
+        scan_item.set_cover_comment("(Some of) SCANOSS scan was skipped. (API limits being exceeded)")
+
     if not merged_result:
         if files_count < 1:
             scan_item.set_cover_comment("(No file detected.)")
@@ -219,6 +223,12 @@ def create_report_file(
 
     if merged_result:
         sheet_list = {}
+        # Remove results that are in excluding file list
+        for i in range(len(merged_result) - 1, -1, -1):  # Iterate from last to first
+            item_path = merged_result[i].source_name_or_path  # Assuming SourceItem has 'file_path' attribute
+            if item_path in excluded_file_list:
+                del merged_result[i]  # Delete matching item
+
         scan_item.append_file_items(merged_result, PKG_NAME)
 
         if selected_scanner == 'scanoss':
@@ -262,6 +272,7 @@ def create_report_file(
 
 
 def merge_results(scancode_result: list = [], scanoss_result: list = [], spdx_downloads: dict = {}) -> list:
+
     """
     Merge scanner results and spdx parsing result.
     :param scancode_result: list of scancode results in SourceItem.
@@ -329,6 +340,7 @@ def run_scanners(
 
     logger, result_log = init_log(os.path.join(output_path, f"fosslight_log_src_{start_time}.txt"),
                                   True, logging.INFO, logging.DEBUG, PKG_NAME, path_to_scan, path_to_exclude)
+    excluded_file_list = excluding_files(path_to_exclude, path_to_scan)
 
     if '.xlsx' not in output_extensions and print_matched_text:
         logger.warning("-m option is only available for excel.")
@@ -341,14 +353,15 @@ def run_scanners(
                                                                                       print_matched_text, formats, called_by_cli,
                                                                                       time_out, correct_mode, correct_filepath)
         if selected_scanner == 'scanoss' or selected_scanner == 'all' or selected_scanner == '':
-            scanoss_result = run_scanoss_py(path_to_scan, output_file_name, formats, True, write_json_file, num_cores,
-                                            path_to_exclude)
+            scanoss_result, api_limit_exceed = run_scanoss_py(path_to_scan, output_file_name, formats, True, write_json_file,
+                                                              num_cores, path_to_exclude)
         if selected_scanner in SCANNER_TYPE:
             spdx_downloads = get_spdx_downloads(path_to_scan, path_to_exclude)
             merged_result = merge_results(scancode_result, scanoss_result, spdx_downloads)
             scan_item = create_report_file(start_time, merged_result, license_list, scanoss_result, selected_scanner,
                                            print_matched_text, output_path, output_files, output_extensions, correct_mode,
-                                           correct_filepath, path_to_scan, path_to_exclude, formats)
+                                           correct_filepath, path_to_scan, path_to_exclude, formats, excluded_file_list,
+                                           api_limit_exceed)
         else:
             print_help_msg_source_scanner()
             result_log[RESULT_KEY] = "Unsupported scanner"

fosslight_source/run_scanoss.py

@@ -17,6 +17,8 @@ from ._parsing_scanoss_file import parsing_extraInfo  # scanoss
 import shutil
 from pathlib import Path
 from scanoss.scanner import Scanner, ScanType
+import io
+import contextlib
 
 logger = logging.getLogger(constant.LOGGER_NAME)
 warnings.filterwarnings("ignore", category=FutureWarning)
@@ -75,7 +77,13 @@ def run_scanoss_py(path_to_scan: str, output_file_name: str = "", format: list =
             scan_options=ScanType.SCAN_SNIPPETS.value,
             nb_threads=num_threads if num_threads > 0 else 10
         )
-        scanner.scan_folder_with_options(scan_dir=path_to_scan)
+
+        output_buffer = io.StringIO()
+        with contextlib.redirect_stdout(output_buffer), contextlib.redirect_stderr(output_buffer):
+            scanner.scan_folder_with_options(scan_dir=path_to_scan)
+        captured_output = output_buffer.getvalue()
+        api_limit_exceed = "due to service limits being exceeded" in captured_output
+        logger.debug(f"{captured_output}")
 
         if os.path.isfile(output_json_file):
             total_files_to_excluded = []
@@ -117,4 +125,4 @@ def run_scanoss_py(path_to_scan: str, output_file_name: str = "", format: list =
     except Exception as error:
         logger.debug(f"Moving scanoss raw files failed.: {error}")
 
-    return scanoss_file_list
+    return scanoss_file_list, api_limit_exceed

{fosslight_source-2.1.5.dist-info → fosslight_source-2.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-source
-Version: 2.1.5
+Version: 2.1.7
 Summary: FOSSLight Source Scanner
 Home-page: https://github.com/fosslight/fosslight_source_scanner
 Author: LG Electronics
@@ -16,14 +16,15 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: pyparsing
-Requires-Dist: scanoss<=1.14.0
+Requires-Dist: scanoss>=1.18.0
 Requires-Dist: XlsxWriter
-Requires-Dist: fosslight-util>=2.1.6
+Requires-Dist: fosslight-util>=2.1.10
 Requires-Dist: PyYAML
 Requires-Dist: wheel>=0.38.1
 Requires-Dist: intbitset
 Requires-Dist: fosslight-binary>=5.0.0
 Requires-Dist: psycopg2-binary==2.9.9
+Requires-Dist: beautifulsoup4==4.12.*
 Requires-Dist: scancode-toolkit==32.2.*; sys_platform != "darwin"
 Requires-Dist: scancode-toolkit==32.0.*; sys_platform == "darwin"
 
@@ -64,7 +65,7 @@ Please see the [**User Guide**](https://fosslight.org/fosslight-guide-en/scanner
 ## 👏 Contributing Guide
 
 We always welcome your contributions.  
-Please see the [CONTRIBUTING guide](https://fosslight.org/fosslight-guide-en/learn/1_contribution.html) for how to contribute.
+Please see the [CONTRIBUTING guide](https://fosslight.org/hub-guide-en/contribution/1_contribution.html) for how to contribute.
 
 
 ## 📄 License

{fosslight_source-2.1.5.dist-info → fosslight_source-2.1.7.dist-info}/RECORD

@@ -4,13 +4,13 @@ fosslight_source/_license_matched.py,sha256=-3H881XQjFDafRttBsuboS3VbCPYEvPH1pwW
 fosslight_source/_parsing_scancode_file_item.py,sha256=4U8wTuuNm-2-hanTxiQr2FvHTBrf2ZwESyea_E8caHU,13466
 fosslight_source/_parsing_scanoss_file.py,sha256=Ss6BWTdT1Q43xTT9GBwL6XyzHT2p57ymVm04NL76Vbg,4506
 fosslight_source/_scan_item.py,sha256=2RdnH5ZvrD7yjGxaHAIgSLmhq0dyW1379RScqPYJtOI,5679
-fosslight_source/cli.py,sha256=8-l4npRWZdabkDywThm8pe9KBf4soJDIRjuVIlmeaC0,15843
+fosslight_source/cli.py,sha256=yQLuPW05MWWHJKM8tH8P4R1eBHMSW80Z6BQNEAEtgBw,16639
 fosslight_source/run_scancode.py,sha256=leq-FuGwX-kBg-sNZXQ-DSKy-uTj7w2QBFeOLgyvPxc,7094
-fosslight_source/run_scanoss.py,sha256=Z7iebJk9NJegoI2m2PT4hw3Qs294KhFwWxpcEnWn15U,5354
+fosslight_source/run_scanoss.py,sha256=8wu3sa-YBqjfb5x2dbDJuAdw3rrExueOW23WdzqDCaU,5721
 fosslight_source/run_spdx_extractor.py,sha256=Hr9sTv06cJaVITy8amwexIW2FV8_rUcFw6hKmR9ZYws,1990
-fosslight_source-2.1.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_source-2.1.5.dist-info/METADATA,sha256=14NPsCAnq15O8ArP1KqbjnbcjwcR64e0SLoah7RNvk8,3393
-fosslight_source-2.1.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-fosslight_source-2.1.5.dist-info/entry_points.txt,sha256=NzFURHC4L8uf1PmnZ2uGQcZxR7UbYCgjetb_9aPHV-w,114
-fosslight_source-2.1.5.dist-info/top_level.txt,sha256=C2vw-0OIent84Vq-UEk1gt_kK1EL8dIItzBzp3WNyA4,17
-fosslight_source-2.1.5.dist-info/RECORD,,
+fosslight_source-2.1.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_source-2.1.7.dist-info/METADATA,sha256=Ced16udUh8-n9kS_uIsB1hY8x-EhY_p3iP75q95t1Es,3433
+fosslight_source-2.1.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+fosslight_source-2.1.7.dist-info/entry_points.txt,sha256=NzFURHC4L8uf1PmnZ2uGQcZxR7UbYCgjetb_9aPHV-w,114
+fosslight_source-2.1.7.dist-info/top_level.txt,sha256=C2vw-0OIent84Vq-UEk1gt_kK1EL8dIItzBzp3WNyA4,17
+fosslight_source-2.1.7.dist-info/RECORD,,