Changeset 326 for binary-improvements/MapRendering/Web/WebPermissions.cs

Timestamp:

Sep 4, 2018, 2:33:52 PM (6 years ago)

Author:

alloc

Message:

More cleanup, allocation improvements

File:

• binary-improvements/MapRendering/Web/WebPermissions.cs (modified) (12 diffs)

binary-improvements/MapRendering/Web/WebPermissions.cs

@@ -12 +12 @@
                         new Dictionary<string, WebModulePermission> ();
 
-                private Dictionary<string, AdminToken> admintokens;
+                private readonly Dictionary<string, AdminToken> admintokens = new CaseInsensitiveStringDictionary<AdminToken> ();
                 private FileSystemWatcher fileWatcher;
 
-                private Dictionary<string, WebModulePermission> modules;
+                private readonly Dictionary<string, WebModulePermission> modules = new CaseInsensitiveStringDictionary<WebModulePermission> ();
 
                 public WebPermissions () {
@@ -49 +49 @@
 
                 public WebModulePermission GetModulePermission (string _module) {
-                        if (modules.ContainsKey (_module.ToLower ())) {
-                                return modules [_module.ToLower ()];
+                        WebModulePermission result;
+                        if (modules.TryGetValue (_module, out result)) {
+                                return result;
                         }
 
@@ -83 +84 @@
                 public AdminToken[] GetAdmins () {
                         AdminToken[] result = new AdminToken[admintokens.Count];
-                        admintokens.Values.CopyTo (result, 0);
+                        admintokens.CopyValuesTo (result);
                         return result;
                 }
@@ -90 +91 @@
                 // Commands
                 public void AddModulePermission (string _module, int _permissionLevel, bool _save = true) {
-                        WebModulePermission p = new WebModulePermission (_module.ToLower (), _permissionLevel);
+                        WebModulePermission p = new WebModulePermission (_module, _permissionLevel);
                         lock (this) {
                                 modules [_module] = p;
@@ -100 +101 @@
 
                 public void AddKnownModule (string _module, int _defaultPermission) {
-                        if (!string.IsNullOrEmpty (_module)) {
-                                lock (this) {
-                                        if (!IsKnownModule (_module)) {
-                                                knownModules.Add (_module, new WebModulePermission (_module, _defaultPermission));
-                                        }
-
-                                        if (_defaultPermission > 0 && !modules.ContainsKey (_module.ToLower ())) {
-                                                AddModulePermission (_module, _defaultPermission);
-                                        }
+                        if (string.IsNullOrEmpty (_module)) {
+                                return;
+                        }
+
+                        lock (this) {
+                                if (!IsKnownModule (_module)) {
+                                        knownModules.Add (_module, new WebModulePermission (_module, _defaultPermission));
+                                }
+
+                                if (_defaultPermission > 0 && !modules.ContainsKey (_module)) {
+                                        AddModulePermission (_module, _defaultPermission);
                                 }
                         }
@@ -114 +117 @@
 
                 public bool IsKnownModule (string _module) {
-                        if (!string.IsNullOrEmpty (_module)) {
-                                lock (this) {
-                                        return knownModules.ContainsKey (_module);
-                                }
-                        }
-
-                        return false;
+                        if (string.IsNullOrEmpty (_module)) {
+                                return false;
+                        }
+
+                        lock (this) {
+                                return knownModules.ContainsKey (_module);
+                        }
+
                 }
 
                 public void RemoveModulePermission (string _module, bool _save = true) {
                         lock (this) {
-                                modules.Remove (_module.ToLower ());
+                                modules.Remove (_module);
                                 if (_save) {
                                         Save ();
@@ -174 +178 @@
 
                 public void Load () {
-                        admintokens = new Dictionary<string, AdminToken> ();
-                        modules = new Dictionary<string, WebModulePermission> ();
+                        admintokens.Clear ();
+                        modules.Clear ();
 
                         if (!Utils.FileExists (GetFullPath ())) {
@@ -190 +194 @@
                                 xmlDoc.Load (GetFullPath ());
                         } catch (XmlException e) {
-                                Log.Error (string.Format ("Failed loading permissions file: {0}", e.Message));
+                                Log.Error ("Failed loading permissions file: " + e.Message);
                                 return;
                         }
@@ -196 +200 @@
                         XmlNode adminToolsNode = xmlDoc.DocumentElement;
 
+                        if (adminToolsNode == null) {
+                                Log.Error ("Failed loading permissions file: No DocumentElement found");
+                                return;
+                        }
+                        
                         foreach (XmlNode childNode in adminToolsNode.ChildNodes) {
                                 if (childNode.Name == "admintokens") {
@@ -230 +239 @@
                                                 string name = lineItem.GetAttribute ("name");
                                                 string token = lineItem.GetAttribute ("token");
-                                                int permissionLevel = 2000;
+                                                int permissionLevel;
                                                 if (!int.TryParse (lineItem.GetAttribute ("permission_level"), out permissionLevel)) {
                                                         Log.Warning (
@@ -267 +276 @@
                                                 }
 
-                                                int permissionLevel = 0;
+                                                int permissionLevel;
                                                 if (!int.TryParse (lineItem.GetAttribute ("permission_level"), out permissionLevel)) {
                                                         Log.Warning (
@@ -275 +284 @@
                                                 }
 
-                                                AddModulePermission (lineItem.GetAttribute ("module").ToLower (), permissionLevel, false);
+                                                AddModulePermission (lineItem.GetAttribute ("module"), permissionLevel, false);
                                         }
                                 }