add file width and height to fileInfo by @jake09

Author: scarlet9

lib/uploadhandler.js

@@ -108,55 +108,70 @@ module.exports = function (options) {
             .on('file', function (name, file) {
                 counter++;
                 var fileInfo = map[path.basename(file.path)];
-                fs.exists(file.path, function(exists) {
-                    if (exists) {
-                        fileInfo.size = file.size;
-                        if (!fileInfo.validate()) {
-                            fs.unlink(file.path);
-                            finish();
-                            return;
-                        }
 
-                        var generatePreviews = function () {
-                            if (options.imageTypes.test(fileInfo.name)) {
-                                _.each(options.imageVersions, function (value, version) {
-                                    counter++;
-                                    // creating directory recursive
-                                    mkdirp(options.uploadDir() + '/' + version + '/', function (err, made) {
-                                        var opts = options.imageVersions[version];
-                                        imageMagick.resize({
-                                            width: opts.width,
-                                            height: opts.height,
-                                            srcPath: options.uploadDir() + '/' + fileInfo.name,
-                                            dstPath: options.uploadDir() + '/' + version + '/' + fileInfo.name,
-                                            customArgs: opts.imageArgs || ['-auto-orient']
-                                        }, finish);
-                                    });
-                                });
+                (function (_next) {
+                    if (options.imageTypes.test(fileInfo.name)) {
+                        imageMagick.identify(file.path, function (err, features) {
+                            if (!err) {
+                                fileInfo.width = features.width;
+                                fileInfo.height = features.height;
+                            }
+                            _next();
+                        });
+                    } else {
+                        _next();
+                    }
+                })(function () {
+                    fs.exists(file.path, function(exists) {
+                        if (exists) {
+                            fileInfo.size = file.size;
+                            if (!fileInfo.validate()) {
+                                fs.unlink(file.path);
+                                finish();
+                                return;
                             }
-                        }
 
-                        mkdirp(options.uploadDir() + '/', function(err, made) {
-                            fs.rename(file.path, options.uploadDir() + '/' + fileInfo.name, function (err) {
-                                if (!err) {
-                                    generatePreviews();
-                                    finish();
-                                } else {
-                                    var is = fs.createReadStream(file.path);
-                                    var os = fs.createWriteStream(options.uploadDir() + '/' + fileInfo.name);
-                                    is.on('end', function (err) {
-                                        if (!err) {
-                                            fs.unlink(file.path);
-                                            generatePreviews();
-                                        }
-                                        finish();
+                            var generatePreviews = function () {
+                                if (options.imageTypes.test(fileInfo.name)) {
+                                    _.each(options.imageVersions, function (value, version) {
+                                        counter++;
+                                        // creating directory recursive
+                                        mkdirp(options.uploadDir() + '/' + version + '/', function (err, made) {
+                                            var opts = options.imageVersions[version];
+                                            imageMagick.resize({
+                                                width: opts.width,
+                                                height: opts.height,
+                                                srcPath: options.uploadDir() + '/' + fileInfo.name,
+                                                dstPath: options.uploadDir() + '/' + version + '/' + fileInfo.name,
+                                                customArgs: opts.imageArgs || ['-auto-orient']
+                                            }, finish);
+                                        });
                                     });
-                                    is.pipe(os);
                                 }
+                            }
+
+                            mkdirp(options.uploadDir() + '/', function(err, made) {
+                                fs.rename(file.path, options.uploadDir() + '/' + fileInfo.name, function (err) {
+                                    if (!err) {
+                                        generatePreviews();
+                                        finish();
+                                    } else {
+                                        var is = fs.createReadStream(file.path);
+                                        var os = fs.createWriteStream(options.uploadDir() + '/' + fileInfo.name);
+                                        is.on('end', function (err) {
+                                            if (!err) {
+                                                fs.unlink(file.path);
+                                                generatePreviews();
+                                            }
+                                            finish();
+                                        });
+                                        is.pipe(os);
+                                    }
+                                });
                             });
-                        });
-                    }
-                    else finish();
+                        }
+                        else finish();
+                    });
                 });
             })
             .on('aborted', function () {