diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index 30cd70a33..2253776ac 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus -PKG_VERSION:=166 -PKG_RELEASE:=2 +PKG_VERSION:=167 +PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua index ce3c05b68..bb0d7dcb2 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua @@ -12,6 +12,8 @@ end) local fs = require "nixio.fs" local sys = require "luci.sys" +local ucic = luci.model.uci.cursor() + m = Map(shadowsocksr, translate("Servers subscription and manage")) -- Server Subscribe @@ -78,7 +80,6 @@ end s = m:section(TypedSection, "servers") s.anonymous = true s.addremove = true -s.sortable = false s.template = "cbi/tblsection" s.sortable = true s.extedit = luci.dispatcher.build_url("admin/services/shadowsocksr/servers/%s") @@ -92,7 +93,7 @@ end o = s:option(DummyValue, "type", translate("Type")) function o.cfgvalue(...) - return Value.cfgvalue(...) or translate("") + return string.upper(Value.cfgvalue(...)) or translate("") end o = s:option(DummyValue, "alias", translate("Alias")) @@ -105,11 +106,6 @@ function o.cfgvalue(...) return Value.cfgvalue(...) or "N/A" end -o = s:option(DummyValue, "switch_enable", translate("Auto Switch")) -function o.cfgvalue(...) - return Value.cfgvalue(...) or "1" -end - o = s:option(DummyValue, "server_port", translate("Socket Connected")) o.template="shadowsocksr/socket" o.width="10%" @@ -118,6 +114,24 @@ o = s:option(DummyValue, "server", translate("Ping Latency")) o.template="shadowsocksr/ping" o.width="10%" + +o = s:option(Button,"apply_node",translate("Apply")) +o.inputstyle = "apply" +o.write = function(self, section) + ucic:set("shadowsocksr", '@global[0]', 'global_server', section) + ucic:save("shadowsocksr") + ucic:commit("shadowsocksr") + luci.sys.init.stop("shadowsocksr") + luci.sys.init.start("shadowsocksr") + luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "client")) +end + +o = s:option(Flag, "switch_enable", translate("Auto Switch")) +o.rmempty = false +function o.cfgvalue(...) + return Value.cfgvalue(...) or 1 +end + m:append(Template("shadowsocksr/server_list")) return m