7
7
from packageurl import PackageURL
8
8
9
9
from sbom2doc .docbuilder .consolebuilder import ConsoleBuilder
10
+ from sbom2doc .docbuilder .htmlbuilder import HTMLBuilder
10
11
from sbom2doc .docbuilder .jsonbuilder import JSONBuilder
11
12
from sbom2doc .docbuilder .markdownbuilder import MarkdownBuilder
12
13
from sbom2doc .docbuilder .pdfbuilder import PDFBuilder
13
14
from sbom2doc .docbuilder .spreadsheetbuilder import SpreadsheetBuilder
14
- from sbom2doc .docbuilder .htmlbuilder import HTMLBuilder
15
15
16
16
17
17
def generate_document (format , sbom_parser , filename , outfile , include_license ):
@@ -92,7 +92,19 @@ def generate_document(format, sbom_parser, filename, outfile, include_license):
92
92
if len (packages ) > 0 :
93
93
sbom_document .heading (1 , "Package Summary" )
94
94
sbom_document .createtable (
95
- ["Name" , "Version" , "PURL" , "CPE" , "Type" , "Supplier" , "License" , "Ecosystem" , "Download" , "Copyright" ], [12 , 8 , 8 , 8 , 12 ]
95
+ [
96
+ "Name" ,
97
+ "Version" ,
98
+ "PURL" ,
99
+ "CPE" ,
100
+ "Type" ,
101
+ "Supplier" ,
102
+ "License" ,
103
+ "Ecosystem" ,
104
+ "Download" ,
105
+ "Copyright" ,
106
+ ],
107
+ [12 , 8 , 8 , 8 , 12 ],
96
108
)
97
109
for package in packages :
98
110
# Minimum elements are ID, Name, Version, Supplier
@@ -127,7 +139,20 @@ def generate_document(format, sbom_parser, filename, outfile, include_license):
127
139
cpe = reference [2 ]
128
140
download = package .get ("downloadlocation" , "NOT KNOWN" )
129
141
copyright = package .get ("copyrighttext" , "-" )
130
- sbom_document .addrow ([name , version , purl , cpe , type , supplier , license , ecosystem , download , copyright ])
142
+ sbom_document .addrow (
143
+ [
144
+ name ,
145
+ version ,
146
+ purl ,
147
+ cpe ,
148
+ type ,
149
+ supplier ,
150
+ license ,
151
+ ecosystem ,
152
+ download ,
153
+ copyright ,
154
+ ]
155
+ )
131
156
if (
132
157
id is None
133
158
or name is None
@@ -207,11 +232,11 @@ def generate_document(format, sbom_parser, filename, outfile, include_license):
207
232
208
233
if len (vulnerabilities ) > 0 :
209
234
sbom_document .heading (1 , "Vulnerabilities Summary" )
210
- sbom_document .createtable (["Id" , "Source" , "Status" ])
235
+ sbom_document .createtable (["Id" , "Source" , "Status" ])
211
236
for vulnerability in vulnerabilities :
212
237
id = vulnerability ["id" ]
213
- status = vulnerability .get ("status" ,"-" )
214
- source = vulnerability .get ("source" ,"-" )
238
+ status = vulnerability .get ("status" , "-" )
239
+ source = vulnerability .get ("source" , "-" )
215
240
sbom_document .addrow ([id , source , status ])
216
241
sbom_document .showtable (widths = [3 , 2 , 4 , 5 ])
217
242
@@ -222,7 +247,7 @@ def generate_document(format, sbom_parser, filename, outfile, include_license):
222
247
# Ignore undefined licenses or expressions
223
248
if key == "NOASSERTION" or license_info .license_expression (key ):
224
249
continue
225
- license_url = f"https://spdx.org/licenses/{ key } .json"
250
+ # license_url = f"https://spdx.org/licenses/{key}.json"
226
251
try :
227
252
license_text = license_info .get_license_text (key )
228
253
if len (license_text ) > 0 :
0 commit comments