From b32700ef5d0c9d3c286cc8d5370194924bc9c491 Mon Sep 17 00:00:00 2001 From: Wonjae Park Date: Wed, 17 May 2023 16:22:35 +0900 Subject: [PATCH] Remove empty scanoss reference --- src/fosslight_source/_parsing_scanoss_file.py | 21 ++++++++++--------- src/fosslight_source/_scan_item.py | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/fosslight_source/_parsing_scanoss_file.py b/src/fosslight_source/_parsing_scanoss_file.py index 047859df..de7d5e1c 100644 --- a/src/fosslight_source/_parsing_scanoss_file.py +++ b/src/fosslight_source/_parsing_scanoss_file.py @@ -19,16 +19,17 @@ def parsing_extraInfo(scanned_result): scanoss_extra_info = [] for scan_item in scanned_result: license_w_source = scan_item.scanoss_reference - if license_w_source: - extra_item = [scan_item.file, ','.join(license_w_source['component_declared']), - ','.join(license_w_source['file_spdx_tag']), - ','.join(license_w_source['file_header']), - ','.join(license_w_source['license_file']), - ','.join(license_w_source['scancode']), - scan_item.matched_lines, scan_item.fileURL] - else: - extra_item = [scan_item.file, '', '', '', '', '', scan_item.matched_lines, scan_item.fileURL] - scanoss_extra_info.append(extra_item) + if scan_item.matched_lines: + if license_w_source: + extra_item = [scan_item.file, ','.join(license_w_source['component_declared']), + ','.join(license_w_source['file_spdx_tag']), + ','.join(license_w_source['file_header']), + ','.join(license_w_source['license_file']), + ','.join(license_w_source['scancode']), + scan_item.matched_lines, scan_item.fileURL] + else: + extra_item = [scan_item.file, '', '', '', '', '', scan_item.matched_lines, scan_item.fileURL] + scanoss_extra_info.append(extra_item) scanoss_extra_info.insert(0, SCANOSS_INFO_HEADER) return scanoss_extra_info diff --git a/src/fosslight_source/_scan_item.py b/src/fosslight_source/_scan_item.py index 1c7029af..213fecc5 100644 --- a/src/fosslight_source/_scan_item.py +++ b/src/fosslight_source/_scan_item.py @@ -28,8 +28,8 @@ class ScanItem: oss_name = "" oss_version = "" download_location = "" - matched_lines = "" - fileURL = "" + matched_lines = "" # Only for SCANOSS results + fileURL = "" # Only for SCANOSS results license_reference = "" def __init__(self, value):