From d659d0a0e2a397c1ebc84674ebda0fd8944c1e2a Mon Sep 17 00:00:00 2001 From: LatvianModder Date: Wed, 3 Apr 2024 14:20:10 +0300 Subject: [PATCH] Added Log#format --- .../dev/latvian/apps/webutils/ansi/Log.java | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/src/main/java/dev/latvian/apps/webutils/ansi/Log.java b/src/main/java/dev/latvian/apps/webutils/ansi/Log.java index 045204c..89872da 100644 --- a/src/main/java/dev/latvian/apps/webutils/ansi/Log.java +++ b/src/main/java/dev/latvian/apps/webutils/ansi/Log.java @@ -19,27 +19,27 @@ public enum Type { public static Log INSTANCE = new Log(); public static void info(Object message) { - INSTANCE.log(Type.INFO, Ansi.of(message)); + INSTANCE.log(Type.INFO, message); } public static void warn(Object message) { - INSTANCE.log(Type.WARN, Ansi.of(message).yellow()); + INSTANCE.log(Type.WARN, message); } public static void error(Object message) { - INSTANCE.log(Type.ERROR, Ansi.of(message).error()); + INSTANCE.log(Type.ERROR, message); } public static void debug(Object message) { - INSTANCE.log(Type.DEBUG, Ansi.of(message).lightGray()); + INSTANCE.log(Type.DEBUG, message); } public static void success(Object message) { - INSTANCE.log(Type.SUCCESS, Ansi.of(message).green()); + INSTANCE.log(Type.SUCCESS, message); } public static void fail(Object message) { - INSTANCE.log(Type.FAIL, Ansi.of(message).red()); + INSTANCE.log(Type.FAIL, message); } public static void success(Object message, boolean success) { @@ -51,19 +51,32 @@ public static void success(Object message, boolean success) { } public static void important(Object message) { - INSTANCE.log(Type.IMPORTANT, Ansi.of(message).orange()); + INSTANCE.log(Type.IMPORTANT, message); } public static void code(Object message) { - INSTANCE.log(Type.CODE, Ansi.of(message).teal()); + INSTANCE.log(Type.CODE, message); } - public void log(Type type, AnsiComponent message) { + public void log(Type type, Object message) { var now = new Date(); var c = Ansi.of(); c.append(Ansi.cyan(TimeUtils.formatDate(new StringBuilder(), now).toString())); c.append(' '); - c.append(message); + c.append(format(Ansi.of(message), type)); System.out.println(c); } + + public AnsiComponent format(Object message, Type type) { + return switch (type) { + case WARN -> Ansi.of(message).yellow(); + case ERROR -> Ansi.of(message).error(); + case DEBUG -> Ansi.of(message).lightGray(); + case SUCCESS -> Ansi.of(message).green(); + case FAIL -> Ansi.of(message).red(); + case IMPORTANT -> Ansi.of(message).orange(); + case CODE -> Ansi.of(message).teal(); + default -> Ansi.of(message); + }; + } }