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

[issue-246] parse SPDXID for file correctly #247

Closed
wants to merge 2 commits into from
Closed

[issue-246] parse SPDXID for file correctly #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3538e63
[issue-246] parse SPDXID for file correctly
meretp Oct 20, 2022
b7068ae
[issue-246] delete namespace from File_SPDXID
meretp Oct 21, 2022
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: 21 additions & 0 deletions spdx/parsers/rdfbuilders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,27 @@ def set_file_notice(self, doc, text):
else:
raise OrderError("File::Notice")

def set_file_spdx_id(self, doc, spdx_id):
"""
Set the file SPDX Identifier.
Raise OrderError if no package or no file defined.
Raise SPDXValueError if malformed value.
Raise CardinalityError if more than one spdx_id set.
"""
if self.has_package(doc) and self.has_file(doc):
if not self.file_spdx_id_set:
self.file_spdx_id_set = True
spdx_id = spdx_id.split("#")[-1]
if validations.validate_file_spdx_id(spdx_id):
self.file(doc).spdx_id = spdx_id
return True
else:
raise SPDXValueError("File::SPDXID")
else:
raise CardinalityError("File::SPDXID")
else:
raise OrderError("File::SPDXID")


class SnippetBuilder(tagvaluebuilders.SnippetBuilder):
def __init__(self):
Expand Down
1 change: 0 additions & 1 deletion spdx/parsers/validations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ def validate_pkg_lics_comment(value, optional=False):


def validate_file_spdx_id(value, optional=False):
value = value.split("#")[-1]
TEXT_RE = re.compile(r"SPDXRef-([A-Za-z0-9.\-]+)", re.UNICODE)
if value is None:
return optional
Expand Down
4 changes: 2 additions & 2 deletions tests/data/doc_parse/spdx-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
},
"files": [
{
"id": "https://spdx.org/spdxdocs/spdx-example-444504E0-4F89-41D3-9A0C-0305E82C3301#SPDXRef-File1",
"id": "SPDXRef-File1",
"name": "Jenna-2.6.3/jena-2.6.3-sources.jar",
"type": 3,
"comment": "This file belongs to Jena",
Expand Down Expand Up @@ -137,7 +137,7 @@
"artifactOfProjectURI": []
},
{
"id": "https://spdx.org/spdxdocs/spdx-example-444504E0-4F89-41D3-9A0C-0305E82C3301#SPDXRef-File2",
"id": "SPDXRef-File2",
"name": "src/org/spdx/parser/DOAPProject.java",
"type": 1,
"comment": null,
Expand Down