Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change SCANOSS Invocation Method from Command Line to Library Function #178

Merged
merged 4 commits into from
Aug 5, 2024
Merged

Change SCANOSS Invocation Method from Command Line to Library Function #178

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1cf55ba
Refactor to use SCANOSS library directly
YongGoose Jul 31, 2024
d390a4b
Remove deprecated pkg_resources usage
YongGoose Jul 31, 2024
b61ac9f
Merge branch 'fosslight:main' into main
YongGoose Jul 31, 2024
728d581
Fix issue with file detection failure
YongGoose Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions src/fosslight_source/run_scanoss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0

import os
import pkg_resources
import importlib_metadata
import warnings
import logging
import json
Expand All @@ -16,13 +16,13 @@
from ._parsing_scanoss_file import parsing_extraInfo # scanoss
import shutil
from pathlib import Path
from scanoss.scanner import Scanner, ScanType

logger = logging.getLogger(constant.LOGGER_NAME)
warnings.filterwarnings("ignore", category=FutureWarning)
_PKG_NAME = "fosslight_source"
SCANOSS_RESULT_FILE = "scanner_output.wfp"
SCANOSS_OUTPUT_FILE = "scanoss_raw_result.json"
SCANOSS_COMMAND_PREFIX = "scanoss-py scan --ignore-cert-errors -o "


def get_scanoss_extra_info(scanned_result):
Expand Down Expand Up @@ -51,7 +51,7 @@ def run_scanoss_py(path_to_scan, output_file_name="", format="", called_by_cli=F

scanoss_file_list = []
try:
pkg_resources.get_distribution("scanoss")
importlib_metadata.distribution("scanoss")
except Exception as error:
logger.warning(f"{error}. Skipping scan with scanoss.")
logger.warning("Please install scanoss and dataclasses before run fosslight_source with scanoss option.")
Expand All @@ -65,14 +65,16 @@ def run_scanoss_py(path_to_scan, output_file_name="", format="", called_by_cli=F
Path(output_path).mkdir(parents=True, exist_ok=True)
output_json_file = os.path.join(output_path, SCANOSS_OUTPUT_FILE)

scan_command = f"{SCANOSS_COMMAND_PREFIX} {output_json_file} {path_to_scan}"
if num_threads > 0:
scan_command += " -T " + str(num_threads)
else:
scan_command += " -T " + "10"

try:
os.system(scan_command)
scanner = Scanner(
ignore_cert_errors=True,
skip_folders=path_to_exclude,
scan_output=output_json_file,
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)

if os.path.isfile(output_json_file):
total_files_to_excluded = []
if path_to_exclude:
Expand Down
Loading