Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: abp2blocklist.js

Issue 29426594: Issue 3673 - Merge closely matching rules (Closed) Base URL: https://hg.adblockplus.org/abp2blocklist
Left Patch Set: Merge rules by resource-type and if-domain Created May 6, 2017, 5:17 p.m.
Right Patch Set: Rebase Created July 28, 2017, 1:31 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | lib/abp2blocklist.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2017 eyeo GmbH 3 * Copyright (C) 2006-2017 eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 "use strict"; 18 "use strict";
19 19
20 let readline = require("readline"); 20 let readline = require("readline");
21 let Filter = require("filterClasses").Filter; 21 let Filter = require("filterClasses").Filter;
22 let ContentBlockerList = require("./lib/abp2blocklist.js").ContentBlockerList; 22 let ContentBlockerList = require("./lib/abp2blocklist.js").ContentBlockerList;
23 23
24 var rl = readline.createInterface({input: process.stdin, terminal: false}); 24 var rl = readline.createInterface({input: process.stdin, terminal: false});
25 var blockerList = new ContentBlockerList(); 25 var blockerList = new ContentBlockerList({merge: "all"});
26 26
27 rl.on("line", line => 27 rl.on("line", line =>
28 { 28 {
29 if (/^\s*[^\[\s]/.test(line)) 29 if (/^\s*[^\[\s]/.test(line))
30 blockerList.addFilter(Filter.fromText(Filter.normalize(line))); 30 blockerList.addFilter(Filter.fromText(Filter.normalize(line)));
31 }); 31 });
32 32
33 rl.on("close", () => 33 rl.on("close", () =>
34 { 34 {
35 console.log(JSON.stringify(blockerList.generateRules({merge: true}), null, 35 blockerList.generateRules().then(rules =>
36 "\t")); 36 {
37 // If the rule set is too huge, JSON.stringify throws
38 // "RangeError: Invalid string length" on Node.js. As a workaround, print
39 // each rule individually.
40 console.log("[");
41 if (rules.length > 0)
42 {
43 let stringifyRule = rule => JSON.stringify(rule, null, "\t");
44 for (let i = 0; i < rules.length - 1; i++)
45 console.log(stringifyRule(rules[i]) + ",");
46 console.log(stringifyRule(rules[rules.length - 1]));
47 }
48 console.log("]");
49 });
37 }); 50 });
LEFTRIGHT

Powered by Google App Engine
This is Rietveld