fosslight-util 1.4.38__py3-none-any.whl → 1.4.40__py3-none-any.whl

fosslight_util/_get_downloadable_url.py

@@ -15,28 +15,11 @@ logger = logging.getLogger(constant.LOGGER_NAME)
 
 
 def extract_name_version_from_link(link):
-    # Github : https://github.com/(owner)/(repo)
-    # npm : https://www.npmjs.com/package/(package)/v/(version)
-    # npm2 : https://www.npmjs.com/package/@(group)/(package)/v/(version)
-    # pypi : https://pypi.org/project/(oss_name)/(version)
-    # pypi2 : https://files.pythonhosted.org/packages/source/(alphabet)/(oss_name)/(oss_name)-(version).tar.gz
-    # Maven: https://mvnrepository.com/artifact/(group)/(artifact)/(version)
-    # pub: https://pub.dev/packages/(package)/versions/(version)
-    # Cocoapods: https://cocoapods.org/(package)
-    pkg_pattern = {
-        "pypi": r'https?:\/\/pypi\.org\/project\/([^\/]+)[\/]?([^\/]*)',
-        "pypi2": r'https?:\/\/files\.pythonhosted\.org\/packages\/source\/[\w]\/([^\/]+)\/[\S]+-([^\-]+)\.tar\.gz',
-        "maven": r'https?:\/\/mvnrepository\.com\/artifact\/([^\/]+)\/([^\/]+)\/?([^\/]*)',
-        "npm": r'https?:\/\/www\.npmjs\.com\/package\/([^\/\@]+)(?:\/v\/)?([^\/]*)',
-        "npm2": r'https?:\/\/www\.npmjs\.com\/package\/(\@[^\/]+\/[^\/]+)(?:\/v\/)?([^\/]*)',
-        "pub": r'https?:\/\/pub\.dev\/packages\/([^\/]+)(?:\/versions\/)?([^\/]*)',
-        "pods": r'https?:\/\/cocoapods\.org\/pods\/([^\/]+)'
-    }
     oss_name = ""
     oss_version = ""
     if link.startswith("www."):
         link = link.replace("www.", "https://www.", 1)
-    for key, value in pkg_pattern.items():
+    for key, value in constant.PKG_PATTERN.items():
         p = re.compile(value)
         match = p.match(link)
         if match:
@@ -57,7 +40,7 @@ def extract_name_version_from_link(link):
                 elif key == "pub":
                     oss_name = f"pub:{origin_name}"
                     oss_version = match.group(2)
-                elif key == "pods":
+                elif key == "cocoapods":
                     oss_name = f"cocoapods:{origin_name}"
             except Exception as ex:
                 logger.info(f"extract_name_version_from_link {key}:{ex}")

fosslight_util/constant.py

@@ -14,3 +14,23 @@ supported_sheet_and_scanner = {'SRC': FL_SOURCE,
                                f'SRC_{FL_DEPENDENCY}': FL_DEPENDENCY,
                                f'BIN_{FL_BINARY}': FL_BINARY,
                                f'DEP_{FL_DEPENDENCY}': FL_DEPENDENCY}
+
+# Github : https://github.com/(owner)/(repo)
+# npm : https://www.npmjs.com/package/(package)/v/(version)
+# npm2 : https://www.npmjs.com/package/@(group)/(package)/v/(version)
+# pypi : https://pypi.org/project/(oss_name)/(version)
+# pypi2 : https://files.pythonhosted.org/packages/source/(alphabet)/(oss_name)/(oss_name)-(version).tar.gz
+# Maven: https://mvnrepository.com/artifact/(group)/(artifact)/(version)
+# pub: https://pub.dev/packages/(package)/versions/(version)
+# Cocoapods : https://cocoapods.org/(package)
+# go : https://pkg.go.dev/(package_name_with_slash)@(version)
+PKG_PATTERN = {
+    "pypi": r'https?:\/\/pypi\.org\/project\/([^\/]+)[\/]?([^\/]*)',
+    "pypi2": r'https?:\/\/files\.pythonhosted\.org\/packages\/source\/[\w]\/([^\/]+)\/[\S]+-([^\-]+)\.tar\.gz',
+    "maven": r'https?:\/\/mvnrepository\.com\/artifact\/([^\/]+)\/([^\/]+)\/?([^\/]*)',
+    "npm": r'https?:\/\/www\.npmjs\.com\/package\/([^\/\@]+)(?:\/v\/)?([^\/]*)',
+    "npm2": r'https?:\/\/www\.npmjs\.com\/package\/(\@[^\/]+\/[^\/]+)(?:\/v\/)?([^\/]*)',
+    "pub": r'https?:\/\/pub\.dev\/packages\/([^\/]+)(?:\/versions\/)?([^\/]*)',
+    "cocoapods": r'https?:\/\/cocoapods\.org\/pods\/([^\/]+)',
+    "go": r'https?:\/\/pkg.go.dev\/([^\@]+)\@?v?([^\/]*)'
+}

fosslight_util/cover.py

@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Copyright (c) 2024 LG Electronics Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+import os
+import sys
+from fosslight_util.help import print_package_version
+
+
+class CoverItem:
+    tool_name_key = "Tool name"
+    tool_version_key = "Tool version"
+    start_time_key = "Start time"
+    python_ver_key = "Python version"
+    analyzed_path_key = "Analyzed path"
+    comment_key = "Comment"
+
+    def __init__(self, tool_name="", start_time="", input_path="", comment=""):
+        self.tool_name = tool_name
+        if start_time:
+            date, time = start_time.split('_')
+            self.start_time = f'{date}, {time[0:2]}:{time[2:4]}'
+        else:
+            self.start_time = ""
+        self.input_path = os.path.abspath(input_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):
+        pass
+
+    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
+        json_item[self.comment_key] = self.comment
+
+        return json_item

fosslight_util/help.py

@@ -52,10 +52,12 @@ def print_package_version(pkg_name, msg="", exitopt=True):
     if msg == "":
         msg = f"{pkg_name} Version:"
     cur_version = pkg_resources.get_distribution(pkg_name).version
-    print(f'{msg} {cur_version}')
 
     if exitopt:
+        print(f'{msg} {cur_version}')
         sys.exit(0)
+    else:
+        return cur_version
 
 
 def print_help_msg_download(exitOpt=True):

fosslight_util/output_format.py

@@ -3,7 +3,7 @@
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
 import os
-from fosslight_util.write_excel import write_result_to_excel, write_result_to_csv, remove_empty_sheet
+from fosslight_util.write_excel import write_result_to_excel, write_result_to_csv
 from fosslight_util.write_opossum import write_opossum
 from fosslight_util.write_yaml import write_yaml
 
@@ -56,29 +56,24 @@ def check_output_format(output='', format='', customized_format={}):
     return success, msg, output_path, output_file, output_extension
 
 
-def write_output_file(output_file_without_ext, file_extension, sheet_list, extended_header={}, hide_header={}):
+def write_output_file(output_file_without_ext, file_extension, sheet_list, extended_header={}, hide_header={}, cover=""):
     success = True
     msg = ''
 
-    is_not_null, sheet_list = remove_empty_sheet(sheet_list)
-    if is_not_null:
-        if file_extension == '':
-            file_extension = '.xlsx'
-        result_file = output_file_without_ext + file_extension
+    if file_extension == '':
+        file_extension = '.xlsx'
+    result_file = output_file_without_ext + file_extension
 
-        if file_extension == '.xlsx':
-            success, msg = write_result_to_excel(result_file, sheet_list, extended_header, hide_header)
-        elif file_extension == '.csv':
-            success, msg, result_file = write_result_to_csv(result_file, sheet_list)
-        elif file_extension == '.json':
-            success, msg = write_opossum(result_file, sheet_list)
-        elif file_extension == '.yaml':
-            success, msg, result_file = write_yaml(result_file, sheet_list, False)
-        else:
-            success = False
-            msg = f'Not supported file extension({file_extension})'
+    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)
+    elif file_extension == '.json':
+        success, msg = write_opossum(result_file, sheet_list)
+    elif file_extension == '.yaml':
+        success, msg, result_file = write_yaml(result_file, sheet_list, False)
     else:
-        result_file = ""
-        msg = "Nothing is detected from the scanner so output file is not generated."
+        success = False
+        msg = f'Not supported file extension({file_extension})'
 
     return success, msg, result_file

fosslight_util/write_excel.py

@@ -13,6 +13,7 @@ import copy
 from pathlib import Path
 import fosslight_util.constant as constant
 from jsonmerge import merge
+from fosslight_util.cover import CoverItem
 
 _HEADER = {'BIN (': ['ID', 'Binary Name', 'Source Code Path',
                      'NOTICE.html', 'OSS Name', 'OSS Version',
@@ -31,6 +32,7 @@ _EMPTY_ITEM_MSG = "* There is no item"\
 IDX_FILE = 0
 IDX_EXCLUDE = 7
 logger = logging.getLogger(constant.LOGGER_NAME)
+COVER_SHEET_NAME = 'Scanner Info'
 
 
 def write_excel_and_csv(filename_without_extension, sheet_list, ignore_os=False, extended_header={}, hide_header={}):
@@ -105,9 +107,9 @@ def get_header_row(sheet_name, sheet_content, extended_header={}):
             if sheet_name.startswith(header_key):
                 selected_header = merged_headers[header_key]
                 break
-
-    if not selected_header:
-        selected_header = sheet_content.pop(0)
+    if len(sheet_content) > 0:
+        if not selected_header:
+            selected_header = sheet_content.pop(0)
     return selected_header, sheet_content
 
 
@@ -166,16 +168,18 @@ def write_result_to_csv(output_file, sheet_list_origin, separate_sheet=False, ex
     return success, error_msg, output
 
 
-def write_result_to_excel(out_file_name, sheet_list, extended_header={}, hide_header={}):
+def write_result_to_excel(out_file_name, sheet_list, extended_header={}, hide_header={}, cover=""):
     success = True
     error_msg = ""
 
     try:
-        if sheet_list:
-            output_dir = os.path.dirname(out_file_name)
-            Path(output_dir).mkdir(parents=True, exist_ok=True)
+        output_dir = os.path.dirname(out_file_name)
+        Path(output_dir).mkdir(parents=True, exist_ok=True)
 
-            workbook = xlsxwriter.Workbook(out_file_name)
+        workbook = xlsxwriter.Workbook(out_file_name)
+        if cover:
+            write_cover_sheet(workbook, cover)
+        if sheet_list:
             for sheet_name, sheet_contents in sheet_list.items():
                 selected_header, sheet_content_without_header = get_header_row(sheet_name, sheet_contents[:], extended_header)
                 try:
@@ -188,13 +192,33 @@ def write_result_to_excel(out_file_name, sheet_list, extended_header={}, hide_he
 
                 if hide_header:
                     hide_column(worksheet, selected_header, hide_header)
-            workbook.close()
+        workbook.close()
     except Exception as ex:
         error_msg = str(ex)
         success = False
     return success, error_msg
 
 
+def write_cover_sheet(workbook, cover):
+    worksheet = workbook.add_worksheet(COVER_SHEET_NAME)
+
+    format_bold = workbook.add_format({'bold': True})
+    worksheet.merge_range('A1:B1', 'About the scanner', format_bold)
+
+    key_format = workbook.add_format({'bold': True, 'font_color': 'white', 'bg_color': 'navy'})
+    item_format = workbook.add_format()
+    item_format.set_text_wrap()
+
+    cover_json = cover.get_print_json()
+    row = 1
+    for item in cover_json:
+        worksheet.write(row, 0, item, key_format)
+        worksheet.write(row, 1, cover_json[item], item_format)
+        row += 1
+    worksheet.set_column(0, 0, 30)
+    worksheet.set_column(1, 1, 100)
+
+
 def write_result_to_sheet(worksheet, sheet_contents):
     row = 1
     for row_item in sheet_contents:
@@ -221,7 +245,33 @@ def create_worksheet(workbook, sheet_name, header_row):
     return worksheet
 
 
-def merge_excels(find_excel_dir, final_out, merge_files=''):
+def merge_cover_comment(find_excel_dir, merge_files=''):
+    FIND_EXTENSION = '.xlsx'
+    merge_comment = []
+    cover_comment = ''
+    try:
+        files = os.listdir(find_excel_dir)
+
+        if len([name for name in files if name.endswith(FIND_EXTENSION)]) > 0:
+            for file in files:
+                if merge_files:
+                    if file not in merge_files:
+                        continue
+                if file.endswith(FIND_EXTENSION):
+                    file = os.path.join(find_excel_dir, file)
+                    df_excel = pd.read_excel(file, sheet_name=COVER_SHEET_NAME, index_col=0, engine='openpyxl')
+                    if not df_excel.empty:
+                        tool_name = df_excel.loc[CoverItem.tool_name_key].values[0]
+                        comment = df_excel.loc[CoverItem.comment_key].values[0]
+                        merge_comment.append(str(f"[{tool_name}] {comment}"))
+            cover_comment = '\n'.join(merge_comment)
+    except Exception as ex:
+        logger.warning(f'Fail to merge comment of Scanner info: {str(ex)}')
+
+    return cover_comment
+
+
+def merge_excels(find_excel_dir, final_out, merge_files='', cover=''):
     success = True
     msg = ""
     FIND_EXTENSION = '.xlsx'
@@ -231,7 +281,7 @@ def merge_excels(find_excel_dir, final_out, merge_files=''):
 
         if len([name for name in files if name.endswith(FIND_EXTENSION)]) > 0:
             writer = pd.ExcelWriter(final_out)
-
+            write_cover_sheet(writer.book, cover)
             for file in files:
                 if merge_files:
                     if file not in merge_files:
@@ -243,13 +293,14 @@ def merge_excels(find_excel_dir, final_out, merge_files=''):
                     excel_file = pd.ExcelFile(file, engine='openpyxl')
 
                     for sheet_name in excel_file.sheet_names:
-                        sheet_name_to_copy = f"{f_short_name}_{sheet_name}"
+                        if sheet_name == COVER_SHEET_NAME:
+                            continue
                         df_excel = pd.read_excel(
                             file, sheet_name=sheet_name, engine='openpyxl')
-                        if sheet_name not in added_sheet_names:
-                            sheet_name_to_copy = sheet_name
-                        df_excel.to_excel(writer, sheet_name_to_copy,
-                                          index=False)
+                        if sheet_name in added_sheet_names:
+                            sheet_name = f"{f_short_name}_{sheet_name}"
+                        df_excel.to_excel(writer, sheet_name, index=False)
+                        added_sheet_names.append(sheet_name)
             writer.close()
     except Exception as ex:
         msg = str(ex)

{fosslight_util-1.4.38.dist-info → fosslight_util-1.4.40.dist-info}/METADATA

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

{fosslight_util-1.4.38.dist-info → fosslight_util-1.4.40.dist-info}/RECORD

@@ -1,19 +1,20 @@
 fosslight_util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fosslight_util/_get_downloadable_url.py,sha256=vCsrppexrNR6ROzgosDb9ZiJCcWvuykdClBGd91nkd4,10175
+fosslight_util/_get_downloadable_url.py,sha256=63ZPI4KCpUFgL4oheKm8zvekuCRzpwNkVaLJcA-uA90,9010
 fosslight_util/compare_yaml.py,sha256=0bapoyS0yrzkiK70K57E8-3wZ_D6mZAJ-24Eq9TYBlk,2632
-fosslight_util/constant.py,sha256=mDrH3Ahldhs9xT63iC8BmeRLHjN6fewI1H-pxnGvcD8,595
+fosslight_util/constant.py,sha256=j9uhncoC2Fn4j4ATNsjUoS91nVXhyGzU6xLyWFj941A,1834
 fosslight_util/convert_excel_to_yaml.py,sha256=7ZsAMMQJIEXrmcl_28nSHvFpGMi1ZiRZYpEfI5O8vP8,2298
 fosslight_util/correct.py,sha256=RQ70zaQ_xuo9Mo0zIcb6pRQwt96bsimQJWkYldE2vbg,5224
+fosslight_util/cover.py,sha256=21l-BS3ZJ8nDxMLHKGT9igB3XbCme55A0eQf01jbISM,1436
 fosslight_util/download.py,sha256=tYsY5rb3fRCwqCDzZzF7wY_kzpMO4cz3G6B7ApdEolA,13732
-fosslight_util/help.py,sha256=3ej8HhpszfFLRxR99Ob55MwHypjIHce1-YSp5_ENq-A,2113
+fosslight_util/help.py,sha256=xhAf43fuRLOU3TE7jqaxVTizVn4aANDvHaHYQAdaqYc,2154
 fosslight_util/oss_item.py,sha256=Gjw-aI4gZGYrCbAkCL35lXlgA2w2F2plgOUmenQ1Cig,5238
-fosslight_util/output_format.py,sha256=-gw3F6wOHS0dKEtbZj8q4JC3JdXdDfid_bOtdlOJEdo,3243
+fosslight_util/output_format.py,sha256=kJpuTuS3XTrsdUd2gsl5GWto5KtJfSej-qkD9azZFdQ,2982
 fosslight_util/parsing_yaml.py,sha256=zmetMiZprni_YMxUfj_Nx-nXm0sT31Ck_V0nWFS6ZmE,4332
 fosslight_util/read_excel.py,sha256=eN2aNkJv3Y2071f6lHfQTHx5IFJe0imxH3TeRO_kodc,5154
 fosslight_util/set_log.py,sha256=8cFGpr4HMk4grHo3a5keR4V1xWBscbjowYPxyrh42ks,3140
 fosslight_util/spdx_licenses.py,sha256=r90hUY4_T-XrHIJHLx1Ox3gWZ3qzdZj9rJFo7AwmkPE,3641
 fosslight_util/timer_thread.py,sha256=5VbZENQPD-N0NUmzEktqGr6Am-e7vxD79K05mmr29g0,433
-fosslight_util/write_excel.py,sha256=JWZGvmJ42cD1kLJ_2Z43JhaDp2S3SxHjREtL73YBzX8,10017
+fosslight_util/write_excel.py,sha256=8-qZhCM31KzLrNwysX_hF9ZCSzSUOzkZmTPeekKVKJg,12065
 fosslight_util/write_opossum.py,sha256=PGJV5DysNJvIFbzsyGXxh_kRcvZuHAOmLs-WlXP8qMI,11831
 fosslight_util/write_scancodejson.py,sha256=CSKjuwbA04nK5ogXklNsCBgGDZXPr805T8KPLgvx71U,2282
 fosslight_util/write_spdx.py,sha256=B_aHv9vScgZI5gHo5Hd56ckNWOHdyAQebRV54bTx9ec,9542
@@ -22,9 +23,9 @@ fosslight_util/write_yaml.py,sha256=ppBBErAXbXw8jtJ9j7BDeQHHzDlsTRt62XR0GgTcr70,
 fosslight_util/resources/frequentLicenselist.json,sha256=GUhzK6tu7ok10fekOnmVmUgIGRC-acGABZKTNKfDyYA,4776157
 fosslight_util/resources/frequent_license_nick_list.json,sha256=ryU2C_6ZxHbz90_sUN9OvI9GXkCMLu7oGcmd9W79YYo,5005
 fosslight_util/resources/licenses.json,sha256=mK55z-bhY7Mjpj2KsO1crKGGL-X3F6MBFQJ0zLlx010,240843
-fosslight_util-1.4.38.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_util-1.4.38.dist-info/METADATA,sha256=EI1wf4oIup1AK-1YhpCLpjFzLO2BnzCKb17NJIMwtLE,6189
-fosslight_util-1.4.38.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-fosslight_util-1.4.38.dist-info/entry_points.txt,sha256=bzXX5i7HZ13V8BLKvtu_9KO3ZjtRypH-XszOXT6I3bU,69
-fosslight_util-1.4.38.dist-info/top_level.txt,sha256=2qyYWGLakgBRy4BqoBNt-I5C29tBr_e93e5e1pbuTGA,15
-fosslight_util-1.4.38.dist-info/RECORD,,
+fosslight_util-1.4.40.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_util-1.4.40.dist-info/METADATA,sha256=o4BdKiS8Caz_wUgyy2_REDR9uQ-vYmkgw-Njxyjdo2A,6189
+fosslight_util-1.4.40.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+fosslight_util-1.4.40.dist-info/entry_points.txt,sha256=bzXX5i7HZ13V8BLKvtu_9KO3ZjtRypH-XszOXT6I3bU,69
+fosslight_util-1.4.40.dist-info/top_level.txt,sha256=2qyYWGLakgBRy4BqoBNt-I5C29tBr_e93e5e1pbuTGA,15
+fosslight_util-1.4.40.dist-info/RECORD,,