1
0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-25 03:43:25 +01:00

Pull reference Easylist assests from own repo

This commit is contained in:
Raymond Hill 2022-10-24 12:37:04 -04:00
parent ae5717ea72
commit 2f646dbdb0
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 5 additions and 7 deletions

View File

@ -176,12 +176,10 @@
"group": "ads", "group": "ads",
"title": "EasyList", "title": "EasyList",
"contentURL": [ "contentURL": [
"https://secure.fanboy.co.nz/easylist.txt", "https://ublockorigin.github.io/uAssets/thirdparties/easylist.txt",
"https://easylist.to/easylist/easylist.txt",
"assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt" "assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt"
], ],
"cdnURLs": [ "cdnURLs": [
"https://secure.fanboy.co.nz/easylist.txt",
"https://gitcdn.link/cdn/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist.txt", "https://gitcdn.link/cdn/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist.txt",
"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist.txt", "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist.txt",
"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist.txt", "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist.txt",
@ -228,12 +226,10 @@
"group": "privacy", "group": "privacy",
"title": "EasyPrivacy", "title": "EasyPrivacy",
"contentURL": [ "contentURL": [
"https://secure.fanboy.co.nz/easyprivacy.txt", "https://ublockorigin.github.io/uAssets/thirdparties/easyprivacy.txt",
"https://easylist.to/easylist/easyprivacy.txt",
"assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt" "assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt"
], ],
"cdnURLs": [ "cdnURLs": [
"https://secure.fanboy.co.nz/easyprivacy.txt",
"https://gitcdn.link/cdn/uBlockOrigin/uAssetsCDN/main/thirdparties/easyprivacy.txt", "https://gitcdn.link/cdn/uBlockOrigin/uAssetsCDN/main/thirdparties/easyprivacy.txt",
"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easyprivacy.txt", "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easyprivacy.txt",
"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easyprivacy.txt", "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easyprivacy.txt",

View File

@ -1754,7 +1754,9 @@
const regexFromArg = arg => { const regexFromArg = arg => {
if ( arg === '' ) { return /^/; } if ( arg === '' ) { return /^/; }
if ( /^\/.*\/$/.test(arg) ) { return new RegExp(arg.slice(1, -1)); } if ( /^\/.*\/$/.test(arg) ) { return new RegExp(arg.slice(1, -1)); }
return new RegExp(arg.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')); return new RegExp(
arg.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*+/g, '.*?')
);
}; };
const reM3u = regexFromArg(m3uPattern); const reM3u = regexFromArg(m3uPattern);
const reUrl = regexFromArg(urlPattern); const reUrl = regexFromArg(urlPattern);