From 6f06bc930b6e48a7cd259e4df430557d9ced9c5a Mon Sep 17 00:00:00 2001 From: Pitu Date: Sat, 21 Jan 2017 03:57:25 -0300 Subject: [PATCH] Made deleting files a promise-thingy --- controllers/uploadController.js | 18 ++++++------------ 1 file 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'}) })