Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

this fixes importing empty ABP custom ruleset

This commit is contained in:
gorhill 2015-05-22 18:03:14 -04:00
parent d8a47f1c0b
commit 73ac79feff
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/_locales/en/messages.json
View File

@ -500,8 +500,8 @@
"description":"Firefox/Fennec-specific: Show Dashboard"
},
"showNetworkLogButton":{
"message":"Show Network Request Log",
"description":"Firefox/Fennec-specific: Show Network Request Log"
"message":"Show Logger",
"description":"Firefox/Fennec-specific: Show Logger"
},
"fennecMenuItemBlockingOff": {
"message": "off",

17
src/js/1p-filters.js
View File

@ -72,19 +72,24 @@ var handleImportFilePicker = function() {
// https://github.com/chrisaljoudi/uBlock/issues/1004
// Support extraction of filters from ABP backup file
var abpImporter = function(s) {
var reAbpExtractor = /\n\[Subscription\]\n+url=~[\x08-\x7E]+?\[Subscription filters\]([\x08-\x7E]*?)(?:\[Subscription\]|$)/ig;
var matches = reAbpExtractor.exec(s);
var reAbpSubscriptionExtractor = /\n\[Subscription\]\n+url=~[^\n]+([\x08-\x7E]*?)(?:\[Subscription\]|$)/ig;
var reAbpFilterExtractor = /\[Subscription filters\]([\x08-\x7E]*?)(?:\[Subscription\]|$)/i;
var matches = reAbpSubscriptionExtractor.exec(s);
// Not an ABP backup file
if ( matches === null ) {
return s;
}
//
var out = [];
var filterMatch;
while ( matches !== null ) {
if ( matches.length !== 2 ) {
continue;
if ( matches.length === 2 ) {
filterMatch = reAbpFilterExtractor.exec(matches[1].trim());
if ( filterMatch !== null && filterMatch.length === 2 ) {
out.push(filterMatch[1].trim().replace(/\\\[/g, '['));
}
out.push(matches[1].trim().replace(/\\\[/g, '['));
matches = reAbpExtractor.exec(s);
}
matches = reAbpSubscriptionExtractor.exec(s);
}
return out.join('\n');
};