clean up json output

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/share/lua/intf/modules/httprequests.lua b/share/lua/intf/modules/httprequests.lua
index 9e549c4a08d5048e0981b9ce5b00717d63d026bb..bbef5695815854ba41be7f325daa011fda491df9 100644 (file)
--- a/share/lua/intf/modules/httprequests.lua
+++ b/share/lua/intf/modules/httprequests.lua
@@ -196,9 +196,28 @@ function xmlString(s)
   end
 end
 
+--dkjson outputs numbered tables as arrays
+--so we don't need the array indicators
+function removeArrayIndicators(dict)
+       local newDict=dict
 
+       for k,v in pairs(dict) do
+               if (type(v)=="table") then
+                       local arrayEntry=v._array
+                       if arrayEntry then
+                               v=arrayEntry
+                       end
+
+                       dict[k]=removeArrayIndicators(v)
+               end
+       end
+
+       return newDict
+end
 
 printTableAsJson = function (dict)
+       dict=removeArrayIndicators(dict)
+
        local output=dkjson.encode (dict, { indent = true })
        print(output)
 end