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

ReSharper Code optimization

Browse source
This commit is contained in:
Shank 2011-06-05 23:36:41 -06:00
parent 8b99bfacc0
commit dfc4325e59
10 changed files with 233 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

67
TShockAPI/FileTools.cs
View file

@ -1,18 +1,17 @@
using System;
using System.IO;
using System.Runtime.InteropServices;
using System.Web;
using System.IO;
using Terraria;
namespace TShockAPI
{
class FileTools
internal class FileTools
{
public static string SaveDir = "./tshock/";
public static void CreateFile(string file)
{
using (FileStream fs = File.Create(file)) { }
using (FileStream fs = File.Create(file))
{
}
}
/// <summary>
@ -21,7 +20,7 @@ namespace TShockAPI
/// <param name="err">string message</param>
public static void WriteError(string err)
{
if (System.IO.File.Exists(SaveDir + "errors.txt"))
if (File.Exists(SaveDir + "errors.txt"))
{
TextWriter tw = new StreamWriter(SaveDir + "errors.txt", true);
tw.WriteLine(err);
@ -29,7 +28,7 @@ namespace TShockAPI
}
else
{
FileTools.CreateFile(SaveDir + "errors.txt");
CreateFile(SaveDir + "errors.txt");
TextWriter tw = new StreamWriter(SaveDir + "errors.txt", true);
tw.WriteLine(err);
tw.Close();
@ -41,30 +40,45 @@ namespace TShockAPI
/// </summary>
public static void SetupConfig()
{
if (!System.IO.Directory.Exists(SaveDir)) { System.IO.Directory.CreateDirectory(SaveDir); }
if (!System.IO.File.Exists(SaveDir + "motd.txt"))
if (!Directory.Exists(SaveDir))
{
FileTools.CreateFile(SaveDir + "motd.txt");
Directory.CreateDirectory(SaveDir);
}
if (!File.Exists(SaveDir + "motd.txt"))
{
CreateFile(SaveDir + "motd.txt");
TextWriter tw = new StreamWriter(SaveDir + "motd.txt");
tw.WriteLine("This server is running TShock. Type /help for a list of commands.");
tw.WriteLine("%255,000,000%Current map: %map%");
tw.WriteLine("Current players: %players%");
tw.Close();
}
if (!System.IO.File.Exists(SaveDir + "bans.txt")) { FileTools.CreateFile(SaveDir + "bans.txt"); }
if (!System.IO.File.Exists(SaveDir + "cheaters.txt")) { FileTools.CreateFile(SaveDir + "cheaters.txt"); }
if (!System.IO.File.Exists(SaveDir + "grief.txt")) { FileTools.CreateFile(SaveDir + "grief.txt"); }
if (!System.IO.File.Exists(SaveDir + "whitelist.txt")) { FileTools.CreateFile(SaveDir + "whitelist.txt"); }
if (!System.IO.File.Exists(SaveDir + "groups.txt"))
if (!File.Exists(SaveDir + "bans.txt"))
{
FileTools.CreateFile(SaveDir + "groups.txt");
CreateFile(SaveDir + "bans.txt");
}
if (!File.Exists(SaveDir + "cheaters.txt"))
{
CreateFile(SaveDir + "cheaters.txt");
}
if (!File.Exists(SaveDir + "grief.txt"))
{
CreateFile(SaveDir + "grief.txt");
}
if (!File.Exists(SaveDir + "whitelist.txt"))
{
CreateFile(SaveDir + "whitelist.txt");
}
if (!File.Exists(SaveDir + "groups.txt"))
{
CreateFile(SaveDir + "groups.txt");
StreamWriter sw = new StreamWriter(SaveDir + "groups.txt");
sw.Write(Resources.groups);
sw.Close();
}
if (!System.IO.File.Exists(SaveDir + "users.txt"))
if (!File.Exists(SaveDir + "users.txt"))
{
FileTools.CreateFile(SaveDir + "users.txt");
CreateFile(SaveDir + "users.txt");
StreamWriter sw = new StreamWriter(SaveDir + "users.txt");
sw.Write(Resources.users);
sw.Close();
@ -81,14 +95,21 @@ namespace TShockAPI
/// <returns>true/false</returns>
public static bool OnWhitelist(string ip)
{
if (!ConfigurationManager.enableWhitelist) { return true; }
if (!System.IO.File.Exists(SaveDir + "whitelist.txt")) { FileTools.CreateFile(SaveDir + "whitelist.txt"); TextWriter tw = new StreamWriter(SaveDir + "whitelist.txt"); tw.WriteLine("127.0.0.1"); tw.Close(); }
if (!ConfigurationManager.enableWhitelist)
{
return true;
}
if (!File.Exists(SaveDir + "whitelist.txt"))
{
CreateFile(SaveDir + "whitelist.txt");
TextWriter tw = new StreamWriter(SaveDir + "whitelist.txt");
tw.WriteLine("127.0.0.1");
tw.Close();
}
TextReader tr = new StreamReader(SaveDir + "whitelist.txt");
string whitelist = tr.ReadToEnd();
ip = Tools.GetRealIP(ip);
return whitelist.Contains(ip);
}
public FileTools() { }
}
}