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

SafeSet/SafeGet replaced with this[]

Browse source
This commit is contained in:
high 2011-09-05 14:12:49 -04:00
parent 1cfca90b8d
commit 07e88dc8a7
4 changed files with 36 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

31
TShockAPI/Rest.cs
View file

@ -9,7 +9,7 @@ using HttpServer.Headers;
using Newtonsoft.Json; using Newtonsoft.Json;
using HttpListener = HttpServer.HttpListener; using HttpListener = HttpServer.HttpListener;
namespace TShockAPI namespace Rests
{ {
/// <summary> /// <summary>
/// Rest command delegate /// Rest command delegate
@ -146,18 +146,18 @@ namespace TShockAPI
{ {
public string Status public string Status
{ {
get { return SafeGet("status"); } get { return this["status"]; }
set { SafeSet("status", value); } set { this["status"] = value; }
} }
public string Error public string Error
{ {
get { return SafeGet("error"); } get { return this["error"]; }
set { SafeSet("error", value); } set { this["error"] = value; }
} }
public string Response public string Response
{ {
get { return SafeGet("response"); } get { return this["response"]; }
set { SafeSet("response", value); } set { this["response"] = value; }
} }
public RestObject(string status) public RestObject(string status)
@ -166,23 +166,21 @@ namespace TShockAPI
} }
/// <summary> /// <summary>
/// Gets value safely. /// Gets value safely, if it does not exist, return null. Sets/Adds value safely, if null it will remove.
/// </summary> /// </summary>
/// <param name="key"></param> /// <param name="key"></param>
/// <param name="value"></param>
/// <returns>Returns null if key does not exist.</returns> /// <returns>Returns null if key does not exist.</returns>
public string SafeGet(string key) public new string this[string key]
{
get
{ {
string ret; string ret;
if (TryGetValue(key, out ret)) if (TryGetValue(key, out ret))
return ret; return ret;
return null; return null;
} }
/// <summary> set
/// Sets/Adds value safely. If null it will remove.
/// </summary>
/// <param name="key"></param>
/// <param name="value"></param>
public void SafeSet(string key, string value)
{ {
if (!ContainsKey(key)) if (!ContainsKey(key))
{ {
@ -193,12 +191,13 @@ namespace TShockAPI
else else
{ {
if (value != null) if (value != null)
this[key] = value; base[key] = value;
else else
Remove(key); Remove(key);
} }
} }
} }
}
public class RestCommand public class RestCommand
{ {

1
TShockAPI/RestManager.cs
View file

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using HttpServer; using HttpServer;
using Rests;
using Terraria; using Terraria;
namespace TShockAPI { namespace TShockAPI {

5
TShockAPI/SecureRest.cs
View file

@ -4,8 +4,9 @@ using System.Linq;
using System.Net; using System.Net;
using System.Text; using System.Text;
using HttpServer; using HttpServer;
using TShockAPI;
namespace TShockAPI namespace Rests
{ {
/// <summary> /// <summary>
/// ///
@ -66,7 +67,7 @@ namespace TShockAPI
Tokens.Add(hash, user); Tokens.Add(hash, user);
obj.SafeSet("token", hash); obj["token"] = hash;
return obj; return obj;
} }

1
TShockAPI/TShock.cs
View file

@ -39,6 +39,7 @@ using System.Threading;
using Community.CsharpSqlite.SQLiteClient; using Community.CsharpSqlite.SQLiteClient;
using HttpServer; using HttpServer;
using MySql.Data.MySqlClient; using MySql.Data.MySqlClient;
using Rests;
using Terraria; using Terraria;
using TerrariaAPI; using TerrariaAPI;
using TerrariaAPI.Hooks; using TerrariaAPI.Hooks;