Issue 2325 - Add a way to set settings in libadblockplus for FRP and automatic updates

src/FilterEngine.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 116 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, bool firstRunDisabled, bool autoUpdatesDisabled)
     : jsEngine(jsEngine), initialized(false), firstRun(false), updateCheckId(0)
 {
   jsEngine->SetEventCallback("init", std::tr1::bind(&FilterEngine::InitDone,
       this, std::tr1::placeholders::_1));
 
   {
     // Lock the JS engine while we are loading scripts, no timeouts should fire
     // until we are done.
     const JsContext context(jsEngine);
+    jsEngine->Evaluate(std::string("var firstRunDisabled = ") + (firstRunDisabled ? "true;" : "false;"));

[sergei, 2015/04/21 12:35:24]

Would it be better to add them at least as members of `_appInfo`?

[Eric, 2015/05/15 19:36:13]

Not particularly. Application info is a description of the browser host, not how
ABP is configured.

I do agree that it would be good to add these to _some_ global object, if only
to mark them more clearly. I'd call such a global object (unsurprisingly I hope)
'configuration'.

+    jsEngine->Evaluate(std::string("var autoupdatesDisabled = ") + (autoUpdatesDisabled ? "true;" : "false;"));

[Eric, 2015/05/15 19:36:13]

My suggestion to use name value pairs would change these evaluations to
something like this: (lots of newlines to avoid wrapping)

  jsEngine->Evaluate(
    std::string("configuration.")
    + entry.first
    + "="
    + entry.second
    + ";"
  );

This would be the body of an iterator, with name/value pairs declared as
"std::vector<std::pair>".

+
     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
@@ skipping 258 matching lines @@
 }
 
 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();
 }