Merge pull request #362 from JemyCheung/crc32

Now user could specify crc32 of the file content for form uploading

Author: bachue

examples/form_upload_simple.js

@@ -12,28 +12,13 @@ var putPolicy = new qiniu.rs.PutPolicy(options);
 
 var uploadToken = putPolicy.uploadToken(mac);
 var config = new qiniu.conf.Config();
-var localFile = '/Users/jemy/Downloads/VIDEO_20191008_093955.mp4.zip';
+var localFile = '/Users/jemy/Downloads/download.csv';
 // config.zone = qiniu.zone.Zone_z0;
 var formUploader = new qiniu.form_up.FormUploader(config);
 var putExtra = new qiniu.form_up.PutExtra();
-
-// bytes
-// formUploader.put(uploadToken, null, "hello", null, function(respErr,
-//   respBody, respInfo) {
-//   if (respErr) {
-//     throw respErr;
-//   }
-//
-//   if (respInfo.statusCode == 200) {
-//     console.log(respBody);
-//   } else {
-//     console.log(respInfo.statusCode);
-//     console.log(respBody);
-//   }
-// });
-
 // file
-putExtra.fname = 'testfile16.mp4';
+putExtra.fname = 'test01.csv';
+putExtra.crc32 = 3497766758;
 formUploader.putFile(uploadToken, null, localFile, putExtra, function (respErr,
     respBody, respInfo) {
     if (respErr) {
@@ -47,22 +32,3 @@ formUploader.putFile(uploadToken, null, localFile, putExtra, function (respErr,
         console.log(respBody);
     }
 });
-
-// test query zone frequently when config.zone==null;
-setTimeout(upload, 1500);
-function upload () {
-    putExtra.fname = 'testfile17.mp4';
-    formUploader.putFile(uploadToken, null, localFile, putExtra, function (respErr,
-        respBody, respInfo) {
-        if (respErr) {
-            throw respErr;
-        }
-
-        if (respInfo.statusCode == 200) {
-            console.log(respBody);
-        } else {
-            console.log(respInfo.statusCode);
-            console.log(respBody);
-        }
-    });
-}

qiniu/storage/form.js

@@ -26,7 +26,7 @@ function PutExtra (fname, params, mimeType, crc32, checkCrc) {
     this.params = params || {};
     this.mimeType = mimeType || null;
     this.crc32 = crc32 || null;
-    this.checkCrc = checkCrc || 1;
+    this.checkCrc = checkCrc || true;
 }
 
 FormUploader.prototype.putStream = function (uploadToken, key, fsStream,
@@ -122,10 +122,16 @@ function createMultipartForm (uploadToken, key, fsStream, putExtra, callbackFunc
         fileBody.push(data);
     });
 
-    fsStream.on('end', function () {
-        fileBody = Buffer.concat(fileBody);
-        var bodyCrc32 = parseInt('0x' + getCrc32(fileBody));
-        postForm.field('crc32', bodyCrc32);
+    fsStream.on('end', function() {
+        if (putExtra.checkCrc) {
+            if (putExtra.crc32 == null) {
+                fileBody = Buffer.concat(fileBody);
+                var bodyCrc32 = parseInt('0x' + getCrc32(fileBody));
+                postForm.field('crc32', bodyCrc32);
+            } else {
+                postForm.field('crc32', putExtra.crc32);
+            }
+        }
     });
     callbackFunc(postForm);
 }