Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More fixes to TestClient, I even tested this time

Browse Source 
git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@2294 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2008-10-10 21:53:47 +00:00
parent 5fd194130d
commit 7939843f0d
3 changed files with 35 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
Programs/examples/TestClient/ClientManager.cs
View File

@@ -107,27 +107,37 @@ namespace OpenMetaverse.TestClient
if (client.Network.Login(loginParams))
{
Clients[client.Self.AgentID] = client;
if (client.MasterKey == UUID.Zero)
{
UUID query = UUID.Random();
client.Directory.OnDirPeopleReply +=
DirectoryManager.DirPeopleReplyCallback peopleDirCallback =
delegate(UUID queryID, List<DirectoryManager.AgentSearchData> matchedPeople)
{
if (queryID != query)
return;
if (matchedPeople.Count != 1)
Console.WriteLine("Unable to resolve master key.");
else
client.MasterKey = matchedPeople[0].AgentID;
if (queryID == query)
{
if (matchedPeople.Count != 1)
{
Logger.Log("Unable to resolve master key from " + client.MasterName, Helpers.LogLevel.Warning);
}
else
{
client.MasterKey = matchedPeople[0].AgentID;
Logger.Log("Master key resolved to " + client.MasterKey, Helpers.LogLevel.Info);
}
}
};
client.Directory.OnDirPeopleReply += peopleDirCallback;
client.Directory.StartPeopleSearch(DirectoryManager.DirFindFlags.People, client.MasterName, 0, query);
}
Console.WriteLine("Logged in " + client.ToString());
Logger.Log("Logged in " + client.ToString(), Helpers.LogLevel.Info);
}
else
{
Console.WriteLine("Failed to login " + account.FirstName + " " + account.LastName + ": " +
client.Network.LoginMessage);
Logger.Log("Failed to login " + account.FirstName + " " + account.LastName + ": " +
client.Network.LoginMessage, Helpers.LogLevel.Warning);
}
return client;
@@ -195,13 +205,16 @@ namespace OpenMetaverse.TestClient
public void DoCommandAll(string cmd, UUID fromAgentID)
{
string[] tokens = cmd.Trim().Split(new char[] { ' ', '\t' });
string firstToken = tokens[0].ToLower();
string[] args = new string[tokens.Length - 1];
Array.Copy(tokens, 1, args, 0, args.Length);
if (tokens.Length == 0)
return;
string firstToken = tokens[0].ToLower();
if (String.IsNullOrEmpty(firstToken))
return;
string[] args = new string[tokens.Length - 1];
if (args.Length > 0)
Array.Copy(tokens, 1, args, 0, args.Length);
if (firstToken == "login")
{
@@ -245,10 +258,12 @@ namespace OpenMetaverse.TestClient
ThreadPool.QueueUserWorkItem((WaitCallback)
delegate(object state)
{
Logger.Log(client.Commands[firstToken].Execute(args, fromAgentID),
Helpers.LogLevel.Info);
TestClient testClient = (TestClient)state;
Logger.Log(testClient.Commands[firstToken].Execute(args, fromAgentID),
Helpers.LogLevel.Info, testClient);
++completed;
});
},
client);
}
while (completed < clientsCopy.Count)
@@ -266,24 +281,11 @@ namespace OpenMetaverse.TestClient
client.Network.Logout();
}
/// <summary>
///
/// </summary>
public void LogoutAll()
{
// make a copy of the clients list so that it can be iterated without fear of being changed during iteration
Dictionary<UUID, TestClient> clientsCopy = new Dictionary<UUID, TestClient>(Clients);
foreach (TestClient client in clientsCopy.Values)
Logout(client);
}
/// <summary>
///
/// </summary>
public void Quit()
{
LogoutAll();
Running = false;
// TODO: It would be really nice if we could figure out a way to abort the ReadLine here in so that Run() will exit.
}