Format /seen account history list, optimize map loading.

khobbits · khobbits · commit b941234d67e4 · 2014-04-18T05:57:47.000+01:00
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsConf.java b/Essentials/src/com/earth2me/essentials/EssentialsConf.java
@@ -170,7 +170,6 @@ else if (templateName != null)
 			finally
 			{
 				inputStream.close();
-				save();
 			}
 		}
 		catch (IOException ex)
diff --git a/Essentials/src/com/earth2me/essentials/UUIDMap.java b/Essentials/src/com/earth2me/essentials/UUIDMap.java
@@ -117,6 +117,10 @@ public void forceWriteUUIDMap()
 	public Future<?> _writeUUIDMap()
 	{
 		final ConcurrentSkipListMap<String, UUID> names = ess.getUserMap().getNames().clone();
+		if (names.size() < 1)
+		{
+			return null;
+		}
 		pendingDiskWrites.incrementAndGet();
 		Future<?> future = EXECUTOR_SERVICE.submit(new WriteRunner(ess.getDataFolder(), userList, names, pendingDiskWrites));
 		return future;
diff --git a/Essentials/src/com/earth2me/essentials/UserMap.java b/Essentials/src/com/earth2me/essentials/UserMap.java
@@ -15,6 +15,7 @@
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.ExecutionException;
 import net.ess3.api.IEssentials;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 
@@ -33,7 +34,6 @@ public UserMap(final IEssentials ess)
 		this.ess = ess;
 		uuidMap = new UUIDMap(ess);
 		users = CacheBuilder.newBuilder().maximumSize(ess.getSettings().getMaxUserCacheCount()).softValues().build(this);
-		loadAllUsersAsync(ess);
 	}
 
 	private void loadAllUsersAsync(final IEssentials ess)
@@ -43,33 +43,34 @@ private void loadAllUsersAsync(final IEssentials ess)
 			@Override
 			public void run()
 			{
-				final File userdir = new File(ess.getDataFolder(), "userdata");
-				if (!userdir.exists())
-				{
-					return;
-				}
-				keys.clear();
-				names.clear();
-				users.invalidateAll();
-				for (String string : userdir.list())
+				synchronized (users)
 				{
-					if (!string.endsWith(".yml"))
-					{
-						continue;
-					}
-					final String name = string.substring(0, string.length() - 4);
-					try
+					final File userdir = new File(ess.getDataFolder(), "userdata");
+					if (!userdir.exists())
 					{
-						keys.add(UUID.fromString(name));
+						return;
 					}
-					catch (IllegalArgumentException ex)
+					keys.clear();
+					names.clear();
+					users.invalidateAll();
+					for (String string : userdir.list())
 					{
-						//Ignore these users till they rejoin.
+						if (!string.endsWith(".yml"))
+						{
+							continue;
+						}
+						final String name = string.substring(0, string.length() - 4);
+						try
+						{
+							keys.add(UUID.fromString(name));
+						}
+						catch (IllegalArgumentException ex)
+						{
+							//Ignore these users till they rejoin.
+						}
 					}
+					uuidMap.loadAllUsers(names, history);
 				}
-
-				uuidMap.loadAllUsers(names, history);
-
 			}
 		});
 	}
@@ -164,7 +165,7 @@ public User load(final UUID uuid) throws Exception
 
 		if (userFile.exists())
 		{
-			player = new OfflinePlayer(uuid, ess.getServer());			
+			player = new OfflinePlayer(uuid, ess.getServer());
 			final User user = new User(player, ess);
 			((OfflinePlayer)player).setName(user.getLastAccountName());
 			trackUUID(uuid, user.getName());
@@ -212,7 +213,7 @@ public ConcurrentSkipListMap<UUID, ArrayList<String>> getHistory()
 	{
 		return history;
 	}
-	
+
 	public List<String> getUserHistory(final UUID uuid)
 	{
 		return history.get(uuid);
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java
@@ -74,9 +74,9 @@ private void seenOnline(final Server server, final CommandSource sender, final U
 		sender.sendMessage(tl("seenOnline", user.getDisplayName(), DateUtil.formatDateDiff(user.getLastLogin())));
 		
 		List<String> history = ess.getUserMap().getUserHistory(user.getBase().getUniqueId());
-		if (history.size() > 1)
+		if (history != null && history.size() > 1)
 		{
-			sender.sendMessage("User has also been known as: " + StringUtil.joinList(history));  //TODO: TL
+			sender.sendMessage(tl("seenAccounts", StringUtil.joinListSkip(", ", user.getName(), history)));
 		}
 		
 		if (user.isAfk())
@@ -119,9 +119,9 @@ private void seenOffline(final Server server, final CommandSource sender, User u
 		}
 		
 		List<String> history = ess.getUserMap().getUserHistory(user.getBase().getUniqueId());
-		if (history.size() > 1)
+		if (history != null && history.size() > 1)
 		{
-			sender.sendMessage("User has also been known as: " + StringUtil.joinList(history)); //TODO: TL
+			sender.sendMessage(tl("seenAccounts", StringUtil.joinListSkip(", ", user.getName(), history)));
 		}
 				
 		if (user.getBase().isBanned())
diff --git a/Essentials/src/com/earth2me/essentials/utils/StringUtil.java b/Essentials/src/com/earth2me/essentials/utils/StringUtil.java
@@ -60,6 +60,40 @@ public static String joinList(String seperator, Object... list)
 		}
 		return buf.toString();
 	}
+	
+	public static String joinListSkip(String seperator, String skip, Object... list)
+	{
+		StringBuilder buf = new StringBuilder();
+		for (Object each : list)
+		{
+			if (each.toString().equalsIgnoreCase(skip)) {
+				continue;
+			}
+			
+			if (buf.length() > 0)
+			{
+				buf.append(seperator);
+			}
+
+			if (each instanceof Collection)
+			{
+				buf.append(joinListSkip(seperator, skip, ((Collection)each).toArray()));
+			}
+			else
+			{
+				try
+				{
+					buf.append(each.toString());
+				}
+				catch (Exception e)
+				{
+					buf.append(each.toString());
+				}
+			}
+		}
+		return buf.toString();
+	}
+	
 	private StringUtil()
 	{
 	}
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000 characters.
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000 characters.
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_et.properties b/Essentials/src/messages_et.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_hu.properties b/Essentials/src/messages_hu.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_ko.properties b/Essentials/src/messages_ko.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_lt.properties b/Essentials/src/messages_lt.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_ro.properties b/Essentials/src/messages_ro.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_ru.properties b/Essentials/src/messages_ru.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_sv.properties b/Essentials/src/messages_sv.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_tr.properties b/Essentials/src/messages_tr.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_zh.properties b/Essentials/src/messages_zh.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_zh_HK.properties b/Essentials/src/messages_zh_HK.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/Essentials/src/messages_zh_TW.properties b/Essentials/src/messages_zh_TW.properties
@@ -545,3 +545,4 @@ weatherInvalidWorld=World named {0} not found\!
 gameModeInvalid=\u00a74You need to specify a valid player/mode.
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000
 mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
+seenAccounts=\u00a76Player has also been known as:\u00a7c {0}
diff --git a/nbactions.xml b/nbactions.xml
@@ -23,6 +23,7 @@
             <actionName>build</actionName>
             <goals>
                 <goal>package</goal>
+                <goal>dependency:copy</goal>
             </goals>
         </action>
     </actions>

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,6 @@ else if (templateName != null)`
`170`	`170`	`finally`
`171`	`171`	`{`
`172`	`172`	`inputStream.close();`
`173`		`- save();`
`174`	`173`	`}`
`175`	`174`	`}`
`176`	`175`	`catch (IOException ex)`
Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,9 @@ private void seenOnline(final Server server, final CommandSource sender, final U`
`74`	`74`	`sender.sendMessage(tl("seenOnline", user.getDisplayName(), DateUtil.formatDateDiff(user.getLastLogin())));`
`75`	`75`
`76`	`76`	`List<String> history = ess.getUserMap().getUserHistory(user.getBase().getUniqueId());`
`77`		`- if (history.size() > 1)`
	`77`	`+ if (history != null && history.size() > 1)`
`78`	`78`	`{`
`79`		`- sender.sendMessage("User has also been known as: " + StringUtil.joinList(history)); //TODO: TL`
	`79`	`+ sender.sendMessage(tl("seenAccounts", StringUtil.joinListSkip(", ", user.getName(), history)));`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`if (user.isAfk())`
`@@ -119,9 +119,9 @@ private void seenOffline(final Server server, final CommandSource sender, User u`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`List<String> history = ess.getUserMap().getUserHistory(user.getBase().getUniqueId());`
`122`		`- if (history.size() > 1)`
	`122`	`+ if (history != null && history.size() > 1)`
`123`	`123`	`{`
`124`		`- sender.sendMessage("User has also been known as: " + StringUtil.joinList(history)); //TODO: TL`
	`124`	`+ sender.sendMessage(tl("seenAccounts", StringUtil.joinListSkip(", ", user.getName(), history)));`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`if (user.getBase().isBanned())`