diff --git a/swh/indexer/metadata.py b/swh/indexer/metadata.py --- a/swh/indexer/metadata.py +++ b/swh/indexer/metadata.py @@ -19,11 +19,11 @@ ADDITIONAL_CONFIG = { 'tools': ('dict', { - 'name': 'hard_mapping_npm', + 'name': 'swh-metadata-translator', 'version': '0.0.1', 'configuration': { - 'type': 'test', - 'debian-package': '' + 'type': 'local', + 'context': 'npm' }, }), } @@ -60,7 +60,7 @@ 'translated_metadata': None } try: - context = self.tools['name'] + context = self.tools['configuration']['context'] result['translated_metadata'] = compute_metadata( context, raw_content) except: diff --git a/swh/indexer/metadata_dictionary.py b/swh/indexer/metadata_dictionary.py --- a/swh/indexer/metadata_dictionary.py +++ b/swh/indexer/metadata_dictionary.py @@ -156,8 +156,8 @@ mapping_tool_fn = { - "hard_mapping_npm": NpmMapping(), - "pom_xml": MavenMapping(), + "npm": NpmMapping(), + "maven": MavenMapping(), "doap_xml": DoapMapping() } @@ -193,8 +193,8 @@ raw_content1 = b"""{"name": "test_name", "unknown_term": "ut", "prerequisites" :"packageXYZ"}""" - result = compute_metadata("hard_mapping_npm", raw_content) - result1 = compute_metadata("pom_xml", raw_content1) + result = compute_metadata("npm", raw_content) + result1 = compute_metadata("maven", raw_content1) print(result) print(result1) diff --git a/swh/indexer/tests/test_metadata.py b/swh/indexer/tests/test_metadata.py --- a/swh/indexer/tests/test_metadata.py +++ b/swh/indexer/tests/test_metadata.py @@ -23,7 +23,11 @@ return { 'id': 30, 'name': 'hard_mapping_npm', - 'version': '0.1' + 'version': '0.1', + 'configuration': { + 'type': 'local', + 'context': 'npm' + }, } @@ -35,11 +39,11 @@ self.config = { 'rescheduling_task': None, 'tools': { - 'name': 'hard_mapping_npm', - 'version': '0.1', + 'name': 'swh-metadata-translator', + 'version': '0.0.1', 'configuration': { 'type': 'local', - 'debian-package': '' + 'context': 'npm' } } } @@ -69,12 +73,12 @@ """ # given content = b"" - tool = "hard_mapping_npm" + context = "npm" # None if no metadata was found or an error occurred declared_metadata = None # when - result = compute_metadata(tool, content) + result = compute_metadata(context, content) # then self.assertEqual(declared_metadata, result) @@ -107,7 +111,7 @@ } # when - result = compute_metadata("hard_mapping_npm", content) + result = compute_metadata("npm", content) # then self.assertEqual(declared_metadata, result)