Merge tag '0.1.2@mvn' into release

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'cc.sukazyo'
-version '0.1.1'
+version '0.1.2'
 
 repositories {
 	mavenCentral()

src/main/java/cc/sukazyo/cono/morny/Logger.java

@@ -1,5 +1,7 @@
 package cc.sukazyo.cono.morny;
 
+import cc.sukazyo.cono.morny.util.StringUtils;
+
 public class Logger {
 	
 	public static final Logger logger = new Logger();
@@ -16,15 +18,15 @@ public class Logger {
 		System.out.println(formatMessage(message, "WARN"));
 	}
 	
+	public void error (String message) {
+		System.out.println(formatMessage(message, "ERRO"));
+	}
+	
 	private String formatMessage (String message, String level) {
-		String levelStr = "\n["+level+"]";
+		String prompt = String.format("[%s][%s]", System.currentTimeMillis(), Thread.currentThread().getName());
-		return String.format(
+		String levelStr = String.format("[%s]", level);
-				"[%d][%s][%s]%s",
+		String newline = "\n" + StringUtils.repeatChar('\'', prompt.length()) + levelStr;
-				System.currentTimeMillis(),
+		return prompt + levelStr + message.replaceAll("\\n", newline);
-				Thread.currentThread().getName(),
-				level,
-				message.replaceAll("\\n", levelStr)
-		);
 	}
 	
 }

src/main/java/cc/sukazyo/cono/morny/MornyCoeur.java

@@ -2,6 +2,7 @@ package cc.sukazyo.cono.morny;
 
 import cc.sukazyo.cono.morny.bot.api.OnUpdate;
 import cc.sukazyo.cono.morny.bot.event.EventListeners;
+import cc.sukazyo.cono.morny.data.MornyHello;
 import com.pengrad.telegrambot.TelegramBot;
 import com.pengrad.telegrambot.request.GetMe;
 
@@ -13,11 +14,13 @@ public class MornyCoeur {
 	
 	public static void main (String[] args) {
 		
+		logger.info(MornyHello.MORNY_PREVIEW_IMAGE_ASCII);
 		logger.info("System Starting");
 		
-		logger.info("args key: " + args[0]);
+		logger.info("args key:\n  " + args[0]);
 		
-		account = login(args[0]);
+		try { account = login(args[0]); }
+		catch (Exception e) { logger.error("Cannot login to bot/api."); System.exit(-1); }
 		
 		logger.info("Bot login succeed.");
 		
@@ -38,7 +41,7 @@ public class MornyCoeur {
 				return account;
 			} catch (Exception e) {
 				e.printStackTrace(System.out);
-				logger.info("login failed.");
+				logger.error("login failed.");
 			}
 		}
 		throw new RuntimeException("Login failed..");

src/main/java/cc/sukazyo/cono/morny/util/StringUtils.java

@@ -0,0 +1,13 @@
+package cc.sukazyo.cono.morny.util;
+
+import java.util.Arrays;
+
+public class StringUtils {
+	
+	public static String repeatChar (char c, int i) {
+		char[] chars = new char[i];
+		Arrays.fill(chars, c);
+		return new String(chars);
+	}
+	
+}