Run a single FilterEngine instance in a separate process

Shared/PluginSettings.cpp

 #include "PluginStdAfx.h"
 
 #include <Wbemidl.h>
 #include <time.h>
 #include "PluginIniFileW.h"
 #include "PluginIniFile.h"
 #include "PluginSettings.h"
 #include "PluginDictionary.h"
 #include "PluginClient.h"
 #include "PluginChecksum.h"
@@ skipping 190 matching lines @@
   s_criticalSectionLocal.Lock();
   {
     if ((!s_instance) || (s_isLightOnly))
     {
       s_instance = new CPluginSettings();
 #ifdef USE_CONSOLE
       CONSOLE("Fetching Available Subscription\n");
 #endif
       try
       {
-        CPluginSettings::GetInstance()->m_subscriptions = CPluginClient::GetInstance()->GetFilterEngine()->FetchAvailableSubscriptions();
+        CPluginSettings::GetInstance()->m_subscriptions = CPluginClient::GetInstance()->FetchAvailableSubscriptions();
       }
       catch(std::exception ex)
       {
         DEBUG_GENERAL(ex.what());
         throw ex;
       }
       s_isLightOnly = false;
     }
 
     instance = s_instance;
@@ skipping 1268 matching lines @@
     }
 
     CPluginSettingsWhitelistLock lock;
     if (lock.IsLocked())
     {
       ClearWhitelist();
 
       s_criticalSectionLocal.Lock();
       try
       {
-      std::vector<AdblockPlus::FilterPtr> filters = CPluginClient::GetInstance()->GetFilterEngine()->GetListedFilters();
+      std::vector<AdblockPlus::FilterPtr> filters = CPluginClient::GetInstance()->GetListedFilters();
       for (int i = 0; i < filters.size(); i ++)
       {
         if (filters[i]->GetType() == AdblockPlus::Filter::Type::TYPE_EXCEPTION)
         {
           std::string text = filters[i]->GetProperty("text")->AsString();
           //@@||example.com^$document
           size_t endPos = text.rfind("^$document");
           if (endPos != std::string::npos)
           {
             size_t startPos = text.find("@@||") + 4;
@@ skipping 38 matching lines @@
 
     std::string newDomain = CW2A(domain, CP_UTF8);
 
     //Domain already present?
     if (std::find(m_whitelistedDomains.begin(), m_whitelistedDomains.end(), newDomain) != m_whitelistedDomains.end())
     {
       return;
     }
     s_criticalSectionLocal.Lock();
     {
-      AdblockPlus::FilterPtr whitelistFilter = CPluginClient::GetInstance()->GetFilterEngine()->GetFilter(std::string("@@||").append(CW2A(domain)).append("^$document"));
+      AdblockPlus::FilterPtr whitelistFilter = CPluginClient::GetInstance()->GetFilter(std::string("@@||").append(CW2A(domain)).append("^$document"));
       whitelistFilter->AddToList();
     }
     s_criticalSectionLocal.Unlock();
 
   }
 
   if (isForcingUpdateOnStart)
   {
     ForceConfigurationUpdateOnStart();
   }
@@ skipping 68 matching lines @@
 void CPluginSettings::SetSubscription(BSTR url)
 {
   std::string urlConverted = CT2A(url, CP_UTF8);
   SetSubscription(urlConverted);
 }
 
 void CPluginSettings::SetSubscription(std::string url)
 {
   try
   {
-    FilterEngine* filterEngine= CPluginClient::GetInstance()->GetFilterEngine();
-    std::vector<AdblockPlus::SubscriptionPtr> subscriptions = filterEngine->GetListedSubscriptions();
+    std::vector<AdblockPlus::SubscriptionPtr> subscriptions = CPluginClient::GetInstance()->GetListedSubscriptions();
     if (subscriptions.size() > 0)
     {
       for (int i = 0; i < subscriptions.size(); i ++)
       {
         subscriptions[i]->RemoveFromList();
       }
     }
-    AdblockPlus::SubscriptionPtr subscription = filterEngine->GetSubscription(url);
+    AdblockPlus::SubscriptionPtr subscription = CPluginClient::GetInstance()->GetSubscription(url);
     subscription->AddToList();
     RefreshFilterlist();
     RefreshWhitelist();
   }
   catch(std::exception ex)
   {
     DEBUG_GENERAL(ex.what());
   }
   catch(std::runtime_error ex)
   {
@@ skipping 10 matching lines @@
     }
     return retTokens;
 }
 
 
 void CPluginSettings::SetDefaultSubscription()
 {
   CPluginSystem* system = CPluginSystem::GetInstance();
   CString lng = system->GetBrowserLanguage().Left(2);
   std::string browserLanguage = CW2A(lng, CP_UTF8);
-  FilterEngine* filterEngine = CPluginClient::GetInstance()->GetFilterEngine();
-  std::vector<SubscriptionPtr> subscriptions = filterEngine->FetchAvailableSubscriptions();
+  std::vector<SubscriptionPtr> subscriptions = CPluginClient::GetInstance()->FetchAvailableSubscriptions();
   bool subscriptionSet = false;
   while (!subscriptionSet)
   {
     for (int i = 0; i < subscriptions.size(); i++)
     {
       std::string prefixes = subscriptions[i]->GetProperty("prefixes")->AsString();
       std::vector<std::string> tokens = split(prefixes, ',');
       for (int j = 0; j < tokens.size(); j ++)
       {
         if (tokens[j] == browserLanguage)
         {
           SetSubscription(subscriptions[i]->GetProperty("url")->AsString());
           subscriptionSet = true;
         }
       }
     }
 
     if (browserLanguage == "en")
       break;
     // failed to set the subscription for browser language. Try "en"
     browserLanguage = "en";
 
   }
 }
 
 CString CPluginSettings::GetSubscription()
 {
   try
   {
-    FilterEngine* filterEngine= CPluginClient::GetInstance()->GetFilterEngine();
-    std::vector<AdblockPlus::SubscriptionPtr> subscriptions = filterEngine->GetListedSubscriptions();
+   std::vector<AdblockPlus::SubscriptionPtr> subscriptions = CPluginClient::GetInstance()->GetListedSubscriptions();
 
     if (subscriptions.size() == 0)
     {
       SetDefaultSubscription();
-      subscriptions = filterEngine->GetListedSubscriptions();
+      subscriptions = CPluginClient::GetInstance()->GetListedSubscriptions();
     }
     for (int i = 0; i < subscriptions.size(); i ++)
     {
       return CString(CA2T(subscriptions[i]->GetProperty("url")->AsString().c_str(), CP_UTF8));
     }
   }
   catch(std::exception ex)
   {
     DEBUG_GENERAL(ex.what());
   }
   catch(std::runtime_error ex)
   {
     DEBUG_GENERAL(ex.what());
   }
   return CString(L"");
 }
 
 
 void CPluginSettings::RefreshFilterlist()
 {
   try
-  {
-    FilterEngine* filterEngine= CPluginClient::GetInstance()->GetFilterEngine();
-    
+  {  
     // Make sure at least the default subscription is set
     CPluginSettings* settings = CPluginSettings::GetInstance();
     settings->GetSubscription();
 
-    std::vector<AdblockPlus::SubscriptionPtr> subscriptions = filterEngine->GetListedSubscriptions();
+    std::vector<AdblockPlus::SubscriptionPtr> subscriptions = CPluginClient::GetInstance()->GetListedSubscriptions();
     for (int i = 0; i < subscriptions.size(); i ++)
     {
       subscriptions[i]->UpdateFilters();
     }
   }
   catch(std::exception ex)
   {
     DEBUG_GENERAL(ex.what());
   }
   catch(std::runtime_error ex)
   {
     DEBUG_GENERAL(ex.what());
   }
 }
 
 #endif // SUPPORT_WHITELIST