fosslight-util 2.1.19__py3-none-any.whl → 2.1.21__py3-none-any.whl

fosslight_util/_get_downloadable_url.py

@@ -16,6 +16,7 @@ logger = logging.getLogger(constant.LOGGER_NAME)
 def extract_name_version_from_link(link):
     oss_name = ""
     oss_version = ""
+    matched = False
     if link.startswith("www."):
         link = link.replace("www.", "https://www.", 1)
     for key, value in constant.PKG_PATTERN.items():
@@ -55,7 +56,10 @@ def extract_name_version_from_link(link):
                 if key in ["pypi", "maven", "npm", "npm2", "pub", "go"]:
                     oss_version, link = get_latest_package_version(link, key, origin_name)
                     logger.info(f'Try to download with the latest version:{link}')
+            matched = True
             break
+    if not matched:
+        key = ""
     return oss_name, oss_version, link, key
 
 

fosslight_util/download.py

@@ -27,6 +27,7 @@ import subprocess
 import re
 from typing import Tuple
 import urllib.parse
+import json
 
 logger = logging.getLogger(constant.LOGGER_NAME)
 compression_extension = {".tar.bz2", ".tar.gz", ".tar.xz", ".tgz", ".tar", ".zip", ".jar", ".bz2"}
@@ -96,7 +97,8 @@ def parse_src_link(src_link):
 def cli_download_and_extract(link: str, target_dir: str, log_dir: str, checkout_to: str = "",
                              compressed_only: bool = False, ssh_key: str = "",
                              id: str = "", git_token: str = "",
-                             called_cli: bool = True) -> Tuple[bool, str, str, str]:
+                             called_cli: bool = True,
+                             output: bool = False) -> Tuple[bool, str, str, str]:
     global logger
 
     success = True
@@ -155,6 +157,17 @@ def cli_download_and_extract(link: str, target_dir: str, log_dir: str, checkout_
         success = False
         msg = str(error)
 
+    if output:
+        output_result = {
+            "success": success,
+            "message": msg,
+            "oss_name": oss_name,
+            "oss_version": oss_version
+        }
+        output_json = os.path.join(log_dir, "fosslight_download_output.json")
+        with open(output_json, 'w') as f:
+            json.dump(output_result, f, indent=4)
+
     logger.info(f"\n* FOSSLight Downloader - Result: {success} ({msg})")
     return success, msg, oss_name, oss_version
 
@@ -478,10 +491,17 @@ def main():
     parser.add_argument('-s', '--source', help='Source link to download', type=str, dest='source')
     parser.add_argument('-t', '--target_dir', help='Target directory', type=str, dest='target_dir', default="")
     parser.add_argument('-d', '--log_dir', help='Directory to save log file', type=str, dest='log_dir', default="")
+    parser.add_argument('-c', '--checkout_to', help='Checkout to  branch or tag', type=str, dest='checkout_to', default="")
+    parser.add_argument('-z', '--compressed_only', help='Unzip only compressed file',
+                        action='store_true', dest='compressed_only', default=False)
+    parser.add_argument('-o', '--output', help='Generate output file', action='store_true', dest='output', default=False)
 
     src_link = ""
     target_dir = os.getcwd()
     log_dir = os.getcwd()
+    checkout_to = ""
+    compressed_only = False
+    output = False
 
     try:
         args = parser.parse_args()
@@ -496,11 +516,19 @@ def main():
         target_dir = args.target_dir
     if args.log_dir:
         log_dir = args.log_dir
+    if args.checkout_to:
+        checkout_to = args.checkout_to
+    if args.compressed_only:
+        compressed_only = args.compressed_only
+    if args.output:
+        output = args.output
 
     if not src_link:
         print_help_msg_download()
     else:
-        cli_download_and_extract(src_link, target_dir, log_dir)
+        cli_download_and_extract(src_link, target_dir, log_dir, checkout_to,
+                                 compressed_only, "", "", "", False,
+                                 output)
 
 
 if __name__ == '__main__':

{fosslight_util-2.1.19.dist-info → fosslight_util-2.1.21.dist-info}/METADATA

@@ -1,21 +1,18 @@
 Metadata-Version: 2.1
 Name: fosslight-util
-Version: 2.1.19
+Version: 2.1.21
 Summary: FOSSLight Util
 Home-page: https://github.com/fosslight/fosslight_util
+Download-URL: https://github.com/fosslight/fosslight_util
 Author: LG Electronics
 License: Apache-2.0
-Download-URL: https://github.com/fosslight/fosslight_util
-Platform: UNKNOWN
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: XlsxWriter
 Requires-Dist: pandas
 Requires-Dist: openpyxl
@@ -27,12 +24,9 @@ Requires-Dist: python3-wget
 Requires-Dist: beautifulsoup4
 Requires-Dist: jsonmerge
 Requires-Dist: setuptools>=65.5.1
+Requires-Dist: numpy
 Requires-Dist: requests
 Requires-Dist: GitPython
-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.*; sys_platform == "linux"
 Requires-Dist: cyclonedx-python-lib==8.5.*; sys_platform == "linux"
 
@@ -67,7 +61,7 @@ It is a package that supports common utils used by FOSSLight Scanner.
 
 ## 📋 Prerequisite
 
-FOSSLight Util needs a Python 3.6+.
+FOSSLight Util needs a Python 3.10+.
 
 ## 🎉 How to install
 
@@ -81,7 +75,7 @@ $ pip3 install fosslight_util
 
 Three modules can be called. Please refer to each file for detailed calling method.
 
-
+   
 ### 1. Setup logger (tests/test_log.py)
 ```
 from fosslight_util.set_log import init_log
@@ -102,7 +96,7 @@ def test():
     logger.warning("TESTING - Print log")
 ```
 
-
+  
 ### 2. Write result files (tests/test_output_format.py)
 ```
 from fosslight_util.output_format import write_output_file
@@ -118,7 +112,7 @@ def test():
                         '0.4.3', 'Apache-2.0', 'https://github.com/jpeddicord/askalono', '', 'Copyright (c) 2018 Amazon.com, Inc. or its affiliates.', '', '']]}
     success, msg = write_output_file('test_result/excel/FOSSLight-Report', '.xlsx', sheet_contents)
 ```
-
+  
 ### 3. Get spdx licenses (tests/test_spdx_licenses.py)
 ```
 from fosslight_util.spdx_licenses import get_spdx_licenses_json
@@ -184,5 +178,3 @@ Please report any ideas or bugs to improve by creating an issue in [fosslight_ut
 FOSSLight Util is released under [Apache-2.0][l].
 
 [l]: https://github.com/fosslight/fosslight_util/blob/main/LICENSE
-
-

{fosslight_util-2.1.19.dist-info → fosslight_util-2.1.21.dist-info}/RECORD

@@ -1,10 +1,10 @@
 fosslight_util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fosslight_util/_get_downloadable_url.py,sha256=TbzzW-MJky-A610mgw5bpf6xmELyQAwXo9jfubi05d8,12271
+fosslight_util/_get_downloadable_url.py,sha256=p6vSYr6BdSwqafqMX3Cl5M45MSE9N02w512Mh5C2Hyo,12355
 fosslight_util/compare_yaml.py,sha256=eLqqCLgERxRHN5vsnpQVMXIEU862Lx66mD_y4uMgQE4,2916
 fosslight_util/constant.py,sha256=zElnWOzXt020sYiFTiRQn8ZjZyZpL3aPmfAqfQLcxJk,2278
 fosslight_util/correct.py,sha256=1WEAL-9_KhjFPLucPhv0PNN3K7avm0z8mU6sTuSyeHM,3864
 fosslight_util/cover.py,sha256=qqqKzxqFwKimal764FaugRUBcHWdeKt8af6xeK0mH8E,2040
-fosslight_util/download.py,sha256=V3EBgXt-xHarJZFrskXHaX4Ij81ZPjj6hzvtmpKu7xE,17642
+fosslight_util/download.py,sha256=A-L9zBVUDoP6LQrAaVv3IzpEldOSxE3lBMqNOYTaYVU,18856
 fosslight_util/exclude.py,sha256=fDmBsZJ_F7O9Oh2T-07R03XNbElo1tFaf_z01KfSAqU,2399
 fosslight_util/help.py,sha256=Bmyz-eFP0X0qUfgFPrWiuyUPE0TLQfWjgfHTzJBIInc,2377
 fosslight_util/oss_item.py,sha256=8W2HlwqGH3l1iPPdvycrRYKsBSBpqAkqYyYtBVPgMtY,6868
@@ -24,9 +24,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.19.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_util-2.1.19.dist-info/METADATA,sha256=rqYqFM4FZEKmhmATRltYAJreokGayqWFTX2tENCgje4,6481
-fosslight_util-2.1.19.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-fosslight_util-2.1.19.dist-info/entry_points.txt,sha256=bzXX5i7HZ13V8BLKvtu_9KO3ZjtRypH-XszOXT6I3bU,69
-fosslight_util-2.1.19.dist-info/top_level.txt,sha256=2qyYWGLakgBRy4BqoBNt-I5C29tBr_e93e5e1pbuTGA,15
-fosslight_util-2.1.19.dist-info/RECORD,,
+fosslight_util-2.1.21.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_util-2.1.21.dist-info/METADATA,sha256=BaqzJe4829VFc5HECJui2DBzr8_IhlVEPWNPnUimJa0,6156
+fosslight_util-2.1.21.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+fosslight_util-2.1.21.dist-info/entry_points.txt,sha256=0yZggRWNwDaClDG8UmUA10UFG8cVX3Jiy5gG9nW7hJs,68
+fosslight_util-2.1.21.dist-info/top_level.txt,sha256=2qyYWGLakgBRy4BqoBNt-I5C29tBr_e93e5e1pbuTGA,15
+fosslight_util-2.1.21.dist-info/RECORD,,

{fosslight_util-2.1.19.dist-info → fosslight_util-2.1.21.dist-info}/entry_points.txt

@@ -1,3 +1,2 @@
 [console_scripts]
 fosslight_download = fosslight_util.download:main
-