Uses async

1 files changed, 10 insertions, 11 deletions

diff --git a/controllers/uploadController.js b/controllers/uploadController.js
index ec9e066..51c0cf4 100644
--- a/controllers/uploadController.js
+++ b/controllers/uploadController.js
@@ -17,18 +17,17 @@ const storage = multer.diskStorage({
 	destination: function(req, file, cb) {
 		cb(null, uploadDir);
 	},
-	filename: function(req, file, cb) {
-		for (let i = 0; i < maxTries; i++) {
+  	filename: function(req, file, cb) {
+		const access = i => {
 			const name = randomstring.generate(config.uploads.fileLength) + path.extname(file.originalname);
-			try {
-				fs.accessSync(path.join(uploadDir, name));
-				console.log(`A file named "${name}" already exists (${i + 1}/${maxTries}).`);
-			} catch (err) {
-				// Note: fs.accessSync() will throw an Error if a file with the same name does not exist
-				return cb(null, name);
-			}
-		}
-		return cb('Could not allocate a unique file name. Try again?');
+			fs.access(path.join(uploadDir, name), err => {
+				if (err) return cb(null, name);
+				console.log(`A file named "${name}" already exists (${++i}/${maxTries}).`);
+				if (i < maxTries) return access(i);
+				return cb('Could not allocate a unique file name. Try again?');
+			});
+		};
+		access(0);
 	}
 });