cbi: Increare responsiveness of "Save & Apply"

1 files changed, 18 insertions, 1 deletions

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index b00ccf8d2a..09ba553ec2 100644
--- a/libs/cbi/luasrc/cbi.lua
+++ b/libs/cbi/luasrc/cbi.lua
@@ -211,6 +211,7 @@ function Map.__init__(self, config, ...)
 	self.config = config
 	self.parsechain = {self.config}
 	self.template = "cbi/map"
+	self.apply_on_parse = nil
 	self.uci = uci.cursor()
 	self.save = true
 	if not self.uci:load(self.config) then
@@ -252,7 +253,14 @@ function Map.parse(self, ...)
 				-- Refresh data because commit changes section names
 				self.uci:load(config)
 			end
-			self.uci:apply(self.parsechain)
+			if self.apply_on_parse then
+				self.uci:apply(self.parsechain)
+			else
+				self._apply = function()
+					local cmd = self.uci:apply(self.parsechain, true)
+					return io.popen(cmd)
+				end
+			end
 
 			-- Reparse sections
 			Node.parse(self, ...)
@@ -264,6 +272,15 @@ function Map.parse(self, ...)
 	end
 end
 
+function Map.render(self, ...)
+	Node.render(self, ...)
+	if self._apply then
+		local fp = self._apply()
+		fp:read("*a")
+		fp:close()
+	end
+end
+
 -- Creates a child section
 function Map.section(self, class, ...)
 	if instanceof(class, AbstractSection) then