fosslight-util 1.4.47__tar.gz → 1.4.48__tar.gz

{fosslight_util-1.4.47 → fosslight_util-1.4.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight_util
-Version: 1.4.47
+Version: 1.4.48
 Summary: FOSSLight Util
 Home-page: https://github.com/fosslight/fosslight_util
 Author: LG Electronics

{fosslight_util-1.4.47 → fosslight_util-1.4.48}/setup.py

@@ -14,7 +14,7 @@ with open('requirements.txt', 'r', 'utf-8') as f:
 if __name__ == "__main__":
     setup(
         name='fosslight_util',
-        version='1.4.47',
+        version='1.4.48',
         package_dir={"": "src"},
         packages=find_packages(where='src'),
         description='FOSSLight Util',

{fosslight_util-1.4.47 → fosslight_util-1.4.48}/src/fosslight_util/cover.py

@@ -9,16 +9,31 @@ from fosslight_util.help import print_package_version
 
 
 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]}'
@@ -28,7 +43,6 @@ class CoverItem:
         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 +51,6 @@ class CoverItem:
     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

{fosslight_util-1.4.47 → fosslight_util-1.4.48}/src/fosslight_util/output_format.py

@@ -116,7 +116,7 @@ def write_output_file(output_file_without_ext, file_extension, sheet_list, exten
     if file_extension == '.xlsx':
         success, msg = write_result_to_excel(result_file, sheet_list, extended_header, hide_header, cover)
     elif file_extension == '.csv':
-        success, msg, result_file = write_result_to_csv(result_file, sheet_list)
+        success, msg, result_file = write_result_to_csv(result_file, sheet_list, False, extended_header)
     elif file_extension == '.json':
         success, msg = write_opossum(result_file, sheet_list)
     elif file_extension == '.yaml':

{fosslight_util-1.4.47 → fosslight_util-1.4.48}/src/fosslight_util.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-util
-Version: 1.4.47
+Version: 1.4.48
 Summary: FOSSLight Util
 Home-page: https://github.com/fosslight/fosslight_util
 Author: LG Electronics