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");
-
-// Hack to force `require("url")` to return our URL module instead of the
-// one included with Node.js! We manually load it here and then tweak the cache.
-let urlModuleKey = require("path").join(__dirname, "node_modules", "url.js");
-require("url.js");
-require.cache["url"] = require.cache[urlModuleKey];
-
 let Filter = require("filterClasses").Filter;
-let contentBlockerLists = require("./lib/contentBlockerLists.js");
-
+let ContentBlockerList = require("./lib/abp2blocklist.js").ContentBlockerList;
 
 var rl = readline.createInterface({input: process.stdin, terminal: false});
-var filters = [];
+var blockerList = new ContentBlockerList();
 
 rl.on("line", line =>
 {
-  if (line.charAt(0) != "[")
-    filters.push(Filter.fromText(line));
+  if (/^\s*[^\[\s]/.test(line))
+    blockerList.addFilter(Filter.fromText(line));
 });
 
 rl.on("close", () =>
 {
-  console.log(JSON.stringify(contentBlockerLists.convertFilters(filters),
+  console.log(JSON.stringify(blockerList.generateRules(),
                              null, "\t"));
 });