diff --git a/share/lua/intf/modules/httprequests.lua b/share/lua/intf/modules/httprequests.lua
index b771175edc968dd684f55f1a59825cb24ac4f942..bed51a0e9d936f039febdb4634c7611fea015cb7 100644
--- a/share/lua/intf/modules/httprequests.lua
+++ b/share/lua/intf/modules/httprequests.lua
@@ -35,27 +35,27 @@ end
--split text where it matches the delimiter
function strsplit(text, delimiter)
- local strfind = string.find
- local strsub = string.sub
- local tinsert = table.insert
- local list = {}
- local pos = 1
- if strfind("", delimiter, 1) then -- this would result in endless loops
- error("delimiter matches empty string!")
- end
- local i=1
- while 1 do
- i=i+1
- local first, last = strfind(text, delimiter, pos)
- if first then -- found?
- tinsert(list,i, strsub(text, pos, first-1))
- pos = last+1
- else
- tinsert(list,i, strsub(text, pos))
- break
- end
- end
- return list
+ local strfind = string.find
+ local strsub = string.sub
+ local tinsert = table.insert
+ local list = {}
+ local pos = 1
+ if strfind("", delimiter, 1) then -- this would result in endless loops
+ error("delimiter matches empty string!")
+ end
+ local i=1
+ while 1 do
+ i=i+1
+ local first, last = strfind(text, delimiter, pos)
+ if first then -- found?
+ tinsert(list,i, strsub(text, pos, first-1))
+ pos = last+1
+ else
+ tinsert(list,i, strsub(text, pos))
+ break
+ end
+ end
+ return list
end
function round(what, precision)
@@ -66,123 +66,123 @@ end
processcommands = function ()
- local input = _GET['input']
- local command = _GET['command']
- local id = tonumber(_GET['id'] or -1)
- local val = _GET['val']
- local options = _GET['option']
- local band = _GET['band']
- if type(options) ~= "table" then -- Deal with the 0 or 1 option case
- options = { options }
- end
-
- if command == "in_play" then
- --[[
- vlc.msg.err( "<options>" )
- for a,b in ipairs(options) do
- vlc.msg.err(b)
- end
- vlc.msg.err( "</options>" )
- --]]
- vlc.playlist.add({{path=vlc.strings.make_uri(input),options=options}})
- elseif command == "addsubtitle" then
- vlc.input.add_subtitle (vlc.strings.make_uri(val))
- elseif command == "in_enqueue" then
- vlc.playlist.enqueue({{path=vlc.strings.make_uri(input),options=options}})
- elseif command == "pl_play" then
- if id == -1 then
- vlc.playlist.play()
- else
- vlc.playlist.goto(id)
- end
- elseif command == "pl_pause" then
- if vlc.playlist.status() == "stopped" then
- if id == -1 then
- vlc.playlist.play()
- else
- vlc.playlist.goto(id)
- end
- else
- vlc.playlist.pause()
- end
- elseif command == "pl_forcepause" then
- if vlc.playlist.status() == "playing" then
- vlc.playlist.pause()
- end
- elseif command == "pl_forceresume" then
- if vlc.playlist.status() == "paused" then
- vlc.playlist.pause()
- end
- elseif command == "pl_stop" then
- vlc.playlist.stop()
- elseif command == "pl_next" then
- vlc.playlist.next()
- elseif command == "pl_previous" then
- vlc.playlist.prev()
- elseif command == "pl_delete" then
- vlc.playlist.delete(id)
- elseif command == "pl_empty" then
- vlc.playlist.clear()
- elseif command == "pl_sort" then
- vlc.playlist.sort( val, id > 0 )
- elseif command == "pl_random" then
- vlc.playlist.random()
- elseif command == "pl_loop" then
- --if loop is set true, then repeat needs to be set false
- if vlc.playlist.loop() then
- vlc.playlist.repeat_("off")
- end
- elseif command == "pl_repeat" then
- --if repeat is set true, then loop needs to be set false
- if vlc.playlist.repeat_() then
- vlc.playlist.loop("off")
- end
- elseif command == "pl_sd" then
- if vlc.sd.is_loaded(val) then
- vlc.sd.remove(val)
- else
- vlc.sd.add(val)
- end
- elseif command == "fullscreen" then
- vlc.video.fullscreen()
- elseif command == "snapshot" then
- common.snapshot()
- elseif command == "volume" then
- common.volume(val)
- elseif command == "seek" then
- common.seek(val)
- elseif command == "key" then
- common.hotkey("key-"..val)
- elseif command == "audiodelay" then
- if vlc.object.input() and val then
- vlc.var.set(vlc.object.input(),"audio-delay",val)
- end
- elseif command == "rate" then
- if vlc.object.input() and tonumber(val) >= 0 then
- vlc.var.set(vlc.object.input(),"rate",val)
- end
- elseif command == "subdelay" then
- if vlc.object.input() then
- vlc.var.set(vlc.object.input(),"spu-delay",val)
- end
- elseif command == "aspectratio" then
- if vlc.object.vout() then
- vlc.var.set(vlc.object.vout(),"aspect-ratio",val)
- end
- elseif command == "preamp" then
- vlc.equalizer.preampset(val)
- elseif command == "equalizer" then
- vlc.equalizer.equalizerset(band,val)
- elseif command == "enableeq" then
- if val == '0' then vlc.equalizer.enable(false) else vlc.equalizer.enable(true) end
- elseif command == "setpreset" then
- vlc.equalizer.setpreset(val)
- end
-
- local input = nil
- local command = nil
- local id = nil
- local val = nil
+ local input = _GET['input']
+ local command = _GET['command']
+ local id = tonumber(_GET['id'] or -1)
+ local val = _GET['val']
+ local options = _GET['option']
+ local band = _GET['band']
+ if type(options) ~= "table" then -- Deal with the 0 or 1 option case
+ options = { options }
+ end
+
+ if command == "in_play" then
+ --[[
+ vlc.msg.err( "<options>" )
+ for a,b in ipairs(options) do
+ vlc.msg.err(b)
+ end
+ vlc.msg.err( "</options>" )
+ --]]
+ vlc.playlist.add({{path=vlc.strings.make_uri(input),options=options}})
+ elseif command == "addsubtitle" then
+ vlc.input.add_subtitle (vlc.strings.make_uri(val))
+ elseif command == "in_enqueue" then
+ vlc.playlist.enqueue({{path=vlc.strings.make_uri(input),options=options}})
+ elseif command == "pl_play" then
+ if id == -1 then
+ vlc.playlist.play()
+ else
+ vlc.playlist.goto(id)
+ end
+ elseif command == "pl_pause" then
+ if vlc.playlist.status() == "stopped" then
+ if id == -1 then
+ vlc.playlist.play()
+ else
+ vlc.playlist.goto(id)
+ end
+ else
+ vlc.playlist.pause()
+ end
+ elseif command == "pl_forcepause" then
+ if vlc.playlist.status() == "playing" then
+ vlc.playlist.pause()
+ end
+ elseif command == "pl_forceresume" then
+ if vlc.playlist.status() == "paused" then
+ vlc.playlist.pause()
+ end
+ elseif command == "pl_stop" then
+ vlc.playlist.stop()
+ elseif command == "pl_next" then
+ vlc.playlist.next()
+ elseif command == "pl_previous" then
+ vlc.playlist.prev()
+ elseif command == "pl_delete" then
+ vlc.playlist.delete(id)
+ elseif command == "pl_empty" then
+ vlc.playlist.clear()
+ elseif command == "pl_sort" then
+ vlc.playlist.sort( val, id > 0 )
+ elseif command == "pl_random" then
+ vlc.playlist.random()
+ elseif command == "pl_loop" then
+ --if loop is set true, then repeat needs to be set false
+ if vlc.playlist.loop() then
+ vlc.playlist.repeat_("off")
+ end
+ elseif command == "pl_repeat" then
+ --if repeat is set true, then loop needs to be set false
+ if vlc.playlist.repeat_() then
+ vlc.playlist.loop("off")
+ end
+ elseif command == "pl_sd" then
+ if vlc.sd.is_loaded(val) then
+ vlc.sd.remove(val)
+ else
+ vlc.sd.add(val)
+ end
+ elseif command == "fullscreen" then
+ vlc.video.fullscreen()
+ elseif command == "snapshot" then
+ common.snapshot()
+ elseif command == "volume" then
+ common.volume(val)
+ elseif command == "seek" then
+ common.seek(val)
+ elseif command == "key" then
+ common.hotkey("key-"..val)
+ elseif command == "audiodelay" then
+ if vlc.object.input() and val then
+ vlc.var.set(vlc.object.input(),"audio-delay",val)
+ end
+ elseif command == "rate" then
+ if vlc.object.input() and tonumber(val) >= 0 then
+ vlc.var.set(vlc.object.input(),"rate",val)
+ end
+ elseif command == "subdelay" then
+ if vlc.object.input() then
+ vlc.var.set(vlc.object.input(),"spu-delay",val)
+ end
+ elseif command == "aspectratio" then
+ if vlc.object.vout() then
+ vlc.var.set(vlc.object.vout(),"aspect-ratio",val)
+ end
+ elseif command == "preamp" then
+ vlc.equalizer.preampset(val)
+ elseif command == "equalizer" then
+ vlc.equalizer.equalizerset(band,val)
+ elseif command == "enableeq" then
+ if val == '0' then vlc.equalizer.enable(false) else vlc.equalizer.enable(true) end
+ elseif command == "setpreset" then
+ vlc.equalizer.setpreset(val)
+ end
+
+ local input = nil
+ local command = nil
+ local id = nil
+ local val = nil
end
@@ -190,58 +190,58 @@ end
function xmlString(s)
if (type(s)=="string") then
- return vlc.strings.convert_xml_special_chars(s)
+ return vlc.strings.convert_xml_special_chars(s)
else
- return tostring(s)
+ return tostring(s)
end
end
--dkjson outputs numbered tables as arrays
--so we don't need the array indicators
function removeArrayIndicators(dict)
- local newDict=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
+ 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
+ dict[k]=removeArrayIndicators(v)
+ end
+ end
- return newDict
+ return newDict
end
printTableAsJson = function (dict)
- dict=removeArrayIndicators(dict)
+ dict=removeArrayIndicators(dict)
- local output=dkjson.encode (dict, { indent = true })
- print(output)
+ local output=dkjson.encode (dict, { indent = true })
+ print(output)
end
local printXmlKeyValue = function (k,v,indent)
- print("\n")
- for i=1,indent do print(" ") end
- if (k) then
- print("<"..k..">")
- end
-
- if (type(v)=="table") then
- printTableAsXml(v,indent+2)
- else
- print(xmlString(v))
+ print("\n")
+ for i=1,indent do print(" ") end
+ if (k) then
+ print("<"..k..">")
+ end
+
+ if (type(v)=="table") then
+ printTableAsXml(v,indent+2)
+ else
+ print(xmlString(v))
end
if (k) then
- print("</"..xmlString(k)..">")
- end
+ print("</"..xmlString(k)..">")
+ end
end
printTableAsXml = function (dict,indent)
- for k,v in pairs(dict) do
+ for k,v in pairs(dict) do
printXmlKeyValue(k,v,indent)
end
end
@@ -261,140 +261,140 @@ end
--main accessors
getplaylist = function ()
- local p
-
- if _GET["search"] then
- if _GET["search"] ~= "" then
- _G.search_key = _GET["search"]
- else
- _G.search_key = nil
- end
- local key = vlc.strings.decode_uri(_GET["search"])
- p = vlc.playlist.search(key)
- else
- p = vlc.playlist.get()
- end
-
- --logTable(p) --Uncomment to debug
-
- return p
+ local p
+
+ if _GET["search"] then
+ if _GET["search"] ~= "" then
+ _G.search_key = _GET["search"]
+ else
+ _G.search_key = nil
+ end
+ local key = vlc.strings.decode_uri(_GET["search"])
+ p = vlc.playlist.search(key)
+ else
+ p = vlc.playlist.get()
+ end
+
+ --logTable(p) --Uncomment to debug
+
+ return p
end
parseplaylist = function (item)
- if item.flags.disabled then return end
+ if item.flags.disabled then return end
- if (item.children) then
- local result={}
- local name = (item.name or "")
+ if (item.children) then
+ local result={}
+ local name = (item.name or "")
- result["type"]="node"
- result.id=tostring(item.id)
- result.name=tostring(name)
- result.ro=item.flags.ro and "ro" or "rw"
+ result["type"]="node"
+ result.id=tostring(item.id)
+ result.name=tostring(name)
+ result.ro=item.flags.ro and "ro" or "rw"
- --store children in an array
- --we use _array as a proxy for arrays
- result.children={}
- result.children._array={}
+ --store children in an array
+ --we use _array as a proxy for arrays
+ result.children={}
+ result.children._array={}
- for _, child in ipairs(item.children) do
- local nextChild=parseplaylist(child)
+ for _, child in ipairs(item.children) do
+ local nextChild=parseplaylist(child)
table.insert(result.children._array,nextChild)
end
- return result
- else
- local result={}
- local name, path = item.name or ""
- local path = item.path or ""
- local current_item = vlc.input.item()
+ return result
+ else
+ local result={}
+ local name, path = item.name or ""
+ local path = item.path or ""
+ local current_item = vlc.input.item()
- -- Is the item the one currently played
- if(current_item ~= nil) then
+ -- Is the item the one currently played
+ if(current_item ~= nil) then
if(vlc.input.item().uri(current_item) == path) then
result.current = "current"
end
end
- result["type"]="leaf"
- result.id=tostring(item.id)
- result.uri=tostring(path)
- result.name=name
- result.ro=item.flags.ro and "ro" or "rw"
- result.duration=math.floor(item.duration)
+ result["type"]="leaf"
+ result.id=tostring(item.id)
+ result.uri=tostring(path)
+ result.name=name
+ result.ro=item.flags.ro and "ro" or "rw"
+ result.duration=math.floor(item.duration)
- return result
- end
+ return result
+ end
end
playlisttable = function ()
- local basePlaylist=getplaylist()
+ local basePlaylist=getplaylist()
- return parseplaylist(basePlaylist)
+ return parseplaylist(basePlaylist)
end
getbrowsetable = function ()
- local dir = nil
- local uri = _GET["uri"]
- --uri takes precedence, but fall back to dir
- if uri then
- dir = vlc.strings.make_path(uri)
- else
- dir = _GET["dir"]
- end
-
- --backwards compatibility with old format driveLetter:\\..
- --this is forgiving with the slash type and number
- local position=string.find(dir, '%a:[\\/]*%.%.',0)
- if position==1 then dir="" end
-
- local result={}
- --paths are returned as an array of elements
- result.element={}
- result.element._array={}
-
- if dir then
- if dir == "~" then dir = vlc.misc.homedir() end
- -- FIXME: hack for Win32 drive list
- if dir~="" then
- dir = common.realpath(dir.."/")
- end
-
- local d = vlc.net.opendir(dir)
- table.sort(d)
-
- for _,f in pairs(d) do
- if f == ".." or not string.match(f,"^%.") then
- local df = common.realpath(dir..f)
- local s = vlc.net.stat(df)
- local path, name = df, f
- local element={}
-
- for k,v in pairs(s) do
- element[k]=v
- end
- element["path"]=path
- element["name"]=name
-
- local uri=vlc.strings.make_uri(df)
- --windows paths are returned with / separators, but make_uri expects \ for windows and returns nil
- if not uri then
- --convert failed path to windows format and try again
- path=string.gsub(path,"/","\\")
- uri=vlc.strings.make_uri(df)
- end
- element["uri"]=uri
-
- table.insert(result.element._array,element)
- end
-
- end
- end
-
- return result;
+ local dir = nil
+ local uri = _GET["uri"]
+ --uri takes precedence, but fall back to dir
+ if uri then
+ dir = vlc.strings.make_path(uri)
+ else
+ dir = _GET["dir"]
+ end
+
+ --backwards compatibility with old format driveLetter:\\..
+ --this is forgiving with the slash type and number
+ local position=string.find(dir, '%a:[\\/]*%.%.',0)
+ if position==1 then dir="" end
+
+ local result={}
+ --paths are returned as an array of elements
+ result.element={}
+ result.element._array={}
+
+ if dir then
+ if dir == "~" then dir = vlc.misc.homedir() end
+ -- FIXME: hack for Win32 drive list
+ if dir~="" then
+ dir = common.realpath(dir.."/")
+ end
+
+ local d = vlc.net.opendir(dir)
+ table.sort(d)
+
+ for _,f in pairs(d) do
+ if f == ".." or not string.match(f,"^%.") then
+ local df = common.realpath(dir..f)
+ local s = vlc.net.stat(df)
+ local path, name = df, f
+ local element={}
+
+ for k,v in pairs(s) do
+ element[k]=v
+ end
+ element["path"]=path
+ element["name"]=name
+
+ local uri=vlc.strings.make_uri(df)
+ --windows paths are returned with / separators, but make_uri expects \ for windows and returns nil
+ if not uri then
+ --convert failed path to windows format and try again
+ path=string.gsub(path,"/","\\")
+ uri=vlc.strings.make_uri(df)
+ end
+ element["uri"]=uri
+
+ table.insert(result.element._array,element)
+ end
+
+ end
+ end
+
+ return result;
end
@@ -407,92 +407,92 @@ local playlist = vlc.object.playlist()
local vout = vlc.object.vout()
local aout = vlc.object.aout()
- local s ={}
-
- --update api version when new data/commands added
- s.apiversion=1
- s.version=vlc.misc.version()
- s.volume=vlc.volume.get()
-
- if input then
- s.length=math.floor(vlc.var.get(input,"length"))
- s.time=math.floor(vlc.var.get(input,"time"))
- s.position=vlc.var.get(input,"position")
- s.audiodelay=vlc.var.get(input,"audio-delay")
- s.rate=vlc.var.get(input,"rate")
- s.subtitledelay=vlc.var.get(input,"spu-delay")
- else
- s.length=0
- s.time=0
- s.position=0
- s.audiodelay=0
- s.rate=1
- s.subtitledelay=0
- end
-
- if vout then
- s.fullscreen=vlc.var.get(vout,"fullscreen")
- s.aspectratio=vlc.var.get(vout,"aspect-ratio");
- if s.aspectratio=="" then s.aspectratio = "default" end
- else
- s.fullscreen=0
- end
-
- if aout then
- local filters=vlc.var.get(aout,"audio-filter")
- local temp=strsplit(filters,":")
- s.audiofilters={}
- local id=0
- for i,j in pairs(temp) do
- s.audiofilters['filter_'..id]=j
- id=id+1
- end
- end
-
- s.videoeffects={}
- s.videoeffects.hue=round(vlc.config.get("hue"),2)
- s.videoeffects.brightness=round(vlc.config.get("brightness"),2)
- s.videoeffects.contrast=round(vlc.config.get("contrast"),2)
- s.videoeffects.saturation=round(vlc.config.get("saturation"),2)
- s.videoeffects.gamma=round(vlc.config.get("gamma"),2)
-
- s.state=vlc.playlist.status()
- s.random=vlc.var.get(playlist,"random")
- s.loop=vlc.var.get(playlist,"loop")
- s["repeat"]=vlc.var.get(playlist,"repeat")
+ local s ={}
+
+ --update api version when new data/commands added
+ s.apiversion=1
+ s.version=vlc.misc.version()
+ s.volume=vlc.volume.get()
+
+ if input then
+ s.length=math.floor(vlc.var.get(input,"length"))
+ s.time=math.floor(vlc.var.get(input,"time"))
+ s.position=vlc.var.get(input,"position")
+ s.audiodelay=vlc.var.get(input,"audio-delay")
+ s.rate=vlc.var.get(input,"rate")
+ s.subtitledelay=vlc.var.get(input,"spu-delay")
+ else
+ s.length=0
+ s.time=0
+ s.position=0
+ s.audiodelay=0
+ s.rate=1
+ s.subtitledelay=0
+ end
+
+ if vout then
+ s.fullscreen=vlc.var.get(vout,"fullscreen")
+ s.aspectratio=vlc.var.get(vout,"aspect-ratio");
+ if s.aspectratio=="" then s.aspectratio = "default" end
+ else
+ s.fullscreen=0
+ end
+
+ if aout then
+ local filters=vlc.var.get(aout,"audio-filter")
+ local temp=strsplit(filters,":")
+ s.audiofilters={}
+ local id=0
+ for i,j in pairs(temp) do
+ s.audiofilters['filter_'..id]=j
+ id=id+1
+ end
+ end
+
+ s.videoeffects={}
+ s.videoeffects.hue=round(vlc.config.get("hue"),2)
+ s.videoeffects.brightness=round(vlc.config.get("brightness"),2)
+ s.videoeffects.contrast=round(vlc.config.get("contrast"),2)
+ s.videoeffects.saturation=round(vlc.config.get("saturation"),2)
+ s.videoeffects.gamma=round(vlc.config.get("gamma"),2)
+
+ s.state=vlc.playlist.status()
+ s.random=vlc.var.get(playlist,"random")
+ s.loop=vlc.var.get(playlist,"loop")
+ s["repeat"]=vlc.var.get(playlist,"repeat")
s.equalizer={}
- s.equalizer.preamp=round(vlc.equalizer.preampget(),2)
- s.equalizer.bands=vlc.equalizer.equalizerget()
- if s.equalizer.bands ~= null then
- for k,i in pairs(s.equalizer.bands) do s.equalizer.bands[k]=round(i,2) end
- s.equalizer.presets=vlc.equalizer.presets()
- end
-
- if (includecategories and item) then
- s.information={}
- s.information.category={}
- s.information.category.meta=item:metas()
-
- local info = item:info()
- for k, v in pairs(info) do
- local streamTable={}
- for k2, v2 in pairs(v) do
- local tag = string.gsub(k2," ","_")
- streamTable[tag]=v2
- end
-
- s.information.category[k]=streamTable
- end
-
- s.stats={}
-
- local statsdata = item:stats()
- for k,v in pairs(statsdata) do
- local tag = string.gsub(k,"_","")
+ s.equalizer.preamp=round(vlc.equalizer.preampget(),2)
+ s.equalizer.bands=vlc.equalizer.equalizerget()
+ if s.equalizer.bands ~= null then
+ for k,i in pairs(s.equalizer.bands) do s.equalizer.bands[k]=round(i,2) end
+ s.equalizer.presets=vlc.equalizer.presets()
+ end
+
+ if (includecategories and item) then
+ s.information={}
+ s.information.category={}
+ s.information.category.meta=item:metas()
+
+ local info = item:info()
+ for k, v in pairs(info) do
+ local streamTable={}
+ for k2, v2 in pairs(v) do
+ local tag = string.gsub(k2," ","_")
+ streamTable[tag]=v2
+ end
+
+ s.information.category[k]=streamTable
+ end
+
+ s.stats={}
+
+ local statsdata = item:stats()
+ for k,v in pairs(statsdata) do
+ local tag = string.gsub(k,"_","")
s.stats[tag]=v
end
- end
- return s
+ end
+ return s
end