Page MenuHomeSoftware Heritage
Files F9696611

D2406.id8513.diff
No OneTemporary
Actions

D2406.id8513.diff
View Options

diff --git a/swh/lister/npm/lister.py b/swh/lister/npm/lister.py
--- a/swh/lister/npm/lister.py
+++ b/swh/lister/npm/lister.py
@@ -2,8 +2,6 @@
# License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information
-from urllib.parse import quote
-
from swh.lister.core.indexing_lister import IndexingHttpLister
from swh.lister.npm.models import NpmModel
from swh.scheduler.utils import create_task_dict
@@ -36,13 +34,13 @@
"""(Override) Transform from npm package name to model
"""
- package_url, package_metadata_url = self._compute_urls(repo_name)
+ package_url = 'https://www.npmjs.com/package/%s' % repo_name
return {
'uid': repo_name,
'indexable': repo_name,
'name': repo_name,
'full_name': repo_name,
- 'html_url': package_metadata_url,
+ 'html_url': package_url,
'origin_url': package_url,
'origin_type': 'npm',
}
@@ -57,12 +55,8 @@
"""
task_type = 'load-%s' % origin_type
task_policy = self.config['loading_task_policy']
- package_name = kwargs.get('name')
- package_metadata_url = kwargs.get('html_url')
return create_task_dict(task_type, task_policy,
- package_name=package_name,
- package_url=origin_url,
- package_metadata_url=package_metadata_url)
+ url=origin_url)
def request_headers(self):
"""(Override) Set requests headers to send when querying the npm
@@ -73,16 +67,6 @@
headers['Accept'] = 'application/json'
return headers
- def _compute_urls(self, repo_name):
- """Return a tuple (package_url, package_metadata_url)
- """
- return (
- 'https://www.npmjs.com/package/%s' % repo_name,
- # package metadata url needs to be escaped otherwise some requests
- # may fail (for instance when a package name contains '/')
- '%s/%s' % (self.url, quote(repo_name, safe=''))
- )
-
def string_pattern_check(self, inner, lower, upper=None):
""" (Override) Inhibit the effect of that method as packages indices
correspond to package names and thus do not respect any kind
diff --git a/swh/lister/npm/tests/test_lister.py b/swh/lister/npm/tests/test_lister.py
--- a/swh/lister/npm/tests/test_lister.py
+++ b/swh/lister/npm/tests/test_lister.py
@@ -66,12 +66,10 @@
# kwargs
kwargs = row['arguments']['kwargs']
- assert len(kwargs) == 3
- package_name = kwargs['package_name']
- package_url = kwargs['package_url']
- assert package_url == 'https://www.npmjs.com/package/%s' % package_name
- meta_url = kwargs['package_metadata_url']
- assert meta_url == 'https://replicate.npmjs.com/%s' % package_name
+ assert len(kwargs) == 1
+ package_url = kwargs['url']
+ package_name = package_url.split('/')[-1]
+ assert package_url == f'https://www.npmjs.com/package/{package_name}'
assert row['policy'] == 'recurring'
assert row['priority'] is None

File Metadata

Mime Type
text/plain
Expires
Sun, Aug 17, 8:48 PM (1 d, 14 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3220234

Event Timeline

About · Developer information · Legal