aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhackademix <giorgio@maone.net>2018-09-30 00:12:17 +0200
committerhackademix <giorgio@maone.net>2018-10-02 23:00:20 +0200
commit37774e035b5ebf53e2fde92b11e4f3419b53909c (patch)
tree4fdec879072ebe9de58efc9173efa09f95adf1d2
parent7ef9967c8a17215575be6dca47fbddcd614bafbe (diff)
WebLabels matching by id made case-insensitive.
-rw-r--r--bg/ExternalLicenses.js11
1 files 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;