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

Timestamp:

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

Author:

alloc

Message:

Fixes update A16.2

Location:

binary-improvements/MapRendering/Web/API

Files:

• ExecuteConsoleCommand.cs (modified) (2 diffs)
• GetAnimalsLocation.cs (modified) (1 diff)
• GetHostileLocation.cs (modified) (1 diff)
• GetStats.cs (modified) (1 diff)
• GetWebUIUpdates.cs (modified) (1 diff)
• WebAPI.cs (modified) (2 diffs)

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