Remove some superfluous escaping (#2519)

* Remove some superfluous escaping

- There is no need to escape . or - outside of a []
- (?:-|.) can be replaced with [.-]
- Simplify some convoluted regexp

* Fix some mistakes

* Remove even more
main
jvoisin 6 years ago committed by Elbert Alias
parent 9c2835e577
commit ea0aba1f3a

@ -634,14 +634,11 @@
18 18
], ],
"icon": "AngularJS.svg", "icon": "AngularJS.svg",
"implies": "AngularJS", "implies": "AngularJS",
"js": { "js": {
"ngMaterial": "" "ngMaterial": ""
}, },
"script": [ "script": "/([\\d.rc-]+)?/angular-material(?:\\.min)?\\.js\\;version:\\1",
"/([\\d.]+(?:\\-?rc[.\\d]*)*)/angular-material(?:\\.min)?\\.js\\;version:\\1",
"angular-material.*\\.js"
],
"website": "https://material.angularjs.org" "website": "https://material.angularjs.org"
}, },
"AngularDart": { "AngularDart": {
@ -673,8 +670,8 @@
"angular.version.full": "(.*)\\;version:\\1" "angular.version.full": "(.*)\\;version:\\1"
}, },
"script": [ "script": [
"angular(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "angular[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
"/([\\d.]+(?:\\-?rc[.\\d]*)*)/angular(?:\\.min)?\\.js\\;version:\\1", "/([\\d.]+(?:-?rc[.\\d]*)*)/angular(?:\\.min)?\\.js\\;version:\\1",
"angular.*\\.js" "angular.*\\.js"
], ],
"website": "https://angularjs.org" "website": "https://angularjs.org"
@ -1287,7 +1284,7 @@
}, },
"script": [ "script": [
"twitter\\.github\\.com/bootstrap", "twitter\\.github\\.com/bootstrap",
"bootstrap(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "bootstrap[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
"(?:/([\\d.]+))?(?:/js)?/bootstrap(?:\\.min)?\\.js\\;version:\\1" "(?:/([\\d.]+))?(?:/js)?/bootstrap(?:\\.min)?\\.js\\;version:\\1"
], ],
"website": "https://getbootstrap.com" "website": "https://getbootstrap.com"
@ -2586,7 +2583,7 @@
"icon": "DokuWiki.png", "icon": "DokuWiki.png",
"implies": "PHP", "implies": "PHP",
"meta": { "meta": {
"generator": "^DokuWiki( Release [\\-\\d]+)?\\;version:\\1" "generator": "^DokuWiki( Release [\\d-]+)?\\;version:\\1"
}, },
"website": "https://www.dokuwiki.org" "website": "https://www.dokuwiki.org"
}, },
@ -2768,7 +2765,7 @@
22 22
], ],
"headers": { "headers": {
"Server": "ELOG HTTP( \\d[\\-\\d\\.]+)?\\;version:\\1" "Server": "ELOG HTTP ?([\\d.-]+)?\\;version:\\1"
}, },
"icon": "ELOG.png", "icon": "ELOG.png",
"implies": "ELOG", "implies": "ELOG",
@ -2932,7 +2929,7 @@
27 27
], ],
"headers": { "headers": {
"Server": "Erlang( OTP/(?:[\\-\\d\\.ABR]+))?\\;version:\\1" "Server": "Erlang( OTP/(?:[\\d.ABR-]+))?\\;version:\\1"
}, },
"icon": "Erlang.png", "icon": "Erlang.png",
"website": "http://www.erlang.org" "website": "http://www.erlang.org"
@ -4189,7 +4186,7 @@
], ],
"html": "<svg[^>]*><desc>Created with Highstock ([\\d.]*)\\;version:\\1", "html": "<svg[^>]*><desc>Created with Highstock ([\\d.]*)\\;version:\\1",
"icon": "Highcharts.png", "icon": "Highcharts.png",
"script": "highstock(?:\\-|\\.)?([\\d\\.]*\\d).*\\.js\\;version:\\1", "script": "highstock[.-]?([\\d\\.]*\\d).*\\.js\\;version:\\1",
"website": "http://highcharts.com/products/highstock" "website": "http://highcharts.com/products/highstock"
}, },
"Hinza Advanced CMS": { "Hinza Advanced CMS": {
@ -4221,7 +4218,7 @@
"Hogan": "" "Hogan": ""
}, },
"script": [ "script": [
"hogan-(?:-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "hogan-[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
"([\\d.]+)/hogan(?:\\.min)?\\.js\\;version:\\1" "([\\d.]+)/hogan(?:\\.min)?\\.js\\;version:\\1"
], ],
"website": "https://twitter.github.io/hogan.js/" "website": "https://twitter.github.io/hogan.js/"
@ -5294,7 +5291,7 @@
"meta": { "meta": {
"laterpay:connector:callbacks:on_user_has_access": "deobfuscateText" "laterpay:connector:callbacks:on_user_has_access": "deobfuscateText"
}, },
"script": "https?://connectormwi\\.laterpay\\.net/([0-9.]+)[a-zA-z\\-]*/live/[\\w-]+\\.js\\;version:\\1", "script": "https?://connectormwi\\.laterpay\\.net/([0-9.]+)[a-zA-z-]*/live/[\\w-]+\\.js\\;version:\\1",
"website": "https://www.laterpay.net/" "website": "https://www.laterpay.net/"
}, },
"Lazy.js": { "Lazy.js": {
@ -6356,7 +6353,7 @@
], ],
"icon": "Moment.js.svg", "icon": "Moment.js.svg",
"implies": "Moment.js", "implies": "Moment.js",
"script": "moment-timezone(?:\\-data)?(?:\\.min)?\\.js", "script": "moment-timezone(?:-data)?(?:\\.min)?\\.js",
"website": "http://momentjs.com/timezone/" "website": "http://momentjs.com/timezone/"
}, },
"Moment.js": { "Moment.js": {
@ -8138,7 +8135,7 @@
"react.version": "(.*)\\;version:\\1" "react.version": "(.*)\\;version:\\1"
}, },
"script": [ "script": [
"react(?:\\-with\\-addons)?(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "react(?:-with-addons)?[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
"/([\\d.]+)/react(?:\\.min)?\\.js\\;version:\\1", "/([\\d.]+)/react(?:\\.min)?\\.js\\;version:\\1",
"react.*\\.js" "react.*\\.js"
], ],
@ -10559,7 +10556,7 @@
"Vue.version": "(.*)\\;version:\\1" "Vue.version": "(.*)\\;version:\\1"
}, },
"script": [ "script": [
"vue(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "vue[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
"(?:/([\\d.]+))?/vue(?:\\.min)?\\.js\\;version:\\1" "(?:/([\\d.]+))?/vue(?:\\.min)?\\.js\\;version:\\1"
], ],
"website": "http://vuejs.org" "website": "http://vuejs.org"
@ -11077,7 +11074,7 @@
"XRegExp.version": "(.*)\\;version:\\1" "XRegExp.version": "(.*)\\;version:\\1"
}, },
"script": [ "script": [
"xregexp(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "xregexp[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
"/([\\d.]+)/xregexp(?:\\.min)?\\.js\\;version:\\1", "/([\\d.]+)/xregexp(?:\\.min)?\\.js\\;version:\\1",
"xregexp.*\\.js" "xregexp.*\\.js"
], ],
@ -11380,7 +11377,7 @@
"cats": [ "cats": [
18 18
], ],
"html": "<!-- ZK [\\.\\d\\s]+-->", "html": "<!-- ZK [.\\d\\s]+-->",
"icon": "ZK.png", "icon": "ZK.png",
"implies": "Java", "implies": "Java",
"script": "zkau/", "script": "zkau/",
@ -11889,7 +11886,7 @@
"jQuery.fn.jquery": "([\\d.]+)\\;version:\\1" "jQuery.fn.jquery": "([\\d.]+)\\;version:\\1"
}, },
"script": [ "script": [
"jquery(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "jquery[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
"/([\\d.]+)/jquery(?:\\.min)?\\.js\\;version:\\1", "/([\\d.]+)/jquery(?:\\.min)?\\.js\\;version:\\1",
"jquery.*\\.js(?:\\?ver(?:sion)?=([\\d.]+))?\\;version:\\1" "jquery.*\\.js(?:\\?ver(?:sion)?=([\\d.]+))?\\;version:\\1"
], ],
@ -11956,7 +11953,7 @@
"jQuery.ui.version": "(.*)\\;version:\\1" "jQuery.ui.version": "(.*)\\;version:\\1"
}, },
"script": [ "script": [
"jquery-ui(?:-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "jquery-ui[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
"([\\d.]+)/jquery-ui(?:\\.min)?\\.js\\;version:\\1", "([\\d.]+)/jquery-ui(?:\\.min)?\\.js\\;version:\\1",
"jquery-ui.*\\.js" "jquery-ui.*\\.js"
], ],
@ -12241,7 +12238,7 @@
"cats": [ "cats": [
25 25
], ],
"html": "<div id=\"particles\\-js\">", "html": "<div id=\"particles-js\">",
"js": { "js": {
"particlesJS": "" "particlesJS": ""
}, },

Loading…
Cancel
Save