Logic refactoring

googleapis · Dec 9, 2014 · 9802af2 · 9802af2
1 parent 88e9eab
commit 9802af2
Showing 1 changed file with 17 additions and 18 deletions.
diff --git a/lib/storage/file.js b/lib/storage/file.js
@@ -319,32 +319,31 @@ File.prototype.createReadStream = function(options) {
 
           .on('complete', function(res) {
             var failed = false;
-
-            if (crc32c) {
-              localCrc32cHash = new Buffer([localCrc32cHash]);
-              localCrc32cHash = localCrc32cHash.toString('base64');
-            }
-
-            if (md5) {
-              localMd5Hash = localMd5Hash.digest('base64');
-            }
+            var crcFail = true;
+            var md5Fail = true;
 
             var hashes = {};
             res.headers['x-goog-hash'].split(',').forEach(function(hash) {
               var hashType = hash.split('=')[0];
               hashes[hashType] = hash.substr(hash.indexOf('=') + 1);
             });
 
+            var remoteMd5 = hashes.md5;
+            var remoteCrc = hashes.crc32c && hashes.crc32c.substr(4);
+
+            if (crc32c) {
+              crcFail =
+                new Buffer([localCrc32cHash]).toString('base64') !== remoteCrc;
+              failed = crcFail;
+            }
+
+            if (md5) {
+              md5Fail = localMd5Hash.digest('base64') !== remoteMd5;
+              failed = md5Fail;
+            }
+
             if (validation === 'all') {
-              if (hashes.md5) {
-                failed = localMd5Hash !== hashes.md5;
-              } else if (hashes.crc32) {
-                failed = localCrc32cHash !== hashes.crc32c.substr(4);
-              }
-            } else if (md5) {
-              failed = localMd5Hash !== hashes.md5;
-            } else if (crc32c) {
-              failed = localCrc32cHash !== hashes.crc32c.substr(4);
+              failed = remoteMd5 ? md5Fail || crcFail : crcFail;
             }
 
             if (failed) {