diff options
Diffstat (limited to 'app/server')
| -rw-r--r-- | app/server/db/model.js | 3 | ||||
| -rw-r--r-- | app/server/util/upload.js | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/server/db/model.js b/app/server/db/model.js index e43909a..c5faf03 100644 --- a/app/server/db/model.js +++ b/app/server/db/model.js @@ -132,15 +132,12 @@ module.exports = function modelScope(type, db_model, _props) { destroy: (id) => { return new Promise( (resolve, reject) => { - console.log('destroy', type, id) crud.show(id).then( data => { if (! data) { console.error('no record found', id) return reject('no record found') } - console.log(type) if (type === 'file') { - console.log('destroying file', data) upload.destroyFile(data) } crud.destroy(id).then( (destroyData) => { diff --git a/app/server/util/upload.js b/app/server/util/upload.js index 1511830..4697bcb 100644 --- a/app/server/util/upload.js +++ b/app/server/util/upload.js @@ -129,9 +129,10 @@ module.exports.put = function (opt) { } module.exports.destroyFile = function(file){ - if (file.url.indexOf(process.env.S3_PATH) === -1) return - console.log('delete', file.url) - s3.deleteFile(file.url, function(err, res){ + const file_url = file.get('url') + if (file_url.indexOf(process.env.S3_PATH) === -1) return + console.log('delete', file_url) + s3.deleteFile(file_url, function(err, res){ console.log('file deleted!') // check `err`, then do `res.pipe(..)` or `res.resume()` or whatever. }) |