Initial libadblockplus integration

Shared/AdblockPlusClient.h

 #ifndef _SIMPLE_ADBLOCK_CLIENT_H_
 #define _SIMPLE_ADBLOCK_CLIENT_H_
 
 
 #include "PluginTypedef.h"
 #include "PluginClientBase.h"
+#include "AdblockPlus.h"
 
 
+using namespace AdblockPlus;

[Felix Dahlke, 2013/04/03 05:35:27]

I'd really prefer to avoid using namespace in headers, can get messy.

+
 class CPluginFilter;
 
 
+class LibFileReader : public AdblockPlus::FileReader
+{
+public:
+  std::auto_ptr<std::istream> Read(const std::string& path) const

[Felix Dahlke, 2013/04/03 05:35:27]

Should be declared inline or, preferably, have its implementation moved to the
.cpp file.

+  {
+    std::ifstream* file = new std::ifstream;
+    file->open(("lib/" + path).c_str());

[Wladimir Palant, 2013/04/03 12:42:19]

Does that assume a particular current work directory? Does that assumption
always work?

+    return std::auto_ptr<std::istream>(file);
+  }
+};
+
+class CerrErrorCallback : public AdblockPlus::ErrorCallback
+{
+public:
+  void operator()(const std::string& message)

[Felix Dahlke, 2013/04/03 05:35:27]

Should be declared inline or, preferably, have its implementation moved to the
.cpp file.

+  {
+//    std::cerr << "Error: " << message << std::endl;

[Wladimir Palant, 2013/04/03 12:42:19]

I'm not a big fan of code that has been outcommented. It's not obvious why this
code isn't used and under what circumstances it should be used. If anything, I
would prefer #if defined(DEBUG) here or something like that. But this should
probably just use CPluginDebug instead.

+  }
+};
+

[Oleksandr, 2013/04/03 13:12:17]

To be honest, these 2 classes LibFileReader and CerrErrorCallback are straight
from abpshell project. I just used them as placeholders, to have basic filtering
and hiding done through libadblockplus in the meantime. All comments are valid
of course.

+
 class CAdblockPlusClient : public CPluginClientBase
 {
 
 private:
 
   std::auto_ptr<CPluginFilter> m_filter;
+  std::auto_ptr<LibFileReader> fileReader;
+  std::auto_ptr<CerrErrorCallback> errorCallback;
+  std::auto_ptr<AdblockPlus::JsEngine> jsEngine;
+  std::auto_ptr<AdblockPlus::FilterEngine> filterEngine;
 
   TFilterFileList m_filterDownloads;
 
   CComAutoCriticalSection m_criticalSectionFilter;
   CComAutoCriticalSection m_criticalSectionCache;
 
   std::map<CString,bool> m_cacheBlockedSources;
 
 
   // Private constructor used by the singleton pattern
   CAdblockPlusClient();
 
 public:
 
   static CAdblockPlusClient* s_instance;
+
   ~CAdblockPlusClient();
 
   static CAdblockPlusClient* GetInstance();
 
-  // Read the filters from the persistent storage and make them ready for use
-  void ReadFilters();
-  void RequestFilterDownload(const CString& filter, const CString& filterPath);
-  bool DownloadFirstMissingFilter();
+  bool LoadFilters();
+
+  AdblockPlus::FilterEngine* GetFilterEngine();
 
   // Removes the url from the list of whitelisted urls if present
   // Only called from ui thread
   bool ShouldBlock(CString src, int contentType, const CString& domain, bool addDebug=false);
 
   bool IsElementHidden(const CString& tag, IHTMLElement* pEl, const CString& domain, const CString& indent);
   bool IsUrlWhiteListed(const CString& url);
 
   int GetIEVersion();
+
 };
 
 #endif // _SIMPLE_ADBLOCK_CLIENT_H_