Issue 2005 - Refactor working with strings in InputBuffer and OutputBuffer

src/plugin/AdblockPlusClient.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
@@ skipping 127 matching lines @@
       message >> description.title;
       message >> description.specialization;
       message >> description.listed;
       result.push_back(description);
     }
     return result;
   }
 }
 
 CAdblockPlusClient* CAdblockPlusClient::s_instance = NULL;
-
-CAdblockPlusClient::CAdblockPlusClient() : CPluginClientBase()
+CComAutoCriticalSection CAdblockPlusClient::s_criticalSectionLocal;
+
+CAdblockPlusClient::CAdblockPlusClient()
 {
   m_filter = std::auto_ptr<CPluginFilter>(new CPluginFilter());
 }
 
 bool CAdblockPlusClient::CallEngine(Communication::OutputBuffer& message, Communication::InputBuffer& inputBuffer)
 {
   DEBUG_GENERAL("CallEngine start");
   CriticalSection::Lock lock(enginePipeLock);
   try
   {
     if (!enginePipe)
       enginePipe.reset(OpenEnginePipe());
     enginePipe->WriteMessage(message);
     inputBuffer = enginePipe->ReadMessage();
   }
-  catch (const std::exception& e)
-  {
-    DEBUG_GENERAL(e.what());
+  catch (const std::exception& ex)
+  {
+    DEBUG_EXCEPTION(ex);
     return false;
   }
   DEBUG_GENERAL("CallEngine end");
   return true;
 }
 
 bool CAdblockPlusClient::CallEngine(Communication::ProcType proc, Communication::InputBuffer& inputBuffer)
 {
   Communication::OutputBuffer message;
   message << proc;
@@ skipping 69 matching lines @@
   m_criticalSectionFilter.Lock();
   {
     isHidden = filter && filter->IsElementHidden(tag, pEl, domain, indent);
   }
   m_criticalSectionFilter.Unlock();
   return isHidden;
 }
 
 bool CAdblockPlusClient::IsWhitelistedUrl(const std::wstring& url)
 {
-  DEBUG_GENERAL((L"IsWhitelistedUrl: " + url + L" start").c_str());
-  Communication::OutputBuffer request;
-  request << Communication::PROC_IS_WHITELISTED_URL << url;
-
-  Communication::InputBuffer response;
-  if (!CallEngine(request, response)) 
-    return false;
-
-  bool isWhitelisted;
-  response >> isWhitelisted;
-
-  DEBUG_GENERAL((L"IsWhitelistedUrl: " + url + L" end").c_str());
-  return isWhitelisted;
+  return !GetWhitelistingFilter(url).empty();
+}
+
+std::string CAdblockPlusClient::GetWhitelistingFilter(const std::wstring& url)
+{
+  DEBUG_GENERAL((L"GetWhitelistingFilter: " + url + L" start").c_str());
+  Communication::OutputBuffer request;
+  request << Communication::PROC_GET_WHITELISTING_FITER << url;
+
+  Communication::InputBuffer response;
+  if (!CallEngine(request, response)) 
+    return "";
+
+  std::string filterText;
+  response >> filterText;
+
+  DEBUG_GENERAL((L"GetWhitelistingFilter: " + url + L" end").c_str());
+  return filterText;
 }
 
 bool CAdblockPlusClient::IsElemhideWhitelistedOnDomain(const std::wstring& url)
 {
   Communication::OutputBuffer request;
   request << Communication::PROC_IS_ELEMHIDE_WHITELISTED_ON_URL << url;
 
   Communication::InputBuffer response;
   if (!CallEngine(request, response)) 
     return false;
@@ skipping 111 matching lines @@
 }
 
 void CAdblockPlusClient::AddFilter(const std::wstring& text)
 {
   Communication::OutputBuffer request;
   request << Communication::PROC_ADD_FILTER << text;
   CallEngine(request);
 }
 
 void CAdblockPlusClient::RemoveFilter(const std::wstring& text)
+{
+  RemoveFilter(ToUtf8String(text));
+}
+
+void CAdblockPlusClient::RemoveFilter(const std::string& text)
 {
   Communication::OutputBuffer request;
   request << Communication::PROC_REMOVE_FILTER << text;
   CallEngine(request);
 }
 
 void CAdblockPlusClient::SetPref(const std::wstring& name, const std::wstring& value)
 {
   Communication::OutputBuffer request;
   request << Communication::PROC_SET_PREF << name << value;
@@ skipping 140 matching lines @@
   DEBUG_GENERAL("CompareVersions");
   Communication::OutputBuffer request;
   request << Communication::PROC_COMPARE_VERSIONS << v1 << v2;
   Communication::InputBuffer response;
   if (!CallEngine(request, response))
     return 0;
   int result;
   response >> result;
   return result;
 }