From 6b566060739fa8011e236fdb18ed94bfc71de800 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Thu, 6 Feb 2014 04:23:09 -0500 Subject: [PATCH] refactor(rest) onDelete --- lib/server/rest.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/server/rest.js b/lib/server/rest.js index 82d67eb8..83b0ec07 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -225,7 +225,7 @@ fs.rmdir(p.name, function(error) { Util.exec(callback, error, p.name); }); - else if (query === 'files') { + else if (query === 'files') getBody(p.request, function(body) { var i, name, files = Util.parseJSON(body), @@ -237,16 +237,18 @@ function onStat(name, error, stat) { ++assync; - Util.exec(callback, error, null, function() { + if (error) + Util.exec(callback, error); + else { if (stat.isDirectory()) fs.rmdir(name, log); else if (stat.isFile()) fs.unlink(name, log); - }); - - if (assync === n && !error) - Util.exec(callback, null, body); + + if (assync === n) + Util.exec(callback, null, body); + } } for (i = 0; i < n; i ++) { @@ -257,7 +259,7 @@ fs.stat(name, onStat.bind(null, name)); } }); - } else + else fs.unlink(p.name, function(error) { Util.exec(callback, error, p.name); });