Issue 537 - Mark first few downloads

lib/subscriptionClasses.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 178 matching lines @@
   let result;
   try
   {
     obj.url = Services.io.newURI(obj.url, null, null).spec;
 
     // URL is valid - this is a downloadable subscription
     result = new DownloadableSubscription(obj.url, obj.title);
     if ("downloadStatus" in obj)
       result._downloadStatus = obj.downloadStatus;
     if ("lastSuccess" in obj)
-      result.lastSuccess = parseInt(obj.lastSuccess) || 0;
+      result.lastSuccess = parseInt(obj.lastSuccess, 10) || 0;
     if ("lastCheck" in obj)
-      result._lastCheck = parseInt(obj.lastCheck) || 0;
+      result._lastCheck = parseInt(obj.lastCheck, 10) || 0;
     if ("expires" in obj)
-      result.expires = parseInt(obj.expires) || 0;
+      result.expires = parseInt(obj.expires, 10) || 0;
     if ("softExpiration" in obj)
-      result.softExpiration = parseInt(obj.softExpiration) || 0;
+      result.softExpiration = parseInt(obj.softExpiration, 10) || 0;
     if ("errors" in obj)
-      result._errors = parseInt(obj.errors) || 0;
+      result._errors = parseInt(obj.errors, 10) || 0;
     if ("version" in obj)
-      result.version = parseInt(obj.version) || 0;
+      result.version = parseInt(obj.version, 10) || 0;
     if ("requiredVersion" in obj)
     {
       let {addonVersion} = require("info");
       result.requiredVersion = obj.requiredVersion;
       if (Services.vc.compare(result.requiredVersion, addonVersion) > 0)
         result.upgradeRequired = true;
     }
     if ("homepage" in obj)
       result._homepage = obj.homepage;
     if ("lastDownload" in obj)
-      result._lastDownload = parseInt(obj.lastDownload) || 0;
+      result._lastDownload = parseInt(obj.lastDownload, 10) || 0;
     if ("downloadCount" in obj)
-      result.downloadCount = obj.downloadCount;

[Wladimir Palant, 2014/11/10 19:18:15]

Should be a number with the comments above addressed.

[Thomas Greiner, 2014/11/11 17:17:18]

Done.

+      result.downloadCount = parseInt(obj.downloadCount, 10) || 0;
   }
   catch (e)
   {
     // Invalid URL - custom filter group
     if (!("title" in obj))
     {
       // Backwards compatibility - titles and filter types were originally
       // determined by group identifier.
       if (obj.url == "~wl~")
         obj.defaults = "whitelist";
@@ skipping 327 matching lines @@
   /**
    * Should be true if requiredVersion is higher than current Adblock Plus version
    * @type Boolean
    */
   upgradeRequired: false,
   
   /**
    * Number indicating how often the object was downloaded.
    * @type Number
    */
-  downloadCount: 1,

[Wladimir Palant, 2014/11/10 19:18:15]

Again, I think that the default should be 0.

[Thomas Greiner, 2014/11/11 17:17:18]

Done.

+  downloadCount: 0,
 
   /**
    * See Subscription.serialize()
    */
   serialize: function(buffer)
   {
     RegularSubscription.prototype.serialize.call(this, buffer);
     if (this.downloadStatus)
       buffer.push("downloadStatus=" + this.downloadStatus);
     if (this.lastSuccess)
       buffer.push("lastSuccess=" + this.lastSuccess);
     if (this.lastCheck)
       buffer.push("lastCheck=" + this.lastCheck);
     if (this.expires)
       buffer.push("expires=" + this.expires);
     if (this.softExpiration)
       buffer.push("softExpiration=" + this.softExpiration);
     if (this.errors)
       buffer.push("errors=" + this.errors);
     if (this.version)
       buffer.push("version=" + this.version);
     if (this.requiredVersion)
       buffer.push("requiredVersion=" + this.requiredVersion);
     if (this.downloadCount)
       buffer.push("downloadCount=" + this.downloadCount);
   }
 };