Issue #404 - Create common library shared between plugin/engine and installer

src/engine/Main.cpp

+/*
+ * 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
+ * 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/>.
+ */
+
 #include <AdblockPlus.h>
 #include <functional>
 #include <vector>
 #include <thread>
 #include <Windows.h>
 
 #include "../shared/AutoHandle.h"
 #include "../shared/Communication.h"
 #include "../shared/Dictionary.h"
 #include "../shared/Utils.h"
 #include "../shared/Version.h"
 #include "../shared/CriticalSection.h"
-#include "IE_Version.h"
+#include "IeVersion.h"
 #include "AdblockPlus.h"
 #include "Debug.h"
 #include "Updater.h"
 
 namespace
 {
   std::auto_ptr<AdblockPlus::FilterEngine> filterEngine;
   std::auto_ptr<Updater> updater;
   int activeConnections = 0;
   CriticalSection activeConnectionsLock;
   HWND callbackWindow;
 
-  void WriteStrings(Communication::OutputBuffer& response,
-      const std::vector<std::string>& strings)
-  {
-    int32_t count = static_cast<int32_t>(strings.size());
-    response << count;
-    for (int32_t i = 0; i < count; i++)
-      response << strings[i];
-  }
-
   void WriteSubscriptions(Communication::OutputBuffer& response,
       const std::vector<AdblockPlus::SubscriptionPtr>& subscriptions)
   {
     int32_t count = static_cast<int32_t>(subscriptions.size());
     response << count;
     for (int32_t i = 0; i < count; i++)
     {
       AdblockPlus::SubscriptionPtr subscription = subscriptions[i];
       response << subscription->GetProperty("url")->AsString()
                << subscription->GetProperty("title")->AsString()
@@ skipping 37 matching lines @@
   {
     Communication::OutputBuffer response;
 
     Communication::ProcType procedure;
     request >> procedure;
     switch (procedure)
     {
       case Communication::PROC_MATCHES:
       {
         std::string url;
-        std::string type;
+        using namespace AdblockPlus;
         std::string documentUrl;
+        int32_t type;
         request >> url >> type >> documentUrl;
-        referrerMapping.Add(url, documentUrl); 
-        AdblockPlus::FilterPtr filter = filterEngine->Matches(url, type, referrerMapping.BuildReferrerChain(documentUrl));
-        response << (filter && filter->GetType() != AdblockPlus::Filter::TYPE_EXCEPTION);
+        referrerMapping.Add(url, documentUrl);
+        auto contentType = static_cast<FilterEngine::ContentType>(type);
+        FilterPtr filter = filterEngine->Matches(url, contentType, referrerMapping.BuildReferrerChain(documentUrl));
+        response << (filter && filter->GetType() != Filter::TYPE_EXCEPTION);
         break;
       }
       case Communication::PROC_GET_ELEMHIDE_SELECTORS:
       {
         std::string domain;
         request >> domain;
-        WriteStrings(response, filterEngine->GetElementHidingSelectors(domain));
+        response << filterEngine->GetElementHidingSelectors(domain);
         break;
       }
       case Communication::PROC_AVAILABLE_SUBSCRIPTIONS:
       {
         WriteSubscriptions(response, filterEngine->FetchAvailableSubscriptions());
         break;
       }
       case Communication::PROC_LISTED_SUBSCRIPTIONS:
       {
         WriteSubscriptions(response, filterEngine->GetListedSubscriptions());
@@ skipping 64 matching lines @@
             const size_t prefixLen = strlen(prefix);
             const size_t suffixLen = strlen(suffix);
             if (!text.compare(0, prefixLen, prefix) &&
                 !text.compare(text.size() - suffixLen, suffixLen, suffix))
             {
               domains.push_back(text.substr(prefixLen, text.size() - prefixLen - suffixLen));
             }
           }
         }
 
-        WriteStrings(response, domains);
-        break;
-      }
-      case Communication::PROC_IS_WHITELISTED_URL:
+        response << domains;
+        break;
+      }
+      case Communication::PROC_GET_WHITELISTING_FITER:
       {
         std::string url;
         request >> url;
-        AdblockPlus::FilterPtr match = filterEngine->Matches(url, "DOCUMENT", url);
-        response << (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION);
+        AdblockPlus::FilterPtr match = filterEngine->Matches(url,
+          AdblockPlus::FilterEngine::ContentType::CONTENT_TYPE_DOCUMENT, url);
+        std::string filterText;
+        if (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION)
+        {
+          filterText = match->GetProperty("text")->AsString();
+        }
+        response << filterText;
         break;
       }
       case Communication::PROC_IS_ELEMHIDE_WHITELISTED_ON_URL:
       {
         std::string url;
         request >> url;
-        AdblockPlus::FilterPtr match = filterEngine->Matches(url, "ELEMHIDE", url);
+        AdblockPlus::FilterPtr match = filterEngine->Matches(url,
+          AdblockPlus::FilterEngine::ContentType::CONTENT_TYPE_ELEMHIDE, url);
         response << (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION);
         break;
       }
       case Communication::PROC_ADD_FILTER:
       {
         std::string text;
         request >> text;
 
         filterEngine->GetFilter(text)->AddToList();
         break;
@@ skipping 103 matching lines @@
       case Communication::PROC_COMPARE_VERSIONS:
       {
         std::string v1, v2;
         request >> v1 >> v2;
 
         response << filterEngine->CompareVersions(v1, v2);
         break;
       }
       case Communication::PROC_GET_DOCUMENTATION_LINK:
       {
-        response << ToUtf16String(filterEngine->GetPref("documentation_link")->AsString());
+        response << filterEngine->GetPref("documentation_link")->AsString();
         break;
       }
       case Communication::PROC_TOGGLE_PLUGIN_ENABLED:
       {
         filterEngine->SetPref("enabled", filterEngine->GetJsEngine()->NewValue(!filterEngine->GetPref("enabled")->AsBool()));
         response << filterEngine->GetPref("enabled")->AsBool();
         break;
       }
       case Communication::PROC_GET_HOST:
       {
@@ skipping 146 matching lines @@
     }
     catch (const std::runtime_error& e)
     {
       DebugException(e);
       return 1;
     }
   }
 
   return 0;
 }