Issue 5146 - Implement DownloadableSubscription parsing in C++

compiled/subscription/DownloadableSubscription.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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #pragma once
 
 #include <cstdint>
 #include <vector>
 
+#include "../base.h"
 #include "../bindings/runtime.h"
 #include "../filter/Filter.h"
-#include "../Md5.h"
 #include "../StringMap.h"
 #include "Subscription.h"
+
+ABP_NS_BEGIN
 
 class String;
 class DownloadableSubscription_Parser;
 
 class DownloadableSubscription : public Subscription
 {
 public:
   static constexpr Type classType = Type::DOWNLOADABLE;
   explicit DownloadableSubscription(const String& id);
 
@@ skipping 15 matching lines @@
       GetLastSuccess, SetLastSuccess);
   SUBSCRIPTION_PROPERTY(int, mErrorCount, SUBSCRIPTION_ERRORS,
       GetErrorCount, SetErrorCount);
   SUBSCRIPTION_PROPERTY(uint64_t, mDataRevision, NONE,
       GetDataRevision, SetDataRevision);
   SUBSCRIPTION_STRING_PROPERTY(mRequiredVersion, NONE,
       GetRequiredVersion, SetRequiredVersion);
   SUBSCRIPTION_PROPERTY(int, mDownloadCount, NONE,
       GetDownloadCount, SetDownloadCount);
 
-  DownloadableSubscription_Parser* BINDINGS_EXPORTED ParseDownload();
+  static DownloadableSubscription_Parser* BINDINGS_EXPORTED ParseDownload();
   OwnedString BINDINGS_EXPORTED Serialize() const;
 };
 
 typedef intrusive_ptr<DownloadableSubscription> DownloadableSubscriptionPtr;
 
 class DownloadableSubscription_Parser : public ref_counted
 {
-  DownloadableSubscriptionPtr mSubscription;
-  std::vector<DependentString> mFiltersText;
-  StringMap<OwnedString> mParams;
+  std::vector<OwnedString> mFiltersText;
+  OwnedStringMap<OwnedString> mParams;
   bool mFirstLine;
 public:
-  DownloadableSubscription_Parser(DownloadableSubscription& sub);
+  DownloadableSubscription_Parser();
   void BINDINGS_EXPORTED Process(const String& line);
   // return the expiration interval.
-  int BINDINGS_EXPORTED Finalize();
+  int64_t BINDINGS_EXPORTED Finalize(DownloadableSubscription&);
   const String& BINDINGS_EXPORTED GetRedirect() const;
   const String& BINDINGS_EXPORTED GetHomepage() const;
-  const String& BINDINGS_EXPORTED GetVersion() const;
 private:
-  MD5 mChecksum;
-  static int ParseExpires(const String& expires);
+  static int64_t ParseExpires(const String& expires);
 };
 
+ABP_NS_END