fosslight-scanner 2.1.12__py3-none-any.whl → 2.1.13__py3-none-any.whl

fosslight_scanner/_help.py

@@ -29,7 +29,9 @@ _HELP_MESSAGE_SCANNER = f"""
             -f <formats> [<format> ...]\t    FOSSLight Report file format ({', '.join(SUPPORT_FORMAT)})
                                      * Compare mode result file: supports excel, json, yaml, html
                                      * Multiple formats can be specified separated by space.
-            -e <path>\t\t    Path to exclude from analysis (ex, -e [dir] [file])
+            -e <path>\t\t    Path to exclude from analysis (files and directories)
+                                     * IMPORTANT: Always wrap patterns in double quotes ("") to avoid shell expansion.
+                                       Example) fosslight -e "test/abc.py" "*.jar"
             -o <output>\t\t    Output directory or file
             -c <number>\t\t    Number of processes to analyze source
             -r\t\t\t    Keep raw data

fosslight_scanner/fosslight_scanner.py

@@ -28,6 +28,7 @@ from fosslight_util.output_format import check_output_formats_v2
 from fosslight_util.cover import CoverItem
 from fosslight_util.oss_item import ScannerItem
 from fosslight_util.output_format import write_output_file
+from fosslight_util.exclude import get_excluded_paths
 
 from .common import (
     call_analysis_api, update_oss_item,
@@ -46,7 +47,7 @@ COMPARE_OUTPUT_REPORT_PREFIX = "fosslight_compare_"
 PKG_NAME = "fosslight_scanner"
 logger = logging.getLogger(constant.LOGGER_NAME)
 warnings.simplefilter(action='ignore', category=FutureWarning)
-_output_dir = "fosslight_raw_data"
+_output_dir = ".fosslight_raw_data"
 _log_file = "fosslight_log_all_"
 _start_time = ""
 _executed_path = ""
@@ -181,6 +182,10 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
     if not correct_fpath:
         correct_fpath = src_path
 
+    excluded_path_with_default_exclusion, excluded_path_without_dot, excluded_files, cnt_file_except_skipped = (
+            get_excluded_paths(src_path, path_to_exclude))
+    logger.debug(f"Skipped paths: {excluded_path_with_default_exclusion}")
+
     try:
         final_excel_dir = os.path.abspath(final_excel_dir)
         abs_path = os.path.abspath(src_path)
@@ -203,7 +208,10 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
                                     source_write_json_file=source_write_json_file,
                                     source_print_matched_text=source_print_matched_text,
                                     source_time_out=source_time_out,
-                                    formats=formats
+                                    formats=formats,
+                                    all_exclude_mode=(excluded_path_with_default_exclusion,
+                                                      excluded_path_without_dot,
+                                                      excluded_files, cnt_file_except_skipped)
                         )
                         if success:
                             all_scan_item.file_items.update(result[2].file_items)
@@ -228,7 +236,11 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
                                                     _output_dir,
                                                     formats, db_url, binary_simple,
                                                     correct_mode, correct_fpath,
-                                                    path_to_exclude=path_to_exclude)
+                                                    path_to_exclude=path_to_exclude,
+                                                    all_exclude_mode=(excluded_path_with_default_exclusion,
+                                                                      excluded_path_without_dot,
+                                                                      excluded_files,
+                                                                      cnt_file_except_skipped))
                 if success:
                     all_scan_item.file_items.update(result.file_items)
                     all_cover_items.append(result.cover)
@@ -236,7 +248,10 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
             if run_dep:
                 dep_scanitem = run_dependency(src_path, _output_dir,
                                               dep_arguments, path_to_exclude, formats,
-                                              recursive_dep)
+                                              recursive_dep,
+                                              all_exclude_mode=(excluded_path_with_default_exclusion,
+                                                                excluded_path_without_dot,
+                                                                excluded_files, cnt_file_except_skipped))
                 all_scan_item.file_items.update(dep_scanitem.file_items)
                 all_cover_items.append(dep_scanitem.cover)
         else:
@@ -249,7 +264,7 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
         cover = CoverItem(tool_name=PKG_NAME,
                           start_time=_start_time,
                           input_path=abs_path,
-                          exclude_path=path_to_exclude,
+                          exclude_path=excluded_path_without_dot,
                           simple_mode=False)
         merge_comment = []
         for ci in all_cover_items:
@@ -335,6 +350,38 @@ def download_source(link, out_dir):
     return success, temp_src_dir, oss_name, oss_version
 
 
+def rename_and_remove_hidden_folder(output_path, output_dir, keep_raw_data=False):
+    try:
+        hidden_log_dir = os.path.join(output_path, ".fosslight_log")
+        visible_log_dir = os.path.join(output_path, "fosslight_log")
+        if os.path.exists(hidden_log_dir):
+            try:
+                if os.path.exists(visible_log_dir):
+                    shutil.rmtree(visible_log_dir)
+                shutil.move(hidden_log_dir, visible_log_dir)
+            except Exception as ex:
+                logger.debug(f"Error renaming log folder: {ex}")
+        
+        if keep_raw_data:
+            visible_raw_dir = os.path.join(os.path.dirname(output_dir), "fosslight_raw_data")
+            if os.path.exists(output_dir):
+                if os.path.exists(visible_raw_dir):
+                    shutil.rmtree(visible_raw_dir)
+                shutil.move(output_dir, visible_raw_dir)
+                logger.debug(f"Renamed {output_dir} to {visible_raw_dir}")
+        else:
+            logger.debug(f"Remove temporary files: {output_dir}")
+            if os.path.exists(output_dir):
+                shutil.rmtree(output_dir)
+            
+            visible_raw_dir = os.path.join(os.path.dirname(output_dir), "fosslight_raw_data")
+            if os.path.exists(visible_raw_dir):
+                shutil.rmtree(visible_raw_dir)
+                logger.debug(f"Removed previous raw data folder: {visible_raw_dir}")
+    except Exception as ex:
+        logger.debug(f"Error cleaning up output directories: {ex}")
+
+
 def init(output_path="", make_outdir=True):
     global _output_dir, _log_file, _start_time, logger
 
@@ -352,7 +399,7 @@ def init(output_path="", make_outdir=True):
         Path(_output_dir).mkdir(parents=True, exist_ok=True)
         _output_dir = os.path.abspath(_output_dir)
 
-    log_dir = os.path.join(output_root_dir, "fosslight_log")
+    log_dir = os.path.join(output_root_dir, ".fosslight_log")
     logger, result_log = init_log(os.path.join(log_dir, f"{_log_file}{_start_time}.txt"),
                                   True, logging.INFO, logging.DEBUG, PKG_NAME)
 
@@ -480,12 +527,9 @@ def run_main(mode_list, path_arg, dep_arguments, output_file_or_dir, file_format
                     shutil.rmtree(extract_folder)
             else:
                 logger.error("(mode) No mode has been selected for analysis.")
-        try:
-            if not keep_raw_data:
-                logger.debug(f"Remove temporary files: {_output_dir}")
-                shutil.rmtree(_output_dir)
-        except Exception as ex:
-            logger.debug(f"Error to remove temp files:{ex}")
+        
+        rename_and_remove_hidden_folder(output_path, _output_dir, keep_raw_data)
+
     except Exception as ex:
         logger.warning(str(ex))
         return False

{fosslight_scanner-2.1.12.dist-info → fosslight_scanner-2.1.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fosslight_scanner
-Version: 2.1.12
+Version: 2.1.13
 Summary: FOSSLight Scanner
 Home-page: https://github.com/fosslight/fosslight_scanner
 Download-URL: https://github.com/fosslight/fosslight_scanner
@@ -20,10 +20,10 @@ Requires-Dist: openpyxl
 Requires-Dist: progress
 Requires-Dist: pyyaml
 Requires-Dist: beautifulsoup4
-Requires-Dist: fosslight_util<3.0.0,>=2.1.35
-Requires-Dist: fosslight_source<3.0.0,>=2.2.1
-Requires-Dist: fosslight_dependency<5.0.0,>=4.1.28
-Requires-Dist: fosslight_binary<6.0.0,>=5.1.16
+Requires-Dist: fosslight_util<3.0.0,>=2.1.37
+Requires-Dist: fosslight_source<3.0.0,>=2.2.3
+Requires-Dist: fosslight_dependency<5.0.0,>=4.1.29
+Requires-Dist: fosslight_binary<6.0.0,>=5.1.17
 Requires-Dist: fosslight_prechecker<5.0.0,>=4.0.0
 Dynamic: author
 Dynamic: classifier

{fosslight_scanner-2.1.12.dist-info → fosslight_scanner-2.1.13.dist-info}/RECORD

@@ -1,15 +1,15 @@
 fosslight_scanner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fosslight_scanner/_get_input.py,sha256=f78M57QU7Lhw1VfZJKvYXbGsUiYMViPz1---UDIbV9I,1396
-fosslight_scanner/_help.py,sha256=5G_oL80402ylacXLnPDGn4xmJKsmv_FL_RBgLjdQ_Hw,3162
+fosslight_scanner/_help.py,sha256=sWJ5wapLWLGDv2Acm9Eh4i3dTxdrYiLB2T7BPYC2os0,3366
 fosslight_scanner/_parse_setting.py,sha256=htxNNvhizZ2ZT18Aw6ihKuBpOMAyptkbMS5Z0_Xh5mQ,2551
 fosslight_scanner/_run_compare.py,sha256=zmzX-FIvWCSkwPvEA3iHfVpyg6QDGUCpw3tJuGLdPWM,10657
 fosslight_scanner/cli.py,sha256=vz_oGevbejqo3tHa4z6d-Ft0xu-gP9Pg-VmXb9IhO_s,6910
 fosslight_scanner/common.py,sha256=FyEoqVsIZ4pRIlHRXZES8PYaYfy3PEmUaOn02YSuuYU,8377
-fosslight_scanner/fosslight_scanner.py,sha256=wOSSnJZuUCvom9rvdwOUy7B2f-CUzDdecI2hm52dyFg,21174
+fosslight_scanner/fosslight_scanner.py,sha256=zEdSjbQB87reiAyLxpKzQOYPT8ooJSXf3oSrrXA-bOk,23792
 fosslight_scanner/resources/bom_compare.html,sha256=VocJ9bDmQQOwfGyvXatPZ4W-QddO-IlsAvKdO0nZ7pA,2240
-fosslight_scanner-2.1.12.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_scanner-2.1.12.dist-info/METADATA,sha256=5AuTEQ3qZgFO4g01z1Lc8uDSVlaDQakzmjJtsk-47To,8599
-fosslight_scanner-2.1.12.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-fosslight_scanner-2.1.12.dist-info/entry_points.txt,sha256=dl7AA0_Jqnq0NHuCEaxcJFgstLw3sod_-FGtcgZuJbs,104
-fosslight_scanner-2.1.12.dist-info/top_level.txt,sha256=43_xLb5KYpy8wOU1H2Wd2fEsWBY7Dg6ZEJJXkfT64Ak,18
-fosslight_scanner-2.1.12.dist-info/RECORD,,
+fosslight_scanner-2.1.13.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_scanner-2.1.13.dist-info/METADATA,sha256=6L8_JOtCLuxJRenV1je0nfHivjIYX4ilusxByyGJ2KE,8599
+fosslight_scanner-2.1.13.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+fosslight_scanner-2.1.13.dist-info/entry_points.txt,sha256=dl7AA0_Jqnq0NHuCEaxcJFgstLw3sod_-FGtcgZuJbs,104
+fosslight_scanner-2.1.13.dist-info/top_level.txt,sha256=43_xLb5KYpy8wOU1H2Wd2fEsWBY7Dg6ZEJJXkfT64Ak,18
+fosslight_scanner-2.1.13.dist-info/RECORD,,