Issue 5146 - Implement DownloadableSubscription parsing in C++

compiled/bindings/main.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 20 matching lines @@
 #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 "../ElemHide.h"
 #include "../ElemHideEmulation.h"
 #include "../FilterNotifier.h"
 
+ABP_NS_USING
+
 int main()
 {
   try
   {
     class_<Filter>("Filter")
         .property("text", &Filter::GetText)
         .function("serialize", &Filter::Serialize)
         .class_function("fromText", &Filter::FromText)
         .subclass_differentiator(&Filter::mType, {
           {Filter::Type::INVALID, "InvalidFilter"},
@@ skipping 18 matching lines @@
         .property("lastHit", &ActiveFilter::GetLastHit, &ActiveFilter::SetLastHit)
         .function("isActiveOnDomain", &ActiveFilter::IsActiveOnDomain)
         .function("isActiveOnlyOnDomain", &ActiveFilter::IsActiveOnlyOnDomain)
         .function("isGeneric", &ActiveFilter::IsGeneric)
         .function("serialize", &ActiveFilter::Serialize);
 
     class_<RegExpFilter,ActiveFilter>("RegExpFilter")
         .function("matches", &RegExpFilter::Matches);
 
     class_<BlockingFilter,RegExpFilter>("BlockingFilter")
-        .class_property("type", "'blocking'");
+        .class_property("type", "'blocking'")
+        .property("collapse", &BlockingFilter::GetCollapse);
+
 
     class_<WhitelistFilter,RegExpFilter>("WhitelistFilter")
         .class_property("type", "'whitelist'");
 
     class_<ElemHideBase,ActiveFilter>("ElemHideBase")
         .property("selector", &ElemHideBase::GetSelector)
         .property("selectorDomain", &ElemHideBase::GetSelectorDomain);
 
     class_<ElemHideFilter,ElemHideBase>("ElemHideFilter")
         .class_property("type", "'elemhide'");
@@ skipping 34 matching lines @@
         .property("lastCheck", &DownloadableSubscription::GetLastCheck, &DownloadableSubscription::SetLastCheck)
         .property("hardExpiration", &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("errorCount", &DownloadableSubscription::GetErrorCount, &DownloadableSubscription::SetErrorCount)
         .property("dataRevision", &DownloadableSubscription::GetDataRevision, &DownloadableSubscription::SetDataRevision)
         .property("requiredVersion", &DownloadableSubscription::GetRequiredVersion, &DownloadableSubscription::SetRequiredVersion)
         .property("downloadCount", &DownloadableSubscription::GetDownloadCount, &DownloadableSubscription::SetDownloadCount)
-        .function("parseDownload", &DownloadableSubscription::ParseDownload)
+        .class_function("parseDownload", &DownloadableSubscription::ParseDownload)
         .function("serialize", &DownloadableSubscription::Serialize);
 
-    class_<_DownloadableSubscription_Parser>("_DownloadableSubscription_Parser")
-        .property("redirect", &_DownloadableSubscription_Parser::GetRedirect)
-        .property("homepage", &_DownloadableSubscription_Parser::GetHomepage)
-        .function("process", &_DownloadableSubscription_Parser::Process)
-        .function("finalize", &_DownloadableSubscription_Parser::Finalize);
+    class_<DownloadableSubscription_Parser>("DownloadableSubscription_Parser")
+        .property("redirect", &DownloadableSubscription_Parser::GetRedirect)
+        .property("homepage", &DownloadableSubscription_Parser::GetHomepage)
+        .function("process", &DownloadableSubscription_Parser::Process)
+        .function("finalize", &DownloadableSubscription_Parser::Finalize);
 
     singleton<FilterStorage>("FilterStorage", &FilterStorage::GetInstance)
         .property("subscriptionCount", &FilterStorage::GetSubscriptionCount)
         .function("subscriptionAt", &FilterStorage::SubscriptionAt)
         .function("indexOfSubscription", &FilterStorage::IndexOfSubscription)
         .function("getSubscriptionForFilter", &FilterStorage::GetSubscriptionForFilter)
         .function("addSubscription", &FilterStorage::AddSubscription)
         .function("removeSubscription", &FilterStorage::RemoveSubscription)
-        .function("moveSubscription", &FilterStorage::MoveSubscription);
+        .function("moveSubscription", &FilterStorage::MoveSubscription)
+        .function("clearSubscriptionFilters", &FilterStorage::ClearSubscriptionFilters);
 
-    class_<_ElemHide_SelectorList>("_ElemHide_SelectorList")
-        .property("selectorCount", &_ElemHide_SelectorList::GetSelectorCount)
-        .function("selectorAt", &_ElemHide_SelectorList::SelectorAt)
-        .function("filterKeyAt", &_ElemHide_SelectorList::FilterKeyAt);
+    class_<ElemHide_SelectorList>("ElemHide_SelectorList")
+        .property("selectorCount", &ElemHide_SelectorList::GetSelectorCount)
+        .function("selectorAt", &ElemHide_SelectorList::SelectorAt)
+        .function("filterKeyAt", &ElemHide_SelectorList::FilterKeyAt);
 
-    singleton<ElemHide>("ElemHide", &ElemHide::GetInstance)
+    class_<ElemHide>("ElemHide")
+        .class_function("create", &ElemHide::Create)
         .function("add", &ElemHide::Add)
         .function("remove", &ElemHide::Remove)
         .function("clear", &ElemHide::Clear)
         .function("getSelectorsForDomain", &ElemHide::GetSelectorsForDomain)
         .function("getUnconditionalSelectors", &ElemHide::GetUnconditionalSelectors);
 
-    class_<_ElemHideEmulation_FilterList>("_ElemHideEmulation_FilterList")
-        .property("filterCount", &_ElemHideEmulation_FilterList::GetFilterCount)
-        .function("filterAt", &_ElemHideEmulation_FilterList::FilterAt);
+    class_<ElemHideEmulation_FilterList>("ElemHideEmulation_FilterList")
+        .property("filterCount", &ElemHideEmulation_FilterList::GetFilterCount)
+        .function("filterAt", &ElemHideEmulation_FilterList::FilterAt);
 
-    singleton<ElemHideEmulation>("ElemHideEmulation", &ElemHideEmulation::GetInstance)
+    class_<ElemHideEmulation>("ElemHideEmulation")
+        .class_function("create", &ElemHideEmulation::Create)
         .function("add", &ElemHideEmulation::Add)
         .function("remove", &ElemHideEmulation::Remove)
         .function("clear", &ElemHideEmulation::Clear)
         .function("getRulesForDomain", &ElemHideEmulation::GetRulesForDomain);
 
     printBindings();
     RegExpFilter::GenerateCustomBindings();
-    FilterNotifier::GenerateCustomBindings();
+    FilterNotifier::GenerateCustomBindings::Generate();
 
     return 0;
   }
   catch (const std::exception& e)
   {
     EM_ASM_ARGS(
       console.error("Error occurred generating JavaScript bindings: " +
           Module.AsciiToString($0)), e.what()
     );
     return 1;
   }
 }