Index: binary-improvements/MapRendering/Commands/EnableOpenIDDebug.cs =================================================================== --- binary-improvements/MapRendering/Commands/EnableOpenIDDebug.cs (revision 318) +++ binary-improvements/MapRendering/Commands/EnableOpenIDDebug.cs (revision 325) @@ -1,28 +1,24 @@ using System; using System.Collections.Generic; +using AllocsFixes.NetConnections.Servers.Web; -namespace AllocsFixes.CustomCommands -{ - public class EnableOpenIDDebug : ConsoleCmdAbstract - { - public override string GetDescription () - { +namespace AllocsFixes.CustomCommands { + public class EnableOpenIDDebug : ConsoleCmdAbstract { + public override string GetDescription () { return "enable/disable OpenID debugging"; } - public override string[] GetCommands () - { - return new string[] { "openiddebug" }; + public override string[] GetCommands () { + return new[] {"openiddebug"}; } - public override void Execute (List _params, CommandSenderInfo _senderInfo) - { + public override void Execute (List _params, CommandSenderInfo _senderInfo) { try { if (_params.Count != 1) { - SdtdConsole.Instance.Output ("Current state: " + AllocsFixes.NetConnections.Servers.Web.OpenID.debugOpenId); + SdtdConsole.Instance.Output ("Current state: " + OpenID.debugOpenId); return; } - AllocsFixes.NetConnections.Servers.Web.OpenID.debugOpenId = _params[0].Equals("1"); + OpenID.debugOpenId = _params [0].Equals ("1"); SdtdConsole.Instance.Output ("Set OpenID debugging to " + _params [0].Equals ("1")); } catch (Exception e) { Index: binary-improvements/MapRendering/Commands/EnableRendering.cs =================================================================== --- binary-improvements/MapRendering/Commands/EnableRendering.cs (revision 318) +++ binary-improvements/MapRendering/Commands/EnableRendering.cs (revision 325) @@ -2,27 +2,22 @@ using System.Collections.Generic; -namespace AllocsFixes.CustomCommands -{ - public class EnableRendering : ConsoleCmdAbstract - { - public override string GetDescription () - { +namespace AllocsFixes.CustomCommands { + public class EnableRendering : ConsoleCmdAbstract { + public override string GetDescription () { return "enable/disable live map rendering"; } - public override string[] GetCommands () - { - return new string[] { "enablerendering" }; + public override string[] GetCommands () { + return new[] {"enablerendering"}; } - public override void Execute (List _params, CommandSenderInfo _senderInfo) - { + public override void Execute (List _params, CommandSenderInfo _senderInfo) { try { if (_params.Count != 1) { - SdtdConsole.Instance.Output ("Current state: " + AllocsFixes.MapRendering.MapRendering.renderingEnabled); + SdtdConsole.Instance.Output ("Current state: " + MapRendering.MapRendering.renderingEnabled); return; } - AllocsFixes.MapRendering.MapRendering.renderingEnabled = _params[0].Equals("1"); + MapRendering.MapRendering.renderingEnabled = _params [0].Equals ("1"); SdtdConsole.Instance.Output ("Set live map rendering to " + _params [0].Equals ("1")); } catch (Exception e) { Index: binary-improvements/MapRendering/Commands/ReloadWebPermissions.cs =================================================================== --- binary-improvements/MapRendering/Commands/ReloadWebPermissions.cs (revision 318) +++ binary-improvements/MapRendering/Commands/ReloadWebPermissions.cs (revision 325) @@ -1,23 +1,19 @@ using System; using System.Collections.Generic; +using AllocsFixes.NetConnections.Servers.Web; -namespace AllocsFixes.CustomCommands -{ - public class ReloadWebPermissions : ConsoleCmdAbstract - { - public override string GetDescription () - { +namespace AllocsFixes.CustomCommands { + public class ReloadWebPermissions : ConsoleCmdAbstract { + public override string GetDescription () { return "force reload of web permissions file"; } - public override string[] GetCommands () - { - return new string[] { "reloadwebpermissions" }; + public override string[] GetCommands () { + return new[] {"reloadwebpermissions"}; } - public override void Execute (List _params, CommandSenderInfo _senderInfo) - { + public override void Execute (List _params, CommandSenderInfo _senderInfo) { try { - AllocsFixes.NetConnections.Servers.Web.WebPermissions.Instance.Load (); + WebPermissions.Instance.Load (); SdtdConsole.Instance.Output ("Web permissions file reloaded"); } catch (Exception e) { Index: binary-improvements/MapRendering/Commands/RenderMap.cs =================================================================== --- binary-improvements/MapRendering/Commands/RenderMap.cs (revision 318) +++ binary-improvements/MapRendering/Commands/RenderMap.cs (revision 325) @@ -1,25 +1,18 @@ -using AllocsFixes.MapRendering; using System; -using System.IO; using System.Collections.Generic; -namespace AllocsFixes.CustomCommands -{ - public class RenderMap : ConsoleCmdAbstract - { - public override string GetDescription () - { +namespace AllocsFixes.CustomCommands { + public class RenderMap : ConsoleCmdAbstract { + public override string GetDescription () { return "render the current map to a file"; } - public override string[] GetCommands () - { - return new string[] { "rendermap" }; + public override string[] GetCommands () { + return new[] {"rendermap"}; } - public override void Execute (List _params, CommandSenderInfo _senderInfo) - { + public override void Execute (List _params, CommandSenderInfo _senderInfo) { try { - AllocsFixes.MapRendering.MapRendering.Instance.RenderFullMap (); + MapRendering.MapRendering.Instance.RenderFullMap (); SdtdConsole.Instance.Output ("Render map done"); Index: binary-improvements/MapRendering/Commands/WebPermissionsCmd.cs =================================================================== --- binary-improvements/MapRendering/Commands/WebPermissionsCmd.cs (revision 318) +++ binary-improvements/MapRendering/Commands/WebPermissionsCmd.cs (revision 325) @@ -1,29 +1,24 @@ -using System; using System.Collections.Generic; -using System.IO; +using AllocsFixes.NetConnections.Servers.Web; -using AllocsFixes.NetConnections.Servers.Web; -using UnityEngine; - -namespace AllocsFixes.CustomCommands -{ +namespace AllocsFixes.CustomCommands { public class WebPermissionsCmd : ConsoleCmdAbstract { public override string[] GetCommands () { - return new string[] { "webpermission" }; + return new[] {"webpermission"}; } - - public override string GetDescription () { + + public override string GetDescription () { return "Manage web permission levels"; } - + public override string GetHelp () { return "Set/get permission levels required to access a given web functionality. Default\n" + - "level required for functions that are not explicitly specified is 0.\n" + - "Usage:\n" + - " webpermission add \n" + - " webpermission remove \n" + - " webpermission list"; + "level required for functions that are not explicitly specified is 0.\n" + + "Usage:\n" + + " webpermission add \n" + + " webpermission remove \n" + + " webpermission list"; } - + public override void Execute (List _params, CommandSenderInfo _senderInfo) { if (_params.Count >= 1) { @@ -46,5 +41,5 @@ } } - + private void ExecuteAdd (List _params) { if (_params.Count != 3) { @@ -52,10 +47,10 @@ return; } - + if (!WebPermissions.Instance.IsKnownModule (_params [1])) { SdtdConsole.Instance.Output ("\"" + _params [1] + "\" is not a valid web function."); return; } - + int level; if (!int.TryParse (_params [2], out level)) { @@ -63,9 +58,9 @@ return; } - + WebPermissions.Instance.AddModulePermission (_params [1], level); SdtdConsole.Instance.Output (string.Format ("{0} added with permission level of {1}.", _params [1], level)); } - + private void ExecuteRemove (List _params) { if (_params.Count != 2) { @@ -73,14 +68,14 @@ return; } - + if (!WebPermissions.Instance.IsKnownModule (_params [1])) { SdtdConsole.Instance.Output ("\"" + _params [1] + "\" is not a valid web function."); return; } - + WebPermissions.Instance.RemoveModulePermission (_params [1]); SdtdConsole.Instance.Output (string.Format ("{0} removed from permissions list.", _params [1])); } - + private void ExecuteList () { SdtdConsole.Instance.Output ("Defined web function permissions:"); @@ -90,5 +85,4 @@ } } - } } Index: binary-improvements/MapRendering/Commands/WebTokens.cs =================================================================== --- binary-improvements/MapRendering/Commands/WebTokens.cs (revision 318) +++ binary-improvements/MapRendering/Commands/WebTokens.cs (revision 325) @@ -1,20 +1,15 @@ -using System; using System.Collections.Generic; -using System.IO; using System.Text.RegularExpressions; +using AllocsFixes.NetConnections.Servers.Web; -using AllocsFixes.NetConnections.Servers.Web; -using UnityEngine; - -namespace AllocsFixes.CustomCommands -{ +namespace AllocsFixes.CustomCommands { public class WebTokens : ConsoleCmdAbstract { - private static Regex validNameTokenMatcher = new Regex (@"^\w+$"); + private static readonly Regex validNameTokenMatcher = new Regex (@"^\w+$"); public override string[] GetCommands () { - return new string[] { "webtokens" }; + return new[] {"webtokens"}; } - - public override string GetDescription () { + + public override string GetDescription () { return "Manage web tokens"; } @@ -22,10 +17,10 @@ public override string GetHelp () { return "Set/get webtoken permission levels. A level of 0 is maximum permission.\n" + - "Usage:\n" + - " webtokens add \n" + - " webtokens remove \n" + - " webtokens list"; + "Usage:\n" + + " webtokens add \n" + + " webtokens remove \n" + + " webtokens list"; } - + public override void Execute (List _params, CommandSenderInfo _senderInfo) { if (_params.Count >= 1) { @@ -61,5 +56,6 @@ if (!validNameTokenMatcher.IsMatch (_params [1])) { - SdtdConsole.Instance.Output ("Argument 'username' may only contain characters (A-Z, a-z), digits (0-9) and underscores (_)."); + SdtdConsole.Instance.Output ( + "Argument 'username' may only contain characters (A-Z, a-z), digits (0-9) and underscores (_)."); return; } @@ -71,5 +67,6 @@ if (!validNameTokenMatcher.IsMatch (_params [2])) { - SdtdConsole.Instance.Output ("Argument 'usertoken' may only contain characters (A-Z, a-z), digits (0-9) and underscores (_)."); + SdtdConsole.Instance.Output ( + "Argument 'usertoken' may only contain characters (A-Z, a-z), digits (0-9) and underscores (_)."); return; } @@ -82,7 +79,9 @@ WebPermissions.Instance.AddAdmin (_params [1], _params [2], level); - SdtdConsole.Instance.Output (string.Format ("Web user with name={0} and password={1} added with permission level of {2}.", _params [1], _params [2], level)); + SdtdConsole.Instance.Output (string.Format ( + "Web user with name={0} and password={1} added with permission level of {2}.", _params [1], _params [2], + level)); } - + private void ExecuteRemove (List _params) { if (_params.Count != 2) { @@ -90,5 +89,5 @@ return; } - + if (string.IsNullOrEmpty (_params [1])) { SdtdConsole.Instance.Output ("Argument 'username' is empty."); @@ -97,5 +96,6 @@ if (!validNameTokenMatcher.IsMatch (_params [1])) { - SdtdConsole.Instance.Output ("Argument 'username' may only contain characters (A-Z, a-z), digits (0-9) and underscores (_)."); + SdtdConsole.Instance.Output ( + "Argument 'username' may only contain characters (A-Z, a-z), digits (0-9) and underscores (_)."); return; } @@ -104,13 +104,13 @@ SdtdConsole.Instance.Output (string.Format ("{0} removed from web user permissions list.", _params [1])); } - + private void ExecuteList () { SdtdConsole.Instance.Output ("Defined webuser permissions:"); SdtdConsole.Instance.Output (" Level: Name / Token"); foreach (WebPermissions.AdminToken at in WebPermissions.Instance.GetAdmins ()) { - SdtdConsole.Instance.Output (string.Format (" {0,5}: {1} / {2}", at.permissionLevel, at.name, at.token)); + SdtdConsole.Instance.Output ( + string.Format (" {0,5}: {1} / {2}", at.permissionLevel, at.name, at.token)); } } - } } Index: binary-improvements/MapRendering/Commands/webstat.cs =================================================================== --- binary-improvements/MapRendering/Commands/webstat.cs (revision 318) +++ binary-improvements/MapRendering/Commands/webstat.cs (revision 325) @@ -1,33 +1,34 @@ using System; using System.Collections.Generic; +using AllocsFixes.NetConnections.Servers.Web; -namespace AllocsFixes.CustomCommands -{ - public class webstat : ConsoleCmdAbstract - { - public override string GetDescription () - { +namespace AllocsFixes.CustomCommands { + public class webstat : ConsoleCmdAbstract { + public override string GetDescription () { return "DEBUG PURPOSES ONLY"; } - public override string[] GetCommands () - { - return new string[] { "webstat" }; + public override string[] GetCommands () { + return new[] {"webstat"}; } - public override void Execute (List _params, CommandSenderInfo _senderInfo) - { + public override void Execute (List _params, CommandSenderInfo _senderInfo) { try { - int curHandlers = AllocsFixes.NetConnections.Servers.Web.Web.currentHandlers; - int totalHandlers = AllocsFixes.NetConnections.Servers.Web.Web.handlingCount; - long totalTime = AllocsFixes.NetConnections.Servers.Web.Web.totalHandlingTime; + int curHandlers = Web.currentHandlers; + int totalHandlers = Web.handlingCount; + long totalTime = Web.totalHandlingTime; SdtdConsole.Instance.Output ("Current Web handlers: " + curHandlers + " - total: " + totalHandlers); - SdtdConsole.Instance.Output (" - Total time: " + totalTime + " µs - average time: " + (totalTime / totalHandlers) + " µs"); + SdtdConsole.Instance.Output (" - Total time: " + totalTime + " µs - average time: " + + totalTime / totalHandlers + " µs"); - curHandlers = AllocsFixes.NetConnections.Servers.Web.WebCommandResult.currentHandlers; - totalHandlers = AllocsFixes.NetConnections.Servers.Web.WebCommandResult.handlingCount; - totalTime = AllocsFixes.NetConnections.Servers.Web.WebCommandResult.totalHandlingTime; - SdtdConsole.Instance.Output ("Current Web command handlers: " + curHandlers + " - total: " + totalHandlers); - SdtdConsole.Instance.Output (" - Total time: " + totalTime + " µs" + (totalHandlers > 0 ? " - average time: " + (totalTime / totalHandlers) + " µs" : "")); + curHandlers = WebCommandResult.currentHandlers; + totalHandlers = WebCommandResult.handlingCount; + totalTime = WebCommandResult.totalHandlingTime; + SdtdConsole.Instance.Output ("Current Web command handlers: " + curHandlers + " - total: " + + totalHandlers); + SdtdConsole.Instance.Output (" - Total time: " + totalTime + " µs" + + (totalHandlers > 0 + ? " - average time: " + totalTime / totalHandlers + " µs" + : "")); } catch (Exception e) { Log.Out ("Error in webstat.Run: " + e);