Changeset 455 for binary-improvements/MapRendering/API/GetAllowedCommands.cs

Timestamp:

Jul 31, 2023, 4:06:13 PM (16 months ago)

Author:

alloc

Message:

25_30_44

• Got rid (mostly) of custom JSON serialization
• Some code cleanup

File:

• binary-improvements/MapRendering/API/GetAllowedCommands.cs (modified) (1 diff)

binary-improvements/MapRendering/API/GetAllowedCommands.cs

@@ -1 @@
-using AllocsFixes.JSON;
+using JetBrains.Annotations;
+using Utf8Json;
 using Webserver;
 using Webserver.WebAPI;
 
 namespace AllocsFixes.WebAPIs {
+        [UsedImplicitly]
         public class GetAllowedCommands : AbsWebAPI {
+                private static readonly byte[] jsonKeyCommands = JsonWriter.GetEncodedPropertyNameWithBeginObject ("commands");
+
+                private static readonly byte[] jsonKeyCommand = JsonWriter.GetEncodedPropertyNameWithBeginObject ("command");
+                private static readonly byte[] jsonKeyDescription = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("description");
+                private static readonly byte[] jsonKeyHelp = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("help");
+
                 public override void HandleRequest (RequestContext _context) {
-                        JSONObject result = new JSONObject ();
-                        JSONArray entries = new JSONArray ();
+                        JsonWriter writer = new JsonWriter ();
+                        
+                        writer.WriteRaw (jsonKeyCommands);
+                        writer.WriteBeginArray ();
+
+                        bool first = true;
+
                         foreach (IConsoleCommand cc in SdtdConsole.Instance.GetCommands ()) {
                                 int commandPermissionLevel = GameManager.Instance.adminTools.Commands.GetCommandPermissionLevel (cc.GetCommands ());
-                                if (_context.PermissionLevel <= commandPermissionLevel) {
-                                        string cmd = string.Empty;
-                                        foreach (string s in cc.GetCommands ()) {
-                                                if (s.Length > cmd.Length) {
-                                                        cmd = s;
-                                                }
+                                if (_context.PermissionLevel > commandPermissionLevel) {
+                                        continue;
+                                }
+
+                                string cmd = string.Empty;
+                                foreach (string s in cc.GetCommands ()) {
+                                        if (s.Length > cmd.Length) {
+                                                cmd = s;
                                         }
+                                }
 
-                                        JSONObject cmdObj = new JSONObject ();
-                                        cmdObj.Add ("command", new JSONString (cmd));
-                                        cmdObj.Add ("description", new JSONString (cc.GetDescription ()));
-                                        cmdObj.Add ("help", new JSONString (cc.GetHelp ()));
-                                        entries.Add (cmdObj);
+                                if (!first) {
+                                        writer.WriteValueSeparator ();
                                 }
+
+                                first = false;
+                                
+                                writer.WriteRaw (jsonKeyCommand);
+                                writer.WriteString (cmd);
+                                
+                                writer.WriteRaw (jsonKeyDescription);
+                                writer.WriteString (cc.GetDescription ());
+                                
+                                writer.WriteRaw (jsonKeyHelp);
+                                if (cc.GetHelp () == null) {
+                                        writer.WriteString ("");
+                                } else {
+                                        writer.WriteString (cc.GetHelp ());
+                                }
+
+                                writer.WriteEndObject ();
                         }
 
-                        result.Add ("commands", entries);
-
-                        LegacyApiHelper.WriteJSON (_context.Response, result);
+                        writer.WriteEndArray ();
+                        writer.WriteEndObject ();
+                        
+                        WebUtils.WriteJsonData (_context.Response, ref writer);
                 }