Issue 3671 - Split out contentBlockerList API

abp2blocklist.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
 let readline = require("readline");
 let Filter = require("filterClasses").Filter;
-let ContentBlockerList = require("./lib/contentBlockerList.js").ContentBlockerList;
+let ContentBlockerList = require("./lib/abp2blocklist.js").ContentBlockerList;
 
 var rl = readline.createInterface({input: process.stdin, terminal: false});
-var converter = new ContentBlockerList();

[Sebastian Noack, 2016/02/24 00:49:50]

Nit: As you went to call the class ContentBlockerList, mind calling the variable
"blocklist" (or similar) to match the semantics?

[kzar, 2016/02/24 09:59:27]

Done.

+var blockerList = new ContentBlockerList();
 
 rl.on("line", line =>
 {
-  if (line.charAt(0) != "[" && line.search(/\S/) > -1)

[Sebastian Noack, 2016/02/24 00:45:41]

After reading through the respective code in adblockpluscore that downloads and
parses filter lists, I found two seemingly inconsistencies with the logic here.
But feel free to double check.

1. Leading whitespaces (e.g. "  [foo]") don't prevent a header from being
recognized as such.
2. After downloading the filter subscription, filters are normalized before they
are parsed and saved, e.g. "||example.com  " would be treated as
"||example.com", while without normalization the filter would also match those
spaces.

So if I read the code correctly, we should use following logic here:

  if (/^\s*[^\[\s]/.test(line))
    converter.addFilter(Filter.fromText(Filter.normalize(line)));

[kzar, 2016/02/24 09:59:27]

I don't think that will do it as it also matches blank lines. I can't see an
easy way to do it with just a regexp, but how about this?

[kzar, 2016/02/24 19:21:49]

(Sorry, as discussed in IRC I made a mistake during testing this. I didn't
realise the testing tool had multi-line mode enabled, the whitespace lines
matched were actually just a continued match from the previous line.)

-    converter.addFilter(Filter.fromText(line));
+  if (/^\s*[^\[\s]/.test(line))
+    blockerList.addFilter(Filter.fromText(line));
 });
 
 rl.on("close", () =>
 {
-  console.log(JSON.stringify(converter.generateRules(),
+  console.log(JSON.stringify(blockerList.generateRules(),
                              null, "\t"));
 });