[vlc-commits] revert previous attempt to make browse handle uri and path in the dir param

Rob Jonson git at videolan.org
Mon Sep 26 16:58:34 CEST 2011


vlc | branch: master | Rob Jonson <rob at hobbyistsoftware.com> | Sun Sep 25 23:08:05 2011 +0100| [1c7bedae817377832afafc511955ecf5540a14b3] | committer: Rémi Denis-Courmont

revert previous attempt to make browse handle uri and path in the dir param

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1c7bedae817377832afafc511955ecf5540a14b3
---

 share/lua/intf/modules/httprequests.lua |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/share/lua/intf/modules/httprequests.lua b/share/lua/intf/modules/httprequests.lua
index 131f164..74d1a68 100644
--- a/share/lua/intf/modules/httprequests.lua
+++ b/share/lua/intf/modules/httprequests.lua
@@ -356,30 +356,19 @@ end
 
 getbrowsetable = function ()
 
-local dir = _GET["dir"]
-if dir == nil then dir = "" end
---allow browse to deal with file-style URI's as well as paths
-local start=string.sub(dir,0,8)
-if start=="file:///" then
-	dir= string.sub(dir,9)
-end
-
+	local dir = _GET["dir"]
 
 	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
 			dir = common.realpath(dir.."/")
 			local d = vlc.net.opendir(dir)
 			table.sort(d)
 
-			--paths are returned as an array of elements
-
-
-
 			for _,f in pairs(d) do
 				if f == ".." or not string.match(f,"^%.") then
 				local df = common.realpath(dir..f)



More information about the vlc-commits mailing list