Changeset 326 for binary-improvements/MapRendering/Web/API/GetPlayerList.cs

Timestamp:

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

Author:

alloc

Message:

More cleanup, allocation improvements

File:

• binary-improvements/MapRendering/Web/API/GetPlayerList.cs (modified) (6 diffs)

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 ());
                                 }