fosslight-util 2.1.5__tar.gz → 2.1.7__tar.gz

{fosslight_util-2.1.5 → fosslight_util-2.1.7}/PKG-INFO

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

{fosslight_util-2.1.5 → fosslight_util-2.1.7}/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.5',
+        version='2.1.7',
         package_dir={"": "src"},
         packages=find_packages(where='src'),
         description='FOSSLight Util',

{fosslight_util-2.1.5 → fosslight_util-2.1.7}/src/fosslight_util/_get_downloadable_url.py

@@ -103,31 +103,35 @@ def get_downloadable_url(link):
 
 
 def get_download_location_for_pypi(link):
-    # get the url for downloading source file in pypi.org/project/(oss_name)/(oss_version)/#files
+    # get the url for downloading source file: https://docs.pypi.org/api/ Predictable URLs
     ret = False
     new_link = ''
+    host = 'https://files.pythonhosted.org'
 
     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_version = dn_loc_re[0][1]
 
-        pypi_url = 'https://pypi.org/project/' + oss_name + '/' + oss_version + '/#files'
-
-        content = urlopen(pypi_url).read().decode('utf8')
-        bs_obj = BeautifulSoup(content, 'html.parser')
-
-        card_file_list = bs_obj.findAll('div', {'class': 'card file__card'})
-
-        for card_file in card_file_list:
-            file_code = card_file.find('code').text
-            if file_code.lower() == "source":
-                new_link = card_file.find('a').attrs['href']
+        new_link = f'{host}/packages/source/{oss_name[0]}/{oss_name}/{oss_name}-{oss_version}.tar.gz'
+        try:
+            res = urlopen(new_link)
+            if res.getcode() == 200:
                 ret = True
-                break
+            else:
+                logger.warning(f'Cannot find the valid link for pypi (url:{new_link}')
+        except Exception as e:
+            oss_name = re.sub(r"[-]+", "_", oss_name).lower()
+            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:
+                ret = True
+            else:
+                logger.warning(f'Cannot find the valid link for pypi (url:{new_link}')
     except Exception as error:
         ret = False
-        logger.warning('Cannot find the link for pypi (url:'+link+') '+str(error))
+        logger.warning(f'Cannot find the link for pypi (url:{link}({(new_link)})) e:{str(error)}')
 
     return ret, new_link
 

{fosslight_util-2.1.5 → fosslight_util-2.1.7}/src/fosslight_util/write_cyclonedx.py

@@ -15,12 +15,12 @@ from fosslight_util.spdx_licenses import get_spdx_licenses_json, get_license_fro
 from fosslight_util.constant import (LOGGER_NAME, FOSSLIGHT_DEPENDENCY, FOSSLIGHT_SCANNER,
                                      FOSSLIGHT_BINARY, FOSSLIGHT_SOURCE)
 from fosslight_util.oss_item import CHECKSUM_NULL, get_checksum_sha1
-from packageurl import PackageURL
 import traceback
 
 logger = logging.getLogger(LOGGER_NAME)
 
 try:
+    from packageurl import PackageURL
     from cyclonedx.builder.this import this_component as cdx_lib_component
     from cyclonedx.exception import MissingOptionalDependencyException
     from cyclonedx.factory.license import LicenseFactory

{fosslight_util-2.1.5 → fosslight_util-2.1.7}/src/fosslight_util.egg-info/PKG-INFO

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