fosslight-dependency 4.1.4__py3-none-any.whl → 4.1.6__py3-none-any.whl

fosslight_dependency/package_manager/Pub.py

@@ -10,10 +10,11 @@ import re
 import shutil
 import yaml
 import subprocess
+from askalono import identify
 import fosslight_util.constant as constant
 import fosslight_dependency.constant as const
 from fosslight_dependency._package_manager import PackageManager
-from fosslight_dependency._package_manager import check_and_run_license_scanner, get_url_to_purl
+from fosslight_dependency._package_manager import get_url_to_purl
 from fosslight_dependency.dependency_item import DependencyItem, change_dependson_to_purl
 from fosslight_util.oss_item import OssItem
 
@@ -27,6 +28,7 @@ class Pub(PackageManager):
     input_file_name = 'tmp_flutter_oss_licenses.json'
     tmp_dir = "fl_dependency_tmp_dir"
     cur_path = ''
+    pkg_source_list = {}
 
     def __init__(self, input_dir, output_dir):
         super().__init__(self.package_manager_name, self.dn_url, input_dir, output_dir)
@@ -92,6 +94,7 @@ class Pub(PackageManager):
                 if dep_key not in self.relation_tree:
                     self.relation_tree[dep_key] = []
                 self.relation_tree[dep_key].extend(p['dependencies'])
+                self.pkg_source_list[dep_key] = p['source']
 
             for i in self.relation_tree:
                 tmp_dep = []
@@ -110,10 +113,9 @@ class Pub(PackageManager):
         with open(f_name, 'r', encoding='utf8') as pub_file:
             json_f = json.load(pub_file)
 
-        try:
-            purl_dict = {}
-
-            for json_data in json_f:
+        purl_dict = {}
+        for json_data in json_f:
+            try:
                 dep_item = DependencyItem()
                 oss_item = OssItem()
                 oss_origin_name = json_data['name']
@@ -121,6 +123,8 @@ class Pub(PackageManager):
                     continue
                 oss_item.name = f"{self.package_manager_name}:{oss_origin_name}"
                 oss_item.version = json_data['version']
+                if oss_item.version is None:
+                    oss_item.version = ''
                 oss_item.homepage = json_data['homepage']
                 if oss_item.homepage is None:
                     oss_item.homepage = json_data['repository']
@@ -130,17 +134,10 @@ class Pub(PackageManager):
                 dep_item.purl = get_url_to_purl(oss_item.download_location, self.package_manager_name)
                 purl_dict[f'{oss_origin_name}({oss_item.version})'] = dep_item.purl
                 license_txt = json_data['license']
-
-                tmp_license_txt = open(tmp_license_txt_file_name, 'w', encoding='utf-8')
-                tmp_license_txt.write(license_txt)
-                tmp_license_txt.close()
-
-                license_name_with_license_scanner = check_and_run_license_scanner(self.platform,
-                                                                                  self.license_scanner_bin,
-                                                                                  tmp_license_txt_file_name)
-
-                if license_name_with_license_scanner != "":
-                    oss_item.license = license_name_with_license_scanner
+                if license_txt is not None:
+                    detect_askalono = identify(license_txt)
+                    if detect_askalono.score > 0.7:
+                        oss_item.license = detect_askalono.name
 
                 if self.direct_dep:
                     if oss_origin_name not in self.total_dep_list:
@@ -155,11 +152,20 @@ class Pub(PackageManager):
 
                     if f'{oss_origin_name}({oss_item.version})' in self.relation_tree:
                         dep_item.depends_on_raw = self.relation_tree[f'{oss_origin_name}({oss_item.version})']
+                if f'{oss_origin_name}({oss_item.version})' in self.pkg_source_list:
+                    pkg_source = self.pkg_source_list[f'{oss_origin_name}({oss_item.version})']
+                    if pkg_source in ['git', 'path']:
+                        oss_item.download_location = json_data['repository']
+                        if oss_item.download_location is None:
+                            oss_item.download_location = json_data['homepage']
+                        if oss_item.download_location is None:
+                            oss_item.download_location = ''
+                        oss_item.comment = pkg_source
 
                 dep_item.oss_items.append(oss_item)
                 self.dep_items.append(dep_item)
-        except Exception as e:
-            logger.error(f"Fail to parse pub oss information: {e}")
+            except Exception as e:
+                logger.error(f"Fail to parse pub oss information: {e}")
         if self.direct_dep:
             self.dep_items = change_dependson_to_purl(purl_dict, self.dep_items)
 

{fosslight_dependency-4.1.4.dist-info → fosslight_dependency-4.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-dependency
-Version: 4.1.4
+Version: 4.1.6
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Author: LG Electronics
@@ -27,6 +27,7 @@ Requires-Dist: defusedxml
 Requires-Dist: packageurl-python
 Requires-Dist: igraph
 Requires-Dist: matplotlib
+Requires-Dist: pyaskalono
 
 <!--
 Copyright (c) 2021 LG Electronics

{fosslight_dependency-4.1.4.dist-info → fosslight_dependency-4.1.6.dist-info}/RECORD

@@ -18,7 +18,7 @@ fosslight_dependency/package_manager/Helm.py,sha256=ucx2Y0tWX37UHIzIGaRyTe7uQ2vl
 fosslight_dependency/package_manager/Maven.py,sha256=JXiP8LwQZ10tf1l0Qgd4fvmv1RcVn52_PiMx6sTpSKo,10329
 fosslight_dependency/package_manager/Npm.py,sha256=hwKC08m05KlHgfQpPX7lnDEJC-A7WKF9OniYW4n9TDM,10638
 fosslight_dependency/package_manager/Nuget.py,sha256=FGD5tV1mTBl3G9mxWWnoMwLZUiSW7VCcHS7FxhCqU1g,9334
-fosslight_dependency/package_manager/Pub.py,sha256=-cotOpPCmLMmLWwP0dF1hQ44CBzConjnDpJ1So0n7lo,9904
+fosslight_dependency/package_manager/Pub.py,sha256=ZsBSEyYkdIQCFCbc9OeAf5-hAw2oY_fA-KDvnVi9z_E,10299
 fosslight_dependency/package_manager/Pypi.py,sha256=7eBB5ko4HhRhby5txo9NXZl6td1O_8k11v8R9FwxygU,16254
 fosslight_dependency/package_manager/Swift.py,sha256=rAGecP705HJQGBQUj_4ssyty_lDF4YwTt7ymjso0-VQ,6793
 fosslight_dependency/package_manager/Unity.py,sha256=LoyWCMa6R3x0VCsTH1EEJ7FQmYsraCDnoHZUHCmYeiU,4708
@@ -26,12 +26,12 @@ fosslight_dependency/package_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 fosslight_dependency/third_party/askalono/askalono.exe,sha256=NyngElHbrg3zLFRVwn6fPDZE_EDAEb1N8tiwWoCm4pQ,4743680
 fosslight_dependency/third_party/askalono/askalono_macos,sha256=cYSNXhAQpkdd8lkgnY5skNeDmU_8DIuP84eFi0OXKkE,5589868
 fosslight_dependency/third_party/nomos/nomossa,sha256=oFF9I-fhug6AVNyFnWeVXwDRin6NWSvk1g7mHBotB3Q,866408
-fosslight_dependency-4.1.4.dist-info/Apache-2.0.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_dependency-4.1.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_dependency-4.1.4.dist-info/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
-fosslight_dependency-4.1.4.dist-info/METADATA,sha256=GjjFq2gdczpl2l2wU2OKe_DZRtewCqelIBMccFJ_S1o,4956
-fosslight_dependency-4.1.4.dist-info/MIT.txt,sha256=9cx4CbArgByWvkoEZNqpzbpJgA9TUe2D62rMocQpgfs,1082
-fosslight_dependency-4.1.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-fosslight_dependency-4.1.4.dist-info/entry_points.txt,sha256=e1QZbnCrQvfbwe9L6PxXnkRZMhl-PSo0QyUes0dGjU8,91
-fosslight_dependency-4.1.4.dist-info/top_level.txt,sha256=Jc0V7VcVCH0TEM8ksb8dwroTYz4AmRaQnlr3FB71Hcs,21
-fosslight_dependency-4.1.4.dist-info/RECORD,,
+fosslight_dependency-4.1.6.dist-info/Apache-2.0.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_dependency-4.1.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_dependency-4.1.6.dist-info/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
+fosslight_dependency-4.1.6.dist-info/METADATA,sha256=gI4z5TG8NOQuKlFjhZRZAvgEUyi3FPNHJOz_Bb8Cjzw,4982
+fosslight_dependency-4.1.6.dist-info/MIT.txt,sha256=9cx4CbArgByWvkoEZNqpzbpJgA9TUe2D62rMocQpgfs,1082
+fosslight_dependency-4.1.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+fosslight_dependency-4.1.6.dist-info/entry_points.txt,sha256=e1QZbnCrQvfbwe9L6PxXnkRZMhl-PSo0QyUes0dGjU8,91
+fosslight_dependency-4.1.6.dist-info/top_level.txt,sha256=Jc0V7VcVCH0TEM8ksb8dwroTYz4AmRaQnlr3FB71Hcs,21
+fosslight_dependency-4.1.6.dist-info/RECORD,,