diff options
Diffstat (limited to 'server/lib/upload.js')
| -rw-r--r-- | server/lib/upload.js | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/server/lib/upload.js b/server/lib/upload.js index 5c130a2..4346a99 100644 --- a/server/lib/upload.js +++ b/server/lib/upload.js @@ -16,18 +16,18 @@ var acceptableuploadTypes = { 'image/png': 'png' } -module.exports.put = function (key, image, opt) { - var imageSize, imageType, filename +module.exports.put = function (key, file, opt) { + var fileSize, fileType, filename var err var now = new Date() var ts = moment().format('YYYYMMDD') - var extension = acceptableuploadTypes[image.type] + var extension = acceptableuploadTypes[file.mimetype] filename = (+now) + "-" - + image.name.replace(/\..*$/,"") + + file.originalname.replace(/\..*$/,"") .replace(/[^0-9a-zA-Z]+/g,"-") - .substr(-64) + .substr(-128) + "." + extension; var remote_path = "/images/" + key + "/" + ts + "/" + filename @@ -35,10 +35,10 @@ module.exports.put = function (key, image, opt) { if (! extension) { err = "unacceptable filetype" } - else if (image.size < 10) { + else if (file.size < 10) { err = "file too small" } - else if (image.size > 2097152) { // 2mb limit + else if (file.size > 2097152) { // 2mb limit err = "file too large" } @@ -51,9 +51,9 @@ module.exports.put = function (key, image, opt) { opt.acceptable && opt.acceptable(err) console.log("upload > ", remote_path) - s3.putFile(image.path, remote_path, { - 'Content-Length': image.size, - 'Content-Type': image.type, + s3.putFile(file.path, remote_path, { + 'Content-Length': file.size, + 'Content-Type': file.mimetype, 'x-amz-acl': 'public-read' }, function(err, s3res) { if (err || s3res.statusCode !== 200) { @@ -62,9 +62,9 @@ module.exports.put = function (key, image, opt) { return; } - var image_url = s3res.url || s3res.req.url + var file_url = s3res.url || s3res.req.url - opt.success && opt.success(image_url) + opt.success && opt.success(file_url) }).on('error', function(err, s3res){ console.error(err) s3res && s3res.resume && s3res.resume() |