Skip to content

update sw360python & refactor SBomWriter #43

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
tngraf merged 2 commits into from
Sep 24, 2023
Merged

update sw360python & refactor SBomWriter #43

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
d36d00b
chores: "poetry update" to get latest sw360python
gernot-h Aug 8, 2023
4e503cb
refactor(SbomWriter): get rid of tempfile on pretty_print
gernot-h Aug 17, 2023
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
12 changes: 2 additions & 10 deletions capycli/common/capycli_bom_support.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@
import json
import os
import pathlib
import tempfile
import uuid
from datetime import datetime
from enum import Enum
from pathlib import Path
from typing import Any, Dict, Iterable, List, Optional

from cyclonedx.model import (
Expand Down Expand Up @@ -618,14 +616,8 @@ def write_to_json(cls, sbom: Bom, outputfile: str, pretty_print: bool = False) -
cls.remove_empty_properties_in_sbom(sbom)

if pretty_print:
f = tempfile.NamedTemporaryFile(delete=False)
output_file = Path(f.name)
output_file.parent.mkdir(exist_ok=True, parents=True)
writer.output_to_file(filename=f.name, allow_overwrite=True)
jsondata = json_support.load_json_file(f.name)
json_support.write_json_to_file(jsondata, outputfile)
f.close()
os.remove(f.name)
jsondata = writer.output_as_string().encode('utf-8')
json_support.write_json_to_file(json.loads(jsondata), outputfile)
else:
writer.output_to_file(filename=outputfile, allow_overwrite=True)

Expand Down
Loading