Changeset 306 for binary-improvements/MapRendering/Web/WebCommandResult.cs

Timestamp:

Aug 2, 2017, 6:46:15 PM (7 years ago)

Author:

alloc

Message:

Fixes update A16.2

File:

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

binary-improvements/MapRendering/Web/WebCommandResult.cs

@@ -8 +8 @@
 using System.Net.Sockets;
 using System.Threading;
+using AllocsFixes.NetConnections.Servers.Web.API;
 
 namespace AllocsFixes.NetConnections.Servers.Web
@@ -13 +14 @@
         public class WebCommandResult : IConsoleConnection
         {
+                public enum ResultType {
+                        Full,
+                        ResultOnly,
+                        Raw
+                }
+
                 public static int handlingCount = 0;
                 public static int currentHandlers = 0;
@@ -20 +27 @@
                 private string command;
                 private string parameters;
+                private ResultType responseType;
 
-                public WebCommandResult (string _command, string _parameters, HttpListenerResponse _response) {
+                public WebCommandResult (string _command, string _parameters, ResultType _responseType, HttpListenerResponse _response) {
                         Interlocked.Increment (ref handlingCount);
                         Interlocked.Increment (ref currentHandlers);
@@ -28 +36 @@
                         command = _command;
                         parameters = _parameters;
+                        responseType = _responseType;
                 }
 
@@ -38 +47 @@
                         }
 
-                        JSONObject result = new JSONObject ();
-
-                        result.Add ("command", new JSONString (command));
-                        result.Add ("parameters", new JSONString (parameters));
-                        result.Add ("result", new JSONString (sb.ToString ()));
-
                         response.SendChunked = false;
 
                         try {
-                                WriteJSON (response, result);
+                                if (responseType == ResultType.Raw) {
+                                        WebAPI.WriteText (response, sb.ToString ());
+                                } else {
+                                        JSONNode result;
+                                        if (responseType == ResultType.ResultOnly) {
+                                                result = new JSONString (sb.ToString ());
+                                        } else {
+                                                JSONObject resultObj = new JSONObject ();
+
+                                                resultObj.Add ("command", new JSONString (command));
+                                                resultObj.Add ("parameters", new JSONString (parameters));
+                                                resultObj.Add ("result", new JSONString (sb.ToString ()));
+
+                                                result = resultObj;
+                                        }
+                                        WebAPI.WriteJSON (response, result);
+                                }
                         } catch (IOException e) {
                                 if (e.InnerException is SocketException) {
@@ -62 +81 @@
 
                                 msw.Stop ();
-                                totalHandlingTime += msw.ElapsedMicroseconds;
-                                Log.Out ("WebCommandResult.SendLines(): Took {0} µs", msw.ElapsedMicroseconds);
+                                if (GamePrefs.GetInt (EnumGamePrefs.HideCommandExecutionLog) < 1) {
+                                        totalHandlingTime += msw.ElapsedMicroseconds;
+                                        Log.Out ("WebCommandResult.SendLines(): Took {0} µs", msw.ElapsedMicroseconds);
+                                }
                                 Interlocked.Decrement (ref currentHandlers);
                         }
-                }
-
-                public void WriteJSON (HttpListenerResponse resp, JSON.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);
                 }