add shasum when nfs.upload and hfs.uploadBuffer, fixed #148

cnpm · Jan 13, 2014 · d463b09 · d463b09
1 parent 40301f2
commit d463b09
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/controllers/registry/module.js b/controllers/registry/module.js
@@ -349,8 +349,13 @@ exports.upload = function (req, res, next) {
         });
       }
       shasum = shasum.digest('hex');
-      var key = common.getCDNKey(name, filename);
-      nfs.upload(filepath, {key: key, size: length}, function (err, result) {
+
+      var options = {
+        key: common.getCDNKey(name, filename),
+        size: length,
+        shasum: shasum
+      };
+      nfs.upload(filepath, options, function (err, result) {
         // remove tmp file whatever
         fs.unlink(filepath, utility.noop);
         if (err) {
@@ -518,9 +523,12 @@ exports.addPackageAndDist = function (req, res, next) {
     shasum = crypto.createHash('sha1');
     shasum.update(tarballBuffer);
     shasum = shasum.digest('hex');
-    var key = common.getCDNKey(name, filename);
 
-    nfs.uploadBuffer(tarballBuffer, {key: key}, ep.done('upload'));
+    var options = {
+      key: common.getCDNKey(name, filename),
+      shasum: shasum
+    };
+    nfs.uploadBuffer(tarballBuffer, options, ep.done('upload'));
   });
 
   ep.on('upload', function (result) {

diff --git a/proxy/sync_module_worker.js b/proxy/sync_module_worker.js
@@ -422,8 +422,12 @@ SyncModuleWorker.prototype._syncOneVersion = function (versionIndex, sourcePacka
         return ep.emit('error', err);
       }
 
-      var key = common.getCDNKey(sourcePackage.name, filename);
-      nfs.upload(filepath, {key: key, size: dataSize}, ep.done('uploadResult'));
+      var options = {
+        key: common.getCDNKey(sourcePackage.name, filename),
+        size: dataSize,
+        shasum: shasum
+      };
+      nfs.upload(filepath, options, ep.done('uploadResult'));
     });
   }));