diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-07-17 12:18:45 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-07-17 12:18:45 -0400 |
| commit | 4ee827ad464dfa0edb664d27e5069811877deb1e (patch) | |
| tree | 69c6ecb890a6af7f6c247c74f81bc36db591e970 /server/lib/upload.js | |
| parent | b97f3d39ac0e387385aae2685dbe830ee53a686c (diff) | |
| parent | f20841988ccd27780d3801e4a6c32bf9afcc9368 (diff) | |
merge
Diffstat (limited to 'server/lib/upload.js')
| -rw-r--r-- | server/lib/upload.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/server/lib/upload.js b/server/lib/upload.js index a5d7871..e206f7c 100644 --- a/server/lib/upload.js +++ b/server/lib/upload.js @@ -24,7 +24,9 @@ module.exports.put = function (key, file, opt) { var ts = moment().format('YYYYMMDD') var extension = acceptableuploadTypes[file.mimetype] - filename = (+now) + "-" + filename = (+now) + + (opt.username ? "-" + opt.username : "") + + "-" + file.originalname.replace(/\..*$/,"") .replace(/[^0-9a-zA-Z]+/g,"-") .substr(-128) @@ -58,7 +60,9 @@ module.exports.put = function (key, file, opt) { }, function(err, s3res) { if (err || s3res.statusCode !== 200) { console.error(err); - s3res.resume() + if (s3res && s3res.resume) { + s3res.resume() + } return; } |