Fix json, skip dotfiles, no spaces in filenames

Author: fabien

lib/filehandler.js

@@ -7,17 +7,16 @@ module.exports = function (middleware, options) {
         });
         var UploadHandler = require('./uploadhandler')(options);
         var handler = new UploadHandler(req, res, function (result, redirect) {
+            files = {files: result};
             if (redirect) {
-                files = {files: result};
                 res.redirect(redirect.replace(/%s/, encodeURIComponent(JSON.stringify(files))));
             } else {
                 res.set({
                     'Content-Type': (req.headers.accept || '').indexOf('application/json') !== -1
                         ? 'application/json'
                         : 'text/plain'
                 });
-                files = {files: result};
-                res.json(200, { files: files });
+                res.json(200, files);
             }
         });
 

lib/fileinfo.js

@@ -27,8 +27,8 @@ module.exports = function (options) {
         this.name = require('path').basename(this.name).replace(/^\.+/, '');
         // Prevent overwriting existing files:
         while (fs.existsSync(options.baseDir() + '/' + this.name)) {
-            this.name = this.name.replace(/(?:(?: \(([\d]+)\))?(\.[^.]+))?$/, function (s, index, ext) {
-                return ' (' + ((parseInt(index, 10) || 0) + 1) + ')' + (ext || '');
+            this.name = this.name.replace(/(?:(?:\-([\d]+))?(\.[^.]+))?$/, function (s, index, ext) {
+                return '-' + ((parseInt(index, 10) || 0) + 1) + (ext || '');
             });
         }
     };

lib/filemanager.js

@@ -37,19 +37,21 @@ module.exports = function (middleware, options) {
 
         fs.readdir(options.uploadDir(), _.bind(function (err, list) {
             _.each(list, function (name) {
-                var stats = fs.statSync(options.uploadDir() + '/' + name);
-                if (stats.isFile()) {
-                    files[name] = {
-                        path: options.uploadDir() + '/' + name
-                    };
-                    _.each(options.imageVersions, function (value, version) {
-                        counter++;
-                        fs.exists(options.uploadDir() + '/' + version + '/' + name, function (exists) {
-                            if (exists)
-                                files[name][version] = options.uploadDir() + '/' + version + '/' + name;
-                            finish();
+                if (name.indexOf('.') != 0) {
+                    var stats = fs.statSync(options.uploadDir() + '/' + name);
+                    if (stats.isFile()) {
+                        files[name] = {
+                            path: options.uploadDir() + '/' + name
+                        };
+                        _.each(options.imageVersions, function (value, version) {
+                            counter++;
+                            fs.exists(options.uploadDir() + '/' + version + '/' + name, function (exists) {
+                                if (exists)
+                                    files[name][version] = options.uploadDir() + '/' + version + '/' + name;
+                                finish();
+                            });
                         });
-                    });
+                    }
                 }
             }, this);
             finish();

lib/uploadhandler.js

@@ -35,23 +35,25 @@ module.exports = function (options) {
         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);
+                if (name.indexOf('.') != 0) {
+                    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);
         }, this));
     };
 
     UploadHandler.prototype.post = function () {
-
+        
         var self = this,
             form = new formidable.IncomingForm(),
             tmpFiles = [],
@@ -159,7 +161,7 @@ module.exports = function (options) {
     UploadHandler.prototype.destroy = function () {
         var self = this,
             fileName = path.basename(decodeURIComponent(this.req.url));
-
+            
         fs.unlink(options.uploadDir() + '/' + fileName, function (ex) {
             _.each(options.imageVersions, function (value, version) {
                 fs.unlink(options.uploadDir() + '/' + version + '/' + fileName);