Changeset 309 for binary-improvements/MapRendering

Timestamp:

Aug 9, 2017, 7:43:07 PM (7 years ago)

Author:

alloc

Message:

Fixes 14_16_21

Location:

binary-improvements/MapRendering

Files:

• ModInfo.xml (modified) (1 diff)
• Web/API/GetPlayerList.cs (modified) (1 diff)
• Web/API/GetPlayersOnline.cs (modified) (1 diff)
• Web/API/WebAPI.cs (modified) (1 diff)
• Web/Handlers/UserStatusHandler.cs (modified) (1 diff)
• Web/Web.cs (modified) (3 diffs)
• Web/WebCommandResult.cs (modified) (1 diff)

binary-improvements/MapRendering/ModInfo.xml

@@ -5 +5 @@
                 <Description value="Render the game map to image map tiles as it is uncovered" />
                 <Author value="Christian 'Alloc' Illy" />
-                <Version value="20" />
+                <Version value="21" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>

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

@@ -67 +67 @@
 
                                         pJson.Add ("totalplaytime", new JSONNumber (p.TotalPlayTime));
-                                        pJson.Add ("lastonline", new JSONString (p.LastOnline.ToUniversalTime ().ToString ("s")));
+                                        pJson.Add ("lastonline", new JSONString (p.LastOnline.ToUniversalTime ().ToString ("yyyy-MM-ddTHH:mm:ssZ")));
                                         pJson.Add ("ping", new JSONNumber (p.IsOnline ? p.ClientInfo.ping : -1));
 

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

@@ -26 +26 @@
                                 p.Add ("steamid", new JSONString (ci.playerId));
                                 p.Add ("entityid", new JSONNumber (ci.entityId));
-                                p.Add ("ip", new JSONString (ci != null ? ci.ip : string.Empty));
+                                p.Add ("ip", new JSONString (ci.ip));
                                 p.Add ("name", new JSONString (current.Value.EntityName));
                                 p.Add ("online", new JSONBoolean (true));

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

@@ -9 +9 @@
                 public static void WriteJSON (HttpListenerResponse resp, JSON.JSONNode root)
                 {
-                        byte[] buf = Encoding.UTF8.GetBytes (root.ToString());
+                        StringBuilder sb = new StringBuilder ();
+                        root.ToString (sb);
+                        byte[] buf = Encoding.UTF8.GetBytes (sb.ToString ());
                         resp.ContentLength64 = buf.Length;
                         resp.ContentType = "application/json";

binary-improvements/MapRendering/Web/Handlers/UserStatusHandler.cs

@@ -28 +28 @@
                         result.Add ("permissions", perms);
 
-                        WriteJSON (resp, result);
-                }
-
-                public void WriteJSON (HttpListenerResponse resp, JSONNode root) {
-                        byte[] buf = Encoding.UTF8.GetBytes (root.ToString ());
-                        resp.ContentLength64 = buf.Length;
-                        resp.ContentType = "application/json";
-                        resp.ContentEncoding = Encoding.UTF8;
-                        resp.OutputStream.Write (buf, 0, buf.Length);
+                        AllocsFixes.NetConnections.Servers.Web.API.WebAPI.WriteJSON (resp, result);
                 }
 

binary-improvements/MapRendering/Web/Web.cs

@@ -78 +78 @@
                                                                         dataFolder,
                                                                         new AllocsFixes.FileCache.SimpleCache (),
-                                                                        true)
+                                                                        false)
                                         );
                                 } else {
@@ -87 +87 @@
                                                                         dataFolder,
                                                                         new AllocsFixes.FileCache.DirectAccess (),
-                                                                        true)
+                                                                        false)
                                         );
                                 }
@@ -185 +185 @@
                                         }
 
-                                        Log.Out ("Error in Web.HandleRequest(): No handler found for path \"" + request.Url.AbsolutePath + "\"");
+                                        // Not really relevant for non-debugging purposes:
+                                        //Log.Out ("Error in Web.HandleRequest(): No handler found for path \"" + request.Url.AbsolutePath + "\"");
                                         response.StatusCode = (int)HttpStatusCode.NotFound;
                                 } catch (IOException e) {

binary-improvements/MapRendering/Web/WebCommandResult.cs

@@ -47 +47 @@
                         }
 
-                        response.SendChunked = false;
+                        try {
+                                response.SendChunked = false;
 
-                        try {
                                 if (responseType == ResultType.Raw) {
                                         WebAPI.WriteText (response, sb.ToString ());