- this will fix adobe/brackets#8402, adobe/brackets#8232, adobe/brack…

…ets#8231
adobe · Aug 8, 2014 · e2699ea · e2699ea
1 parent 4d13856
commit e2699ea
Show file tree

Hide file tree

Showing 3 changed files with 132 additions and 82 deletions.
diff --git a/downloadStats/logfileProcessor.js b/downloadStats/logfileProcessor.js
@@ -228,20 +228,11 @@ LogfileProcessor.prototype = {
                             var nextMarker = data.Contents[data.Contents.length - 1].Key;
                             _listObjects(bucketName, nextMarker, maxKeys);
                         } else {
-                            var key,
-                                i = data.Contents.length - 1;
-
-                            // Skip any files in subfolders
-                            while (i >= 0) {
-                                var lastLogfileObject = data.Contents[i];
-                                // Key without "/" is a file in this bucket and not in any subdirectory
-                                if (lastLogfileObject.Key.indexOf("/") === -1) {
-                                    key = lastLogfileObject.Key;
-                                    break;
-                                }
-
-                                i = i - 1;
-                            }
+                            // this will get the Key off the last data item
+                            // the log files for the registry are stored in a "subfolder"
+                            // logs. Any file that appears in this bucket will be considered,
+                            // even if it's located in a subfolder of logs
+                            var key = data.Contents[data.Contents.length - 1].Key;
 
                             Promise.settle(allPromises).then(function () {
                                 listObjectPromise.resolve(key);

diff --git a/lib/repository.js b/lib/repository.js
@@ -117,14 +117,19 @@ function updateRecentDownloadsForPackage(name, newRecentDownloadDatapoints) {
 
         _currentRecentDownloadDatapoints = registry[name].recent;
 
-        _(newRecentDownloadDatapoints).keys().forEach(function (dataPoint) {
-            updatedRecentDownloads[dataPoint] = (newRecentDownloadDatapoints[dataPoint]);
+        _(newRecentDownloadDatapoints).forEach(function (value, index) {
+            updatedRecentDownloads[index] = updatedRecentDownloads[index] || 0;
+
+            updatedRecentDownloads[index] += value;
         });
 
-        _(_currentRecentDownloadDatapoints).keys().forEach(function (dataPoint) {
-            updatedRecentDownloads[dataPoint] = (_currentRecentDownloadDatapoints[dataPoint]);
+        _(_currentRecentDownloadDatapoints).forEach(function (value, index) {
+            updatedRecentDownloads[index] = updatedRecentDownloads[index] || 0;
+
+            updatedRecentDownloads[index] += value;
         });
 
+        // Cut off all except for the recent 7 datapoints
         if (_currentRecentDownloadDatapoints.length !== _.size(updatedRecentDownloads)) {
             var result = {};
 
@@ -145,13 +150,13 @@ function updateRecentDownloadsForPackage(name, newRecentDownloadDatapoints) {
 
 /**
  * Add the download data to an existing registry entry.
- * 
+ *
  * @param {!String} name - extension name
  * @param {!Object} newVersionDownloads - JSON object that contains download data for certain versions
  * @param {!Object} recentDownloads - JSON object that contains accumulated daily download data for certain versions
- * 
+ *
  * Examples:
- * 
+ *
  * Extension version is the key, the value is the accumulated downloads for this specific version
  * newVersionDownloads: "snippets-extension": {
  *                          "downloads": {
@@ -163,7 +168,7 @@ function updateRecentDownloadsForPackage(name, newRecentDownloadDatapoints) {
  *                             }
  *                          }
  *                       }
- * 
+ *
  * The date is the key and the value denotes the accumulated download on this day for the most recent version
  * of the extension.
  * recentDownloads: "snippets-extension": {
@@ -210,7 +215,7 @@ function addDownloadDataToPackage(name, newVersionDownloads, recentDownloads) {
                 updated = true;
             }
         });
-        
+
         var recentDownloadsUpdated = updateRecentDownloadsForPackage(name, recentDownloads);
 
         // save changes to registry if there were any updates