Changeset 326 for binary-improvements/MapRendering/Web/API

Timestamp:

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

Author:

alloc

Message:

More cleanup, allocation improvements

Location:

binary-improvements/MapRendering/Web/API

Files:

• GetLandClaims.cs (modified) (2 diffs)
• GetPlayerInventory.cs (modified) (1 diff)
• GetPlayerList.cs (modified) (6 diffs)
• GetPlayersLocation.cs (modified) (1 diff)
• GetPlayersOnline.cs (modified) (1 diff)
• WebAPI.cs (modified) (1 diff)

binary-improvements/MapRendering/Web/API/GetLandClaims.cs

@@ -50 +50 @@
 
                         foreach (KeyValuePair<Player, List<Vector3i>> kvp in claims) {
-                                try {
+//                              try {
                                         JSONObject owner = new JSONObject ();
                                         claimOwners.Add (owner);
@@ -74 +74 @@
                                                 claimsJson.Add (claim);
                                         }
-                                } catch {
-                                }
+//                              } catch {
+//                              }
                         }
 

binary-improvements/MapRendering/Web/API/GetPlayerInventory.cs

@@ -75 +75 @@
 
                 internal static JSONNode GetJsonForItem (InvItem _item) {
-                        if (_item != null) {
-                                JSONObject jsonItem = new JSONObject ();
-                                jsonItem.Add ("count", new JSONNumber (_item.count));
-                                jsonItem.Add ("name", new JSONString (_item.itemName));
-                                jsonItem.Add ("icon", new JSONString (_item.icon));
-                                jsonItem.Add ("iconcolor", new JSONString (_item.iconcolor));
-                                jsonItem.Add ("quality", new JSONNumber (_item.quality));
-                                if (_item.quality >= 0) {
-                                        jsonItem.Add ("qualitycolor", new JSONString (QualityInfo.GetQualityColorHex (_item.quality)));
-                                }
-
-                                return jsonItem;
+                        if (_item == null) {
+                                return new JSONNull ();
                         }
 
-                        return new JSONNull ();
+                        JSONObject jsonItem = new JSONObject ();
+                        jsonItem.Add ("count", new JSONNumber (_item.count));
+                        jsonItem.Add ("name", new JSONString (_item.itemName));
+                        jsonItem.Add ("icon", new JSONString (_item.icon));
+                        jsonItem.Add ("iconcolor", new JSONString (_item.iconcolor));
+                        jsonItem.Add ("quality", new JSONNumber (_item.quality));
+                        if (_item.quality >= 0) {
+                                jsonItem.Add ("qualitycolor", new JSONString (QualityInfo.GetQualityColorHex (_item.quality)));
+                        }
+
+                        return jsonItem;
+
                 }
         }

binary-improvements/MapRendering/Web/API/GetPlayerList.cs

@@ -40 +40 @@
                                 Player p = playersList [sid, false];
 
-                                ulong player_steam_ID = 0L;
+                                ulong player_steam_ID;
                                 if (!ulong.TryParse (sid, out player_steam_ID)) {
                                         player_steam_ID = 0L;
@@ -64 +64 @@
                                         pJson.Add ("ping", new JSONNumber (p.IsOnline ? p.ClientInfo.ping : -1));
 
-                                        JSONBoolean banned = null;
+                                        JSONBoolean banned;
                                         if (admTools != null) {
                                                 banned = new JSONBoolean (admTools.IsBanned (sid));
@@ -132 +132 @@
 
                                 if (colType == typeof (JSONBoolean)) {
-                                        bool value = _filterVal.Trim ().ToLower () == "true";
-                                        return _list.Where (line => (line [_filterCol] as JSONBoolean).GetBool () == value);
+                                        bool value = StringParsers.ParseBool (_filterVal);
+                                        return _list.Where (line => ((JSONBoolean) line [_filterCol]).GetBool () == value);
                                 }
 
@@ -143 +143 @@
                                         //Log.Out ("GetPlayerList: Filter on String with Regex '" + _filterVal + "'");
                                         Regex matcher = new Regex (_filterVal, RegexOptions.IgnoreCase);
-                                        return _list.Where (line => matcher.IsMatch ((line [_filterCol] as JSONString).GetString ()));
+                                        return _list.Where (line => matcher.IsMatch (((JSONString) line [_filterCol]).GetString ()));
                                 }
                         }
@@ -185 +185 @@
 
                                 return _list.Where (delegate (JSONObject line) {
-                                        double objVal = (line [_filterCol] as JSONNumber).GetDouble ();
+                                        double objVal = ((JSONNumber) line [_filterCol]).GetDouble ();
                                         switch (matchType) {
                                                 case NumberMatchType.Greater:
@@ -216 +216 @@
                                 if (colType == typeof (JSONNumber)) {
                                         if (_ascending) {
-                                                return _list.OrderBy (line => (line [_sortCol] as JSONNumber).GetDouble ());
-                                        }
-
-                                        return _list.OrderByDescending (line => (line [_sortCol] as JSONNumber).GetDouble ());
+                                                return _list.OrderBy (line => ((JSONNumber) line [_sortCol]).GetDouble ());
+                                        }
+
+                                        return _list.OrderByDescending (line => ((JSONNumber) line [_sortCol]).GetDouble ());
                                 }
 
                                 if (colType == typeof (JSONBoolean)) {
                                         if (_ascending) {
-                                                return _list.OrderBy (line => (line [_sortCol] as JSONBoolean).GetBool ());
-                                        }
-
-                                        return _list.OrderByDescending (line => (line [_sortCol] as JSONBoolean).GetBool ());
+                                                return _list.OrderBy (line => ((JSONBoolean) line [_sortCol]).GetBool ());
+                                        }
+
+                                        return _list.OrderByDescending (line => ((JSONBoolean) line [_sortCol]).GetBool ());
                                 }
 

binary-improvements/MapRendering/Web/API/GetPlayersLocation.cs

@@ -31 +31 @@
 
                                 if (listOffline || p.IsOnline) {
-                                        ulong player_steam_ID = 0L;
+                                        ulong player_steam_ID;
                                         if (!ulong.TryParse (sid, out player_steam_ID)) {
                                                 player_steam_ID = 0L;

binary-improvements/MapRendering/Web/API/GetPlayersOnline.cs

@@ -41 +41 @@
                                 p.Add ("totalplaytime", new JSONNumber (player != null ? player.TotalPlayTime : -1));
                                 p.Add ("lastonline", new JSONString (player != null ? player.LastOnline.ToString ("s") : string.Empty));
-                                p.Add ("ping", new JSONNumber (ci != null ? ci.ping : -1));
+                                p.Add ("ping", new JSONNumber (ci.ping));
 
                                 players.Add (p);

binary-improvements/MapRendering/Web/API/WebAPI.cs

@@ -5 +5 @@
 namespace AllocsFixes.NetConnections.Servers.Web.API {
         public abstract class WebAPI {
+                public readonly string Name;
+
+                protected WebAPI () {
+                        Name = GetType ().Name;
+                }
+
                 public static void WriteJSON (HttpListenerResponse resp, JSONNode root) {
                         StringBuilder sb = new StringBuilder ();