reduce more sync operations

Author: peecky

lib/uploadhandler.js

@@ -43,8 +43,11 @@ module.exports = function (options) {
 		                        name: name,
 		                        size: stats.size
 							});
-							this.initUrls(fileInfo);
-							files.push(fileInfo);
+							this.initUrls(fileInfo, function(err) {
+								files.push(fileInfo);
+								cb(err);
+								return;
+							});
 						}
 					}
 					cb(err);
@@ -67,11 +70,15 @@ module.exports = function (options) {
             redirect,
             finish = _.bind(function () {
                 if (!--counter) {
-                    _.each(files, function (fileInfo) {
-                        this.initUrls(fileInfo);
-                        this.emit('end', fileInfo);
-                    }, this);
-                    this.callback({files: files}, redirect);
+					async.each(files, function(fileInfo, cb) {
+                        this.initUrls(fileInfo, function(err) {
+							this.emit('end', fileInfo);
+							cb(err);
+						});
+					},
+					function(err) {
+						this.callback({files: files}, redirect);
+					});
                 }
             }, this);
 
@@ -175,15 +182,17 @@ module.exports = function (options) {
         });
     };
 
-    UploadHandler.prototype.initUrls = function (fileInfo) {
+    UploadHandler.prototype.initUrls = function (fileInfo, cb) {
         var baseUrl = (options.ssl ? 'https:' : 'http:') + '//' + (options.hostname || this.req.get('Host'));
         fileInfo.setUrl(null, baseUrl + options.uploadUrl());
         fileInfo.setUrl('delete', baseUrl + this.req.originalUrl);
-        _.each(options.imageVersions, function (value, version) {
-            if (fs.existsSync(options.uploadDir() + '/' + version + '/' + fileInfo.name)) {
-                fileInfo.setUrl(version, baseUrl + options.uploadUrl() + '/' + version);
-            }
-        }, this);
+		async.each(Object.keys(options.imageVersions), function(version, cb) {
+			fs.exists(options.uploadDir() + '/' + version + '/' + fileInfo.name, function(exists) {
+				if (exists) fileInfo.setUrl(version, baseUrl + options.uploadUrl() + '/' + version);
+				cb(null);
+			})
+		},
+		cb);
     };
 
     return UploadHandler;