Fix errorhandling in Delegators

[project/luci.git] / libs / cbi / luasrc / cbi.lua

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index c176da0..db76e3b 100644 (file)
--- a/libs/cbi/luasrc/cbi.lua
+++ b/libs/cbi/luasrc/cbi.lua
@@ -30,9 +30,10 @@ require("luci.template")
 local util = require("luci.util")
 require("luci.http")
 require("luci.uvl")
-require("luci.fs")
+
 
 --local event      = require "luci.sys.event"
+local fs         = require("nixio.fs")
 local uci        = require("luci.model.uci")
 local class      = util.class
 local instanceof = util.instanceof
@@ -52,7 +53,7 @@ REMOVE_PREFIX = "cbi.rts."
 
 -- Loads a CBI map from given file, creating an environment and returns it
 function load(cbimap, ...)
-       require("luci.fs")
+       local fs   = require "nixio.fs"
        local i18n = require "luci.i18n"
        require("luci.config")
        require("luci.util")
@@ -60,9 +61,9 @@ function load(cbimap, ...)
        local upldir = "/lib/uci/upload/"
        local cbidir = luci.util.libpath() .. "/model/cbi/"
 
-       assert(luci.fs.stat(cbimap) or
-               luci.fs.stat(cbidir..cbimap..".lua") or
-               luci.fs.stat(cbidir..cbimap..".lua.gz"),
+       assert(fs.stat(cbimap) or
+               fs.stat(cbidir..cbimap..".lua") or
+               fs.stat(cbidir..cbimap..".lua.gz"),
                        "Model not found!")
 
        local func, err = loadfile(cbimap)
@@ -285,6 +286,11 @@ function Template.render(self)
        luci.template.render(self.template, {self=self})
 end
 
+function Template.parse(self, readinput)
+       self.readinput = (readinput ~= false)
+       return Map.formvalue(self, "cbi.submit") and FORM_DONE or FORM_NODATA
+end
+
 
 --[[
 Map - A map describing a configuration file
@@ -301,6 +307,7 @@ function Map.__init__(self, config, ...)
        self.apply_on_parse = nil
        self.readinput = true
        self.proceed = false
+       self.flow = {}
 
        self.uci = uci.cursor()
        self.save = true
@@ -497,6 +504,7 @@ function Delegator.__init__(self, ...)
        self.defaultpath = {}
        self.pageaction = false
        self.readinput = true
+       self.allow_reset = false
        self.allow_back = false
        self.allow_finish = false
        self.template = "cbi/delegator"
@@ -506,7 +514,7 @@ function Delegator.set(self, name, node)
        if type(node) == "table" and getmetatable(node) == nil then
                node = Compound(unpack(node))
        end
-       assert(instanceof(node, Compound), "Invalid node")
+       assert(type(node) == "function" or instanceof(node, Compound), "Invalid")
        assert(not self.nodes[name], "Duplicate entry")
 
        self.nodes[name] = node
@@ -528,33 +536,66 @@ function Delegator.insert_after(self, name, after)
        table.insert(self.chain, n, name)
 end
 
+function Delegator.set_route(self, ...)
+       local n, chain, route = 0, self.chain, {...}
+       for i = 1, #chain do
+               if chain[i] == self.current then
+                       n = i
+                       break
+               end
+       end
+       for i = 1, #route do
+               n = n + 1
+               chain[n] = route[i]
+       end
+       for i = n + 1, #chain do
+               chain[i] = nil
+       end
+end
+
 function Delegator.get(self, name)
        return self.nodes[name]
 end
 
 function Delegator.parse(self, ...)
        local newcurrent
-       self.chain = self:get_chain()
-       self.current = self:get_active()
-       self.active = self:get(self.current)
+       self.chain = self.chain or self:get_chain()
+       self.current = self.current or self:get_active()
+       self.active = self.active or self:get(self.current)
        assert(self.active, "Invalid state")
        
-       self.active:populate_delegator(self)
-       if self.active:parse() > FORM_PROCEED then
+       local stat = FORM_DONE
+       if type(self.active) ~= "function" then
+               self.active:populate_delegator(self)
+               stat = self.active:parse() 
+       else
+               self:active()
+       end
+
+       if stat > FORM_PROCEED then
                if Map.formvalue(self, "cbi.delg.back") then
                        newcurrent = self:get_prev(self.current)
                else
                        newcurrent = self:get_next(self.current)
                end
+       elseif stat < FORM_PROCEED then
+               return stat
        end
+       
 
-       if not newcurrent or not self:get(newcurrent) then
+       if not Map.formvalue(self, "cbi.submit") then
+               return FORM_NODATA
+       elseif not newcurrent or not self:get(newcurrent) then
                return FORM_DONE
        else
                self.current = newcurrent
                self.active = self:get(self.current)
-               self.active:parse(false)
-               return FROM_PROCEED
+               if type(self.active) ~= "function" then
+                       self.active:parse(false)
+                       return FROM_PROCEED
+               else
+                       return self:parse(...)
+               end
        end
 end
 
@@ -783,8 +824,8 @@ function AbstractSection.parse_optionals(self, section)
                if v.optional and not v:cfgvalue(section) then
                        if field == v.option then
                                field = nil
-                       else
                                self.map.proceed = true
+                       else
                                table.insert(self.optionals[section], v)
                        end
                end
@@ -1258,6 +1299,11 @@ function AbstractValue.parse(self, section, novld)
                        else
                                self.error = { [section] = "invalid" }
                        end
+                       if self.section.error then
+                               table.insert(self.section.error[section], "invalid")
+                       else
+                               self.section.error = {[section] = {"invalid"}}
+                       end 
                        self.map.save = false
                end
                if fvalue and not (fvalue == cvalue) then
@@ -1669,7 +1715,7 @@ end
 
 function FileUpload.cfgvalue(self, section)
        local val = AbstractValue.cfgvalue(self, section)
-       if val and luci.fs.access(val) then
+       if val and fs.access(val) then
                return val
        end
        return nil
@@ -1683,7 +1729,7 @@ function FileUpload.formvalue(self, section)
                then
                        return val
                end
-               luci.fs.unlink(val)
+               fs.unlink(val)
                self.value = nil
        end
        return nil
@@ -1691,7 +1737,7 @@ end
 
 function FileUpload.remove(self, section)
        local val = AbstractValue.formvalue(self, section)
-       if val and luci.fs.access(val) then luci.fs.unlink(val) end
+       if val and fs.access(val) then fs.unlink(val) end
        return AbstractValue.remove(self, section)
 end