Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions minecode/management/commands/priority_queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,14 @@ def add_package_to_scan_queue(package):

def process_request(priority_resource_uri, _priority_router=priority_router):
purl_to_visit = priority_resource_uri.uri
source_purl = priority_resource_uri.source_uri
try:
if TRACE:
logger.debug('visit_uri: uri: {}'.format(purl_to_visit))

errors = _priority_router.process(purl_to_visit)
kwargs = dict()
if source_purl:
kwargs["source_purl"] = source_purl
errors = _priority_router.process(purl_to_visit, **kwargs)
if TRACE:
new_uris_to_visit = list(new_uris_to_visit or [])
logger.debug('visit_uri: new_uris_to_visit: {}'.format(new_uris_to_visit))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,20 @@
"license_detections":[
{
"license_expression":"bsd-new",
"license_expression_spdx":"BSD-3-Clause",
"matches":[
{
"score":100.0,
"license_expression":"bsd-new",
"spdx_license_expression":"BSD-3-Clause",
"from_file":null,
"start_line":1,
"end_line":1,
"matcher":"1-hash",
"score":100.0,
"matched_length":1,
"match_coverage":100.0,
"matcher":"1-hash",
"license_expression":"bsd-new",
"rule_identifier":"bsd-new_1135.RULE",
"rule_relevance":100,
"rule_identifier":"bsd-new_1135.RULE",
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1135.RULE",
"matched_text":"NewBSD"
}
Expand Down
11 changes: 7 additions & 4 deletions minecode/tests/testfiles/cpan/expected_json_cpanmapper.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,20 @@
"license_detections":[
{
"license_expression":"mit",
"license_expression_spdx":"MIT",
"matches":[
{
"score":100.0,
"license_expression":"mit",
"spdx_license_expression":"MIT",
"from_file":null,
"start_line":1,
"end_line":1,
"matcher":"1-spdx-id",
"score":100.0,
"matched_length":1,
"match_coverage":100.0,
"matcher":"1-spdx-id",
"license_expression":"mit",
"rule_identifier":"spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
"rule_relevance":100,
"rule_identifier":"spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
"rule_url":null,
"matched_text":"mit"
}
Expand Down
Loading