From 666998832581af3c1c85364a7a1882aa4dd63651 Mon Sep 17 00:00:00 2001 From: yongjunhong Date: Sat, 20 Jul 2024 17:22:40 +0900 Subject: [PATCH 1/2] Update CoverItem init for dynamic package versions Signed-off-by: yongjunhong --- src/fosslight_util/cover.py | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/src/fosslight_util/cover.py b/src/fosslight_util/cover.py index cca9d5a..546cc05 100644 --- a/src/fosslight_util/cover.py +++ b/src/fosslight_util/cover.py @@ -9,16 +9,36 @@ 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_scanner = "fosslight_scanner" + pkg_source = "fosslight_source" + pkg_dependency = "fosslight_dependency" + pkg_binary = "fosslight_binary" + + pkg_names = [ + pkg_scanner, + pkg_source, + pkg_dependency, + pkg_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]}' @@ -28,7 +48,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): @@ -37,7 +56,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 From fea95b147d60ebcfc04b9775c5c670574a4588d6 Mon Sep 17 00:00:00 2001 From: yongjunhong Date: Mon, 22 Jul 2024 15:58:23 +0900 Subject: [PATCH 2/2] Remove individual package variables Signed-off-by: yongjunhong --- src/fosslight_util/cover.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/fosslight_util/cover.py b/src/fosslight_util/cover.py index 546cc05..f3a01ab 100644 --- a/src/fosslight_util/cover.py +++ b/src/fosslight_util/cover.py @@ -16,26 +16,21 @@ class CoverItem: excluded_path_key = "Excluded path" comment_key = "Comment" - pkg_scanner = "fosslight_scanner" - pkg_source = "fosslight_source" - pkg_dependency = "fosslight_dependency" - pkg_binary = "fosslight_binary" - - pkg_names = [ - pkg_scanner, - pkg_source, - pkg_dependency, - pkg_binary + 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)}' + 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:] + for pkg_name in self.PKG_NAMES[1:] ]) self.tool_name = f'{first_pkg} ({remaining_pkgs})'