From 4c09783a14c28ceba53f81e968097bd53d2d0586 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 5 Dec 2013 10:33:21 +0100 Subject: [PATCH 1/5] Add callback --- lib/filehandler.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/filehandler.js b/lib/filehandler.js index bab6f89..8ec030b 100644 --- a/lib/filehandler.js +++ b/lib/filehandler.js @@ -10,6 +10,8 @@ module.exports = function (middleware, options) { if (redirect) { files = {files: result}; res.redirect(redirect.replace(/%s/, encodeURIComponent(JSON.stringify(files)))); + }else if(options.callback) { + callback(result); } else { res.set({ 'Content-Type': (req.headers.accept || '').indexOf('application/json') !== -1 From bc9c42a5ecc3d4630fa54fc11187a3f025950a85 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 5 Dec 2013 10:43:26 +0100 Subject: [PATCH 2/5] fix --- lib/filehandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/filehandler.js b/lib/filehandler.js index 8ec030b..dbca4e5 100644 --- a/lib/filehandler.js +++ b/lib/filehandler.js @@ -11,7 +11,7 @@ module.exports = function (middleware, options) { files = {files: result}; res.redirect(redirect.replace(/%s/, encodeURIComponent(JSON.stringify(files)))); }else if(options.callback) { - callback(result); + options.callback(result); } else { res.set({ 'Content-Type': (req.headers.accept || '').indexOf('application/json') !== -1 From 0d6606fff6bb78388a7e37ab0f1ff01ed32e5fbd Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 5 Dec 2013 10:45:20 +0100 Subject: [PATCH 3/5] add req & res --- lib/filehandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/filehandler.js b/lib/filehandler.js index dbca4e5..e1bdb65 100644 --- a/lib/filehandler.js +++ b/lib/filehandler.js @@ -11,7 +11,7 @@ module.exports = function (middleware, options) { files = {files: result}; res.redirect(redirect.replace(/%s/, encodeURIComponent(JSON.stringify(files)))); }else if(options.callback) { - options.callback(result); + options.callback(result, req, res); } else { res.set({ 'Content-Type': (req.headers.accept || '').indexOf('application/json') !== -1 From deda287c3b9ed5311d0fd2f2dddc465bab14dc7b Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 5 Dec 2013 10:48:48 +0100 Subject: [PATCH 4/5] check method --- lib/filehandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/filehandler.js b/lib/filehandler.js index e1bdb65..dfea3c4 100644 --- a/lib/filehandler.js +++ b/lib/filehandler.js @@ -10,7 +10,7 @@ module.exports = function (middleware, options) { if (redirect) { files = {files: result}; res.redirect(redirect.replace(/%s/, encodeURIComponent(JSON.stringify(files)))); - }else if(options.callback) { + }else if(req.method == 'POST' && options.callback) { options.callback(result, req, res); } else { res.set({ From 99b5d3a4ccdd6354993aa16529efa501cbd3b982 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 9 Dec 2013 16:35:12 +0100 Subject: [PATCH 5/5] { to _ --- lib/filemanager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/filemanager.js b/lib/filemanager.js index d384c16..48c6986 100644 --- a/lib/filemanager.js +++ b/lib/filemanager.js @@ -60,7 +60,7 @@ module.exports = function (middleware, options) { fs.exists(dir + '/' + filename, function (exists) { if (exists) { filename = filename.replace(/(?:(?: \(([\d]+)\))?(\.[^.]+))?$/, function (s, index, ext) { - return ' (' + ((parseInt(index, 10) || 0) + 1) + ')' + (ext || ''); + return '_' + ((parseInt(index, 10) || 0) + 1) + (ext || ''); }); safeName(dir, filename, callback) } else {