4 files changed, 87 insertions, 2 deletions

diff --git a/src/Protocol/MojangAPI.cpp b/src/Protocol/MojangAPI.cpp
index 823ff5469..3786fecc9 100644
--- a/src/Protocol/MojangAPI.cpp
+++ b/src/Protocol/MojangAPI.cpp
@@ -10,6 +10,7 @@
 #include "inifile/iniFile.h"
 #include "json/json.h"
 #include "PolarSSL++/BlockingSslClientSocket.h"
+#include "../RankManager.h"
 
 
 
@@ -300,6 +301,7 @@ void cMojangAPI::AddPlayerNameToUUIDMapping(const AString & a_PlayerName, const
 		cCSLock Lock(m_CSUUIDToName);
 		m_UUIDToName[UUID] = sProfile(a_PlayerName, UUID, "", "", Now);
 	}
+	NotifyNameUUID(a_PlayerName, a_UUID);
 }
 
 
@@ -322,6 +324,7 @@ void cMojangAPI::AddPlayerProfile(const AString & a_PlayerName, const AString &
 		cCSLock Lock(m_CSUUIDToProfile);
 		m_UUIDToProfile[UUID] = sProfile(a_PlayerName, UUID, a_Properties, Now);
 	}
+	NotifyNameUUID(a_PlayerName, a_UUID);
 }
 
 
@@ -669,6 +672,7 @@ void cMojangAPI::CacheNamesToUUIDs(const AStringVector & a_PlayerNames)
 					continue;
 				}
 				m_NameToUUID[StrToLower(JsonName)] = sProfile(JsonName, JsonUUID, "", "", Now);
+				NotifyNameUUID(JsonName, JsonUUID);
 			}  // for idx - root[]
 		}  // cCSLock (m_CSNameToUUID)
 		
@@ -792,6 +796,21 @@ void cMojangAPI::CacheUUIDToProfile(const AString & a_UUID)
 		cCSLock Lock(m_CSNameToUUID);
 		m_NameToUUID[StrToLower(PlayerName)] = sProfile(PlayerName, a_UUID, Properties, Now);
 	}
+	NotifyNameUUID(PlayerName, a_UUID);
+}
+
+
+
+
+
+void cMojangAPI::NotifyNameUUID(const AString & a_PlayerName, const AString & a_UUID)
+{
+	// Notify the rank manager:
+	cCSLock Lock(m_CSRankMgr);
+	if (m_RankMgr != NULL)
+	{
+		m_RankMgr->NotifyNameUUID(a_PlayerName, a_UUID);
+	}
 }
 
 
diff --git a/src/Protocol/MojangAPI.h b/src/Protocol/MojangAPI.h
index e96c0d589..252d32543 100644
--- a/src/Protocol/MojangAPI.h
+++ b/src/Protocol/MojangAPI.h
@@ -11,6 +11,13 @@
 
 #include <time.h>
 
+
+
+
+
+// fwd: ../RankManager.h"
+class cRankManager;
+
 namespace Json
 {
 	class Value;
@@ -81,7 +88,10 @@ public:
 	/** Called by the Authenticator to add a profile that it has received from authenticating a user. Adds
 	the profile to the respective mapping caches and updtes their datetime stamp to now. */
 	void AddPlayerProfile(const AString & a_PlayerName, const AString & a_UUID, const Json::Value & a_Properties);
-	
+
+	/** Sets the m_RankMgr that is used for name-uuid notifications. Accepts NULL to remove the binding. */
+	void SetRankManager(cRankManager * a_RankManager) { m_RankMgr = a_RankManager; }
+
 protected:
 	/** Holds data for a single player profile. */
 	struct sProfile
@@ -161,6 +171,12 @@ protected:
 	
 	/** Protects m_UUIDToProfile against simultaneous multi-threaded access. */
 	cCriticalSection m_CSUUIDToProfile;
+
+	/** The rank manager that is notified of the name-uuid pairings. May be NULL. Protected by m_CSRankMgr. */
+	cRankManager * m_RankMgr;
+
+	/** Protects m_RankMgr agains simultaneous multi-threaded access. */
+	cCriticalSection m_CSRankMgr;
 	
 	
 	/** Loads the caches from a disk storage. */
@@ -178,6 +194,10 @@ protected:
 	UUIDs that are not valid will not be added into the cache.
 	ASSUMEs that a_UUID is a lowercased short UUID. */
 	void CacheUUIDToProfile(const AString & a_UUID);
+
+	/** Called for each name-uuid pairing that is discovered.
+	If assigned, notifies the m_RankManager of the event. */
+	void NotifyNameUUID(const AString & a_PlayerName, const AString & a_PlayerUUID);
 } ;  // tolua_export
 
 
diff --git a/src/RankManager.cpp b/src/RankManager.cpp
index 65e5d264c..349582950 100644
--- a/src/RankManager.cpp
+++ b/src/RankManager.cpp
@@ -365,7 +365,8 @@ protected:
 
 cRankManager::cRankManager(void) :
 	m_DB("Ranks.sqlite", SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE),
-	m_IsInitialized(false)
+	m_IsInitialized(false),
+	m_MojangAPI(NULL)
 {
 }
 
@@ -373,6 +374,18 @@ cRankManager::cRankManager(void) :
 
 
 
+cRankManager::~cRankManager()
+{
+	if (m_MojangAPI != NULL)
+	{
+		m_MojangAPI->SetRankManager(NULL);
+	}
+}
+
+
+
+
+
 void cRankManager::Initialize(cMojangAPI & a_MojangAPI)
 {
 	ASSERT(!m_IsInitialized);  // Calling Initialize for the second time?
@@ -386,6 +399,8 @@ void cRankManager::Initialize(cMojangAPI & a_MojangAPI)
 	
 	m_IsInitialized = true;
 	
+	a_MojangAPI.SetRankManager(this);
+
 	// Check if tables empty, migrate from ini files then
 	if (AreDBTablesEmpty())
 	{
@@ -1655,6 +1670,28 @@ bool cRankManager::IsPermissionInGroup(const AString & a_Permission, const AStri
 
 
 
+void cRankManager::NotifyNameUUID(const AString & a_PlayerName, const AString & a_UUID)
+{
+	ASSERT(m_IsInitialized);
+	cCSLock Lock(m_CS);
+
+	try
+	{
+		SQLite::Statement stmt(m_DB, "UPDATE PlayerRank SET PlayerName = ? WHERE PlayerUUID = ?");
+		stmt.bind(1, a_PlayerName);
+		stmt.bind(2, a_UUID);
+		stmt.exec();
+	}
+	catch (const SQLite::Exception & ex)
+	{
+		LOGWARNING("%s: Failed to update DB: %s", __FUNCTION__, ex.what());
+	}
+}
+
+
+
+
+
 bool cRankManager::AreDBTablesEmpty(void)
 {
 	return (
diff --git a/src/RankManager.h b/src/RankManager.h
index 532b4cd83..24030ef22 100644
--- a/src/RankManager.h
+++ b/src/RankManager.h
@@ -49,6 +49,8 @@ public:
 	
 	/** Creates the rank manager. Needs to be initialized before other use. */
 	cRankManager(void);
+
+	~cRankManager();
 	
 	/** Initializes the rank manager. Performs migration and default-setting if no data is found in the DB.
 	The a_MojangAPI param is used when migrating from old ini files, to look up player UUIDs. */
@@ -194,6 +196,9 @@ public:
 	/** Returns true iff the specified group contains the specified permission. */
 	bool IsPermissionInGroup(const AString & a_Permission, const AString & a_GroupName);
 	
+	/** Called by cMojangAPI whenever the playername-uuid pairing is discovered. Updates the DB. */
+	void NotifyNameUUID(const AString & a_PlayerName, const AString & a_UUID);
+	
 protected:
 
 	/** The database storage for all the data. Protected by m_CS. */
@@ -204,6 +209,10 @@ protected:
 	
 	/** Set to true once the manager is initialized. */
 	bool m_IsInitialized;
+
+	/** The MojangAPI instance that is used for translating playernames to UUIDs.
+	Set in Initialize(), may be NULL. */
+	cMojangAPI * m_MojangAPI;
 	
 	
 	/** Returns true if all the DB tables are empty, indicating a fresh new install. */