reduce sync operations

Author: peecky

lib/uploadhandler.js

@@ -4,7 +4,8 @@ var EventEmitter = require('events').EventEmitter,
     formidable = require('formidable'),
     imageMagick = require('imagemagick'),
     mkdirp = require('mkdirp'),
-    _ = require('lodash');
+    _ = require('lodash'),
+	async = require('async');
 
 module.exports = function (options) {
 
@@ -34,19 +35,25 @@ module.exports = function (options) {
         this.noCache();
         var files = [];
         fs.readdir(options.uploadDir(), _.bind(function (err, list) {
-            _.each(list, function (name) {
-                var stats = fs.statSync(options.uploadDir() + '/' + name),
-                    fileInfo;
-                if (stats.isFile()) {
-                    fileInfo = new FileInfo({
-                        name: name,
-                        size: stats.size
-                    });
-                    this.initUrls(fileInfo);
-                    files.push(fileInfo);
-                }
-            }, this);
-            this.callback({files: files});
+			async.each(list, function(name, cb) {
+				fs.stat(options.uploadDir() + '/' + name, function(err, stats) {
+					if (!err) {
+						if (stats.isFile()) {
+							fileInfo = new FileInfo({
+		                        name: name,
+		                        size: stats.size
+							});
+							this.initUrls(fileInfo);
+							files.push(fileInfo);
+						}
+					}
+					cb(err);
+				});
+			},
+			function(err) {
+				if (err) console.log(err);
+				this.callback({files: files});
+			});
         }, this));
     };
 
@@ -87,7 +94,8 @@ module.exports = function (options) {
             })
             .on('file', function (name, file) {
                 var fileInfo = map[path.basename(file.path)];
-                if (fs.existsSync(file.path)) {
+				fs.exists(file.path, function(exists) {
+                if (exists) {
                     fileInfo.size = file.size;
                     if (!fileInfo.validate()) {
                         fs.unlink(file.path);
@@ -98,9 +106,7 @@ module.exports = function (options) {
                         if (options.imageTypes.test(fileInfo.name)) {
                             _.each(options.imageVersions, function (value, version) {
                                 // creating directory recursive
-                                if (!fs.existsSync(options.uploadDir() + '/' + version + '/'))
-                                    mkdirp.sync(options.uploadDir() + '/' + version + '/');
-
+								mkdirp(options.uploadDir() + '/' + version + '/', function (err, made) {
                                 counter++;
                                 var opts = options.imageVersions[version];
                                 imageMagick.resize({
@@ -110,13 +116,12 @@ module.exports = function (options) {
                                     dstPath: options.uploadDir() + '/' + version + '/' + fileInfo.name,
                                     customArgs: opts.imageArgs || ['-auto-orient']
                                 }, finish);
+								}
                             });
                         }
                     }
 
-                    if (!fs.existsSync(options.uploadDir() + '/'))
-                        mkdirp.sync(options.uploadDir() + '/');
-
+					mkdirp(options.uploadDir() + '/', function(err, made) {
                     counter++;
                     fs.rename(file.path, options.uploadDir() + '/' + fileInfo.name, function (err) {
                         if (!err) {
@@ -127,15 +132,17 @@ module.exports = function (options) {
                             var os = fs.createWriteStream(options.uploadDir() + '/' + fileInfo.name);
                             is.on('end', function (err) {
                                 if (!err) {
-                                    fs.unlinkSync(file.path);
+                                    fs.unlink(file.path);
                                     generatePreviews();
                                 }
                                 finish();
                             });
                             is.pipe(os);
                         }
                     });
+					});
                 }
+				}
             })
             .on('aborted', function () {
                 _.each(tmpFiles, function (file) {