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 166 matching lines @@
         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 = filterValidation.parseFilter(message.text);
-        if (result.error && result.error.type != "empty-filter")

[Thomas Greiner, 2015/07/15 08:32:38]

Look at the else-case. This means that empty filters will be added. What you
want is this:

if (result.error)
{
  if (result.error.type != "empty-filter")
    sendMessage(...);
}
else
  FilterStorage.addFilter(result.filter);

[Sebastian Noack, 2015/07/15 09:00:45]

There is no error type "empty-filter". As I said, the result will be {filter:
null} in this case. So the logic here should look like:

  if (result.error)
    sendMessage("app", "error", [result.error.toString()], sender.page);
  else if (result.filter)
    FilterStorage.addFilter(result.filter);

[saroyanm, 2015/07/15 10:47:11]

I think it was misunderstanding, what I understood from your previouse message
that you would like to keep that entire logic in parseFilter, which is in
filterValidation module, so I've created a separate review where I've added new
"empty-filter" error to parseFilter function.
Should have aligned with you before implementing.
Done.

[Sebastian Noack, 2015/07/15 11:19:59]

What I meant is, that you should merely leave the check for empty filters to the
filterValidation module, which is already implemented there as
!Filter.normlize(text), and returns {filter: null} in that case.

+        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 = 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" &&
-              error.type != "empty-filter")
+          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);
@@ skipping 93 matching lines @@
           subscription.title = message.title;
           subscription.homepage = message.homepage;
           FilterStorage.addSubscription(subscription);
           if (!subscription.lastDownload)
             Synchronizer.execute(subscription);
         }
         break;
     }
   });
 })(this);