From 765f1401215ad65f4bf4ce5918d6a06304d142ac Mon Sep 17 00:00:00 2001 From: Luck Date: Sun, 17 Dec 2017 21:20:22 +0000 Subject: [PATCH] Various fixes for log commands --- .../common/actionlog/ExtendedLogEntry.java | 2 +- .../lucko/luckperms/common/actionlog/Log.java | 16 +++++----- .../commands/impl/log/LogGroupHistory.java | 2 +- .../common/commands/impl/log/LogRecent.java | 2 +- .../common/commands/impl/log/LogSearch.java | 2 +- .../commands/impl/log/LogTrackHistory.java | 2 +- .../commands/impl/log/LogUserHistory.java | 2 +- .../commands/impl/misc/InfoCommand.java | 2 +- .../luckperms/common/locale/Message.java | 8 +++-- .../luckperms/common/utils/DateUtil.java | 29 +++++++++++++++++++ 10 files changed, 50 insertions(+), 17 deletions(-) diff --git a/common/src/main/java/me/lucko/luckperms/common/actionlog/ExtendedLogEntry.java b/common/src/main/java/me/lucko/luckperms/common/actionlog/ExtendedLogEntry.java index 95e143810..e9c1a5e93 100644 --- a/common/src/main/java/me/lucko/luckperms/common/actionlog/ExtendedLogEntry.java +++ b/common/src/main/java/me/lucko/luckperms/common/actionlog/ExtendedLogEntry.java @@ -130,7 +130,7 @@ public class ExtendedLogEntry implements LogEntry { return acted.toString(); } } - return String.valueOf(actorName); + return String.valueOf(actedName); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/common/actionlog/Log.java b/common/src/main/java/me/lucko/luckperms/common/actionlog/Log.java index ce3420281..ec5942206 100644 --- a/common/src/main/java/me/lucko/luckperms/common/actionlog/Log.java +++ b/common/src/main/java/me/lucko/luckperms/common/actionlog/Log.java @@ -50,7 +50,7 @@ public class Log { throw new IllegalArgumentException("pageNo cannot be less than 1: " + pageNo); } - int minimumEntries = ((pageNo * 5) - entries) + 1; + int minimumEntries = ((pageNo * entries) - entries) + 1; if (set.size() < minimumEntries) { throw new IllegalStateException("Log does not contain that many entries. " + "Requested: " + minimumEntries + ", Log Count: " + set.size()); @@ -73,8 +73,8 @@ public class Log { return out; } - private static int getMaxPages(long size, int entries) { - return (int) Math.ceil((double) size / entries); + private static int getMaxPages(int size, int entries) { + return (int) Math.ceil((double) size / (double) entries); } @Getter @@ -109,7 +109,7 @@ public class Log { public int getRecentMaxPages(UUID actor, int entriesPerPage) { return getMaxPages(content.stream() .filter(e -> e.getActor().equals(actor)) - .count(), entriesPerPage); + .mapToInt(x -> 1).sum(), entriesPerPage); } public SortedSet getUserHistory(UUID uuid) { @@ -129,7 +129,7 @@ public class Log { .filter(e -> e.getType() == LogEntry.Type.USER) .filter(e -> e.getActed().isPresent()) .filter(e -> e.getActed().get().equals(uuid)) - .count(), entriesPerPage); + .mapToInt(x -> 1).sum(), entriesPerPage); } public SortedSet getGroupHistory(String name) { @@ -147,7 +147,7 @@ public class Log { return getMaxPages(content.stream() .filter(e -> e.getType() == LogEntry.Type.GROUP) .filter(e -> e.getActedName().equals(name)) - .count(), entriesPerPage); + .mapToInt(x -> 1).sum(), entriesPerPage); } public SortedSet getTrackHistory(String name) { @@ -165,7 +165,7 @@ public class Log { return getMaxPages(content.stream() .filter(e -> e.getType() == LogEntry.Type.TRACK) .filter(e -> e.getActedName().equals(name)) - .count(), entriesPerPage); + .mapToInt(x -> 1).sum(), entriesPerPage); } public SortedSet getSearch(String query) { @@ -181,7 +181,7 @@ public class Log { public int getSearchMaxPages(String query, int entriesPerPage) { return getMaxPages(content.stream() .filter(e -> e.matchesSearch(query)) - .count(), entriesPerPage); + .mapToInt(x -> 1).sum(), entriesPerPage); } @SuppressWarnings("WeakerAccess") diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogGroupHistory.java b/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogGroupHistory.java index f6ad55ef5..6bebe8fb6 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogGroupHistory.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogGroupHistory.java @@ -95,7 +95,7 @@ public class LogGroupHistory extends SubCommand { long time = e.getValue().getTimestamp(); Message.LOG_ENTRY.send(sender, e.getKey(), - DateUtil.formatTimeShort(now - time), + DateUtil.formatTimeBrief(now - time), e.getValue().getActorFriendlyString(), Character.toString(e.getValue().getType().getCode()), e.getValue().getActedFriendlyString(), diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogRecent.java b/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogRecent.java index 663412e92..7fcd40fab 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogRecent.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogRecent.java @@ -145,7 +145,7 @@ public class LogRecent extends SubCommand { long time = e.getValue().getTimestamp(); Message.LOG_ENTRY.send(sender, e.getKey(), - DateUtil.formatTimeShort(now - time), + DateUtil.formatTimeBrief(now - time), e.getValue().getActorFriendlyString(), Character.toString(e.getValue().getType().getCode()), e.getValue().getActedFriendlyString(), diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogSearch.java b/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogSearch.java index 1b099098a..89eba6b3a 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogSearch.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogSearch.java @@ -87,7 +87,7 @@ public class LogSearch extends SubCommand { long time = e.getValue().getTimestamp(); Message.LOG_ENTRY.send(sender, e.getKey(), - DateUtil.formatTimeShort(now - time), + DateUtil.formatTimeBrief(now - time), e.getValue().getActorFriendlyString(), Character.toString(e.getValue().getType().getCode()), e.getValue().getActedFriendlyString(), diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogTrackHistory.java b/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogTrackHistory.java index 0c6248f31..28b62e4c5 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogTrackHistory.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogTrackHistory.java @@ -95,7 +95,7 @@ public class LogTrackHistory extends SubCommand { long time = e.getValue().getTimestamp(); Message.LOG_ENTRY.send(sender, e.getKey(), - DateUtil.formatTimeShort(now - time), + DateUtil.formatTimeBrief(now - time), e.getValue().getActorFriendlyString(), Character.toString(e.getValue().getType().getCode()), e.getValue().getActedFriendlyString(), diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogUserHistory.java b/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogUserHistory.java index 341cf3935..22e2ed227 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogUserHistory.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/impl/log/LogUserHistory.java @@ -125,7 +125,7 @@ public class LogUserHistory extends SubCommand { long time = e.getValue().getTimestamp(); Message.LOG_ENTRY.send(sender, e.getKey(), - DateUtil.formatTimeShort(now - time), + DateUtil.formatTimeBrief(now - time), e.getValue().getActorFriendlyString(), Character.toString(e.getValue().getType().getCode()), e.getValue().getActedFriendlyString(), diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/impl/misc/InfoCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/impl/misc/InfoCommand.java index 39681d13e..850ec010b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/impl/misc/InfoCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/impl/misc/InfoCommand.java @@ -72,7 +72,7 @@ public class InfoCommand extends SingleCommand { plugin.getContextManager().getStaticContextString().orElse("None"), plugin.getPlayerCount(), plugin.getUniqueConnections().size(), - DateUtil.formatTimeShort((System.currentTimeMillis() - plugin.getStartTime()) / 1000L), + DateUtil.formatTimeBrief((System.currentTimeMillis() - plugin.getStartTime()) / 1000L), plugin.getUserManager().getAll().size(), plugin.getGroupManager().getAll().size(), plugin.getTrackManager().getAll().size(), diff --git a/common/src/main/java/me/lucko/luckperms/common/locale/Message.java b/common/src/main/java/me/lucko/luckperms/common/locale/Message.java index c7e7bbdac..05e7e7b18 100644 --- a/common/src/main/java/me/lucko/luckperms/common/locale/Message.java +++ b/common/src/main/java/me/lucko/luckperms/common/locale/Message.java @@ -62,7 +62,11 @@ public enum Message { LOG_INFO("&7&l[&bL&3P&7&l] &3{}", false), LOG_WARN("&7&l[&bLuck&3Perms&7&l] &c[WARN] {}", false), LOG_ERROR("&7&l[&bLuck&3Perms&7&l] &4[ERROR] {}", false), - LOG("&3LOG &3&l> &8(&e{}&8) [&a{}&8] (&b{}&8)&f: {}", true), + LOG( + "{PREFIX}&3LOG &3&l> &8(&e{}&8) [&a{}&8] (&b{}&8)" + "\n" + + "{PREFIX}&3LOG &3&l> &f{}", + false + ), VERBOSE_LOG("&3VB &3&l> {}", true), EXPORT_LOG("&3EXPORT &3&l> &f{}", true), EXPORT_LOG_PROGRESS("&3EXPORT &3&l> &7{}", true), @@ -390,7 +394,7 @@ public enum Message { LOG_ENTRY( "{PREFIX}&b#{} &8(&7{} ago&8) &8(&e{}&8) [&a{}&8] (&b{}&8)" + "\n" + - "{PERFIX}&7> &f{}", + "{PREFIX}&7> &f{}", false ), diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/DateUtil.java b/common/src/main/java/me/lucko/luckperms/common/utils/DateUtil.java index e579660e8..57faa573f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/DateUtil.java +++ b/common/src/main/java/me/lucko/luckperms/common/utils/DateUtil.java @@ -199,6 +199,35 @@ public class DateUtil { return time.toString().trim(); } + public static String formatTimeBrief(long seconds) { + if (seconds <= 0) { + return "0s"; + } + + long minute = seconds / 60; + seconds = seconds % 60; + long hour = minute / 60; + minute = minute % 60; + long day = hour / 24; + hour = hour % 24; + + StringBuilder time = new StringBuilder(); + if (day != 0) { + time.append(day).append("d "); + time.append(hour).append("h "); + } else if (hour != 0) { + time.append(hour).append("h "); + time.append(minute).append("m "); + } else if (minute != 0) { + time.append(minute).append("m "); + time.append(seconds).append("s"); + } else if (seconds != 0) { + time.append(seconds).append("s"); + } + + return time.toString().trim(); + } + private static String formatDateDiff(Calendar fromDate, Calendar toDate) { boolean future = false; if (toDate.equals(fromDate)) {