Skip to content

Remove empty scanoss reference #119

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

Merged
merged 1 commit into from
May 18, 2023
Merged

Remove empty scanoss reference #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions src/fosslight_source/_parsing_scanoss_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/fosslight_source/_scan_item.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down