fosslight-util 2.1.13__tar.gz → 2.1.15__tar.gz

{fosslight_util-2.1.13 → fosslight_util-2.1.15}/PKG-INFO

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

{fosslight_util-2.1.13 → fosslight_util-2.1.15}/setup.py

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

{fosslight_util-2.1.13 → fosslight_util-2.1.15}/src/fosslight_util/_get_downloadable_url.py

@@ -27,7 +27,7 @@ def extract_name_version_from_link(link):
                 origin_name = match.group(1)
                 if (key == "pypi") or (key == "pypi2"):
                     oss_name = f"pypi:{origin_name}"
-                    oss_name = re.sub(r"[-_.]+", "-", oss_name).lower()
+                    oss_name = re.sub(r"[-_.]+", "-", oss_name)
                     oss_version = match.group(2)
                 elif key == "maven":
                     artifact = match.group(2)
@@ -42,12 +42,17 @@ def extract_name_version_from_link(link):
                     oss_version = match.group(2)
                 elif key == "cocoapods":
                     oss_name = f"cocoapods:{origin_name}"
+                elif key == "go":
+                    if origin_name.endswith('/'):
+                        origin_name = origin_name[:-1]
+                    oss_name = f"go:{origin_name}"
+                    oss_version = match.group(2)
             except Exception as ex:
                 logger.info(f"extract_name_version_from_link {key}:{ex}")
             if oss_name and (not oss_version):
-                if key in ["pypi", "maven", "npm", "npm2", "pub"]:
+                if key in ["pypi", "maven", "npm", "npm2", "pub", "go"]:
                     oss_version, link = get_latest_package_version(link, key, origin_name)
-                    logger.debug(f'Try to download with the latest version:{link}')
+                    logger.info(f'Try to download with the latest version:{link}')
             break
     return oss_name, oss_version, link, key
 
@@ -76,8 +81,13 @@ def get_latest_package_version(link, pkg_type, oss_name):
             if pub_response.status_code == 200:
                 find_version = pub_response.json().get('latest').get('version')
             link_with_version = f'https://pub.dev/packages/{oss_name}/versions/{find_version}'
+        elif pkg_type == 'go':
+            go_response = requests.get(f'https://proxy.golang.org/{oss_name}/@latest')
+            if go_response.status_code == 200:
+                find_version = go_response.json().get('Version')
+            link_with_version = f'https://pkg.go.dev/{oss_name}@{find_version}'
     except Exception as e:
-        logger.debug(f'Fail to get latest package version({link}:{e})')
+        logger.info(f'Fail to get latest package version({link}:{e})')
     return find_version, link_with_version
 
 
@@ -98,10 +108,42 @@ def get_downloadable_url(link):
         ret, result_link = get_download_location_for_npm(new_link)
     elif pkg_type == "pub":
         ret, result_link = get_download_location_for_pub(new_link)
+    elif pkg_type == "go":
+        ret, result_link = get_download_location_for_go(new_link)
 
     return ret, result_link, oss_name, oss_version
 
 
+def get_download_location_for_go(link):
+    # get the url for downloading source file: https://proxy.golang.org/<module>/@v/VERSION.zip
+    ret = False
+    new_link = ''
+    host = 'https://proxy.golang.org'
+
+    try:
+        dn_loc_re = re.findall(r'pkg.go.dev\/([^\@]+)\@?([^\/]*)', link)
+        if dn_loc_re:
+            oss_name = dn_loc_re[0][0]
+            if oss_name.endswith('/'):
+                oss_name = oss_name[:-1]
+            oss_version = dn_loc_re[0][1]
+
+            new_link = f'{host}/{oss_name}/@v/{oss_version}.zip'
+        try:
+            res = urlopen(new_link)
+            if res.getcode() == 200:
+                ret = True
+            else:
+                logger.warning(f'Cannot find the valid link for go (url:{new_link}')
+        except Exception as e:
+            logger.warning(f'Fail to find the valid link for go (url:{new_link}: {e}')
+    except Exception as error:
+        ret = False
+        logger.warning(f'Cannot find the link for go (url:{link}({(new_link)})): {error}')
+
+    return ret, new_link
+
+
 def get_download_location_for_pypi(link):
     # get the url for downloading source file: https://docs.pypi.org/api/ Predictable URLs
     ret = False
@@ -111,7 +153,7 @@ def get_download_location_for_pypi(link):
     try:
         dn_loc_re = re.findall(r'pypi.org\/project\/?([^\/]*)\/?([^\/]*)', link)
         oss_name = dn_loc_re[0][0]
-        oss_name = re.sub(r"[-_.]+", "-", oss_name).lower()
+        oss_name = re.sub(r"[-_.]+", "-", oss_name)
         oss_version = dn_loc_re[0][1]
 
         new_link = f'{host}/packages/source/{oss_name[0]}/{oss_name}/{oss_name}-{oss_version}.tar.gz'
@@ -122,7 +164,7 @@ def get_download_location_for_pypi(link):
             else:
                 logger.warning(f'Cannot find the valid link for pypi (url:{new_link}')
         except Exception:
-            oss_name = re.sub(r"[-]+", "_", oss_name).lower()
+            oss_name = re.sub(r"[-]+", "_", oss_name)
             new_link = f'{host}/packages/source/{oss_name[0]}/{oss_name}/{oss_name}-{oss_version}.tar.gz'
             res = urlopen(new_link)
             if res.getcode() == 200:

{fosslight_util-2.1.13 → fosslight_util-2.1.15}/src/fosslight_util/help.py

@@ -3,7 +3,10 @@
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
 import sys
-import pkg_resources
+try:
+    from importlib.metadata import version, PackageNotFoundError
+except ImportError:
+    from importlib_metadata import version, PackageNotFoundError  # Python <3.8
 
 _HELP_MESSAGE_COMMON = """
          _______  _______  _______  _______  ___      ___           __
@@ -50,7 +53,10 @@ class PrintHelpMsg():
 def print_package_version(pkg_name: str, msg: str = "", exitopt: bool = True) -> str:
     if msg == "":
         msg = f"{pkg_name} Version:"
-    cur_version = pkg_resources.get_distribution(pkg_name).version
+    try:
+        cur_version = version(pkg_name)
+    except PackageNotFoundError:
+        cur_version = "unknown"
 
     if exitopt:
         print(f'{msg} {cur_version}')

{fosslight_util-2.1.13 → fosslight_util-2.1.15}/src/fosslight_util/set_log.py

@@ -6,7 +6,6 @@
 import logging
 import os
 from pathlib import Path
-import pkg_resources
 import sys
 import platform
 from . import constant as constant
@@ -15,6 +14,11 @@ import coloredlogs
 from typing import Tuple
 from logging import Logger
 
+try:
+    from importlib.metadata import version, PackageNotFoundError
+except ImportError:
+    from importlib_metadata import version, PackageNotFoundError  # Python <3.8
+
 
 def init_check_latest_version(pkg_version="", main_package_name=""):
 
@@ -92,9 +96,11 @@ def init_log(log_file: str, create_file: bool = True, stream_log_level: int = lo
     if main_package_name != "":
         pkg_info = main_package_name
         try:
-            pkg_version = pkg_resources.get_distribution(main_package_name).version
+            pkg_version = version(main_package_name)
             init_check_latest_version(pkg_version, main_package_name)
             pkg_info = main_package_name + " v" + pkg_version
+        except PackageNotFoundError:
+            logger.debug('Cannot check the version: Package not found')
         except Exception as error:
             logger.debug('Cannot check the version:' + str(error))
         _result_log["Tool Info"] = pkg_info

{fosslight_util-2.1.13 → fosslight_util-2.1.15}/src/fosslight_util.egg-info/PKG-INFO

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