Changeset 306 for binary-improvements/MapRendering

Timestamp:

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

Author:

alloc

Message:

Fixes update A16.2

Location:

binary-improvements/MapRendering

Files:

• ModInfo.xml (modified) (1 diff)
• Web/API/ExecuteConsoleCommand.cs (modified) (2 diffs)
• Web/API/GetAnimalsLocation.cs (modified) (1 diff)
• Web/API/GetHostileLocation.cs (modified) (1 diff)
• Web/API/GetStats.cs (modified) (1 diff)
• Web/API/GetWebUIUpdates.cs (modified) (1 diff)
• Web/API/WebAPI.cs (modified) (2 diffs)
• Web/Handlers/ItemIconHandler.cs (modified) (2 diffs)
• Web/WebCommandResult.cs (modified) (6 diffs)

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="19" />
+                <Version value="20" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>

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

@@ -15 +15 @@
                                 return;
                         }
+
+                        WebCommandResult.ResultType responseType =
+                                req.QueryString ["raw"] != null ? WebCommandResult.ResultType.Raw :
+                                (req.QueryString ["simple"] != null ? WebCommandResult.ResultType.ResultOnly :
+                                        WebCommandResult.ResultType.Full);
 
                         string commandline = req.QueryString ["command"];
@@ -36 +41 @@
                         }
 
-                        // TODO: Execute command (store resp as IConsoleConnection instance to deliver response to the single client?)
-
                         resp.SendChunked = true;
-                        WebCommandResult wcr = new WebCommandResult (commandPart, argumentsPart, resp);
+                        WebCommandResult wcr = new WebCommandResult (commandPart, argumentsPart, responseType, resp);
                         SdtdConsole.Instance.ExecuteAsync (commandline, wcr);
                 }

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

@@ -9 +9 @@
     class GetAnimalsLocation : WebAPI
     {
+                private List<EntityAnimal> animals = new List<EntityAnimal> ();
+
         public override void HandleRequest(HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, int permissionLevel)
         {
             JSONArray animalsJsResult = new JSONArray();
 
-            foreach (EntityAnimal entity in Animals.List)
-            {
+                        Animals.Get (animals);
+                        for (int i = 0; i < animals.Count; i++)
+                        {
+                                EntityAnimal entity = animals [i];
                 Vector3i position = new Vector3i(entity.GetPosition());
 

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

@@ -9 +9 @@
     class GetHostileLocation : WebAPI
     {
+                private List<EntityEnemy> enemies = new List<EntityEnemy> ();
+
         public override void HandleRequest(HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, int permissionLevel)
         {
             JSONArray hostilesJsResult = new JSONArray();
 
-            foreach (EntityEnemy entity in Hostiles.List)
+                        Hostiles.Get (enemies);
+                        for (int i = 0; i < enemies.Count; i++)
             {
+                                EntityEnemy entity = enemies [i];
                 Vector3i position = new Vector3i(entity.GetPosition());
 

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

@@ -21 +21 @@
 
                         result.Add ("players", new JSONNumber (GameManager.Instance.World.Players.Count));
-            result.Add ("hostiles", new JSONNumber (Hostiles.Count));
-            result.Add ("animals", new JSONNumber (Animals.Count));
+                        result.Add ("hostiles", new JSONNumber (Hostiles.GetCount ()));
+                        result.Add ("animals", new JSONNumber (Animals.GetCount ()));
 
                         WriteJSON (resp, result);

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

@@ -24 +24 @@
 
                         result.Add ("players", new JSONNumber (GameManager.Instance.World.Players.Count));
-            result.Add ("hostiles", new JSONNumber (Hostiles.Count));
-            result.Add ("animals", new JSONNumber (Animals.Count));
+                        result.Add ("hostiles", new JSONNumber (Hostiles.GetCount ()));
+                        result.Add ("animals", new JSONNumber (Animals.GetCount ()));
 
                         result.Add ("newlogs", new JSONNumber (LogBuffer.Instance.LatestLine - latestLine));

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

@@ -7 +7 @@
         public abstract class WebAPI
         {
-                public void WriteJSON (HttpListenerResponse resp, JSON.JSONNode root)
+                public static void WriteJSON (HttpListenerResponse resp, JSON.JSONNode root)
                 {
                         byte[] buf = Encoding.UTF8.GetBytes (root.ToString());
@@ -14 +14 @@
                         resp.ContentEncoding = Encoding.UTF8;
                         resp.OutputStream.Write (buf, 0, buf.Length);
+                }
+
+                public static void WriteText (HttpListenerResponse _resp, string _text)
+                {
+                        byte[] buf = Encoding.UTF8.GetBytes (_text);
+                        _resp.ContentLength64 = buf.Length;
+                        _resp.ContentType = "text/plain";
+                        _resp.ContentEncoding = Encoding.UTF8;
+                        _resp.OutputStream.Write (buf, 0, buf.Length);
                 }
 

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

@@ -152 +152 @@
 
                 private void AddIcon (string _name, Texture2D _tex, Dictionary<string, List<Color>> _tintedIcons) {
-                        icons.Add (_name + "__FFFFFF", _tex.EncodeToPNG ());
+                        icons [_name + "__FFFFFF"] = _tex.EncodeToPNG ();
 
                         if (_tintedIcons.ContainsKey (_name)) {
@@ -166 +166 @@
                                                 }
 
-                                                icons.Add (tintedName, tintedTex.EncodeToPNG ());
+                                                icons [tintedName] = tintedTex.EncodeToPNG ();
 
                                                 UnityEngine.Object.Destroy (tintedTex);

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