From b7ed444cbb2428150688b2842e95491a740b1156 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sat, 28 Jul 2018 16:47:19 +0200 Subject: luci-app-adblock: small fixes * fix possible controller error during json parsing * remaining code cleanup Signed-off-by: Dirk Brenken --- applications/luci-app-adblock/luasrc/controller/adblock.lua | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'applications/luci-app-adblock/luasrc/controller') diff --git a/applications/luci-app-adblock/luasrc/controller/adblock.lua b/applications/luci-app-adblock/luasrc/controller/adblock.lua index fad8834870..4c77244710 100644 --- a/applications/luci-app-adblock/luasrc/controller/adblock.lua +++ b/applications/luci-app-adblock/luasrc/controller/adblock.lua @@ -6,11 +6,9 @@ module("luci.controller.adblock", package.seeall) local sys = require("luci.sys") local util = require("luci.util") local http = require("luci.http") -local templ = require("luci.template") local i18n = require("luci.i18n") local json = require("luci.jsonc") local uci = require("luci.model.uci").cursor() -local fs = require("nixio.fs") function index() if not nixio.fs.access("/etc/config/adblock") then @@ -48,12 +46,10 @@ function status_update() rt_file = uci:get("adblock", "global", "adb_rtfile") or "/tmp/adb_runtime.json" - if fs.access(rt_file) then - content = json.parse(fs.readfile(rt_file)) - if content then - http.prepare_content("application/json") - http.write_json(content) - end + if nixio.fs.access(rt_file) then + content = json.parse(nixio.fs.readfile(rt_file) or "") + http.prepare_content("application/json") + http.write_json(content) end end -- cgit v1.2.3