diff options
Diffstat (limited to 'app/server/site.js')
| -rw-r--r-- | app/server/site.js | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/app/server/site.js b/app/server/site.js index f2c6b93..8e856fc 100644 --- a/app/server/site.js +++ b/app/server/site.js @@ -28,15 +28,15 @@ const api_tasks = api(app, 'task') upload.init() // app.use('/upload', require('./upload')) -app.post('/folders/:id/upload/', +app.post('/folder/:id/upload/', multer.array('file'), function (req, res, next){ if (! req.files || ! req.files.length) { res.json({ error: "no files" }) return } - var thread_id = res.thread.get('id') - var dirname = process.env.S3_PATH + '/data/' + thread_id + '/' + var folder_id = req.params.id + var dirname = process.env.S3_PATH + '/data/' + folder_id + '/' var promises = req.files.map((file) => { return new Promise( (resolve, reject) => { upload.put({ @@ -46,28 +46,22 @@ app.post('/folders/:id/upload/', unacceptable: function(err){ reject(err) }, - success: function(url){ + success: function(url, filename){ console.log("file >", url) var data = { folder_id: req.params.id, - name: fn, + name: filename.replace(/-/g,'_').replace(/\s/g,'_').replace(/_+/g,'_'), + url, size: file.size, + activity: req.body.activity || 'url', + module: req.body.module, + epoch: 0, generated: false, processed: false, - - thread: res.thread.get('id'), - username: req.user.get('username'), - filename: file.originalname, - date: util.now(), - size: file.size, - privacy: false, - storage: process.env.S3_BUCKET, + // username: req.user.get('username'), } - const fn = file.originalname - api_files.create({ - // table.string('username') - }).then( (file) => { + api_files.create(data).then( (file) => { resolve(file) }).catch( (err) => { console.warn(err) |