Support Acceptable Ads

src/engine/Main.cpp

 #include <AdblockPlus.h>
 #include <functional>
 #include <vector>
 #include <Windows.h>
 
 #include "../shared/AutoHandle.h"
 #include "../shared/Communication.h"
 #include "../shared/Dictionary.h"
 #include "../shared/Utils.h"
 #include "../shared/Version.h"
@@ skipping 96 matching lines @@
       case Communication::PROC_LISTED_SUBSCRIPTIONS:
       {
         WriteSubscriptions(response, filterEngine->GetListedSubscriptions());
         break;
       }
       case Communication::PROC_SET_SUBSCRIPTION:
       {
         std::string url;
         request >> url;
 
+        AdblockPlus::JsValuePtr valuePtr = filterEngine->GetPref("subscriptions_exceptionsurl");
+        std::string aaUrl = "";
+        if (valuePtr->IsString())
+        {
+          aaUrl = valuePtr->AsString();
+        }

[Eric, 2014/06/25 14:34:15]

Why the partial type enforcement? Is there any reason not just to call
AsString() directly?

Personally, I'm a believer in strict type enforcement. (That's a policy choice:
Don't mask errors in code you have complete control over.) That would mean
throwing an exception here, but there's not even try-catch block around the body
of HandleRequest(), much less a way of delivering an exception as a result
rather than an ordinary return value.

[Felix Dahlke, 2014/06/30 17:24:04]

I guess this is because the pref could be missing, but we still want to switch
language subscriptions properly? Wouldn't JsValue::IsNull() be a better check
for that?

         std::vector<AdblockPlus::SubscriptionPtr> subscriptions = filterEngine->GetListedSubscriptions();
+
+        // Remove all subscriptions, besides the Acceptable Ads

[Felix Dahlke, 2014/06/30 17:24:04]

Wow, this is hacky. So we currently only support exactly one subscription?
This'll do the trick for now, but we should really file a follow-up issue for
implementing language switching properly.

[Oleksandr, 2014/07/18 19:06:42]

https://issues.adblockplus.org/ticket/1084
On 2014/06/30 17:24:04, Felix H. Dahlke wrote:

         for (size_t i = 0, count = subscriptions.size(); i < count; i++)
-          subscriptions[i]->RemoveFromList();
+        {
+          if (subscriptions[i].get()->GetProperty("url")->AsString() != aaUrl)

[Felix Dahlke, 2014/06/30 17:24:04]

Are you sure the .get() is required here? That should be
std::tr1::shared_ptr::get - that'd be redundant.

+          {
+            subscriptions[i]->RemoveFromList();
+          }
+        }
+
+        // Add new subscription

[Felix Dahlke, 2014/06/30 17:24:04]

Kinda obvious IMHO :P

+        filterEngine->GetSubscription(url)->AddToList();
+        break;
+      }
+      case Communication::PROC_ADD_SUBSCRIPTION:
+      {
+        std::string url;
+        request >> url;
 
         filterEngine->GetSubscription(url)->AddToList();
         break;
       }
+      case Communication::PROC_REMOVE_SUBSCRIPTION:
+      {
+        std::string url;
+        request >> url;
+
+        filterEngine->GetSubscription(url)->RemoveFromList();
+        break;
+      }
       case Communication::PROC_UPDATE_ALL_SUBSCRIPTIONS:
       {
         std::vector<AdblockPlus::SubscriptionPtr> subscriptions = filterEngine->GetListedSubscriptions();
         for (size_t i = 0, count = subscriptions.size(); i < count; i++)
           subscriptions[i]->UpdateFilters();
         break;
       }
       case Communication::PROC_GET_EXCEPTION_DOMAINS:
       {
         std::vector<AdblockPlus::FilterPtr> filters = filterEngine->GetListedFilters();
@@ skipping 284 matching lines @@
     }
     catch (std::runtime_error e)
     {
       DebugException(e);
       return 1;
     }
   }
 
   return 0;
 }