Issue 4128, 5138 - Add Parser and Serializer implemented in C++

compiled/subscription/Subscription.h

 /*
  * 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 37 matching lines @@
         }\
       }
 
 #define SUBSCRIPTION_PROPERTY(type, name, topic, getter, setter) \
     static_assert(std::is_arithmetic<type>::value, "SUBSCRIPTION_PROPERTY macro can only be used with arithmetic types");\
     SUBSCRIPTION_PROPERTY_INTERNAL(type, type, name, topic, getter, setter)
 
 #define SUBSCRIPTION_STRING_PROPERTY(name, topic, getter, setter) \
     SUBSCRIPTION_PROPERTY_INTERNAL(OwnedString, const String&, name, topic, getter, setter)
 
+class Subscription;
+typedef intrusive_ptr<Subscription> SubscriptionPtr;
+
 class Subscription : public ref_counted
 {
 public:
   typedef std::vector<FilterPtr> Filters;
 
 protected:
   OwnedString mID;
   Filters mFilters;
 
 public:
   enum Type
   {
     UNKNOWN = 0,
     DOWNLOADABLE = 1,
     USERDEFINED = 2
   };
 
-  explicit Subscription(Type type, const String& id);
+  typedef std::pair<OwnedString, OwnedString> KeyValue;
+  typedef std::vector<KeyValue> KeyValues;
+
+  static Subscription* BINDINGS_EXPORTED FromID(const String& id)
+  {
+    return FromProperties(id, KeyValues()).release();
+  }
+  static SubscriptionPtr FromProperties(const KeyValues& properties);
+
   ~Subscription();
 
   Type mType;
 
   const BINDINGS_EXPORTED String& GetID() const
   {
     return mID;
   }
 
   SUBSCRIPTION_STRING_PROPERTY(mTitle, SUBSCRIPTION_TITLE, GetTitle, SetTitle);
   SUBSCRIPTION_PROPERTY(bool, mDisabled, SUBSCRIPTION_DISABLED,
         GetDisabled, SetDisabled);
   SUBSCRIPTION_PROPERTY(bool, mListed, NONE, GetListed, SetListed);
 
   Filters::size_type BINDINGS_EXPORTED GetFilterCount() const
   {
     return mFilters.size();
   }
 
   Filter* BINDINGS_EXPORTED FilterAt(Filters::size_type index);
   int BINDINGS_EXPORTED IndexOfFilter(const Filter& filter);
-  OwnedString BINDINGS_EXPORTED Serialize() const;
-  OwnedString BINDINGS_EXPORTED SerializeFilters() const;
-
-  static Subscription* BINDINGS_EXPORTED FromID(const String& id);
+  void AddFilter(Filter& filter);
+  const Filters& GetFilters() const
+  {
+    return mFilters;
+  }
+  // behaves similar to virtual function
+  OwnedString SerializeProperties() const;
 
   template<typename T>
   T* As();
-};
 
-typedef intrusive_ptr<Subscription> SubscriptionPtr;
+  template<typename T>
+  const T* As() const
+  {
+    return const_cast<Subscription*>(this)->As<T>();
+  }
+protected:
+  OwnedString DoSerializeProperties() const;

[Wladimir Palant, 2017/12/21 10:30:38]

Why is this method called DoSerializeProperties() here but SerializeProperties()
in DownloadableSubscription?

+  explicit Subscription(Type type, const String& id, const KeyValues& properties);
+  static const String* findPropertyValue(const Subscription::KeyValues& properties, const String& propertyName);
+  template<typename Member>
+  static void parseProperty(const KeyValues& properties, Member& member, const String& key)
+  {
+    if (auto strPropValue = findPropertyValue(properties, key))
+      member = AdaptValue<Member>(*strPropValue);
+  }
+private:
+  static SubscriptionPtr FromProperties(const String& id, const KeyValues& properties);
+};