Skip to content

Commit 520722c

Browse files
dd-jydd-jy
authored
Revert "Change dependson to purl (#192)" (#194)
This reverts commit 0b58f82.
1 parent 0b58f82 commit 520722c

File tree

11 files changed

+55
-42
lines changed

11 files changed

+55
-42
lines changed

‎src/fosslight_dependency/_package_manager.py‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -189,18 +189,6 @@ def parse_dependency_tree(self, f_name):
189189
except Exception as e:
190190
logger.warning(f'Fail to parse gradle dependency tree:{e}')
191191

192-
def change_dep_to_purl(self, sheet_list):
193-
try:
194-
for oss_item in sheet_list:
195-
if len(oss_item) < 10:
196-
break
197-
deps_list = oss_item[9]
198-
deps_purl = list(map(lambda x: self.purl_dict.get(x, ''), deps_list))
199-
oss_item[9] = ','.join(deps_purl)
200-
except Exception as e:
201-
logger.warning(f'Fail to change depend_on to purl:{e}')
202-
return sheet_list
203-
204192

205193
def get_url_to_purl(url, pkg_manager, oss_name='', oss_version=''):
206194
purl_prefix = f'pkg:{pkg_manager}'

‎src/fosslight_dependency/package_manager/Android.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ def parse_oss_information(self, f_name):
6969
except Exception as e:
7070
logger.error(f"Fail to find oss scope in dependency tree: {e}")
7171
comment = ','.join(comment_list)
72+
deps = ','.join(deps_list)
73+
7274
sheet_list.append([purl, oss_name, oss_version, license_name, dn_loc, homepage,
73-
'', '', comment, deps_list])
74-
sheet_list = self.change_dep_to_purl(sheet_list)
75+
'', '', comment, deps])
76+
7577
return sheet_list

‎src/fosslight_dependency/package_manager/Cocoapods.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,11 @@ def parse_oss_information(self, f_name):
9292
else:
9393
comment_list.append('transitive')
9494
if f'{pod_oss_name_origin}({oss_version})' in self.relation_tree:
95-
deps_list.extend(self.relation_tree[f'{pod_oss_name_origin}({oss_version})'])
95+
rel_items = [f'{self.package_manager_name}:{ri}'
96+
for ri in self.relation_tree[f'{pod_oss_name_origin}({oss_version})']]
97+
deps_list.extend(rel_items)
9698
comment = ','.join(comment_list)
99+
deps = ','.join(deps_list)
97100

98101
oss_name_report = f'{self.package_manager_name}:{pod_oss_name_origin}'
99102
pod_oss_name = pod_oss_name_origin
@@ -135,10 +138,10 @@ def parse_oss_information(self, f_name):
135138
logger.warning(f'{pod_oss_name_origin} has different version({pod_oss_version})\
136139
with spec version({oss_version})')
137140
sheet_list.append([purl, oss_name_report, pod_oss_version, license_name, dn_loc, homepage,
138-
'', '', comment, deps_list])
141+
'', '', comment, deps])
139142
except Exception as e:
140143
logger.warning(f"Fail to get {pod_oss_name_origin}:{e}")
141-
sheet_list = self.change_dep_to_purl(sheet_list)
144+
142145
return sheet_list
143146

144147
def get_oss_in_podspec(self, spec_file_path):

‎src/fosslight_dependency/package_manager/Go.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@ def parse_oss_information(self, f_name):
101101
comment_list.append('direct')
102102

103103
if f'{package_path}({oss_version})' in self.relation_tree:
104-
deps_list.extend(self.relation_tree[f'{package_path}({oss_version})'])
104+
rel_items = [f'{self.package_manager_name}:{ri}'
105+
for ri in self.relation_tree[f'{package_path}({oss_version})']]
106+
deps_list.extend(rel_items)
105107

106108
homepage_set = []
107109
homepage = self.dn_url + package_path
@@ -147,7 +149,8 @@ def parse_oss_information(self, f_name):
147149
continue
148150

149151
comment = ','.join(comment_list)
152+
deps = ','.join(deps_list)
150153
sheet_list.append([purl, oss_name, oss_version, license_name, dn_loc, homepage,
151-
'', '', comment, deps_list])
152-
sheet_list = self.change_dep_to_purl(sheet_list)
154+
'', '', comment, deps])
155+
153156
return sheet_list

‎src/fosslight_dependency/package_manager/Gradle.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,11 @@ def parse_oss_information(self, f_name):
9191
except Exception as e:
9292
logger.error(f"Fail to find oss scope in dependency tree: {e}")
9393
comment = ','.join(comment_list)
94+
deps = ','.join(deps_list)
95+
9496
sheet_list.append([purl, oss_name, oss_version, license_name, dn_loc, homepage,
95-
'', '', comment, deps_list])
96-
sheet_list = self.change_dep_to_purl(sheet_list)
97+
'', '', comment, deps])
98+
9799
return sheet_list
98100

99101

‎src/fosslight_dependency/package_manager/Maven.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,9 @@ def parse_oss_information(self, f_name):
253253
except Exception as e:
254254
logger.error(f"Fail to find oss scope in dependency tree: {e}")
255255
comment = ','.join(comment_list)
256+
deps = ','.join(deps_list)
257+
256258
sheet_list.append([purl, oss_name, oss_version, license_name, dn_loc, homepage,
257-
'', '', comment, deps_list])
258-
sheet_list = self.change_dep_to_purl(sheet_list)
259+
'', '', comment, deps])
260+
259261
return sheet_list

‎src/fosslight_dependency/package_manager/Npm.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,23 +197,24 @@ def parse_oss_information(self, f_name):
197197
comment_list.append('transitive')
198198

199199
if f'{oss_init_name}({oss_version})' in self.relation_tree:
200-
deps_list.extend(self.relation_tree[f'{oss_init_name}({oss_version})'])
200+
rel_items = [f'npm:{ri}' for ri in self.relation_tree[f'{oss_init_name}({oss_version})']]
201+
deps_list.extend(rel_items)
201202

202203
manifest_file_path = os.path.join(package_path, const.SUPPORT_PACKAE.get(self.package_manager_name))
203204
multi_license, license_comment, multi_flag = check_multi_license(license_name, manifest_file_path)
204205

205206
comment = ','.join(comment_list)
207+
deps = ','.join(deps_list)
206208
if multi_flag:
207209
comment = f'{comment}, {license_comment}'
208-
license_name = multi_license
210+
sheet_list.append([purl, oss_name, oss_version, multi_license, dn_loc, homepage,
211+
'', '', comment, deps])
209212
else:
210213
license_name = license_name.replace(",", "")
211214
license_name = check_unknown_license(license_name, manifest_file_path)
215+
sheet_list.append([purl, oss_name, oss_version, license_name, dn_loc, homepage,
216+
'', '', comment, deps])
212217

213-
sheet_list.append([purl, oss_name, oss_version, license_name, dn_loc, homepage,
214-
'', '', comment, deps_list])
215-
216-
sheet_list = self.change_dep_to_purl(sheet_list)
217218
return sheet_list
218219

219220

‎src/fosslight_dependency/package_manager/Nuget.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,17 @@ def parse_oss_information(self, f_name):
109109
comment_list.append('transitive')
110110

111111
if f'{oss_origin_name}({oss_version})' in self.relation_tree:
112-
deps_list.extend(self.relation_tree[f'{oss_origin_name}({oss_version})'])
112+
rel_items = [f'{self.package_manager_name}:{ri}'
113+
for ri in self.relation_tree[f'{oss_origin_name}({oss_version})']]
114+
deps_list.extend(rel_items)
113115

114116
comment = ','.join(comment_list)
115-
sheet_list.append([purl, oss_name, oss_version, license_name, dn_loc, homepage, '', '', comment, deps_list])
117+
deps = ','.join(deps_list)
118+
sheet_list.append([purl, oss_name, oss_version, license_name, dn_loc, homepage, '', '', comment, deps])
116119

117120
except Exception as e:
118121
logger.warning(f"Failed to parse oss information: {e}")
119-
sheet_list = self.change_dep_to_purl(sheet_list)
122+
120123
if os.path.isfile(tmp_license_txt_file_name):
121124
os.remove(tmp_license_txt_file_name)
122125

‎src/fosslight_dependency/package_manager/Pub.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,16 @@ def parse_oss_information(self, f_name):
155155
comment_list.append('transitive')
156156

157157
if f'{oss_origin_name}({oss_version})' in self.relation_tree:
158-
deps_list.extend(self.relation_tree[f'{oss_origin_name}({oss_version})'])
158+
rel_items = [f'{self.package_manager_name}:{ri}'
159+
for ri in self.relation_tree[f'{oss_origin_name}({oss_version})']]
160+
deps_list.extend(rel_items)
159161
comment = ','.join(comment_list)
162+
deps = ','.join(deps_list)
160163
sheet_list.append([purl, oss_name, oss_version, license_name, dn_loc, homepage,
161-
'', '', comment, deps_list])
164+
'', '', comment, deps])
162165
except Exception as e:
163166
logger.error(f"Fail to parse pub oss information: {e}")
164-
sheet_list = self.change_dep_to_purl(sheet_list)
167+
165168
if os.path.isfile(tmp_license_txt_file_name):
166169
os.remove(tmp_license_txt_file_name)
167170

‎src/fosslight_dependency/package_manager/Pypi.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,14 +305,17 @@ def parse_oss_information(self, f_name):
305305
else:
306306
comment_list.append('transitive')
307307
if f'{oss_init_name}({oss_version})' in self.relation_tree:
308-
deps_list.extend(self.relation_tree[f'{oss_init_name}({oss_version})'])
308+
rel_items = [f'{self.package_manager_name}:{ri}'
309+
for ri in self.relation_tree[f'{oss_init_name}({oss_version})']]
310+
deps_list.extend(rel_items)
309311
comment = ','.join(comment_list)
312+
deps = ','.join(deps_list)
310313
sheet_list.append([purl, oss_name, oss_version,
311-
license_name, dn_loc, homepage, '', '', comment, deps_list])
314+
license_name, dn_loc, homepage, '', '', comment, deps])
312315

313316
except Exception as ex:
314317
logger.warning(f"Fail to parse oss information: {oss_init_name}({ex})")
315-
sheet_list = self.change_dep_to_purl(sheet_list)
318+
316319
return sheet_list
317320

318321
def get_dependencies(self, dependencies, package):

0 commit comments

Comments
 (0)