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

Timestamp:

Nov 16, 2018, 10:38:46 PM (6 years ago)

Author:

alloc

Message:

*Latest optimizations

File:

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

binary-improvements/MapRendering/Web/WebPermissions.cs

@@ -1 +1 @@
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 using System.Xml;
+using UniLinq;
 
 namespace AllocsFixes.NetConnections.Servers.Web {
@@ -10 +12 @@
 
                 private readonly Dictionary<string, WebModulePermission> knownModules =
-                        new Dictionary<string, WebModulePermission> ();
+                        new CaseInsensitiveStringDictionary<WebModulePermission> ();
 
                 private readonly Dictionary<string, AdminToken> admintokens = new CaseInsensitiveStringDictionary<AdminToken> ();
@@ -18 +20 @@
 
                 public WebPermissions () {
+                        allModulesList = new List<WebModulePermission> ();
+                        allModulesListRO = new ReadOnlyCollection<WebModulePermission> (allModulesList);
                         Directory.CreateDirectory (GetFilePath ());
                         InitFileWatcher ();
@@ -54 +58 @@
                         }
 
+                        if (knownModules.TryGetValue (_module, out result)) {
+                                return result;
+                        }
+
                         return defaultModulePermission;
                 }
@@ -93 +101 @@
                         WebModulePermission p = new WebModulePermission (_module, _permissionLevel);
                         lock (this) {
+                                allModulesList.Clear ();
                                 modules [_module] = p;
                                 if (_save) {
@@ -104 +113 @@
                                 return;
                         }
-
-                        lock (this) {
-                                if (!IsKnownModule (_module)) {
-                                        knownModules.Add (_module, new WebModulePermission (_module, _defaultPermission));
-                                }
-
-                                if (_defaultPermission > 0 && !modules.ContainsKey (_module)) {
-                                        AddModulePermission (_module, _defaultPermission);
-                                }
+                        
+                        WebModulePermission p = new WebModulePermission (_module, _defaultPermission);
+
+                        lock (this) {
+                                allModulesList.Clear ();
+                                knownModules [_module] = p;
                         }
                 }
@@ -129 +135 @@
                 public void RemoveModulePermission (string _module, bool _save = true) {
                         lock (this) {
+                                allModulesList.Clear ();
                                 modules.Remove (_module);
                                 if (_save) {
@@ -136 +143 @@
                 }
 
-                public List<WebModulePermission> GetModules () {
-                        List<WebModulePermission> result = new List<WebModulePermission> ();
-                        foreach (string module in knownModules.Keys) {
-                                if (modules.ContainsKey (module)) {
-                                        result.Add (modules [module]);
-                                } else {
-                                        result.Add (knownModules [module]);
-                                }
-                        }
-
-                        return result;
+                private readonly List<WebModulePermission> allModulesList;
+                private readonly ReadOnlyCollection<WebModulePermission> allModulesListRO; 
+
+                public IList<WebModulePermission> GetModules () {
+                        if (allModulesList.Count == 0) {
+                                foreach (KeyValuePair<string, WebModulePermission> kvp in knownModules) {
+                                        if (modules.ContainsKey (kvp.Key)) {
+                                                allModulesList.Add (modules [kvp.Key]);
+                                        } else {
+                                                allModulesList.Add (kvp.Value);
+                                        }
+                                }
+                        }
+
+                        return allModulesListRO;
                 }
 
@@ -302 +313 @@
                                 sw.WriteLine (
                                         "               <!-- <token name=\"adminuser1\" token=\"supersecrettoken\" permission_level=\"0\" /> -->");
-                                foreach (AdminToken at in admintokens.Values) {
-                                        sw.WriteLine ("         <token name=\"{0}\" token=\"{1}\" permission_level=\"{2}\" />", at.name, at.token,
-                                                at.permissionLevel);
+                                foreach (KeyValuePair<string, AdminToken> kvp in admintokens) {
+                                        sw.WriteLine ("         <token name=\"{0}\" token=\"{1}\" permission_level=\"{2}\" />", kvp.Value.name,
+                                                kvp.Value.token, kvp.Value.permissionLevel);
                                 }
 
@@ -310 +321 @@
                                 sw.WriteLine ();
                                 sw.WriteLine (" <permissions>");
-                                foreach (WebModulePermission wap in modules.Values) {
-                                        sw.WriteLine ("         <permission module=\"{0}\" permission_level=\"{1}\" />", wap.module,
-                                                wap.permissionLevel);
+                                foreach (KeyValuePair<string, WebModulePermission> kvp in modules) {
+                                        sw.WriteLine ("         <permission module=\"{0}\" permission_level=\"{1}\" />", kvp.Value.module,
+                                                kvp.Value.permissionLevel);
                                 }