themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'general-devel-rest' of github.com:TShock/TShock into general-devel-rest

Browse source 
Conflicts:
	TShockAPI/RestManager.cs
Fixed /status returning a 500
This commit is contained in:
Lucas Nicodemus 2011-09-05 01:03:20 -06:00
commit e4030d9e38
6 changed files with 152 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

30
TShockAPI/RestManager.cs
View file

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using HttpServer;
using Terraria;
namespace TShockAPI {
@ -16,13 +17,13 @@ namespace TShockAPI {
public void RegisterRestfulCommands()
{
Rest.Register(new RestCommand("/status", Status));
Rest.Register(new RestCommand("/status", Status) {RequiesToken = false});
//RegisterExamples();
}
}
#region RestMethods
object Status(RestVerbs verbs, IParameterCollection parameters, RequestEventArgs request)
object Status(RestVerbs verbs, IParameterCollection parameters)
{
var ReturnBlock = new Dictionary<string, string>();
if (TShock.Config.EnableTokenEndpointAuthentication)
@ -31,17 +32,22 @@ namespace TShockAPI {
ReturnBlock.Add("error", "Server settings require a token for this API call.");
return ReturnBlock;
}
string CurrentPlayers = "";
int PlayerCount = 0;
for (int i = 0; i < Main.player.Length; i++ )
{
if (Main.player[i].active)
{
CurrentPlayers += Main.player[i].name + ", ";
PlayerCount++;
}
}
ReturnBlock.Add("status", "200");
ReturnBlock.Add("name", TShock.Config.ServerNickname);
ReturnBlock.Add("port", Convert.ToString(TShock.Config.ServerPort));
ReturnBlock.Add("playercount", Convert.ToString(TShock.Players.Count()));
string CurrentPlayers = "";
foreach (TSPlayer tplayer in TShock.Players)
{
CurrentPlayers += tplayer.Name + ", ";
}
ReturnBlock.Add("playercount", Convert.ToString(PlayerCount));
ReturnBlock.Add("players", CurrentPlayers);
return ReturnBlock;
}
@ -56,7 +62,7 @@ namespace TShockAPI {
}
//The Wizard example, for demonstrating the response convention:
object Wizard(RestVerbs verbs, IParameterCollection parameters, RequestEventArgs request)
object Wizard(RestVerbs verbs, IParameterCollection parameters)
{
var returnBack = new Dictionary<string, string>();
returnBack.Add("status", "200"); //Keep this in everything, 200 = ok, etc. Standard http status codes.
@ -66,7 +72,7 @@ namespace TShockAPI {
}
//http://127.0.0.1:8080/HelloWorld/name/{username}?type=status
object UserTest(RestVerbs verbs, IParameterCollection parameters, RequestEventArgs request)
object UserTest(RestVerbs verbs, IParameterCollection parameters)
{
var ret = new Dictionary<string, string>();
var type = parameters["type"];