catch invalid jsons

tiefenb · Dec 21, 2013 · e3aa9d5 · e3aa9d5
1 parent e06c6ea
commit e3aa9d5
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/app.js b/app.js
@@ -79,7 +79,13 @@ var async = require('async');
 		  if (err) {
 		  	return callback('Item not found!');
 		  } else {
-		  	data = JSON.parse(data);
+
+		  	try {
+		  		data = JSON.parse(data);
+		  	} catch(e) {
+		  		return callback('File invalid!');
+		  	}
+
 		  	callback(false, data);
 		  }
 		});
@@ -153,7 +159,17 @@ var async = require('async');
 						var q = async.queue(function(file, cb) {
 							fs.readFile(db+'/'+file, function(err, data) {
 								if(!err) {
-									filesArray.push(JSON.parse(data));
+
+									try {
+										data = JSON.parse(data)
+									} catch(e) {
+										console.log('File invalid!', data);
+									}
+
+									if(typeof data !== 'string') {
+										filesArray.push(data);
+									}
+
 								}
 								cb();
 							});