* Fixed dispatching regex

[project/luci.git] / libs / web / luasrc / dispatcher.lua

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index 175f0dc..14801c6 100644 (file)
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -80,7 +80,7 @@ function httpdispatch()
        local pathinfo = luci.http.env.PATH_INFO or ""
        local c = tree
 
-       for s in pathinfo:gmatch("([%w_]+)") do
+       for s in pathinfo:gmatch("([%w-]+)") do
                table.insert(request, s)
        end
 
@@ -134,7 +134,11 @@ function dispatch()
 
        if c and type(c.target) == "function" then
                dispatched = c
-
+               stat, mod = pcall(require, c.module)
+               if stat then
+                       luci.util.updfenv(c.target, mod)
+               end
+               
                stat, err = pcall(c.target)
                if not stat then
                        error500(err)
@@ -173,17 +177,40 @@ end
 
 -- Calls the index function of all available controllers
 function createindex_plain(path, suffix)
+       local cachetime = nil 
+       
        local controllers = luci.util.combine(
                luci.fs.glob(path .. "*" .. suffix) or {},
                luci.fs.glob(path .. "*/*" .. suffix) or {}
        )
+       
+       if indexcache then
+               cachetime = luci.fs.mtime(indexcache)
+               
+               if not cachetime then
+                       luci.fs.mkdir(indexcache)
+                       luci.fs.chmod(indexcache, "a=,u=rwx")
+               end
+       end
 
-       for i,c in ipairs(controllers) do
-               c = "luci.controller." .. c:sub(#path+1, #c-#suffix):gsub("/", ".")
-               stat, mod = pcall(require, c)
-
-               if stat and mod and type(mod.index) == "function" then
-                       index[c] = mod.index
+       if not cachetime then
+               for i,c in ipairs(controllers) do
+                       c = "luci.controller." .. c:sub(#path+1, #c-#suffix):gsub("/", ".")
+                       stat, mod = pcall(require, c)
+       
+                       if stat and mod and type(mod.index) == "function" then
+                               index[c] = mod.index
+                               
+                               if indexcache then
+                                       luci.fs.writefile(indexcache .. "/" .. c, string.dump(mod.index))
+                               end
+                       end
+               end
+       else
+               for i,c in ipairs(luci.fs.dir(indexcache)) do
+                       if c:sub(1) ~= "." then
+                               index[c] = loadfile(indexcache .. "/" .. c)
+                       end
                end
        end
 end
@@ -193,16 +220,18 @@ function createtree()
        if not built_index then
                createindex()
        end
+       
+       require("luci.i18n")
 
        for k, v in pairs(index) do
                luci.util.updfenv(v, _M)
+               luci.util.extfenv(v, "_NAME", k)
                
-               local stat, mod = pcall(require, k)
-               if stat then            
-                       luci.util.updfenv(v, mod)
+               local stat, err = pcall(v)
+               if not stat then
+                       error500(err)   
+                       os.exit(1)
                end
-               
-               pcall(v)
        end
        
        built_tree = true
@@ -216,6 +245,7 @@ function entry(path, target, title, order, add)
        c.target = target
        c.title  = title
        c.order  = order
+       c.module = getfenv(2)._NAME
 
        for k,v in pairs(add) do
                c[k] = v
@@ -234,7 +264,7 @@ function node(...)
 
        for k,v in ipairs(arg) do
                if not c.nodes[v] then
-                       c.nodes[v] = {nodes={}}
+                       c.nodes[v] = {nodes={}, module=getfenv(2)._NAME}
                end
 
                c = c.nodes[v]
@@ -252,6 +282,10 @@ function alias(...)
        end
 end
 
+function call(name)
+       return function() getfenv()[name]() end
+end
+
 function template(name)
        require("luci.template")
        return function() luci.template.render(name) end