Revert "full fastindex integration, drop old cache stuff"

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

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index 202e073321ab01137e57c9df830544ab44649081..c867579d2efac9cd221013123b37f4674a4fddd1 100644 (file)
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -28,15 +28,17 @@ require("luci.http")
 require("luci.sys")
 require("luci.fs")
 
+-- Dirty OpenWRT fix
+if (os.time() < luci.fs.mtime(luci.sys.libpath() .. "/dispatcher.lua")) then
+       os.execute('date -s '..os.date('%m%d%H%M%Y', luci.fs.mtime(luci.sys.libpath() .. "/dispatcher.lua"))..' > /dev/null 2>&1')
+end
+
 -- Local dispatch database
 local tree = {nodes={}}
 
 -- Index table
 local index = {}
 
--- Indexdump
-local indexcache = "/tmp/.luciindex"
-
 -- Global request object
 request = {}
 
@@ -83,7 +85,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
 
@@ -101,7 +103,7 @@ function dispatch()
 
        for i, s in ipairs(request) do
                c = c.nodes[s]
-               if not c then
+               if not c or c.leaf then
                        break
                end
 
@@ -125,14 +127,12 @@ function dispatch()
        
        -- Init template engine
        local tpl = require("luci.template")
-       tpl.viewns.translate  = function(...) return require("luci.i18n").translate(...) end
-       tpl.viewns.controller = luci.http.dispatcher()
-       tpl.viewns.uploadctrl = luci.http.dispatcher_upload()
-       tpl.viewns.media      = luci.config.main.mediaurlbase
-       tpl.viewns.resource   = luci.config.main.resourcebase
-       
-       -- Load default translation
-       require("luci.i18n").loadc("default")
+       tpl.viewns.translate   = function(...) return require("luci.i18n").translate(...) end
+       tpl.viewns.controller  = luci.http.dispatcher()
+       tpl.viewns.uploadctrl  = luci.http.dispatcher_upload()
+       tpl.viewns.media       = luci.config.main.mediaurlbase
+       tpl.viewns.resource    = luci.config.main.resourcebase
+       tpl.viewns.REQUEST_URI = luci.http.env.SCRIPT_NAME .. luci.http.env.PATH_INFO
        
 
        if c and type(c.target) == "function" then
@@ -157,11 +157,13 @@ function createindex()
        local path = luci.sys.libpath() .. "/controller/"
        local suff = ".lua"
        
-       if pcall(require, "fastindex") then
+       --[[if pcall(require, "fastindex") then
                createindex_fastindex(path, suff)
        else
                createindex_plain(path, suff)
-       end
+       end]]--
+       
+       createindex_plain(path, suff)
        
        built_index = true
 end
@@ -180,7 +182,7 @@ end
 
 -- Calls the index function of all available controllers
 function createindex_plain(path, suffix)
-       local cachetime = nil 
+       local cache = nil 
        
        local controllers = luci.util.combine(
                luci.fs.glob(path .. "*" .. suffix) or {},
@@ -188,32 +190,38 @@ function createindex_plain(path, suffix)
        )
        
        if indexcache then
-               cachetime = luci.fs.mtime(indexcache)
+               cache = luci.fs.mtime(indexcache)
                
-               if not cachetime then
+               if not cache then
                        luci.fs.mkdir(indexcache)
                        luci.fs.chmod(indexcache, "a=,u=rwx")
+                       cache = luci.fs.mtime(indexcache)
                end
        end
 
-       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)
+       for i,c in ipairs(controllers) do
+               local module = "luci.controller." .. c:sub(#path+1, #c-#suffix):gsub("/", ".")
+               local cachefile = indexcache .. "/" .. module
+               local stime
+               local ctime
+               
+               if cache then
+                       stime = luci.fs.mtime(c) or 0
+                       ctime = luci.fs.mtime(cachefile) or 0
+               end
+               
+               if not cache or stime > ctime then 
+                       stat, mod = pcall(require, module)
        
                        if stat and mod and type(mod.index) == "function" then
-                               index[c] = mod.index
+                               index[module] = mod.index
                                
-                               if indexcache then
-                                       luci.fs.writefile(indexcache .. "/" .. c, string.dump(mod.index))
+                               if cache then
+                                       luci.fs.writefile(cachefile, luci.util.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
+               else
+                       index[module] = loadfile(cachefile)
                end
        end
 end
@@ -223,11 +231,28 @@ function createtree()
        if not built_index then
                createindex()
        end
+       
+       require("luci.i18n")
+               
+       -- Load default translation
+       luci.i18n.loadc("default")
+       
+       local scope = luci.util.clone(_G)
+       for k,v in pairs(_M) do
+               if type(v) == "function" then
+                       scope[k] = v
+               end
+       end
 
        for k, v in pairs(index) do
-               luci.util.updfenv(v, _M)
-               luci.util.extfenv(v, "_NAME", k)
-               pcall(v)
+               scope._NAME = k
+               setfenv(v, scope)
+               
+               local stat, err = pcall(v)
+               if not stat then
+                       error500(err)   
+                       os.exit(1)
+               end
        end
        
        built_tree = true
@@ -278,6 +303,21 @@ function alias(...)
        end
 end
 
+function rewrite(n, ...)
+       local req = arg
+       return function()
+               for i=1,n do 
+                       table.remove(request, 1)
+               end
+               
+               for i,r in ipairs(req) do
+                       table.insert(request, i, r)
+               end
+               
+               dispatch()
+       end
+end
+
 function call(name)
        return function() getfenv()[name]() end
 end