warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes code according to modern code style. Fixes a few expression bugs.

Browse source
This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions
Download patch file Download diff file Expand all files Collapse all files

198
Scripts/Commands/Logging.cs
View file

@ -1,137 +1,139 @@
using System;
using System.IO;
using System.Text;
using Server.Accounting;
namespace Server.Commands
{
public class CommandLogging
{
public static bool Enabled { get; set; } = true;
public class CommandLogging
{
private static char[] m_NotSafe = { '\\', '/', ':', '*', '?', '"', '<', '>', '|' };
public static bool Enabled{ get; set; } = true;
public static StreamWriter Output { get; private set; }
public static StreamWriter Output{ get; private set; }
public static void Initialize()
{
EventSink.Command += EventSink_Command;
public static void Initialize()
{
EventSink.Command += EventSink_Command;
if ( !Directory.Exists( "Logs" ) )
Directory.CreateDirectory( "Logs" );
if (!Directory.Exists("Logs"))
Directory.CreateDirectory("Logs");
string directory = "Logs/Commands";
string directory = "Logs/Commands";
if ( !Directory.Exists( directory ) )
Directory.CreateDirectory( directory );
if (!Directory.Exists(directory))
Directory.CreateDirectory(directory);
try
{
Output = new StreamWriter( Path.Combine( directory, $"{DateTime.UtcNow.ToLongDateString()}.log"), true );
try
{
Output = new StreamWriter(Path.Combine(directory, $"{DateTime.UtcNow.ToLongDateString()}.log"), true);
Output.AutoFlush = true;
Output.AutoFlush = true;
Output.WriteLine( "##############################" );
Output.WriteLine( "Log started on {0}", DateTime.UtcNow );
Output.WriteLine();
}
catch
{
}
}
Output.WriteLine("##############################");
Output.WriteLine("Log started on {0}", DateTime.UtcNow);
Output.WriteLine();
}
catch
{
}
}
public static object Format( object o )
{
if ( o is Mobile m )
{
if ( m.Account == null )
return $"{m} (no account)";
public static object Format(object o)
{
if (o is Mobile m)
{
if (m.Account == null)
return $"{m} (no account)";
return $"{m} ('{m.Account.Username}')";
}
if ( o is Item item )
{
return $"0x{item.Serial.Value:X} ({item.GetType().Name})";
}
return $"{m} ('{m.Account.Username}')";
}
return o;
}
if (o is Item item) return $"0x{item.Serial.Value:X} ({item.GetType().Name})";
public static void WriteLine( Mobile from, string format, params object[] args )
{
if ( !Enabled )
return;
return o;
}
WriteLine( from, string.Format( format, args ) );
}
public static void WriteLine(Mobile from, string format, params object[] args)
{
if (!Enabled)
return;
public static void WriteLine( Mobile from, string text )
{
if ( !Enabled )
return;
WriteLine(from, string.Format(format, args));
}
try
{
Output.WriteLine( "{0}: {1}: {2}", DateTime.UtcNow, from.NetState, text );
public static void WriteLine(Mobile from, string text)
{
if (!Enabled)
return;
string path = Core.BaseDirectory;
try
{
Output.WriteLine("{0}: {1}: {2}", DateTime.UtcNow, from.NetState, text);
string name = ( !(from.Account is Account acct) ? from.Name : acct.Username );
string path = Core.BaseDirectory;
AppendPath( ref path, "Logs" );
AppendPath( ref path, "Commands" );
AppendPath( ref path, from.AccessLevel.ToString() );
path = Path.Combine( path, $"{name}.log");
string name = !(from.Account is Account acct) ? from.Name : acct.Username;
using ( StreamWriter sw = new StreamWriter( path, true ) )
sw.WriteLine( "{0}: {1}: {2}", DateTime.UtcNow, from.NetState, text );
}
catch
{
}
}
AppendPath(ref path, "Logs");
AppendPath(ref path, "Commands");
AppendPath(ref path, from.AccessLevel.ToString());
path = Path.Combine(path, $"{name}.log");
private static char[] m_NotSafe = { '\\', '/', ':', '*', '?', '"', '<', '>', '|' };
using (StreamWriter sw = new StreamWriter(path, true))
{
sw.WriteLine("{0}: {1}: {2}", DateTime.UtcNow, from.NetState, text);
}
}
catch
{
}
}
public static void AppendPath( ref string path, string toAppend )
{
path = Path.Combine( path, toAppend );
public static void AppendPath(ref string path, string toAppend)
{
path = Path.Combine(path, toAppend);
if ( !Directory.Exists( path ) )
Directory.CreateDirectory( path );
}
if (!Directory.Exists(path))
Directory.CreateDirectory(path);
}
public static string Safe( string ip )
{
if ( ip == null )
return "null";
public static string Safe(string ip)
{
if (ip == null)
return "null";
ip = ip.Trim();
ip = ip.Trim();
if ( ip.Length == 0 )
return "empty";
if (ip.Length == 0)
return "empty";
bool isSafe = true;
bool isSafe = true;
for ( int i = 0; isSafe && i < m_NotSafe.Length; ++i )
isSafe = ( ip.IndexOf( m_NotSafe[i] ) == -1 );
for (int i = 0; isSafe && i < m_NotSafe.Length; ++i)
isSafe = ip.IndexOf(m_NotSafe[i]) == -1;
if ( isSafe )
return ip;
if (isSafe)
return ip;
System.Text.StringBuilder sb = new System.Text.StringBuilder( ip );
StringBuilder sb = new StringBuilder(ip);
for ( int i = 0; i < m_NotSafe.Length; ++i )
sb.Replace( m_NotSafe[i], '_' );
for (int i = 0; i < m_NotSafe.Length; ++i)
sb.Replace(m_NotSafe[i], '_');
return sb.ToString();
}
return sb.ToString();
}
public static void EventSink_Command( CommandEventArgs e )
{
WriteLine( e.Mobile, "{0} {1} used command '{2} {3}'", e.Mobile.AccessLevel, Format( e.Mobile ), e.Command, e.ArgString );
}
public static void EventSink_Command(CommandEventArgs e)
{
WriteLine(e.Mobile, "{0} {1} used command '{2} {3}'", e.Mobile.AccessLevel, Format(e.Mobile), e.Command,
e.ArgString);
}
public static void LogChangeProperty( Mobile from, object o, string name, string value )
{
WriteLine( from, "{0} {1} set property '{2}' of {3} to '{4}'", from.AccessLevel, Format( from ), name, Format( o ), value );
}
}
}
public static void LogChangeProperty(Mobile from, object o, string name, string value)
{
WriteLine(from, "{0} {1} set property '{2}' of {3} to '{4}'", from.AccessLevel, Format(from), name, Format(o),
value);
}
}
}