Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libs/web: Fixed luci.template

Browse source
This commit is contained in:
Steven Barth 2008-09-03 11:01:21 +00:00
parent 7c91b79121
commit 43a730c88a
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libs/web/luasrc/template.lua
View file

@ -139,7 +139,7 @@ Template.cache = setmetatable({}, {__mode = "v"})
-- Constructor - Reads and compiles the template on-demand -- Constructor - Reads and compiles the template on-demand
function Template.__init__(self, name, srcfile, comfile) function Template.__init__(self, name)
local function _encode_filename(str) local function _encode_filename(str)
local function __chrenc( chr ) local function __chrenc( chr )
@ -177,24 +177,25 @@ function Template.__init__(self, name, srcfile, comfile)
local cdir = compiledir .. "/" .. sys.process.info("uid") local cdir = compiledir .. "/" .. sys.process.info("uid")
-- Compile and build -- Compile and build
local sourcefile = srcfile or (viewdir .. "/" .. name .. ".htm") local sourcefile = viewdir .. "/" .. name
local compiledfile = comfile or (cdir .. "/" .. _encode_filename(name) .. ".lua") local compiledfile = cdir .. "/" .. _encode_filename(name) .. ".lua"
local err local err
if compiler_mode == "file" then if compiler_mode == "file" then
local tplmt = fs.mtime(sourcefile) local tplmt = fs.mtime(sourcefile) or fs.mtime(sourcefile .. ".htm")
local commt = fs.mtime(compiledfile) local commt = fs.mtime(compiledfile)
if not fs.mtime(cdir) then if not fs.mtime(cdir) then
fs.mkdir(cdir, true) fs.mkdir(cdir, true)
fs.chmod(fs.dirname(cdir), "a+rxw") fs.chmod(fs.dirname(cdir), "a+rxw")
end end
assert(tplmt or commt, "No such template: " .. name)
-- Build if there is no compiled file or if compiled file is outdated -- Build if there is no compiled file or if compiled file is outdated
if ((commt == nil) and not (tplmt == nil)) if not commt or (commt and tplmt and commt < tplmt) then
or (not (commt == nil) and not (tplmt == nil) and commt < tplmt) then
local source local source
source, err = fs.readfile(sourcefile) source, err = fs.readfile(sourcefile) or fs.readfile(sourcefile .. ".htm")
if source then if source then
local compiled, err = compile(source) local compiled, err = compile(source)
@ -214,7 +215,7 @@ function Template.__init__(self, name, srcfile, comfile)
elseif compiler_mode == "memory" then elseif compiler_mode == "memory" then
local source local source
source, err = fs.readfile(sourcefile) source, err = fs.readfile(sourcefile) or fs.readfile(sourcefile .. ".htm")
if source then if source then
self.template, err = compile(source) self.template, err = compile(source)
end end