From 37774e035b5ebf53e2fde92b11e4f3419b53909c Mon Sep 17 00:00:00 2001 From: hackademix Date: Sun, 30 Sep 2018 00:12:17 +0200 Subject: WebLabels matching by id made case-insensitive. --- bg/ExternalLicenses.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bg/ExternalLicenses.js b/bg/ExternalLicenses.js index 058b651..33bcbf6 100644 --- a/bg/ExternalLicenses.js +++ b/bg/ExternalLicenses.js @@ -29,18 +29,19 @@ let licensesByLabel = new Map(); let licensesByUrl = new Map(); { let {licenses} = require("../license_definitions"); + let mapByLabel = (label, license) => licensesByLabel.set(label.toUpperCase(), license); for (let [id, l] of Object.entries(licenses)) { let {identifier, canonicalUrl, licenseName} = l; if (identifier) { - licensesByLabel.set(identifier, l); + mapByLabel(identifier, l); } else { l.identifier = id; } if (id !== identifier) { - licensesByLabel.set(id, l); + mapByLabel(id, l); } if (licenseName) { - licensesByLabel.set(licenseName, l); + mapByLabel(licenseName, l); } if (Array.isArray(canonicalUrl)) { for (let url of canonicalUrl) { @@ -87,9 +88,9 @@ var ExternalLicenses = { }; for (let {label, url} of scriptInfo.licenseLinks) { - match(licensesByLabel, label = label.trim()) || + match(licensesByLabel, label = label.trim().toUpperCase()) || match(licensesByUrl, url) || - match(licensesByLabel, label.replace(/^GNU-|-(?:or-later|only)$/i, '')); + match(licensesByLabel, label.replace(/^GNU-|-(?:OR-LATER|ONLY)$/, '')); } scriptInfo.free = scriptInfo.licenses.size > 0; return scriptInfo; -- cgit v1.2.3