Changeset 103

Timestamp:

20/01/09 12:23:13 (4 years ago)

Author:

cyrus

Message:

Merge bugfixes and optimizations from mainline

Location:

trunk/luci/libs

Files:

• cbi/luasrc/cbi.lua (modified) (8 diffs)
• cbi/luasrc/view/cbi/tblsection.htm (modified) (2 diffs)
• cbi/luasrc/view/cbi/ucisection.htm (modified) (1 diff)
• core/luasrc/fs.lua (modified) (2 diffs)
• core/luasrc/ip.lua (modified) (1 diff)
• json/luasrc/json.lua (modified) (1 diff)
• uci/luasrc/model/uci.lua (modified) (3 diffs)
• uvl/luasrc/uvl.lua (modified) (7 diffs)
• uvl/root/usr/bin/uvl (modified) (1 diff)
• web/luasrc/dispatcher.lua (modified) (8 diffs)

trunk/luci/libs/cbi/luasrc/cbi.lua

@@ -60 +60 @@
         local upldir = "/lib/uci/upload/"
         local cbidir = luci.util.libpath() .. "/model/cbi/"
-        
-        assert(luci.fs.stat(cbimap) or luci.fs.stat(cbidir..cbimap..".lua"), 
+
+        assert(luci.fs.stat(cbimap) or luci.fs.stat(cbidir..cbimap..".lua"),
          "Model not found!")
-          
+
         local func, err = loadfile(cbimap)
         if not func then
@@ -450 +450 @@
 function Compound.parse(self, ...)
         local cstate, state = 0, 0
-        
+
         for k, child in ipairs(self.children) do
                 cstate = child:parse(...)
                 state = (not state or cstate < state) and cstate or state
         end
-        
+
         return state
 end
@@ -473 +473 @@
         transitor = transitor or self.transistor_linear
         local state = {node=node, name=name, transitor=transitor}
-        
+
         assert(instanceof(node, Node), "Invalid node")
         assert(not self.nodes[name], "Duplicate entry")
-        
+
         self.nodes[name] = state
         self:append(state)
-        
+
         return state
 end
@@ -502 +502 @@
         local active = self:getactive()
         assert(active, "Invalid state")
-        
+
         local cstate = active.node:parse()
         self.active = active.transistor(self, active.node, cstate)
-        
+
         if not self.active then
                 return FORM_DONE
@@ -519 +519 @@
 
 function Delegator.getactive(self)
-        return self:get(Map.formvalue(self, "cbi.delegated") 
-                or (self.children[1] and self.children[1].name)) 
+        return self:get(Map.formvalue(self, "cbi.delegated")
+                or (self.children[1] and self.children[1].name))
 end
 
@@ -808 +808 @@
         datasource.config = "table"
         self.data = data
-        
+
         datasource.formvalue = Map.formvalue
         datasource.formvaluetable = Map.formvaluetable
@@ -816 +816 @@
                 return data[section] and data[section][option]
         end
-        
+
         function datasource.submitstate(self)
                 return Map.formvalue(self, "cbi.submit")
@@ -1496 +1496 @@
         local valid = {}
         for i, v in ipairs(value) do
-                if luci.util.contains(self.vallist, v) then
+                if luci.util.contains(self.keylist, v) then
                         table.insert(valid, v)
                 end

trunk/luci/libs/cbi/luasrc/view/cbi/tblsection.htm

@@ -29 +29 @@
                         <tr class="cbi-section-table-titles">
                         <%- if not self.anonymous then -%>
-                                <th>&#160;</th>
+                                <%- if self.sectionhead then -%>
+                                        <th class="cbi-section-table-cell"><%=self.sectionhead%></th>
+                                <%- else -%>
+                                        <th>&#160;</th>
+                                <%- end -%>
                         <%- end -%>
                         <%- for i, k in pairs(self.children) do if not k.optional then -%>
@@ -43 +47 @@
                         <tr class="cbi-section-table-descr">
                         <%- if not self.anonymous then -%>
-                                <th></th>
+                                <%- if self.sectiondesc then -%>
+                                        <th class="cbi-section-table-cell"><%=self.sectiondesc%></th>
+                                <%- else -%>
+                                        <th></th>
+                                <%- end -%>
                         <%- end -%>
                         <%- for i, k in pairs(self.children) do if not k.optional then -%>

trunk/luci/libs/cbi/luasrc/view/cbi/ucisection.htm

@@ -13 +13 @@
 
 -%>
+
+<%-
+        if type(self.hidden) == "table" then
+                for k, v in pairs(self.hidden) do
+-%>
+        <input type="hidden" id="cbid.<%=self.config%>.<%=section%>.<%=k%>" name="cbid.<%=self.config%>.<%=section%>.<%=k%>" value="<%=luci.util.pcdata(v)%>" />
+<%-
+                end
+        end
+%>
 
 <% self:render_children(section, scope or {}) %>

trunk/luci/libs/core/luasrc/fs.lua

@@ -55 +55 @@
 
 --- Checks wheather the given path exists and points to a regular file.
--- @param filename      String containing the path of the file to read
+-- @param filename      String containing the path of the file to test
 -- @return                      Boolean indicating wheather given path points to regular file
 function isfile(filename)
         return posix.stat(filename, "type") == "regular"
+end
+
+--- Checks wheather the given path exists and points to a directory.
+-- @param dirname       String containing the path of the directory to test
+-- @return                      Boolean indicating wheather given path points to directory
+function isdirectory(dirname)
+        return posix.stat(dirname, "type") == "directory"
 end
 
@@ -130 +137 @@
 end
 
+--- Set the last modification time  of given file path in Unix epoch format.
+-- @param path  String containing the path of the file or directory to read
+-- @param mtime Last modification timestamp
+-- @param atime Last accessed timestamp
+-- @return              0 in case of success nil on error
+-- @return              String containing the error description (if any)
+-- @return              Number containing the os specific errno (if any)
+utime = posix.utime
+
 --- Return the last element - usually the filename - from the given path with
 -- the directory component stripped.

trunk/luci/libs/core/luasrc/ip.lua

@@ -66 +66 @@
 
         elseif type(x) == "table" then
-                list = x
+                list = { unpack(x) }
         end
 

trunk/luci/libs/json/luasrc/json.lua

@@ -500 +500 @@
         ['{'] = Decoder.parse_object
 }
+
+
+--- Create a new Active JSON-Decoder.
+-- @class       function
+-- @name        ActiveDecoder
+-- @param   customnull  Use luci.json.null instead of nil for decoding null
+-- @return  Active JSON-Decoder
+ActiveDecoder = util.class(Decoder)
+
+function ActiveDecoder.__init__(self, source, customnull)
+        Decoder.__init__(self, customnull)
+        self.source = source
+        self.chunk = nil
+        getmetatable(self).__call = self.get
+end
+
+
+--- Fetches one JSON-object from given source
+-- @return Decoded object
+function ActiveDecoder.get(self)
+        local chunk, src_err, object
+        if not self.chunk then
+                chunk, src_err = self.source()
+        else
+                chunk = self.chunk
+        end
+
+        self.chunk, object = self:dispatch(chunk, src_err, true)
+        return object
+end
+
+
+function ActiveDecoder.fetch(self)
+        local chunk, src_err = self.source()
+        assert(chunk or not src_err, src_err)
+        return chunk
+end

trunk/luci/libs/uci/luasrc/model/uci.lua

@@ -62 +62 @@
 function Cursor.delete_all(self, config, stype, comparator)
         local del = {}
-        
+
         if type(comparator) == "table" then
                 local tbl = comparator
@@ -70 +70 @@
                                         return false
                                 end
-                        end 
+                        end
                         return true
                 end
         end
-        
+
         local function helper (section)
 
@@ -125 +125 @@
 end
 
+--- Get a boolean option and return it's value as true or false.
+-- @param config        UCI config
+-- @param section       UCI section name
+-- @param option        UCI option
+-- @return                      Boolean
+function Cursor.get_bool(self, ...)
+        local val = self:get(...)
+        return ( val == "1" or val == "true" or val == "yes" or val == "on" )
+end
+
 --- Get an option or list and return values as table.
 -- @param config        UCI config

trunk/luci/libs/uvl/luasrc/uvl.lua

@@ -68 +68 @@
 -- @name                        UVL
 -- @param schemedir     Path to the scheme directory (optional)
+-- @param configdir     Override config directory (optional)
 -- @return                      Instance object
 UVL = util.class()
 
-function UVL.__init__( self, schemedir )
+function UVL.__init__( self, schemedir, configdir )
         self.schemedir  = schemedir or default_schemedir
+        self.configdir  = configdir
         self.packages   = { }
         self.beenthere  = { }
@@ -947 +949 @@
 end
 
-function uvlitem._loadconf(self, co, c)
+function uvlitem._loadconf(self, co, c, configdir)
         co = co or self._configcache
         if not co then
                 local err
-                co, err = uci.cursor():get_all(c)
+                co, err = uci.cursor(configdir):get_all(c)
 
                 if err then
@@ -984 +986 @@
         self.cref = { c }
         self.sref = { c }
-        self.c    = self:_loadconf(co, c)
+        self.c    = self:_loadconf(co, c, scheme.configdir)
         self.s    = scheme
         self.t    = TYPE_SCHEME
@@ -1048 +1050 @@
                 c, co = co, nil
         end
-
         self.cref = { c }
         self.sref = { c }
-        self.c    = self:_loadconf(co, c)
+        self.c    = self:_loadconf(co, c, scheme.configdir)
         self.s    = scheme
         self.t    = TYPE_CONFIG
@@ -1099 +1100 @@
         self.cref = { c, s }
         self.sref = { c, co and co[s] and co[s]['.type'] or s }
-        self.c    = self:_loadconf(co, c)
+        self.c    = self:_loadconf(co, c, scheme.configdir)
         self.s    = scheme
         self.t    = TYPE_SECTION
@@ -1150 +1151 @@
         self.cref = { c, s, o }
         self.sref = { c, co and co[s] and co[s]['.type'] or s, o }
-        self.c    = self:_loadconf(co, c)
+        self.c    = self:_loadconf(co, c, scheme.configdir)
         self.s    = scheme
         self.t    = TYPE_OPTION
@@ -1203 +1204 @@
         self.cref = { c, s, o, v }
         self.sref = { c, co and co[s] and co[s]['.type'] or s, o, v }
-        self.c    = self:_loadconf(co, c)
+        self.c    = self:_loadconf(co, c, scheme.configdir)
         self.s    = scheme
         self.t    = TYPE_ENUM

trunk/luci/libs/uvl/root/usr/bin/uvl

@@ -201 +201 @@
 
         local uvl = luci.uvl.UVL(
-                type(options.schemedir) == "string" and options.schemedir
+                type(options.schemedir) == "string" and options.schemedir,
+                type(options.configdir) == "string" and options.configdir
         )
 

trunk/luci/libs/web/luasrc/dispatcher.lua

@@ -167 +167 @@
         if c and c.leaf then
                 for j=n+1, #request do
-                        table.insert(args, request[j])
+                        args[#args+1] = request[j]
+                        freq[#freq+1] = request[j]
                 end
         end
@@ -247 +248 @@
         end
 
-        if c and (c.index or type(c.target) == "function") then
+        local target = nil
+        if c then
+                if type(c.target) == "function" then
+                        target = c.target
+                elseif type(c.target) == "table" then
+                        target = c.target.target
+                end
+        end
+
+        if c and (c.index or type(target) == "function") then
                 ctx.dispatched = c
                 ctx.requested = ctx.requested or ctx.dispatched
@@ -254 +264 @@
         if c and c.index then
                 local tpl = require "luci.template"
-                tpl.render "indexer"
-                return true
-        end
-
-        if c and type(c.target) == "function" then
+                if util.copcall(tpl.render, "indexer", {}) then
+                        return true
+                end
+        end
+
+        if type(target) == "function" then
                 util.copcall(function()
-                        local oldenv = getfenv(c.target)
+                        local oldenv = getfenv(target)
                         local module = require(c.module)
                         local env = setmetatable({}, {__index=
@@ -268 +279 @@
                         end})
 
-                        setfenv(c.target, env)
+                        setfenv(target, env)
                 end)
 
-                c.target(unpack(args))
+                if type(c.target) == "table" then
+                        target(c.target, unpack(args))
+                else
+                        target(unpack(args))
+                end
         else
                 error404()
@@ -518 +533 @@
 end
 
+
+local function _call(self, ...)
+        if #self.argv > 0 then 
+                return getfenv()[self.name](unpack(self.argv), ...)
+        else
+                return getfenv()[self.name](...)
+        end
+end
+
 --- Create a function-call dispatching target.
 -- @param       name    Target function of local controller
 -- @param       ...             Additional parameters passed to the function
 function call(name, ...)
-        local argv = {...}
-        return function(...)
-                if #argv > 0 then 
-                        return getfenv()[name](unpack(argv), ...)
-                else
-                        return getfenv()[name](...)
-                end
-        end
+        return {type = "call", argv = {...}, name = name, target = _call}
+end
+
+
+local _template = function(self, ...)
+        require "luci.template".render(self.view)
 end
 
@@ -535 +557 @@
 -- @param       name    Template to be rendered
 function template(name)
-        return function()
-                require("luci.template")
-                luci.template.render(name)
-        end
+        return {type = "template", view = name, target = _template}
+end
+
+
+local function _cbi(self, ...)
+        local cbi = require "luci.cbi"
+        local tpl = require "luci.template"
+        local http = require "luci.http"
+
+        local config = self.config or {}
+        local maps = cbi.load(self.model, ...)
+
+        local state = nil
+
+        for i, res in ipairs(maps) do
+                if config.autoapply then
+                        res.autoapply = config.autoapply
+                end
+                local cstate = res:parse()
+                if not state or cstate < state then
+                        state = cstate
+                end
+        end
+
+        if config.on_valid_to and state and state > 0 and state < 2 then
+                http.redirect(config.on_valid_to)
+                return
+        end
+
+        if config.on_changed_to and state and state > 1 then
+                http.redirect(config.on_changed_to)
+                return
+        end
+
+        if config.on_success_to and state and state > 0 then
+                http.redirect(config.on_success_to)
+                return
+        end
+
+        if config.state_handler then
+                if not config.state_handler(state, maps) then
+                        return
+                end
+        end
+
+        local pageaction = true
+        local cancelaction = false
+        http.header("X-CBI-State", state or 0)
+        luci.template.render("cbi/header", {state = state})
+        for i, res in ipairs(maps) do
+                res:render()
+                if res.pageaction == false then
+                        pageaction = false
+                end
+                if res.cancelaction == true then
+                        cancelaction = true
+                end
+        end
+        luci.template.render("cbi/footer", {pageaction=pageaction, cancelaction=cancelaction, state = state, autoapply = config.autoapply})
 end
 
@@ -544 +621 @@
 -- @param       model   CBI model to be rendered
 function cbi(model, config)
-        config = config or {}
-        return function(...)
-                require("luci.cbi")
-                require("luci.template")
-                local http = require "luci.http"
-
-                maps = luci.cbi.load(model, ...)
-
-                local state = nil
-
-                for i, res in ipairs(maps) do
-                        if config.autoapply then
-                                res.autoapply = config.autoapply
-                        end
-                        local cstate = res:parse()
-                        if not state or cstate < state then
-                                state = cstate
-                        end
-                end
-
-                if config.on_valid_to and state and state > 0 and state < 2 then
-                        luci.http.redirect(config.on_valid_to)
-                        return
-                end
-
-                if config.on_changed_to and state and state > 1 then
-                        luci.http.redirect(config.on_changed_to)
-                        return
-                end
-
-                if config.on_success_to and state and state > 0 then
-                        luci.http.redirect(config.on_success_to)
-                        return
-                end
-
-                if config.state_handler then
-                        if not config.state_handler(state, maps) then
-                                return
-                        end
-                end
-
-                local pageaction = true
-                local cancelaction = false
-                http.header("X-CBI-State", state or 0)
-                luci.template.render("cbi/header", {state = state})
-                for i, res in ipairs(maps) do
-                        res:render()
-                        if res.pageaction == false then
-                                pageaction = false
-                        end
-                        if res.cancelaction == true then
-                                cancelaction = true
-                        end
-                end
-                luci.template.render("cbi/footer", {pageaction=pageaction, cancelaction=cancelaction, state = state, autoapply = config.autoapply})
-        end
+        return {type = "cbi", config = config, model = model, target = _cbi}
+end
+
+
+local function _arcombine(self, ...)
+        local argv = {...}
+        local target = #argv > 0 and self.targets[2] or self.targets[1]
+        setfenv(target.target, self.env)
+        target:target(unpack(argv))
+end
+
+--- Create a combined dispatching target for non argv and argv requests.
+-- @param trg1  Overview Target
+-- @param trg2  Detail Target
+function arcombine(trg1, trg2)
+        return {type = "arcombine", env = getfenv(), target = _arcombine, targets = {trg1, trg2}}
+end
+
+
+local function _form(self, ...)
+        local cbi = require "luci.cbi"
+        local tpl = require "luci.template"
+        local http = require "luci.http"
+
+        local maps = luci.cbi.load(self.model, ...)
+        local state = nil
+
+        for i, res in ipairs(maps) do
+                local cstate = res:parse()
+                if not state or cstate < state then
+                        state = cstate
+                end
+        end
+
+        http.header("X-CBI-State", state or 0)
+        tpl.render("header")
+        for i, res in ipairs(maps) do
+                res:render()
+        end
+        tpl.render("footer")
 end
 
@@ -605 +666 @@
 -- @param       model   CBI form model tpo be rendered
 function form(model)
-        return function(...)
-                require("luci.cbi")
-                require("luci.template")
-                local http = require "luci.http"
-
-                maps = luci.cbi.load(model, ...)
-
-                local state = nil
-
-                for i, res in ipairs(maps) do
-                        local cstate = res:parse()
-                        if not state or cstate < state then
-                                state = cstate
-                        end
-                end
-
-                http.header("X-CBI-State", state or 0)
-                luci.template.render("header")
-                for i, res in ipairs(maps) do
-                        res:render()
-                end
-                luci.template.render("footer")
-        end
-end
+        return {type = "cbi", model = model, target = _form}
+end