fosslight-scanner 1.7.29__tar.gz → 1.7.31__tar.gz

{fosslight_scanner-1.7.29 → fosslight_scanner-1.7.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight_scanner
-Version: 1.7.29
+Version: 1.7.31
 Summary: FOSSLight Scanner
 Home-page: https://github.com/fosslight/fosslight_scanner
 Author: LG Electronics

fosslight_scanner-1.7.31/requirements.txt

@@ -0,0 +1,11 @@
+future
+pandas
+openpyxl
+progress
+pyyaml
+beautifulsoup4
+fosslight_util~=1.4.48
+fosslight_source~=1.7.8
+fosslight_dependency~=3.15.1
+fosslight_binary~=4.1.30
+fosslight_prechecker==3.0.27

{fosslight_scanner-1.7.29 → fosslight_scanner-1.7.31}/setup.py

@@ -15,7 +15,7 @@ with open('requirements.txt', 'r', 'utf-8') as f:
 if __name__ == "__main__":
     setup(
         name='fosslight_scanner',
-        version='1.7.29',
+        version='1.7.31',
         package_dir={"": "src"},
         packages=find_packages(where='src'),
         description='FOSSLight Scanner',

{fosslight_scanner-1.7.29 → fosslight_scanner-1.7.31}/src/fosslight_scanner/_parse_setting.py

@@ -11,7 +11,7 @@ def parse_setting_json(data):
     dep_argument = data.get('dep_argument', '')
     output = data.get('output', '')
     format = data.get('format', '')
-    link = data.get('link', "")
+    link = data.get('link', '')
     db_url = data.get('db_url', '')
     timer = data.get('timer', False)
     raw = data.get('raw', False)
@@ -20,34 +20,49 @@ def parse_setting_json(data):
     correct_fpath = data.get('correct_fpath', '')
     ui = data.get('ui', False)
     exclude_path = data.get('exclude', [])
-
+    selected_source_scanner = data.get('selected_source_scanner', '')
+    source_write_json_file = data.get('source_write_json_file', False)
+    source_print_matched_text = data.get('source_print_matched_text', False)
+    source_time_out = data.get('source_time_out', 120)
+    binary_simple = data.get('binary_simple', False)
     str_lists = [mode, path, exclude_path]
-    strings = [dep_argument, output, format, db_url, correct_fpath, link]
-    booleans = [timer, raw, no_correction, ui]
+    strings = [
+        dep_argument, output, format, db_url,
+        correct_fpath, link, selected_source_scanner
+    ]
+    booleans = [timer, raw, no_correction, ui, source_write_json_file, source_print_matched_text, binary_simple]
+
     is_incorrect = False
 
     # check if json file is incorrect format
     for i, target in enumerate(str_lists):
-        if not (isinstance(target, list) and all(isinstance(item, str) for item in target)):
+        if not (isinstance(target, list) and
+                all(isinstance(item, str) for item in target)):
             is_incorrect = True
             str_lists[i] = []
 
     for i, target in enumerate(strings):
         if not isinstance(target, str):
             is_incorrect = True
-            str_lists[i] = ''
+            strings[i] = ''
 
     for i, target in enumerate(booleans):
         if not isinstance(target, bool):
             is_incorrect = True
-            str_lists[i] = False
+            booleans[i] = False
 
     if not isinstance(core, int):
         is_incorrect = True
         core = -1
 
+    if not isinstance(source_time_out, int):
+        is_incorrect = True
+        source_time_out = 120
+
     if is_incorrect:
         print('Ignoring some values with incorrect format in the setting file.')
 
     return mode, path, dep_argument, output, format, link, db_url, timer, \
-        raw, core, no_correction, correct_fpath, ui, exclude_path
+        raw, core, no_correction, correct_fpath, ui, exclude_path, \
+        selected_source_scanner, source_write_json_file, source_print_matched_text, source_time_out, \
+        binary_simple

fosslight_scanner-1.7.31/src/fosslight_scanner/cli.py

@@ -0,0 +1,134 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Copyright (c) 2022 LG Electronics Inc.
+# SPDX-License-Identifier: Apache-2.0
+import sys
+import json
+import os
+import os.path
+from argparse import ArgumentParser
+
+from ._help import print_help_msg
+from .fosslight_scanner import run_main, PKG_NAME
+from ._parse_setting import parse_setting_json
+from fosslight_util.help import print_package_version
+
+
+def set_args(mode, path, dep_argument, output, format, link, db_url, timer,
+             raw, core, no_correction, correct_fpath, ui, setting, exclude_path):
+
+    selected_source_scanner = "all"
+    source_write_json_file = False
+    source_print_matched_text = False
+    source_time_out = 120
+    binary_simple = False
+
+    if setting and os.path.isfile(setting):
+        try:
+            with open(setting, 'r', encoding='utf-8') as file:
+                data = json.load(file)
+            s_mode, s_path, s_dep_argument, s_output, s_format, s_link, s_db_url, s_timer, s_raw, s_core, \
+                s_no_correction, s_correct_fpath, s_ui, s_exclude_path, \
+                s_selected_source_scanner, s_source_write_json_file, s_source_print_matched_text, \
+                s_source_time_out, s_binary_simple = parse_setting_json(data)
+
+            # direct cli arguments have higher priority than setting file
+            mode = mode or s_mode
+            path = path or s_path
+            dep_argument = dep_argument or s_dep_argument
+            output = output or s_output
+            format = format or s_format
+            link = link or s_link
+            db_url = db_url or s_db_url
+            timer = timer or s_timer
+            raw = raw or s_raw
+            core = core if core != -1 else s_core
+            no_correction = no_correction or s_no_correction
+            correct_fpath = correct_fpath or s_correct_fpath
+            ui = ui or s_ui
+            exclude_path = exclude_path or s_exclude_path
+
+            # These options are only set from the setting file, not from CLI arguments
+            selected_source_scanner = s_selected_source_scanner or selected_source_scanner
+            source_write_json_file = s_source_write_json_file
+            source_print_matched_text = s_source_print_matched_text
+            source_time_out = s_source_time_out if s_source_time_out != 120 else source_time_out
+            binary_simple = s_binary_simple
+
+        except Exception as e:
+            print(f"Cannot open setting file: {e}")
+    return mode, path, dep_argument, output, format, link, db_url, timer, \
+        raw, core, no_correction, correct_fpath, ui, exclude_path, \
+        selected_source_scanner, source_write_json_file, source_print_matched_text, source_time_out, \
+        binary_simple
+
+
+def main():
+    parser = ArgumentParser(description='FOSSLight Scanner',
+                            prog='fosslight_scanner', add_help=False)
+    parser.add_argument('mode', nargs='*',
+                        help='source| dependency| binary| all| compare',
+                        default="")
+    parser.add_argument('--path', '-p',
+                        help='Path to analyze (In compare mode, two FOSSLight reports',
+                        dest='path', nargs='+', default="")
+    parser.add_argument('--wget', '-w', help='Link to be analyzed',
+                        type=str, dest='link', default="")
+    parser.add_argument('--format', '-f',
+                        help='Scanner output file format (excel,yaml), Compare mode (excel,html,yaml,json)',
+                        type=str, dest='format', default="")
+    parser.add_argument('--output', '-o', help='Output directory or file',
+                        type=str, dest='output', default="")
+    parser.add_argument('--dependency', '-d', help='Dependency arguments',
+                        type=str, dest='dep_argument', default="")
+    parser.add_argument('--url', '-u', help="DB Url",
+                        type=str, dest='db_url', default="")
+    parser.add_argument('--core', '-c',
+                        help='Number of processes to analyze source',
+                        type=int, dest='core', default=-1)
+    parser.add_argument('--raw', '-r', help='Keep raw data',
+                        action='store_true', dest='raw', default=False)
+    parser.add_argument('--timer', '-t', help='Hide the progress bar',
+                        action='store_true', dest='timer', default=False)
+    parser.add_argument('--version', '-v', help='Print version',
+                        action='store_true', dest='version', default=False)
+    parser.add_argument('--help', '-h', help='Print help message',
+                        action='store_true', dest='help')
+    parser.add_argument('--exclude', '-e', help='Path to exclude from analysis',
+                        dest='exclude_path', nargs='*', default=[])
+    parser.add_argument('--setting', '-s', help='Scanner json setting file',
+                        type=str, dest='setting', default="")
+    parser.add_argument('--no_correction',
+                        help='No correction with sbom-info.yaml',
+                        action='store_true', required=False, default=False)
+    parser.add_argument('--correct_fpath', help='Path to the sbom-info.yaml',
+                        type=str, required=False, default='')
+    parser.add_argument('--ui', help='Generate UI mode result file',
+                        action='store_true', required=False, default=False)
+
+    try:
+        args = parser.parse_args()
+    except SystemExit:
+        sys.exit(1)
+
+    if args.help:
+        print_help_msg()
+    elif args.version:
+        print_package_version(PKG_NAME, "FOSSLight Scanner Version:")
+    else:
+        mode, path, dep_argument, output, format, link, db_url, timer, raw, core, no_correction, correct_fpath, \
+            ui, exclude_path, selected_source_scanner, source_write_json_file, source_print_matched_text, \
+            source_time_out, binary_simple, = set_args(
+                args.mode, args.path, args.dep_argument, args.output,
+                args.format, args.link, args.db_url, args.timer, args.raw,
+                args.core, args.no_correction, args.correct_fpath, args.ui,
+                args.setting, args.exclude_path)
+
+        run_main(mode, path, dep_argument, output, format, link, db_url, timer,
+                 raw, core, not no_correction, correct_fpath, ui, exclude_path,
+                 selected_source_scanner, source_write_json_file, source_print_matched_text,
+                 source_time_out, binary_simple)
+
+
+if __name__ == "__main__":
+    main()

{fosslight_scanner-1.7.29 → fosslight_scanner-1.7.31}/src/fosslight_scanner/common.py

@@ -9,6 +9,7 @@ import logging
 import shutil
 import pandas as pd
 import yaml
+
 import fosslight_util.constant as constant
 from fosslight_util.parsing_yaml import parsing_yml
 from fosslight_util.write_yaml import create_yaml_with_ossitem
@@ -20,11 +21,14 @@ from fosslight_util.oss_item import OssItem
 logger = logging.getLogger(constant.LOGGER_NAME)
 SRC_SHEET = 'SRC_FL_Source'
 BIN_SHEET = 'BIN_FL_Binary'
-BIN_EXT_HEADER = {'BIN_FL_Binary': ['ID', 'Binary Path', 'OSS Name',
-                                    'OSS Version', 'License', 'Download Location',
-                                    'Homepage', 'Copyright Text', 'Exclude',
-                                    'Comment', 'Vulnerability Link', 'TLSH', 'SHA1']}
-BIN_HIDDEN_HEADER = {'TLSH', "SHA1"}
+BIN_EXT_HEADER = {
+    'BIN_FL_Binary': [
+        'ID', 'Binary Path', 'OSS Name', 'OSS Version', 'License',
+        'Download Location', 'Homepage', 'Copyright Text', 'Exclude',
+        'Comment', 'Vulnerability Link', 'TLSH', 'SHA1'
+    ]
+}
+BIN_HIDDEN_HEADER = {'TLSH', 'SHA1'}
 
 
 def copy_file(source, destination):
@@ -38,16 +42,15 @@ def copy_file(source, destination):
     except Exception as ex:
         logger.debug(f"Failed to copy {source} to {destination}: {ex}")
         return False, copied_file
-    else:
-        return True, copied_file
+    return True, copied_file
 
 
 def run_analysis(path_to_run, params, func, str_run_start, output, exe_path):
     # This function will be replaced by call_analysis_api().
-    logger.info("## Start to run "+str_run_start)
+    logger.info("## Start to run " + str_run_start)
     return_value = ""
     try:
-        if path_to_run != "":
+        if path_to_run:
             logger.info(f"|--- Path to analyze : {path_to_run}")
             os.chdir(output)
             sys.argv = params
@@ -68,7 +71,7 @@ def call_analysis_api(path_to_run, str_run_start, return_idx, func, *args, **kwa
     success = True
     result = []
     try:
-        if path_to_run != "":
+        if path_to_run:
             logger.info(f"|--- Path to analyze : {path_to_run}")
             result = func(*args, **kwargs)
         else:
@@ -79,36 +82,33 @@ def call_analysis_api(path_to_run, str_run_start, return_idx, func, *args, **kwa
         success = False
         logger.error(f"{str_run_start}:{ex}")
     try:
-        if success:
-            if result and return_idx >= 0:
-                if len(result) > return_idx:
-                    result = result[return_idx]
-                else:
-                    success = False
+        if success and result and return_idx >= 0:
+            if len(result) > return_idx:
+                result = result[return_idx]
+            else:
+                success = False
     except Exception as ex:
         logger.debug(f"Get return value:{ex}")
         success = False
-    if not result:
-        result = []
-    return success, result
+    return success, result or []
 
 
 def overwrite_excel(excel_file_path, oss_name, column_name='OSS Name'):
-    if oss_name != "":
+    if oss_name:
         try:
             files = os.listdir(excel_file_path)
             for file in files:
                 if file.endswith(".xlsx"):
-                    file = os.path.join(excel_file_path, file)
-                    excel_file = pd.ExcelFile(file, engine='openpyxl')
+                    file_path = os.path.join(excel_file_path, file)
+                    excel_file = pd.ExcelFile(file_path, engine='openpyxl')
 
                     for sheet_name in excel_file.sheet_names:
                         try:
-                            df = pd.read_excel(file, sheet_name=sheet_name, engine='openpyxl')
+                            df = pd.read_excel(file_path, sheet_name=sheet_name, engine='openpyxl')
                             if column_name in df.columns:
                                 updated = (df[column_name] == '') | (df[column_name].isnull())
                                 df.loc[updated, column_name] = oss_name
-                                df.to_excel(file, sheet_name=sheet_name, index=False)
+                                df.to_excel(file_path, sheet_name=sheet_name, index=False)
                         except Exception as ex:
                             logger.debug(f"overwrite_sheet {sheet_name}:{ex}")
         except Exception as ex:

{fosslight_scanner-1.7.29 → fosslight_scanner-1.7.31}/src/fosslight_scanner/fosslight_scanner.py

@@ -4,32 +4,36 @@
 # Copyright (c) 2020 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
 import os
+import sys
+import re
 import logging
 import warnings
-import re
 import yaml
-import sys
 import shutil
 import shlex
 import subprocess
 from pathlib import Path
 from datetime import datetime
+
 from fosslight_binary import binary_analysis
 from fosslight_dependency.run_dependency_scanner import run_dependency_scanner
-from fosslight_util.download import cli_download_and_extract
+from fosslight_util.download import cli_download_and_extract, compression_extension
+from fosslight_util.download import extract_compressed_file as extract_file
 from ._get_input import get_input_mode
 from fosslight_util.set_log import init_log
 from fosslight_util.timer_thread import TimerThread
 import fosslight_util.constant as constant
 from fosslight_util.output_format import check_output_format
 from fosslight_prechecker._precheck import run_lint as prechecker_lint
-from .common import (copy_file, call_analysis_api,
-                     overwrite_excel,
-                     merge_yamls, correct_scanner_result,
-                     create_scancodejson)
 from fosslight_util.write_excel import merge_excels, merge_cover_comment
-from ._run_compare import run_compare
 from fosslight_util.cover import CoverItem
+
+from .common import (
+    copy_file, call_analysis_api, overwrite_excel,
+    merge_yamls, correct_scanner_result, create_scancodejson
+)
+from ._run_compare import run_compare
+
 fosslight_source_installed = True
 try:
     from fosslight_source.cli import run_scanners as source_analysis
@@ -45,7 +49,10 @@ _log_file = "fosslight_log_all_"
 _start_time = ""
 _executed_path = ""
 SRC_DIR_FROM_LINK_PREFIX = "fosslight_src_dir_"
-SCANNER_MODE = ["all", "compare", "reuse", "prechecker", "binary", "bin", "src", "source", "dependency", "dep"]
+SCANNER_MODE = [
+    "all", "compare", "reuse", "prechecker", "binary",
+    "bin", "src", "source", "dependency", "dep"
+]
 
 
 def run_dependency(path_to_analyze, output_file_with_path, params="", path_to_exclude=[]):
@@ -59,7 +66,7 @@ def run_dependency(path_to_analyze, output_file_with_path, params="", path_to_ex
     github_token = ""
 
     try:
-        if params != "":
+        if params:
             match_obj = re.findall(
                 r'\s*(-\s*[a|d|m|c|n|t])\s*\'([^\']+)\'\s*', params)
             for param, value in match_obj:
@@ -83,22 +90,34 @@ def run_dependency(path_to_analyze, output_file_with_path, params="", path_to_ex
     timer.start()
 
     try:
-        success, result = call_analysis_api(path_to_analyze, "Dependency Analysis",
-                                            1, run_dependency_scanner,
-                                            package_manager,
-                                            os.path.abspath(path_to_analyze),
-                                            output_file_with_path,
-                                            pip_activate_cmd, pip_deactivate_cmd,
-                                            output_custom_dir, app_name,
-                                            github_token, path_to_exclude=path_to_exclude)
+        success, result = call_analysis_api(
+            path_to_analyze, "Dependency Analysis",
+            1, run_dependency_scanner,
+            package_manager,
+            os.path.abspath(path_to_analyze),
+            output_file_with_path,
+            pip_activate_cmd, pip_deactivate_cmd,
+            output_custom_dir, app_name,
+            github_token, path_to_exclude=path_to_exclude
+        )
         if success:
             result_list = result.get('SRC_FL_Dependency')
     except Exception as ex:
         logger.warning(f"Run dependency: {ex}")
 
-    if not result_list:
-        result_list = []
-    return result_list
+    return result_list or []
+
+
+def source_analysis_wrapper(*args, **kwargs):
+    selected_scanner = kwargs.pop('selected_scanner', 'all')
+    source_write_json_file = kwargs.pop('source_write_json_file', False)
+    source_print_matched_text = kwargs.pop('source_print_matched_text', False)
+    source_time_out = kwargs.pop('source_time_out', 120)
+    args = list(args)
+    args.insert(2, source_write_json_file)
+    args.insert(5, source_print_matched_text)
+
+    return source_analysis(*args, selected_scanner=selected_scanner, time_out=source_time_out, **kwargs)
 
 
 def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
@@ -106,7 +125,9 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
                 remove_src_data=True, result_log={}, output_file="",
                 output_extension="", num_cores=-1, db_url="",
                 default_oss_name="", default_oss_version="", url="",
-                correct_mode=True, correct_fpath="", ui_mode=False, path_to_exclude=[]):
+                correct_mode=True, correct_fpath="", ui_mode=False, path_to_exclude=[],
+                selected_source_scanner="all", source_write_json_file=False, source_print_matched_text=False,
+                source_time_out=120, binary_simple=False):
     final_excel_dir = output_path
     success = True
     temp_output_fiiles = []
@@ -129,7 +150,6 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
         if success:
             output_files = {"SRC": f"fosslight_src_{_start_time}{output_extension}",
                             "BIN": f"fosslight_bin_{_start_time}{output_extension}",
-                            "BIN_TXT": f"fosslight_binary_bin_{_start_time}.txt",
                             "DEP": f"fosslight_dep_{_start_time}{output_extension}",
                             "PRECHECKER": f"fosslight_lint_{_start_time}.yaml"}
             if run_prechecker:
@@ -146,12 +166,21 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
                 try:
                     if fosslight_source_installed:
                         src_output = os.path.join(_output_dir, output_files["SRC"])
-                        success, result = call_analysis_api(src_path, "Source Analysis",
-                                                            -1, source_analysis,
-                                                            abs_path,
-                                                            src_output,
-                                                            False, num_cores, False,
-                                                            path_to_exclude=path_to_exclude)
+                        success, result = call_analysis_api(
+                                    src_path,
+                                    "Source Analysis",
+                                    -1, source_analysis_wrapper,
+                                    abs_path,
+                                    src_output,
+                                    num_cores,
+                                    False,
+                                    path_to_exclude=path_to_exclude,
+                                    selected_scanner=selected_source_scanner,
+                                    source_write_json_file=source_write_json_file,
+                                    source_print_matched_text=source_print_matched_text,
+                                    source_time_out=source_time_out
+                        )
+
                     else:  # Run fosslight_source by using docker image
                         src_output = os.path.join("output", output_files["SRC"])
                         output_rel_path = os.path.relpath(abs_path, os.getcwd())
@@ -170,15 +199,9 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
                                                1, binary_analysis.find_binaries,
                                                abs_path,
                                                os.path.join(_output_dir, output_files["BIN"]),
-                                               "", db_url, False,
+                                               "", db_url, binary_simple,
                                                correct_mode, correct_fpath,
                                                path_to_exclude=path_to_exclude)
-                if success:
-                    output_binary_txt_raw = f"{output_files['BIN'].split('.')[0]}.txt"
-                    success_file, copied_file = copy_file(os.path.join(_output_dir, output_binary_txt_raw),
-                                                          os.path.join(output_path, output_files["BIN_TXT"]))
-                    if success_file:
-                        temp_output_fiiles.append(copied_file)
 
             if run_dep:
                 run_dependency(src_path, os.path.join(_output_dir, output_files["DEP"]), dep_arguments, path_to_exclude)
@@ -196,7 +219,8 @@ 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=path_to_exclude,
+                          simple_mode=False)
         cover.comment = merge_cover_comment(_output_dir, merge_files)
 
         if output_extension == ".xlsx":
@@ -314,7 +338,9 @@ def init(output_path="", make_outdir=True):
 
 def run_main(mode_list, path_arg, dep_arguments, output_file_or_dir, file_format, url_to_analyze,
              db_url, hide_progressbar=False, keep_raw_data=False, num_cores=-1,
-             correct_mode=True, correct_fpath="", ui_mode=False, path_to_exclude=[]):
+             correct_mode=True, correct_fpath="", ui_mode=False, path_to_exclude=[],
+             selected_source_scanner="all", source_write_json_file=False, source_print_matched_text=False,
+             source_time_out=120, binary_simple=False):
     global _executed_path, _start_time
 
     output_file = ""
@@ -322,6 +348,7 @@ def run_main(mode_list, path_arg, dep_arguments, output_file_or_dir, file_format
     default_oss_version = ""
     src_path = ""
     _executed_path = os.getcwd()
+    extract_folder = ""
 
     mode_not_supported = list(set(mode_list).difference(SCANNER_MODE))
     if mode_not_supported:
@@ -344,6 +371,17 @@ def run_main(mode_list, path_arg, dep_arguments, output_file_or_dir, file_format
         if isinstance(path_arg, list):
             if len(path_arg) == 1:
                 src_path = path_arg[0]
+
+                for ext in compression_extension:
+                    if src_path.endswith(ext):
+                        temp_folder = f"temp_extract_{datetime.now().strftime('%Y%m%d_%H%M%S')}"
+                        Path(temp_folder).mkdir(parents=True, exist_ok=True)
+
+                        extract_success = extract_file(src_path, temp_folder, False)
+                        if extract_success:
+                            src_path = os.path.join(_executed_path, temp_folder)
+                            extract_folder = src_path
+                        break
             else:
                 logger.warning(f"Cannot analyze with multiple path: {path_arg}")
 
@@ -420,7 +458,12 @@ def run_main(mode_list, path_arg, dep_arguments, output_file_or_dir, file_format
                                 remove_downloaded_source, {}, output_file,
                                 output_extension, num_cores, db_url,
                                 default_oss_name, default_oss_version, url_to_analyze,
-                                correct_mode, correct_fpath, ui_mode, path_to_exclude)
+                                correct_mode, correct_fpath, ui_mode, path_to_exclude,
+                                selected_source_scanner, source_write_json_file, source_print_matched_text, source_time_out,
+                                binary_simple)
+
+                if extract_folder:
+                    shutil.rmtree(extract_folder)
             else:
                 logger.error("No mode has been selected for analysis.")
         try:

{fosslight_scanner-1.7.29 → fosslight_scanner-1.7.31}/src/fosslight_scanner.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-scanner
-Version: 1.7.29
+Version: 1.7.31
 Summary: FOSSLight Scanner
 Home-page: https://github.com/fosslight/fosslight_scanner
 Author: LG Electronics

fosslight_scanner-1.7.31/src/fosslight_scanner.egg-info/requires.txt

@@ -0,0 +1,11 @@
+future
+pandas
+openpyxl
+progress
+pyyaml
+beautifulsoup4
+fosslight_util~=1.4.48
+fosslight_source~=1.7.8
+fosslight_dependency~=3.15.1
+fosslight_binary~=4.1.30
+fosslight_prechecker==3.0.27

fosslight_scanner-1.7.29/requirements.txt

@@ -1,11 +0,0 @@
-future
-pandas
-openpyxl
-progress
-pyyaml
-beautifulsoup4
-fosslight_util>=1.4.45
-fosslight_source>=1.7.8
-fosslight_dependency>=3.15.1
-fosslight_binary>=4.1.30
-fosslight_prechecker>=3.0.27

fosslight_scanner-1.7.29/src/fosslight_scanner/cli.py

@@ -1,90 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (c) 2022 LG Electronics Inc.
-# SPDX-License-Identifier: Apache-2.0
-import sys
-import json
-from argparse import ArgumentParser
-from ._help import print_help_msg
-from .fosslight_scanner import run_main, PKG_NAME
-from ._parse_setting import parse_setting_json
-from fosslight_util.help import print_package_version
-import os.path
-
-
-def set_args(mode, path, dep_argument, output, format, link, db_url, timer,
-             raw, core, no_correction, correct_fpath, ui, setting, exclude_path):
-    if setting and os.path.isfile(setting):
-        try:
-            with open(setting, 'r', encoding='utf-8') as file:
-                data = json.load(file)
-            s_mode, s_path, s_dep_argument, s_output, s_format, s_link, s_db_url, s_timer, s_raw, s_core, \
-                s_no_correction, s_correct_fpath, s_ui, s_exclude_path = parse_setting_json(data)
-
-            # direct cli arguments have higher priority than setting file
-            mode = mode if mode else s_mode
-            path = path if path else s_path
-            dep_argument = dep_argument if dep_argument else s_dep_argument
-            output = output if output else s_output
-            format = format if format else s_format
-            link = link if link else s_link
-            db_url = db_url if db_url else s_db_url
-            timer = timer if timer else s_timer
-            raw = raw if raw else s_raw
-            core = core if core else s_core
-            no_correction = no_correction if no_correction else s_no_correction
-            correct_fpath = correct_fpath if correct_fpath else s_correct_fpath
-            ui = ui if ui else s_ui
-            exclude_path = exclude_path if exclude_path else s_exclude_path
-
-        except Exception as e:
-            print(f"Cannot open setting file: {e}")
-    return mode, path, dep_argument, output, format, link, db_url, timer, \
-        raw, core, no_correction, correct_fpath, ui, exclude_path
-
-
-def main():
-    parser = ArgumentParser(description='FOSSLight Scanner', prog='fosslight_scanner', add_help=False)
-    parser.add_argument('mode', nargs='*', help='source| dependency| binary| all| compare', default="")
-    parser.add_argument('--path', '-p', help='Path to analyze (In compare mode, two FOSSLight reports',
-                        dest='path', nargs='+', default="")
-    parser.add_argument('--wget', '-w', help='Link to be analyzed', type=str, dest='link', default="")
-    parser.add_argument('--format', '-f', help='Scanner output file format (excel,yaml), Compare mode (excel,html,yaml,json)',
-                        type=str, dest='format', default="")
-    parser.add_argument('--output', '-o', help='Output directory or file', type=str, dest='output', default="")
-    parser.add_argument('--dependency', '-d', help='Dependency arguments', type=str, dest='dep_argument', default="")
-    parser.add_argument('--url', '-u', help="DB Url", type=str, dest='db_url', default="")
-    parser.add_argument('--core', '-c', help='Number of processes to analyze source', type=int, dest='core', default=-1)
-    parser.add_argument('--raw', '-r', help='Keep raw data', action='store_true', dest='raw', default=False)
-    parser.add_argument('--timer', '-t', help='Hide the progress bar', action='store_true', dest='timer', default=False)
-    parser.add_argument('--version', '-v', help='Print version', action='store_true', dest='version', default=False)
-    parser.add_argument('--help', '-h', help='Print help message', action='store_true', dest='help')
-    parser.add_argument('--exclude', '-e', help='Path to exclude from analysis', dest='exclude_path', nargs='*', default=[])
-    parser.add_argument('--setting', '-s', help='Scanner json setting file', type=str, dest='setting', default="")
-    parser.add_argument('--no_correction', help='No correction with sbom-info.yaml',
-                        action='store_true', required=False, default=False)
-    parser.add_argument('--correct_fpath', help='Path to the sbom-info.yaml',
-                        type=str, required=False, default='')
-    parser.add_argument('--ui', help='Generate UI mode result file', action='store_true', required=False, default=False)
-
-    try:
-        args = parser.parse_args()
-    except SystemExit:
-        sys.exit(1)
-
-    if args.help:
-        print_help_msg()
-    elif args.version:
-        print_package_version(PKG_NAME, "FOSSLight Scanner Version:")
-    else:
-        mode, path, dep_argument, output, format, link, db_url, timer, raw, core, no_correction, correct_fpath, \
-          ui, exclude_path = set_args(args.mode, args.path, args.dep_argument, args.output, args.format,
-                                      args.link, args.db_url, args.timer, args.raw, args.core, args.no_correction,
-                                      args.correct_fpath, args.ui, args.setting, args.exclude_path)
-
-        run_main(mode, path, dep_argument, output, format, link, db_url, timer,
-                 raw, core, not no_correction, correct_fpath, ui, exclude_path)
-
-
-if __name__ == "__main__":
-    main()

fosslight_scanner-1.7.29/src/fosslight_scanner.egg-info/requires.txt

@@ -1,11 +0,0 @@
-future
-pandas
-openpyxl
-progress
-pyyaml
-beautifulsoup4
-fosslight_util>=1.4.45
-fosslight_source>=1.7.8
-fosslight_dependency>=3.15.1
-fosslight_binary>=4.1.30
-fosslight_prechecker>=3.0.27