Skip to content

Update CoverItem init for dynamic package versions #173

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 2 commits into from
Jul 22, 2024
Merged

Update CoverItem init for dynamic package versions #173

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6669988
Update CoverItem init for dynamic package versions
YongGoose Jul 20, 2024
fea95b1
Remove individual package variables
YongGoose Jul 22, 2024
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
25 changes: 19 additions & 6 deletions src/fosslight_util/cover.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,31 @@


class CoverItem:
tool_name_key = "Tool name"
tool_version_key = "Tool version"
tool_name_key = "Tool information"
start_time_key = "Start time"
python_ver_key = "Python version"
analyzed_path_key = "Analyzed path"
excluded_path_key = "Excluded path"
comment_key = "Comment"

def __init__(self, tool_name="", start_time="", input_path="", comment="", exclude_path=[]):
self.tool_name = tool_name
PKG_NAMES = [
"fosslight_scanner",
"fosslight_source",
"fosslight_dependency",
"fosslight_binary"
]

def __init__(self, tool_name="", start_time="", input_path="", comment="", exclude_path=[], simple_mode=True):
if simple_mode:
self.tool_name = f'{tool_name} v{print_package_version(tool_name, "", False)}'
else:
first_pkg = f'{self.PKG_NAMES[0]} v{print_package_version(self.PKG_NAMES[0], "", False)}'
remaining_pkgs = ", ".join([
f'{pkg_name} v{print_package_version(pkg_name, "", False)}'
for pkg_name in self.PKG_NAMES[1:]
])
self.tool_name = f'{first_pkg} ({remaining_pkgs})'

if start_time:
date, time = start_time.split('_')
self.start_time = f'{date}, {time[0:2]}:{time[2:4]}'
Expand All @@ -28,7 +43,6 @@ def __init__(self, tool_name="", start_time="", input_path="", comment="", exclu
self.exclude_path = ", ".join(exclude_path)
self.comment = comment

self.tool_version = print_package_version(self.tool_name, "", False)
self.python_version = f'{sys.version_info.major}.{sys.version_info.minor}'

def __del__(self):
Expand All @@ -37,7 +51,6 @@ def __del__(self):
def get_print_json(self):
json_item = {}
json_item[self.tool_name_key] = self.tool_name
json_item[self.tool_version_key] = self.tool_version
json_item[self.start_time_key] = self.start_time
json_item[self.python_ver_key] = self.python_version
json_item[self.analyzed_path_key] = self.input_path
Expand Down