Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-11-15 11:39:11 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Фикс отображения HTML логов

Browse source
This commit is contained in:
Gravit 2019-04-13 08:13:46 +07:00
parent bd44a55f6b
commit 3f7cbbb004
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
5 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/DownloadAssetCommand.java
View file

@ -19,7 +19,7 @@ public DownloadAssetCommand(LaunchServer server) {
@Override @Override
public String getArgsDescription() { public String getArgsDescription() {
return "<version> <dir>"; return "[version] [dir]";
} }
@Override @Override

2
LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/DownloadClientCommand.java
View file

@ -24,7 +24,7 @@ public DownloadClientCommand(LaunchServer server) {
@Override @Override
public String getArgsDescription() { public String getArgsDescription() {
return "<version> <dir>"; return "[version] [dir]";
} }
@Override @Override

2
LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/IndexAssetCommand.java
View file

@ -81,7 +81,7 @@ public IndexAssetCommand(LaunchServer server) {
@Override @Override
public String getArgsDescription() { public String getArgsDescription() {
return "<dir> <index> <output-dir>"; return "[dir] [index] [output-dir]";
} }
@Override @Override

2
LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/UnindexAssetCommand.java
View file

@ -24,7 +24,7 @@ public UnindexAssetCommand(LaunchServer server) {
@Override @Override
public String getArgsDescription() { public String getArgsDescription() {
return "<dir> <index> <output-dir>"; return "[dir] [index] [output-dir]";
} }
@Override @Override

17
libLauncher/src/main/java/ru/gravit/utils/helper/LogHelper.java
View file

@ -403,16 +403,23 @@ public static String htmlFormatLog(Level level, String dateTime, String message,
String levelColor; String levelColor;
switch (level) { switch (level) {
case WARNING: case WARNING:
levelColor = "yellow"; levelColor = "gravitlauncher-log-warning";
break; break;
case ERROR: case ERROR:
levelColor = "red"; levelColor = "gravitlauncher-log-error";
break; break;
default: // INFO, DEBUG, Unknown case INFO:
levelColor = "white"; levelColor = "gravitlauncher-log-info";
break;
case DEBUG:
levelColor = "gravitlauncher-log-debug";
break;
default:
levelColor = "gravitlauncher-log-unknown";
break; break;
} }
return String.format("%s <b><font color=\"%s\">[%s] %s</font></b>", dateTime, levelColor, level.toString(), sub ? ' ' + message : message); if(sub) levelColor += " gravitlauncher-log-sub";
return String.format("%s <span class=\"gravitlauncher-log %s\">[%s] %s</span>", dateTime, levelColor, level.toString(), sub ? ' ' + message : message);
} }
private static String ansiFormatVersion(String product) { private static String ansiFormatVersion(String product) {