fosslight-util 2.1.0__py3-none-any.whl → 2.1.1__py3-none-any.whl

fosslight_util/compare_yaml.py

@@ -4,7 +4,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import logging
+from typing import List, Dict
 from fosslight_util.constant import LOGGER_NAME
+from fosslight_util.oss_item import FileItem
 
 logger = logging.getLogger(LOGGER_NAME)
 VERSION = 'version'
@@ -12,7 +14,7 @@ LICENSE = 'license'
 NAME = 'name'
 
 
-def compare_yaml(before_fileitems, after_fileitems):
+def compare_yaml(before_fileitems: List[FileItem], after_fileitems: List[FileItem]) -> Dict[str, List]:
     bf_raw = []
     af_raw = []
     for bf in before_fileitems:

fosslight_util/output_format.py

@@ -183,11 +183,11 @@ def write_output_file(output_file_without_ext: str, file_extension: str, scan_it
         elif format == 'yaml':
             success, msg, _ = write_yaml(result_file, scan_item, False)
         elif format.startswith('spdx'):
-            if platform.system() != 'Windows':
-                success, msg, _ = write_spdx(output_file_without_ext, file_extension, scan_item, spdx_version)
-            else:
+            if platform.system() == 'Windows' or platform.system() == 'Darwin':
                 success = False
-                msg = 'Windows not support spdx format.'
+                msg = f'{platform.system()} not support spdx format.'
+            else:
+                success, msg, _ = write_spdx(output_file_without_ext, file_extension, scan_item, spdx_version)
     else:
         if file_extension == '.xlsx':
             success, msg = write_result_to_excel(result_file, scan_item, extended_header, hide_header)

{fosslight_util-2.1.0.dist-info → fosslight_util-2.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-util
-Version: 2.1.0
+Version: 2.1.1
 Summary: FOSSLight Util
 Home-page: https://github.com/fosslight/fosslight_util
 Author: LG Electronics
@@ -34,7 +34,7 @@ Requires-Dist: numpy; python_version < "3.8"
 Requires-Dist: numpy>=1.22.2; python_version >= "3.8"
 Requires-Dist: pygit2==1.6.1; python_version < "3.7"
 Requires-Dist: pygit2>=1.10.1; python_version >= "3.7"
-Requires-Dist: spdx-tools>=0.8.2; sys_platform != "win32"
+Requires-Dist: spdx-tools==0.8.*; sys_platform == "linux"
 
 <!--
 Copyright (c) 2021 LG Electronics

{fosslight_util-2.1.0.dist-info → fosslight_util-2.1.1.dist-info}/RECORD

@@ -1,14 +1,13 @@
 fosslight_util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fosslight_util/_get_downloadable_url.py,sha256=63ZPI4KCpUFgL4oheKm8zvekuCRzpwNkVaLJcA-uA90,9010
-fosslight_util/compare_yaml.py,sha256=znKz8sp6dk9wwBkJl-MQmkKTmL1IKNOrBWZklW7QVtU,2790
+fosslight_util/compare_yaml.py,sha256=eLqqCLgERxRHN5vsnpQVMXIEU862Lx66mD_y4uMgQE4,2916
 fosslight_util/constant.py,sha256=Ig3ACm9_QirE4389Wt-IfxOqRkVOUjqGnX1B05z2Byo,2151
-fosslight_util/convert_excel_to_yaml.py,sha256=OJ11av4bsoxnVS15aa2aX-X3zGYUZW6M3118TPtHHTc,2323
 fosslight_util/correct.py,sha256=3iUipan8ZX8sbyIIGAPtMkAGvZ4YucjeJwx1K1Bx_z4,3897
 fosslight_util/cover.py,sha256=qqqKzxqFwKimal764FaugRUBcHWdeKt8af6xeK0mH8E,2040
 fosslight_util/download.py,sha256=y2WYHUjAUH5kTTDtPrAop9sD1QDWTiGgFdUbNocIuH0,15070
 fosslight_util/help.py,sha256=M3_XahUkP794US9Q0NS6ujmGvrFFnKBHsTU95Fg1KpA,2181
 fosslight_util/oss_item.py,sha256=8W2HlwqGH3l1iPPdvycrRYKsBSBpqAkqYyYtBVPgMtY,6868
-fosslight_util/output_format.py,sha256=je3oVrDDnA160jIkFGpCHlG9Fc4YDlkQGwor2LFSmb0,8173
+fosslight_util/output_format.py,sha256=o21Vz1VNe9sec2Tb38DykrvzgmcqGG-a1fkm3xe6z8Q,8219
 fosslight_util/parsing_yaml.py,sha256=2zx_N5lMkXT1dRmfJMpzlrru-y_2F_CkVbGlba6vQpU,5380
 fosslight_util/read_excel.py,sha256=-QvrdxaNqYOpIm1H7ZqIEh5NLvFPymZo6BAOZcQmQug,5263
 fosslight_util/set_log.py,sha256=Xpa94AiOyGEK8ucaYkvkAllvlen1Pq_d6UG6kPYBYBc,3780
@@ -23,9 +22,9 @@ fosslight_util/write_yaml.py,sha256=QlEKoIPQsEaYERfbP53TeKgnllYzhLQWm5wYjnWtVjE,
 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-2.1.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_util-2.1.0.dist-info/METADATA,sha256=8Ir3V_wALc0pYZMyeE48wBMFSE1CcOA28-HkPoeKMm4,6431
-fosslight_util-2.1.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-fosslight_util-2.1.0.dist-info/entry_points.txt,sha256=bzXX5i7HZ13V8BLKvtu_9KO3ZjtRypH-XszOXT6I3bU,69
-fosslight_util-2.1.0.dist-info/top_level.txt,sha256=2qyYWGLakgBRy4BqoBNt-I5C29tBr_e93e5e1pbuTGA,15
-fosslight_util-2.1.0.dist-info/RECORD,,
+fosslight_util-2.1.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_util-2.1.1.dist-info/METADATA,sha256=GeJezINLDPAC-wKuBqNmtucPR1Z1o6UGFKGeHlhOQdI,6431
+fosslight_util-2.1.1.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+fosslight_util-2.1.1.dist-info/entry_points.txt,sha256=bzXX5i7HZ13V8BLKvtu_9KO3ZjtRypH-XszOXT6I3bU,69
+fosslight_util-2.1.1.dist-info/top_level.txt,sha256=2qyYWGLakgBRy4BqoBNt-I5C29tBr_e93e5e1pbuTGA,15
+fosslight_util-2.1.1.dist-info/RECORD,,

fosslight_util/convert_excel_to_yaml.py

@@ -1,69 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (c) 2022 LG Electronics Inc.
-# SPDX-License-Identifier: Apache-2.0
-import os
-import sys
-import logging
-import yaml
-import re
-from fosslight_util.constant import LOGGER_NAME
-from fosslight_util.write_yaml import create_yaml_with_ossitem
-from fosslight_util.read_excel import read_oss_report
-
-logger = logging.getLogger(LOGGER_NAME)
-
-
-def find_report_file(path_to_find):
-    file_to_find = ["FOSSLight-Report.xlsx", "OSS-Report.xlsx"]
-
-    try:
-        for file in file_to_find:
-            file_with_path = os.path.join(path_to_find, file)
-            if os.path.isfile(file_with_path):
-                return file
-        for root, dirs, files in os.walk(path_to_find):
-            for file in files:
-                file_name = file.lower()
-                p = re.compile(r"[\s\S]*OSS[\s\S]*-Report[\s\S]*.xlsx", re.I)
-                if p.search(file_name):
-                    return os.path.join(root, file)
-    except Exception as error:
-        logger.debug("Find report:"+str(error))
-    return ""
-
-
-def convert_excel_to_yaml(oss_report_to_read: str, output_file: str, sheet_names: str = "") -> None:
-    _file_extension = ".yaml"
-    yaml_dict = {}
-
-    if os.path.isfile(oss_report_to_read):
-        try:
-            items = read_oss_report(oss_report_to_read, sheet_names)
-            for item in items:
-                create_yaml_with_ossitem(item, yaml_dict)
-            if yaml_dict:
-                output_file = output_file if output_file.endswith(_file_extension) else output_file + _file_extension
-                success = write_yaml_file(output_file, yaml_dict)
-                if success:
-                    logger.warning(f"Output: {output_file}")
-                else:
-                    logger.error(f"Can't write yaml file : {output_file}")
-                    sys.exit(1)
-        except Exception as error:
-            logger.error(f"Convert yaml: {error}")
-    else:
-        logger.error(f"Can't find a file: {oss_report_to_read}")
-
-
-def write_yaml_file(output_file, json_output):
-    success = True
-    error_msg = ""
-
-    try:
-        with open(output_file, 'w') as f:
-            yaml.dump(json_output, f, sort_keys=False)
-    except Exception as ex:
-        error_msg = str(ex)
-        success = False
-    return success, error_msg