Filter changed callback

src/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 <algorithm>
 #include <cctype>
 #include <functional>
 #include <string>
 
-#include <AdblockPlus/LogSystem.h>

[Andrey Novikov, 2013/06/18 11:48:28]

Forgot to remove this :(

 #include <AdblockPlus.h>
 #include "JsContext.h"
 #include "Thread.h"
 
 using namespace AdblockPlus;
 
 extern std::string jsSources[];
 
 Filter::Filter(JsValuePtr value)
     : JsValue(value)
@@ skipping 240 matching lines @@
 void FilterEngine::UpdateCheckDone(const std::string& eventName, FilterEngine::UpdaterCallback callback, JsValueList& params)
 {
   jsEngine->RemoveEventCallback(eventName);
 
   std::string error(params.size() >= 1 && !params[0]->IsNull() ? params[0]->AsString() : "");
   callback(error);
 }
 
 void FilterEngine::SetFilterChangeCallback(FilterEngine::FilterChangeCallback callback)
 {
-  std::string eventName = "filterChange";

[Wladimir Palant, 2013/06/18 15:02:15]

The event name isn't dynamic, no real point passing it to the callback.

-
-  if (callback == 0)
-    jsEngine->RemoveEventCallback(eventName);
-  else
-    jsEngine->SetEventCallback(eventName, std::tr1::bind(&FilterEngine::FilterChanged,
-        this, eventName, callback, std::tr1::placeholders::_1));
-}
-
-void FilterEngine::FilterChanged(const std::string& eventName, FilterEngine::FilterChangeCallback callback, JsValueList& params)
-{
-  AdblockPlus::LogSystemPtr log = jsEngine->GetLogSystem();

[Andrey Novikov, 2013/06/18 11:48:28]

Forgot to remove this :(

-  std::string url(params.size() >= 1 && !params[0]->IsNull() ? params[0]->AsString() : "");
-  std::string status(params.size() >= 2 && !params[1]->IsNull() ? params[1]->AsString() : "");
-  int64_t time(params.size() >= 3 && !params[2]->IsNull() ? params[2]->AsInt() : 0);
-  callback(url, status, time);
-}
+  jsEngine->SetEventCallback("filterChange", std::tr1::bind(&FilterEngine::FilterChanged,
+      this, callback, std::tr1::placeholders::_1));
+}
+
+void FilterEngine::RemoveFilterChangeCallback()
+{
+  jsEngine->RemoveEventCallback("filterChange");
+}
+
+void FilterEngine::FilterChanged(FilterEngine::FilterChangeCallback callback, JsValueList& params)
+{
+  std::string action(params.size() >= 1 && !params[0]->IsNull() ? params[0]->AsString() : "");
+  JsValuePtr item(params.size() >= 2 ? params[1] : jsEngine->NewValue(false));
+  callback(action, item);
+}