deletorrr

1 files changed, 11 insertions, 4 deletions

diff --git a/app/server/util/upload.js b/app/server/util/upload.js
index 4697bcb..7399ef8 100644
--- a/app/server/util/upload.js
+++ b/app/server/util/upload.js
@@ -130,10 +130,17 @@ module.exports.put = function (opt) {
 
 module.exports.destroyFile = function(file){
   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!')
+  const s3_path = process.env.S3_PATH
+  const s3_path_index = file_url.indexOf(s3_path)
+  if (file_url.match(/^https?:\/\/s3.amazonaws.com\//) && s3_path_index === -1) return
+  const file_path = file_url.substr(s3_path_index)
+  console.log('delete', file_path)
+  s3.deleteFile(file_path, function(err, res){
+    if (err) {
+      console.error('error deleting file', err)
+    } else {
+      console.log('file deleted!')
+    }
     // check `err`, then do `res.pipe(..)` or `res.resume()` or whatever.
   })
 }