FilterEngine API improvements

shell/src/FiltersCommand.cpp

 #include <iostream>
 #include <sstream>
 
 #include "FiltersCommand.h"
 
 namespace
 {
-  typedef std::vector<AdblockPlus::Filter*> FilterList;
+  typedef std::vector<AdblockPlus::FilterPtr> FilterList;
 
   void ShowFilterList(const FilterList& filters)
   {
     for (FilterList::const_iterator it = filters.begin();
          it != filters.end(); it++)
     {
+      std::string type;
+      switch ((*it)->GetProperty("type", -1))
+      {
+        case AdblockPlus::Filter::TYPE_BLOCKING:
+          type = "blocking";
+          break;
+        case AdblockPlus::Filter::TYPE_EXCEPTION:
+          type = "exception";
+          break;
+        case AdblockPlus::Filter::TYPE_ELEMHIDE:
+          type = "elemhide";
+          break;
+        case AdblockPlus::Filter::TYPE_ELEMHIDE_EXCEPTION:
+          type = "elemhideexception";
+          break;
+        case AdblockPlus::Filter::TYPE_COMMENT:
+          type = "comment";
+          break;
+        case AdblockPlus::Filter::TYPE_INVALID:
+          type = "invalid";
+          break;
+        default:
+          type = "(unknown type)";
+          break;
+      }
       std::cout << (*it)->GetProperty("text", "(no text)") << " - " <<
-          (*it)->GetProperty("type", "(no type)") << std::endl;
+          type << std::endl;
     }
   }
 }
 
-FiltersCommand::FiltersCommand(
-  AdblockPlus::FilterEngine& filterEngine)

[Felix Dahlke, 2013/04/06 05:17:05]

This fits in one line, no need to wrap.

+FiltersCommand::FiltersCommand(AdblockPlus::FilterEngine& filterEngine)
   : Command("filters"), filterEngine(filterEngine)
 {
 }
 
 void FiltersCommand::operator()(const std::string& arguments)
 {
   std::istringstream argumentStream(arguments);
   std::string action;
   argumentStream >> action;
   if (!action.size())
@@ skipping 48 matching lines @@
 void FiltersCommand::RemoveFilter(const std::string& text)
 {
   AdblockPlus::Filter& filter = filterEngine.GetFilter(text);
   if (!filter.IsListed())
   {
     std::cout << "No such filter '" << text << "'" << std::endl;
     return;
   }
   filter.RemoveFromList();
 }