Changeset 250 for binary-improvements/MapRendering

Timestamp:

Aug 12, 2015, 6:10:28 PM (9 years ago)

Author:

alloc

Message:

Fixes 5_7_9

Location:

binary-improvements/MapRendering

Files:

• API.cs (modified) (1 diff)
• ModInfo.xml (modified) (1 diff)
• Web/API/GetLog.cs (added)
• Web/API/GetPlayerInventory.cs (modified) (2 diffs)
• Web/API/GetWebUIUpdates.cs (added)
• Web/ConnectionHandler.cs (modified) (1 diff)
• Web/Handlers/ApiHandler.cs (modified) (3 diffs)
• Web/LogBuffer.cs (added)
• Web/Web.cs (modified) (1 diff)
• Web/WebConnection.cs (modified) (2 diffs)
• WebAndMapRendering.csproj (modified) (1 diff)

binary-improvements/MapRendering/API.cs

@@ -7 +7 @@
                 public override void GameAwake () {
                         new AllocsFixes.NetConnections.Servers.Web.Web ();
+                        AllocsFixes.NetConnections.Servers.Web.LogBuffer.Instance.GetType ();
                 }
 

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

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

@@ -35 +35 @@
                         result.Add ("equipment", equipment);
 
-                        for (int i = 0; i < inv.belt.Count; i++) {
-                                JSONObject item = new JSONObject ();
-                                if (inv.belt [i] != null) {
-                                        item.Add ("count", new JSONNumber (inv.belt [i].count));
-                                        item.Add ("name", new JSONString (inv.belt [i].itemName));
-                                } else {
-                                        item.Add ("count", new JSONNumber (0));
-                                        item.Add ("name", new JSONString (string.Empty));
-                                }
-                                belt.Add (item);
-                        }
-                        for (int i = 0; i < inv.bag.Count; i++) {
-                                JSONObject item = new JSONObject ();
-                                if (inv.bag [i] != null) {
-                                        item.Add ("count", new JSONNumber (inv.bag [i].count));
-                                        item.Add ("name", new JSONString (inv.bag [i].itemName));
-                                } else {
-                                        item.Add ("count", new JSONNumber (0));
-                                        item.Add ("name", new JSONString (string.Empty));
-                                }
-                                bag.Add (item);
-                        }
+                        DoInventory (belt, inv.belt);
+                        DoInventory (bag, inv.bag);
 
                         AddEquipment (equipment, "head", inv.equipment, XMLData.Item.EnumEquipmentSlot.Head, NGuiInvGridEquipment.EnumClothingLayer.Middle);
@@ -76 +56 @@
                 }
 
+                private void DoInventory (JSONArray _jsonRes, List<InvItem> _inv) {
+                        for (int i = 0; i < _inv.Count; i++) {
+                                _jsonRes.Add (GetJsonForItem (_inv [i]));
+                        }
+                }
+
                 private void AddEquipment (JSONObject _eq, string _slotname, InvItem[] _items, XMLData.Item.EnumEquipmentSlot _slot, NGuiInvGridEquipment.EnumClothingLayer _layer) {
                         int index = (int)_slot + (int)_layer * (int)XMLData.Item.EnumEquipmentSlot.Count;
-                        if (_items != null && _items [index] != null) {
-                                _eq.Add (_slotname, new JSONString (_items [index].itemName));
+                        if (_items != null) {
+                                _eq.Add (_slotname, GetJsonForItem (_items [index]));
                         } else {
-                                _eq.Add (_slotname, new JSONBoolean (false));
+                                _eq.Add (_slotname, new JSONNull ());
+                        }
+                }
+
+                private JSONNode GetJsonForItem (InvItem _item) {
+                        if (_item != null) {
+                                JSONObject jsonItem = new JSONObject ();
+                                jsonItem.Add ("count", new JSONNumber (_item.count));
+                                jsonItem.Add ("name", new JSONString (_item.itemName));
+                                jsonItem.Add ("quality", new JSONNumber (_item.quality));
+                                if (_item.quality >= 0) {
+                                        jsonItem.Add ("qualitycolor", new JSONString (QualityInfo.GetQualityColorHex (_item.quality)));
+                                }
+                                return jsonItem;
+                        } else {
+                                return new JSONNull ();
                         }
                 }

binary-improvements/MapRendering/Web/ConnectionHandler.cs

@@ -50 +50 @@
                 }
 
-                public void SendLog (string text, string trace, UnityEngine.LogType type) {
-                        foreach (WebConnection wc in connections.Values) {
-                                wc.SendLog (text, trace, type);
-                        }
-                }
-
         }
 }

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

@@ -4 +4 @@
 using System.IO;
 using System.Net;
+using System.Reflection;
 using System.Threading;
 
@@ -14 +15 @@
                 public ApiHandler (string staticPart, string moduleName = null) : base(moduleName) {
                         this.staticPart = staticPart;
-                        addApi ("getlandclaims", new GetLandClaims ());
-                        addApi ("getplayersonline", new GetPlayersOnline ());
-                        addApi ("getplayerslocation", new GetPlayersLocation ());
-                        addApi ("getplayerinventory", new GetPlayerInventory ());
-                        addApi ("getstats", new GetStats ());
+
+                        foreach (Type t in Assembly.GetExecutingAssembly ().GetTypes ()) {
+                                if (!t.IsAbstract && t.IsSubclassOf (typeof(WebAPI))) {
+                                        ConstructorInfo ctor = t.GetConstructor (new Type[0]);
+                                        if (ctor != null) {
+                                                WebAPI apiInstance = (WebAPI)ctor.Invoke (new object[0]);
+                                                addApi (t.Name.ToLower (), apiInstance);
+                                        }
+                                }
+                        }
                 }
 
@@ -38 +44 @@
                         } else {
                                 foreach (KeyValuePair<string, WebAPI> kvp in apis) {
-                                        try {
-                                                if (apiName.StartsWith (kvp.Key)) {
+                                        if (apiName.StartsWith (kvp.Key)) {
+                                                try {
                                                         kvp.Value.HandleRequest (req, resp, user, permissionLevel);
                                                         return;
+                                                } catch (Exception e) {
+                                                        Log.Error ("Error in ApiHandler.HandleRequest(): Handler {0} threw an exception:", kvp.Key);
+                                                        Log.Exception (e);
+                                                        resp.StatusCode = (int)HttpStatusCode.InternalServerError;
+                                                        return;
                                                 }
-                                        } catch (Exception e) {
-                                                Log.Out ("Error in ApiHandler.HandleRequest(): Handler threw an exception: " + e);
-                                                resp.StatusCode = (int)HttpStatusCode.InternalServerError;
-                                                return;
                                         }
                                 }

binary-improvements/MapRendering/Web/Web.cs

@@ -250 +250 @@
 
                 public void SendLog (string text, string trace, UnityEngine.LogType type) {
-                        connectionHandler.SendLog (text, trace, type);
+                        // Do nothing, handled by LogBuffer internally
                 }
 

binary-improvements/MapRendering/Web/WebConnection.cs

@@ -12 +12 @@
                 private DateTime login;
                 private DateTime lastAction;
-
                 private List<string> outputLines = new List<string> ();
-                private List<LogLine> logLines = new List<LogLine> ();
 
                 public string SessionID {
@@ -57 +55 @@
 
                 public override void SendLog (string _msg, string _trace, LogType _type) {
-                        LogLine ll = new LogLine ();
-                        ll.message = _msg;
-                        ll.trace = _trace;
-                        ll.type = _type;
-                        logLines.Add (ll);
+                        // Do nothing, handled by LogBuffer
                 }
 
-                private struct LogLine {
-                        public string message;
-                        public string trace;
-                        public LogType type;
-                }
         }
 }

binary-improvements/MapRendering/WebAndMapRendering.csproj

@@ -75 +75 @@
     <Compile Include="Commands\WebTokens.cs" />
     <Compile Include="Commands\WebPermissionsCmd.cs" />
+    <Compile Include="Web\LogBuffer.cs" />
+    <Compile Include="Web\API\GetLog.cs" />
+    <Compile Include="Web\API\GetWebUIUpdates.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />