Merge pull request #28 from dungdung/sentry-detection-cleanup

Cleaned up sentry file detection code
Steam-Chat-Bot · Mar 31, 2015 · 2254d2d · 2254d2d
2 parents 4eacdec + fe7ce31
commit 2254d2d
Showing 1 changed file with 14 additions and 23 deletions.
diff --git a/lib/chatBot.js b/lib/chatBot.js
@@ -71,29 +71,20 @@ var ChatBot = function(username, password, options) {
 		}
 	} else {
 		this.winston.info("Config file does not define a sentryfile. Attempting to autodetect sentry...");
-		if(fs.existsSync("sentry."+this.username+".hash")) {
-			this.sentryFile = "sentry."+this.username+".hash";
-			this.winston.info("Sentry file "+this.sentryFile+" detected.");
-		} else if(fs.existsSync("sentry."+this.username)) {
-			this.sentryFile = "sentry."+this.username;
-			this.winston.info("Sentry file "+this.sentryFile+" detected.");
-		} else if(fs.existsSync("sentryfile."+this.username)) {
-			this.sentryFile = "sentryfile."+this.username;
-			this.winston.info("Sentry file "+this.sentryFile+" detected.");
-		} else if(fs.existsSync("sentryfile."+this.username+".hash")) {
-			this.sentryFile = "sentryfile."+this.username+".hash";
-			this.winston.info("Sentry file "+this.sentryFile+" detected.");
-		} else if(fs.existsSync("bot."+this.username+".hash")) {
-			this.sentryFile = "bot."+this.username+".hash";
-			this.winston.info("Sentry file "+this.sentryFile+" detected.");
-		} else if(fs.existsSync("bot."+this.username+".sentry")) {
-			this.sentryFile = "bot."+this.username+".sentry";
-			this.winston.info("Sentry file "+this.sentryFile+" detected.");
-		} else if(fs.existsSync(this.username+".hash")) {
-			this.sentryFile = this.username+".hash";
-			this.winston.info("Sentry file "+this.sentryFile+" detected.");
-		} else if(fs.existsSync(this.username+".sentry")) {
-			this.sentryFile = this.username+".sentry";
+		var sentryFile = _.find([
+			"sentry."+this.username+".hash",
+			"sentry."+this.username,
+			"sentryfile."+this.username,
+			"sentryfile."+this.username+".hash",
+			"bot."+this.username+".hash",
+			"bot."+this.username+".sentry",
+			this.username+".hash",
+			this.username+".sentry"
+		], function(val) {
+			return fs.existsSync(val);
+		});
+		if ("undefined" !== typeof sentryFile) {
+			this.sentryFile = sentryFile;
 			this.winston.info("Sentry file "+this.sentryFile+" detected.");
 		} else if(fs.existsSync("sentry")) {
 			this.sentryFile = "sentry";