Added the ability to specify target file name in the file manager's move function.

Author: mihail-stanchev

lib/filemanager.js

@@ -88,20 +88,20 @@ module.exports = function (middleware, options) {
         });
     };
 
-    var move = function (source, targetDir, callback) {
+    var move = function (source, target, targetDir, callback) {
         fs.exists(targetDir, function (exists) {
             if (!exists) {
                 mkdirp(targetDir, function (err) {
                     if (err)
                         callback(err);
                     else
-                        move(source, targetDir, callback);
+                        move(source, target, targetDir, callback);
                 });
             } else {
                 fs.stat(source, function (err, stat) {
                     if (!err) {
                         if (stat.isFile()) {
-                            safeName(targetDir, path.basename(source), function (safename) {
+                            safeName(targetDir, path.basename(target), function (safename) {
                                 moveFile(source, targetDir + '/' + safename, function (err) {
                                     callback(err, safename);
                                 });
@@ -117,12 +117,16 @@ module.exports = function (middleware, options) {
         });
     };
 
-    FileManager.prototype.move = function (filename, targetDir, callback) {
+    FileManager.prototype.move = function (moveOptions, callback) {
 
         var targetUrl;
+        var filename = moveOptions.filename;
+        var targetFilename = moveOptions.targetFilename || filename;
+        var targetDir = moveOptions.targetDir || "";
 
         // for safety
         filename = path.basename(filename).replace(/^\.+/, '');
+        targetFilename = path.basename(targetFilename).replace(/^\.+/, '');
 
         if (!targetDir.match(/^\//)) {
             targetUrl = options.targetUrl()  + '/' + targetDir;
@@ -133,7 +137,7 @@ module.exports = function (middleware, options) {
         fs.stat(options.uploadDir() + '/' + filename, function (err, stat) {
             if (!err) {
                 if (stat.isFile()) {
-                    move(options.uploadDir() + '/' + filename, targetDir, function (err, safename) {
+                    move(options.uploadDir() + '/' + filename, targetFilename, targetDir, function (err, safename) {
                         if (err) {
                             callback(err);
                         } else {
@@ -156,7 +160,7 @@ module.exports = function (middleware, options) {
                                 counter++;
                                 fs.exists(options.uploadDir() + '/' + version + '/' + filename, function (exists) {
                                     if (exists) {
-                                        move(options.uploadDir() + '/' + version + '/' + filename, targetDir + '/' + version + '/', function (err, safename) {
+                                        move(options.uploadDir() + '/' + version + '/' + filename, targetFilename, targetDir + '/' + version + '/', function (err, safename) {
                                             if (!err && relative)
                                                 urls[version + '_url'] = targetUrl + '/' + version + '/' + safename;
                                             finish(err);