aboutsummaryrefslogtreecommitdiff
path: root/controllers/uploadController.js
diff options
context:
space:
mode:
authorPitu <[email protected]>2017-01-21 03:57:25 -0300
committerPitu <[email protected]>2017-01-21 03:57:25 -0300
commit6f06bc930b6e48a7cd259e4df430557d9ced9c5a (patch)
treeb090946ba4021bdc5d602acb0d503f2f627192f9 /controllers/uploadController.js
parentIgnore file if it exists already, return its url (diff)
downloadhost.fuwn.me-6f06bc930b6e48a7cd259e4df430557d9ced9c5a.tar.xz
host.fuwn.me-6f06bc930b6e48a7cd259e4df430557d9ced9c5a.zip
Made deleting files a promise-thingy
Diffstat (limited to 'controllers/uploadController.js')
-rw-r--r--controllers/uploadController.js18
1 files changed, 6 insertions, 12 deletions
diff --git a/controllers/uploadController.js b/controllers/uploadController.js
index 70676bd..010498f 100644
--- a/controllers/uploadController.js
+++ b/controllers/uploadController.js
@@ -146,18 +146,12 @@ uploadsController.delete = function(req, res){
db.table('files').where('id', id).then((file) => {
- fs.stat('./' + config.uploads.folder + '/' + file[0].name, function (err, stats) {
-
- if (err) { return res.json({ success: false, description: err.toString() }) }
-
- fs.unlink('./' + config.uploads.folder + '/' + file[0].name, function(err){
- if (err) { return res.json({ success: false, description: err.toString() }) }
-
- db.table('files').where('id', id).del().then(() =>{
- return res.json({ success: true })
- }).catch(function(error) { console.log(error); res.json({success: false, description: 'error'}) })
-
- })
+ uploadsController.deleteFile(file[0].name).then(() => {
+ db.table('files').where('id', id).del().then(() =>{
+ return res.json({ success: true })
+ }).catch(function(error) { console.log(error); res.json({success: false, description: 'error'}) })
+ }).catch((e) => {
+ return res.json({ success: false, description: e.toString() })
})
}).catch(function(error) { console.log(error); res.json({success: false, description: 'error'}) })