Skip to content

add support for scancode output format 4.1.0 #48

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
hesa merged 1 commit into from
Jul 29, 2025
Merged

add support for scancode output format 4.1.0 #48

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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ $ scarfer example-data/cairo-1.16.0-scan.json -ef "/.*pdi.*\.c$"

* [Scancode](https://github.com/nexB/scancode-toolkit) Toolkit, version 21 and upwards

* [Scancode](https://github.com/nexB/scancode-toolkit) Output Format version 1.0.0, 2.0.0, 3.0, 3.2, 4.0
* [Scancode](https://github.com/nexB/scancode-toolkit) Output Format version 1.0.0, 2.0.0, 3.0, 3.2, 4.0, 4.1.0

# Hints on source code scanners

Expand Down
10 changes: 9 additions & 1 deletion scarfer/scan_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ def check_file_format(self):
elif self.scancode_format[:3] == "4.0":
self.copyright_value = "copyright"
self.licenses_value = "license_detections"
elif self.scancode_format[:3] == "4.1":
self.copyright_value = "copyright"
self.licenses_value = "license_detections"
else:
self.licenses_value = "licenses"
self.copyright_value = "value"
Expand Down Expand Up @@ -145,7 +148,7 @@ def read(self):
matches = []
for le in f[self.licenses_value]:
vers = self.scancode_format[:3]
if vers == "3.0" or vers == "3.2" or vers == "4.0":
if vers == "3.0" or vers == "3.2" or vers == "4.0" or vers == "4.1":
for match in le['matches']:
matches.append({
"key": match['license_expression'],
Expand Down Expand Up @@ -173,6 +176,11 @@ def read(self):
_file['license']['expressions'] = [f['detected_license_expression']]
else:
_file['license']['expressions'] = []
elif self.scancode_format[:3] == "4.1":
if f['detected_license_expression']:
_file['license']['expressions'] = [f['detected_license_expression']]
else:
_file['license']['expressions'] = []
else:
_file['license']['expressions'] = f['license_expressions']
_file['license']['matches'] = matches
Expand Down
Loading