Issue 5137 - [emscripten] Added basic filter storage implementation

compiled/bindings/main.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 15 matching lines @@
 #include "../filter/RegExpFilter.h"
 #include "../filter/BlockingFilter.h"
 #include "../filter/WhitelistFilter.h"
 #include "../filter/ElemHideBase.h"
 #include "../filter/ElemHideFilter.h"
 #include "../filter/ElemHideException.h"
 #include "../filter/ElemHideEmulationFilter.h"
 #include "../subscription/Subscription.h"
 #include "../subscription/DownloadableSubscription.h"
 #include "../subscription/UserDefinedSubscription.h"
+#include "../storage/FilterStorage.h"
 #include "../FilterNotifier.h"
 
 int main()
 {
   try
   {
     class_<Filter>("Filter")
         .property("text", &Filter::GetText)
         .function("serialize", &Filter::Serialize)
         .class_function("fromText", &Filter::FromText)
@@ skipping 42 matching lines @@
     class_<ElemHideException,ElemHideBase>("ElemHideException")
         .class_property("type", "'elemhideexception'");
 
     class_<ElemHideEmulationFilter,ElemHideBase>("ElemHideEmulationFilter")
         .class_property("type", "'elemhideemulation'");
 
     class_<Subscription>("Subscription")
         .property("url", &Subscription::GetID)
         .property("title", &Subscription::GetTitle, &Subscription::SetTitle)
         .property("disabled", &Subscription::GetDisabled, &Subscription::SetDisabled)
+        .property("listed", &Subscription::GetListed)
         .property("filterCount", &Subscription::GetFilterCount)
         .function("filterAt", &Subscription::FilterAt)
         .function("indexOfFilter", &Subscription::IndexOfFilter)
         .function("serialize", &Subscription::Serialize)
         .function("serializeFilters", &Subscription::SerializeFilters)
         .class_function("fromURL", &Subscription::FromID)
         .subclass_differentiator(&Subscription::mType, {
           {Subscription::Type::USERDEFINED, "SpecialSubscription"},
           {Subscription::Type::DOWNLOADABLE, "DownloadableSubscription"},
         });
 
     class_<UserDefinedSubscription,Subscription>("SpecialSubscription")
         .function("isDefaultFor", &UserDefinedSubscription::IsDefaultFor)
         .function("makeDefaultFor", &UserDefinedSubscription::MakeDefaultFor)
+        .function("isGeneric", &UserDefinedSubscription::IsGeneric)

[Wladimir Palant, 2017/05/01 14:47:25]

I need to add unit tests for this.

         .function("insertFilterAt", &UserDefinedSubscription::InsertFilterAt)
         .function("removeFilterAt", &UserDefinedSubscription::RemoveFilterAt)
         .function("serialize", &UserDefinedSubscription::Serialize);
 
     class_<DownloadableSubscription,Subscription>("DownloadableSubscription")
         .property("fixedTitle", &DownloadableSubscription::GetFixedTitle, &DownloadableSubscription::SetFixedTitle)
         .property("homepage", &DownloadableSubscription::GetHomepage, &DownloadableSubscription::SetHomepage)
         .property("lastCheck", &DownloadableSubscription::GetLastCheck, &DownloadableSubscription::SetLastCheck)
         .property("expires", &DownloadableSubscription::GetHardExpiration, &DownloadableSubscription::SetHardExpiration)
         .property("softExpiration", &DownloadableSubscription::GetSoftExpiration, &DownloadableSubscription::SetSoftExpiration)
         .property("lastDownload", &DownloadableSubscription::GetLastDownload, &DownloadableSubscription::SetLastDownload)
         .property("downloadStatus", &DownloadableSubscription::GetDownloadStatus, &DownloadableSubscription::SetDownloadStatus)
         .property("lastSuccess", &DownloadableSubscription::GetLastSuccess, &DownloadableSubscription::SetLastSuccess)
         .property("errors", &DownloadableSubscription::GetErrorCount, &DownloadableSubscription::SetErrorCount)
         .property("version", &DownloadableSubscription::GetDataRevision, &DownloadableSubscription::SetDataRevision)
         .property("requiredVersion", &DownloadableSubscription::GetRequiredVersion, &DownloadableSubscription::SetRequiredVersion)
         .property("downloadCount", &DownloadableSubscription::GetDownloadCount, &DownloadableSubscription::SetDownloadCount)
         .function("serialize", &DownloadableSubscription::Serialize);
 
+    namespace_("FilterStorage")
+        .property("subscriptionCount", &FilterStorage::GetSubscriptionCount)
+        .function("subscriptionAt", &FilterStorage::SubscriptionAt)
+        .function("indexOfSubscription", &FilterStorage::IndexOfSubscription)
+        .function("getSubscriptionForFilter", &FilterStorage::GetSubscriptionForFilter)

[Wladimir Palant, 2017/05/01 14:47:25]

Note that the original name is getGroupForFilter - this has been renamed for
consistency. The original name is added as an alias in filterStorage.js.

+        .function("addSubscription", &FilterStorage::AddSubscription)
+        .function("removeSubscription", &FilterStorage::RemoveSubscription)
+        .function("moveSubscription", &FilterStorage::MoveSubscription);
+
     printBindings();
     RegExpFilter::GenerateCustomBindings();
     FilterNotifier::GenerateCustomBindings();
 
     return 0;
   }
   catch (const std::exception& e)
   {
     EM_ASM_ARGS(
       console.error("Error occurred generating JavaScript bindings: " +
           Module.AsciiToString($0)), e.what()
     );
     return 1;
   }
 }