libs/json: Completed JSON library

[project/luci.git] / modules / rpc / luasrc / controller / rpc.lua

diff --git a/modules/rpc/luasrc/controller/rpc.lua b/modules/rpc/luasrc/controller/rpc.lua
index aa77a8f2485d0248a16302b47bdf570f0235beff..98fafe3f1bb6c6eda2f9b9799e39281c3601ea8d 100644 (file)
--- a/modules/rpc/luasrc/controller/rpc.lua
+++ b/modules/rpc/luasrc/controller/rpc.lua
@@ -51,6 +51,7 @@ function rpc_auth()
        local sauth   = require "luci.sauth"
        local http    = require "luci.http"
        local sys     = require "luci.sys"
+       local ltn12   = require "luci.ltn12"
        
        http.setfilehandler()
        
@@ -70,35 +71,53 @@ function rpc_auth()
        end
        
        http.prepare_content("application/json")
-       http.write(jsonrpc.handle(server, http.content()))
+       ltn12.pump.all(jsonrpc.handle(server, http.source()), http.write)
 end
 
 function rpc_uci()
        local uci     = require "luci.controller.rpc.uci"
        local jsonrpc = require "luci.jsonrpc"
        local http    = require "luci.http"
+       local ltn12   = require "luci.ltn12"
        
-       http.setfilehandler()
        http.prepare_content("application/json")
-       http.write(jsonrpc.handle(uci, http.content()))
+       ltn12.pump.all(jsonrpc.handle(uci, http.source()), http.write)
 end
 
 function rpc_fs()
-       local fs      = require "luci.fs"
+       local util    = require "luci.util"
+       local fs      = util.clone(require "luci.fs")
        local jsonrpc = require "luci.jsonrpc"
        local http    = require "luci.http"
+       local ltn12   = require "luci.ltn12"
+       
+       function fs.readfile(filename)
+               if not pcall(require, "mime") then
+                       error("Base64 support not available. Please install LuaSocket.")
+               end
+               
+               return ltn12.source.chain(ltn12.source.file(filename), mime.encode("base64"))
+       end
+       
+       function fs.writefile(filename, data)
+               if not pcall(require, "mime") then
+                       error("Base64 support not available. Please install LuaSocket.")
+               end
+       
+               local sink = ltn12.sink.chain(mime.decode("base64"), ltn12.sink.file(filename))
+               return ltn12.pump.all(ltn12.source.string(data), sink)
+       end
        
-       http.setfilehandler()
        http.prepare_content("application/json")
-       http.write(jsonrpc.handle(fs, http.content()))
+       ltn12.pump.all(jsonrpc.handle(fs, http.source()), http.write)
 end
 
 function rpc_sys()
        local sys     = require "luci.sys"
        local jsonrpc = require "luci.jsonrpc"
        local http    = require "luci.http"
+       local ltn12   = require "luci.ltn12"
        
-       http.setfilehandler()
        http.prepare_content("application/json")
-       http.write(jsonrpc.handle(sys, http.content()))
+       ltn12.pump.all(jsonrpc.handle(sys, http.source()), http.write)
 end
\ No newline at end of file