Issue 2376 - Implement custom filters in new options page

messageResponder.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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
@@ skipping 12 matching lines @@
   var Prefs = require("prefs").Prefs;
   var Utils = require("utils").Utils;
   var FilterStorage = require("filterStorage").FilterStorage;
   var FilterNotifier = require("filterNotifier").FilterNotifier;
   var defaultMatcher = require("matcher").defaultMatcher;
   
   var filterClasses = require("filterClasses");
   var Filter = filterClasses.Filter;
   var BlockingFilter = filterClasses.BlockingFilter;
   var Synchronizer = require("synchronizer").Synchronizer;
-  var parseFilters = require("filterValidation").parseFilters;

[Sebastian Noack, 2015/07/14 13:36:31]

You might want to cache the module into a variable, similar too filterClasses:

  var filterValidation = require("filterValidation");

And then, either below:

  var parseFilters = filterValidation.parseFilters;
  var parseFilter = filterValidation.parseFilter;

Or access the functions via the module where needed:

  var result = filterValidation.parseFilters(..);

[saroyanm, 2015/07/14 13:53:29]

Good point, done.

-  var parseFilter = require("filterValidation").parseFilter;
+  var filterValidation = require("filterValidation");
 
   var subscriptionClasses = require("subscriptionClasses");
   var Subscription = subscriptionClasses.Subscription;
   var DownloadableSubscription = subscriptionClasses.DownloadableSubscription;
   var SpecialSubscription = subscriptionClasses.SpecialSubscription;
 
   function convertObject(keys, obj)
   {
     var result = {};
     for (var i = 0; i < keys.length; i++)
@@ skipping 132 matching lines @@
           listenerFilters.app = message.filter;
         else
           delete listenerFilters.app;
         break;
       case "app.open":
         if (message.what == "options")
           ext.showOptions();
         break;
       case "filters.add":
         var filter = Filter.fromText(message.text);
-        var result = parseFilter(message.text);
+        var result = filterValidation.parseFilter(message.text);
         if (result.error)
           sendMessage("app", "error", [result.error.toString()], sender.page);
-        else
+        else if (result.filter)
           FilterStorage.addFilter(result.filter);
         break;
       case "filters.blocked":
         var filter = defaultMatcher.matchesAny(message.url, message.requestType,
           message.docDomain, message.thirdParty);
         callback(filter instanceof BlockingFilter);
         break;
       case "filters.get":
         var subscription = Subscription.fromURL(message.subscriptionUrl);
         if (!subscription)
         {
           callback([]);
           break;
         }
         
         callback(subscription.filters.map(convertFilter));
         break;
       case "filters.importRaw":
-        var result = parseFilters(message.text);
-        var errors = result.errors.filter(function(error)

[Sebastian Noack, 2015/07/14 13:36:31]

I'd rather go with for-loop, rather than chaining .filter() and .map(). I find
this simpler to read, beside being faster. But it's not too important, if you
disagree.

  var errors = [];
  for (var i = 0; i < result.errors.length; i++)
  {
    var error = result.errors[i];
    if (error.type != "unexpected-filter-list-header")
      errors.push(error);
  }

[saroyanm, 2015/07/14 13:53:28]

Good point, done.

-        {
-          return error.type != "unexpected-filter-list-header";
-        }).map(function(error) 
-        {
-          return error.toString();
-        });
+        var result = filterValidation.parseFilters(message.text);
+        var errors = [];
+        for (var i = 0; i < result.errors.length; i++)
+        {
+          var error = result.errors[i];
+          if (error.type != "unexpected-filter-list-header")
+            errors.push(error.toString());
+        }
 
         if (errors.length > 0)
         {
           sendMessage("app", "error", errors, sender.page);
           return;
         }
 
         var seenFilter = Object.create(null);
         for (var i = 0; i < result.filters.length; i++)
         {
@@ skipping 91 matching lines @@
           subscription.title = message.title;
           subscription.homepage = message.homepage;
           FilterStorage.addSubscription(subscription);
           if (!subscription.lastDownload)
             Synchronizer.execute(subscription);
         }
         break;
     }
   });
 })(this);