Issue 768 - Switch from TR1 to C++11

src/FilterEngine.cpp

 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * 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.
  *
@@ skipping 113 matching lines @@
   params.push_back(shared_from_this());
   JsValuePtr result = func->Call(params);
   return result->AsBool();
 }
 
 bool Subscription::operator==(const Subscription& subscription) const
 {
   return GetProperty("url")->AsString() == subscription.GetProperty("url")->AsString();
 }
 
-FilterEngine::FilterEngine(JsEnginePtr jsEngine)
+FilterEngine::FilterEngine(JsEnginePtr jsEngine, 
+                           const FilterEngine::Prefs& preconfiguredPrefs)
     : jsEngine(jsEngine), initialized(false), firstRun(false), updateCheckId(0)
 {
-  jsEngine->SetEventCallback("init", std::bind(&FilterEngine::InitDone,
+  jsEngine->SetEventCallback("_init", std::bind(&FilterEngine::InitDone,
       this, std::placeholders::_1));
 
   {
     // Lock the JS engine while we are loading scripts, no timeouts should fire
     // until we are done.
     const JsContext context(jsEngine);
+
+    // Set the preconfigured prefs
+    JsValuePtr preconfiguredPrefsObject = jsEngine->NewObject();
+    for (FilterEngine::Prefs::const_iterator it = preconfiguredPrefs.begin();
+         it != preconfiguredPrefs.end(); it++)
+    {
+      preconfiguredPrefsObject->SetProperty(it->first, it->second);
+    }
+    jsEngine->SetGlobalProperty("_preconfiguredPrefs", preconfiguredPrefsObject);
+    // Load adblockplus scripts
     for (int i = 0; !jsSources[i].empty(); i += 2)
       jsEngine->Evaluate(jsSources[i + 1], jsSources[i]);
   }
 
   // TODO: This should really be implemented via a conditional variable
   while (!initialized)
     ::Sleep(10);
 }
 
+namespace
+{
+  typedef std::map<FilterEngine::ContentType, std::string> ContentTypeMap;
+
+  ContentTypeMap CreateContentTypeMap()
+  {
+    ContentTypeMap contentTypes;
+    contentTypes[FilterEngine::CONTENT_TYPE_OTHER] = "OTHER";
+    contentTypes[FilterEngine::CONTENT_TYPE_SCRIPT] = "SCRIPT";
+    contentTypes[FilterEngine::CONTENT_TYPE_IMAGE] = "IMAGE";
+    contentTypes[FilterEngine::CONTENT_TYPE_STYLESHEET] = "STYLESHEET";
+    contentTypes[FilterEngine::CONTENT_TYPE_OBJECT] = "OBJECT";
+    contentTypes[FilterEngine::CONTENT_TYPE_SUBDOCUMENT] = "SUBDOCUMENT";
+    contentTypes[FilterEngine::CONTENT_TYPE_DOCUMENT] = "DOCUMENT";
+    contentTypes[FilterEngine::CONTENT_TYPE_XMLHTTPREQUEST] = "XMLHTTPREQUEST";
+    contentTypes[FilterEngine::CONTENT_TYPE_OBJECT_SUBREQUEST] = "OBJECT_SUBREQUEST";
+    contentTypes[FilterEngine::CONTENT_TYPE_FONT] = "FONT";
+    contentTypes[FilterEngine::CONTENT_TYPE_MEDIA] = "MEDIA";
+    contentTypes[FilterEngine::CONTENT_TYPE_ELEMHIDE] = "ELEMHIDE";
+    return contentTypes;
+  }
+}
+
+const ContentTypeMap FilterEngine::contentTypes = CreateContentTypeMap();
+
+std::string FilterEngine::ContentTypeToString(ContentType contentType)
+{
+  ContentTypeMap::const_iterator it = contentTypes.find(contentType);
+  if (it != contentTypes.end())
+    return it->second;
+  throw std::invalid_argument("Argument is not a valid ContentType");
+}
+
+FilterEngine::ContentType FilterEngine::StringToContentType(const std::string& contentType)
+{
+  std::string contentTypeUpper = contentType;
+  std::transform(contentType.begin(), contentType.end(), contentTypeUpper.begin(), ::toupper);
+  for (ContentTypeMap::const_iterator it = contentTypes.begin();
+       it != contentTypes.end(); it++)
+  {
+    if (it->second == contentTypeUpper)
+      return it->first;
+  }
+  throw std::invalid_argument("Cannot convert argument to ContentType");
+}
+
 void FilterEngine::InitDone(JsValueList& params)
 {
-  jsEngine->RemoveEventCallback("init");
+  jsEngine->RemoveEventCallback("_init");
   initialized = true;
   firstRun = params.size() && params[0]->AsBool();
 }
 
 bool FilterEngine::IsFirstRun() const
 {
   return firstRun;
 }
 
 FilterPtr FilterEngine::GetFilter(const std::string& text)
@@ skipping 35 matching lines @@
 std::vector<SubscriptionPtr> FilterEngine::FetchAvailableSubscriptions() const
 {
   JsValuePtr func = jsEngine->Evaluate("API.getRecommendedSubscriptions");
   JsValueList values = func->Call()->AsList();
   std::vector<SubscriptionPtr> result;
   for (JsValueList::iterator it = values.begin(); it != values.end(); it++)
     result.push_back(SubscriptionPtr(new Subscription(*it)));
   return result;
 }
 
+void FilterEngine::ShowNextNotification(const std::string& url)
+{
+  JsValuePtr func = jsEngine->Evaluate("API.showNextNotification");
+  JsValueList params;
+  if (!url.empty())
+  {
+    params.push_back(jsEngine->NewValue(url));
+  }
+  func->Call(params);
+}
+
+void FilterEngine::SetShowNotificationCallback(const ShowNotificationCallback& value)
+{
+  if (!value)
+    return;
+
+  jsEngine->SetEventCallback("_showNotification",
+    std::bind(&FilterEngine::ShowNotification, this, value,
+              std::placeholders::_1));
+}
+
+void FilterEngine::RemoveShowNotificationCallback()
+{
+  jsEngine->RemoveEventCallback("_showNotification");
+}
+
 AdblockPlus::FilterPtr FilterEngine::Matches(const std::string& url,
-    const std::string& contentType,
+    ContentType contentType,
     const std::string& documentUrl) const
 {
   std::vector<std::string> documentUrls;
   documentUrls.push_back(documentUrl);
   return Matches(url, contentType, documentUrls);
 }
 
 AdblockPlus::FilterPtr FilterEngine::Matches(const std::string& url,
-    const std::string& contentType,
+    ContentType contentType,
     const std::vector<std::string>& documentUrls) const
 {
   if (documentUrls.empty())
     return CheckFilterMatch(url, contentType, "");
 
   std::string lastDocumentUrl = documentUrls.front();
   for (std::vector<std::string>::const_iterator it = documentUrls.begin();
        it != documentUrls.end(); it++) {
     const std::string documentUrl = *it;
-    AdblockPlus::FilterPtr match = CheckFilterMatch(documentUrl, "DOCUMENT",
+    AdblockPlus::FilterPtr match = CheckFilterMatch(documentUrl,
+                                                    CONTENT_TYPE_DOCUMENT,
                                                     lastDocumentUrl);
     if (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION)
       return match;
     lastDocumentUrl = documentUrl;
   }
 
   return CheckFilterMatch(url, contentType, lastDocumentUrl);
 }
 
 AdblockPlus::FilterPtr FilterEngine::CheckFilterMatch(const std::string& url,
-    const std::string& contentType,
+    ContentType contentType,
     const std::string& documentUrl) const
 {
   JsValuePtr func = jsEngine->Evaluate("API.checkFilterMatch");
   JsValueList params;
   params.push_back(jsEngine->NewValue(url));
-  params.push_back(jsEngine->NewValue(contentType));
+  params.push_back(jsEngine->NewValue(ContentTypeToString(contentType)));
   params.push_back(jsEngine->NewValue(documentUrl));
   JsValuePtr result = func->Call(params);
   if (!result->IsNull())
     return FilterPtr(new Filter(result));
   else
     return FilterPtr();
 }
 
 std::vector<std::string> FilterEngine::GetElementHidingSelectors(const std::string& domain) const
 {
@@ skipping 25 matching lines @@
 }
 
 std::string FilterEngine::GetHostFromURL(const std::string& url)
 {
   JsValuePtr func = jsEngine->Evaluate("API.getHostFromUrl");
   JsValueList params;
   params.push_back(jsEngine->NewValue(url));
   return func->Call(params)->AsString();
 }
 
-
-void FilterEngine::ForceUpdateCheck(FilterEngine::UpdaterCallback callback)
-{
-  std::string eventName = "updateCheckDone";
+void FilterEngine::SetUpdateAvailableCallback(
+    FilterEngine::UpdateAvailableCallback callback)
+{
+  jsEngine->SetEventCallback("updateAvailable",
+      std::bind(&FilterEngine::UpdateAvailable, this, callback,
+                std::placeholders::_1));
+}
+
+void FilterEngine::RemoveUpdateAvailableCallback()
+{
+  jsEngine->RemoveEventCallback("updateAvailable");
+}
+
+void FilterEngine::UpdateAvailable(
+    FilterEngine::UpdateAvailableCallback callback, JsValueList& params)
+{
+  if (params.size() >= 1 && !params[0]->IsNull())
+    callback(params[0]->AsString());
+}
+
+void FilterEngine::ForceUpdateCheck(
+    FilterEngine::UpdateCheckDoneCallback callback)
+{
+  std::string eventName = "_updateCheckDone";
   eventName += ++updateCheckId;
 
   jsEngine->SetEventCallback(eventName, std::bind(&FilterEngine::UpdateCheckDone,
       this, eventName, callback, std::placeholders::_1));
 
   JsValuePtr func = jsEngine->Evaluate("API.forceUpdateCheck");
   JsValueList params;
   params.push_back(jsEngine->NewValue(eventName));
   func->Call(params);
 }
 
-void FilterEngine::UpdateCheckDone(const std::string& eventName, FilterEngine::UpdaterCallback callback, JsValueList& params)
+void FilterEngine::UpdateCheckDone(const std::string& eventName,
+    FilterEngine::UpdateCheckDoneCallback 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)
 {
   jsEngine->SetEventCallback("filterChange", std::bind(&FilterEngine::FilterChanged,
       this, callback, std::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);
 }
+
+void FilterEngine::ShowNotification(const ShowNotificationCallback& callback,
+                                         const JsValueList& params)
+{
+  if (params.size() < 1)
+    return;
+
+  callback(Notification::JsValueToNotification(params[0]));
+}
+
+
+int FilterEngine::CompareVersions(const std::string& v1, const std::string& v2)
+{
+  JsValueList params;
+  params.push_back(jsEngine->NewValue(v1));
+  params.push_back(jsEngine->NewValue(v2));
+  JsValuePtr func = jsEngine->Evaluate("API.compareVersions");
+  return func->Call(params)->AsInt();
+}