From 55c1e265e8b274ee73c6e1b9e9a59cb44db7fe84 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 5 Jun 2018 04:12:42 +0200 Subject: fetch task worksssssss --- app/server/site.js | 4 ++-- app/server/util/upload.js | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'app/server') diff --git a/app/server/site.js b/app/server/site.js index 30c19f3..dda39da 100644 --- a/app/server/site.js +++ b/app/server/site.js @@ -51,10 +51,10 @@ app.post('/api/folder/:id/upload/', reject(err) }, success: function(url, filename){ - console.log("file >", url) + console.log("file >", filename, url) var data = { folder_id: req.params.id, - name: filename.replace(/-/g,'_').replace(/\s/g,'_').replace(/_+/g,'_'), + name: filename, url, size: file.size, datatype: file.mimetype.split('/')[0], diff --git a/app/server/util/upload.js b/app/server/util/upload.js index 6871be6..205a90b 100644 --- a/app/server/util/upload.js +++ b/app/server/util/upload.js @@ -44,8 +44,7 @@ module.exports.put = function (opt) { filename = uuid() + "." + extension; } - filename = filename.replace(/[- ]/, '_').replace(/_+/, '_') - + filename = filename.replace(/-/g,'_').replace(/\s/g,'_').replace(/_+/g,'_') var remote_path = opt.dirname + filename if (types && ! extension) { -- cgit v1.2.3-70-g09d2