fosslight-dependency 4.1.13__py3-none-any.whl → 4.1.14__py3-none-any.whl

fosslight_dependency/package_manager/Go.py

@@ -118,37 +118,39 @@ class Go(PackageManager):
                 if f'{package_path}({oss_item.version})' in self.relation_tree:
                     dep_item.depends_on_raw = self.relation_tree[f'{package_path}({oss_item.version})']
 
-                homepage_set = []
-                oss_item.homepage = self.dn_url + package_path
-                dep_item.purl = get_url_to_purl(f"{oss_item.homepage}@{oss_item.version}", self.package_manager_name)
+                dn_loc_set = []
+                tmp_dn_loc = self.dn_url + package_path
+                dep_item.purl = get_url_to_purl(f"{tmp_dn_loc}@{oss_item.version}", self.package_manager_name)
                 purl_dict[f'{package_path}({oss_item.version})'] = dep_item.purl
 
                 if oss_origin_version:
-                    tmp_homepage = f"{oss_item.homepage}@{oss_origin_version}"
-                    homepage_set.append(tmp_homepage)
-                homepage_set.append(oss_item.homepage)
+                    oss_item.download_location = f"{tmp_dn_loc}@{oss_origin_version}"
+                    dn_loc_set.append(oss_item.download_location)
+                dn_loc_set.append(tmp_dn_loc)
 
-                for homepage_i in homepage_set:
+                for dn_loc_i in dn_loc_set:
                     urlopen_success = False
                     while True:
                         try:
-                            res = urllib.request.urlopen(homepage_i)
+                            res = urllib.request.urlopen(dn_loc_i)
                             if res.getcode() == 200:
                                 urlopen_success = True
-                                if homepage_i == oss_item.homepage:
+                                if dn_loc_i == tmp_dn_loc:
                                     if oss_item.version:
-                                        oss_item.comment = f'Cannot connect {tmp_homepage}, get info from the latest version.'
+                                        oss_item.comment = (f'Not found {oss_item.download_location}, '
+                                                            'get info from latest version.')
+                                        oss_item.download_location = tmp_dn_loc
                                 break
                         except urllib.error.HTTPError as e:
                             if e.code == 429:
-                                logger.info(f"{e} ({homepage_i}), Retrying to connect after 20 seconds")
+                                logger.info(f"{e} ({dn_loc_i}), Retrying to connect after 20 seconds")
                                 time.sleep(20)
                                 continue
                             else:
-                                logger.info(f"{e} ({homepage_i})")
+                                logger.info(f"{e} ({dn_loc_i})")
                                 break
                         except Exception as e:
-                            logger.warning(f"{e} ({homepage_i})")
+                            logger.warning(f"{e} ({dn_loc_i})")
                             break
                     if urlopen_success:
                         break
@@ -163,9 +165,9 @@ class Go(PackageManager):
 
                     repository_data = bs_obj.find('div', {'class': 'UnitMeta-repo'})
                     if repository_data:
-                        oss_item.download_location = repository_data.find('a')['href']
+                        oss_item.homepage = repository_data.find('a')['href']
                     else:
-                        oss_item.download_location = oss_item.homepage
+                        oss_item.homepage = oss_item.download_location
 
             except Exception as e:
                 logging.warning(f"Fail to parse {package_path} in go mod : {e}")

fosslight_dependency/package_manager/Npm.py

@@ -176,8 +176,8 @@ class Npm(PackageManager):
                 if d[_private]:
                     private_pkg = True
 
-            oss_item.download_location = self.dn_url + oss_init_name
-            dn_loc = f"{self.dn_url}{oss_init_name}/v/{oss_item.version}"
+            oss_item.download_location = f"{self.dn_url}{oss_init_name}/v/{oss_item.version}"
+            dn_loc = f"{self.dn_url}{oss_init_name}"
             dep_item.purl = get_url_to_purl(dn_loc, self.package_manager_name)
             purl_dict[f'{oss_init_name}({oss_item.version})'] = dep_item.purl
             if d[_repository]:

{fosslight_dependency-4.1.13.dist-info → fosslight_dependency-4.1.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-dependency
-Version: 4.1.13
+Version: 4.1.14
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Author: LG Electronics

{fosslight_dependency-4.1.13.dist-info → fosslight_dependency-4.1.14.dist-info}/RECORD

@@ -12,11 +12,11 @@ fosslight_dependency/package_manager/Android.py,sha256=0UZFvbLxDIreerK4fR316YPyh
 fosslight_dependency/package_manager/Cargo.py,sha256=erAHVVbnRW5KUHVcrPgaHFGJOClpnf4Oi-8HbnSuCaY,5918
 fosslight_dependency/package_manager/Carthage.py,sha256=VU506KafUiHBrr_62iOOXNI1fDOreOQgcC2EWM5PpQo,6122
 fosslight_dependency/package_manager/Cocoapods.py,sha256=k_URV1ekMOU8l_y9_KIp_luu96ZGOl1xLIkH737VREA,8524
-fosslight_dependency/package_manager/Go.py,sha256=HvMjCOE82WY9cECf3V7y_V9hKtQnrCqHzbXGZI2519c,7195
+fosslight_dependency/package_manager/Go.py,sha256=eEWvPoE3Jd0lMJAxWMNdFcoi21fJF0EwtRbjBDHF8KQ,7309
 fosslight_dependency/package_manager/Gradle.py,sha256=IYmj9q3XiE_DPKdtll6lyRr98lFuyKWW2qz57X26Fn0,4359
 fosslight_dependency/package_manager/Helm.py,sha256=ucx2Y0tWX37UHIzIGaRyTe7uQ2vlu2nUuO09hOMq9ZU,4223
 fosslight_dependency/package_manager/Maven.py,sha256=vAiBEAEGQD5eaFGVSLmrZ8AAtoz_IuTmhaWuPTmsku0,10503
-fosslight_dependency/package_manager/Npm.py,sha256=1geiBG2nGamGPW8Jd3_Unn3eh7ejnd7kogpM2-HrWeA,10655
+fosslight_dependency/package_manager/Npm.py,sha256=W7mdJKyIfPlO_S3jPTZiESnBOg7vQZxpkHSPQDazmcE,10659
 fosslight_dependency/package_manager/Nuget.py,sha256=x1SPdxwXS2Oyi1RnLasvJJL-IFJl45VI2CXt3wReW24,8884
 fosslight_dependency/package_manager/Pnpm.py,sha256=LDKooFGQHui_Q5U7XqSJ8KcCPiLVndXf5oGKTJExh5w,7056
 fosslight_dependency/package_manager/Pub.py,sha256=Rrz8_6wdrmMU6f3vbbuAwyMbODBauXNnBbI619OQgDk,10184
@@ -24,12 +24,12 @@ fosslight_dependency/package_manager/Pypi.py,sha256=LPeI7amFXKxhXMSRwiVaKfhHL_D7
 fosslight_dependency/package_manager/Swift.py,sha256=8fdbdAXTNlp2NDoSqQXm48JGAg9UhxA91M1-NhHkT40,6752
 fosslight_dependency/package_manager/Unity.py,sha256=n1006GZ6Qrk8wAdO6wla1Q-JD7Evin7REVj-HDeTARc,5142
 fosslight_dependency/package_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fosslight_dependency-4.1.13.dist-info/Apache-2.0.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_dependency-4.1.13.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_dependency-4.1.13.dist-info/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
-fosslight_dependency-4.1.13.dist-info/METADATA,sha256=xG_h1Ljn_76Wm6_4RXLZeHqQWUCse52LMPYK75aFkGk,5103
-fosslight_dependency-4.1.13.dist-info/MIT.txt,sha256=9cx4CbArgByWvkoEZNqpzbpJgA9TUe2D62rMocQpgfs,1082
-fosslight_dependency-4.1.13.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-fosslight_dependency-4.1.13.dist-info/entry_points.txt,sha256=e1QZbnCrQvfbwe9L6PxXnkRZMhl-PSo0QyUes0dGjU8,91
-fosslight_dependency-4.1.13.dist-info/top_level.txt,sha256=Jc0V7VcVCH0TEM8ksb8dwroTYz4AmRaQnlr3FB71Hcs,21
-fosslight_dependency-4.1.13.dist-info/RECORD,,
+fosslight_dependency-4.1.14.dist-info/Apache-2.0.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_dependency-4.1.14.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_dependency-4.1.14.dist-info/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
+fosslight_dependency-4.1.14.dist-info/METADATA,sha256=SsbCQHD2M6ZcanS4HwKkC1ELBncP6Ds1jCxZvF19j1g,5103
+fosslight_dependency-4.1.14.dist-info/MIT.txt,sha256=9cx4CbArgByWvkoEZNqpzbpJgA9TUe2D62rMocQpgfs,1082
+fosslight_dependency-4.1.14.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+fosslight_dependency-4.1.14.dist-info/entry_points.txt,sha256=e1QZbnCrQvfbwe9L6PxXnkRZMhl-PSo0QyUes0dGjU8,91
+fosslight_dependency-4.1.14.dist-info/top_level.txt,sha256=Jc0V7VcVCH0TEM8ksb8dwroTYz4AmRaQnlr3FB71Hcs,21
+fosslight_dependency-4.1.14.dist-info/RECORD,,