dylan.derr/Send
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing small issues

Browse source
This commit is contained in:
Abhinav Adduri 2017-07-10 12:45:20 -07:00
parent c4b7a2bd97
commit 6aa79472bf
6 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/portal_server.js
View file

@ -147,7 +147,7 @@ app.post('/upload', (req, res, next) => {
req.busboy.on('file', (fieldname, file, filename) => {
log.info('Uploading:', newId);
storage.set(meta.iv, newId, file, filename, meta).then(() => {
storage.set(newId, file, filename, meta).then(() => {
const protocol = conf.env === 'production' ? 'https' : req.protocol;
const url = `${protocol}://${req.get('host')}/download/${newId}/`;
res.json({

10
server/storage.js
View file

@ -115,14 +115,13 @@ function localGet(id) {
return fs.createReadStream(path.join(__dirname, '../static', id));
}
function localSet(id, newId, file, filename, meta) {
function localSet(newId, file, filename, meta) {
return new Promise((resolve, reject) => {
const fstream = fs.createWriteStream(path.join(__dirname, '../static', newId));
file.pipe(fstream);
fstream.on('close', () => {
meta.id = id;
redis_client.hmset(newId, meta);
redis_client.expire(id, 86400000);
redis_client.expire(newId, 86400000);
log.info('localSet:', 'Upload Finished of ' + newId);
resolve(meta.delete);
});
@ -192,7 +191,7 @@ function awsGet(id) {
}
}
function awsSet(id, newId, file, filename, meta) {
function awsSet(newId, file, filename, meta) {
const params = {
Bucket: conf.s3_bucket,
Key: newId,
@ -205,10 +204,9 @@ function awsSet(id, newId, file, filename, meta) {
log.info('awsUploadError:', err.stack); // an error occurred
reject();
} else {
meta.id = id;
redis_client.hmset(newId, meta);
redis_client.expire(id, 86400000);
redis_client.expire(newId, 86400000);
log.info('awsUploadFinish', 'Upload Finished of ' + filename);
resolve(meta.delete);
}