From 4fd4aec328c7f886892db926e7dd999e067488f1 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Mon, 24 Dec 2018 01:53:14 +0800 Subject: [PATCH] luci ssr plus: sort servers name order --- package/lean/luci-app-ssr-plus/Makefile | 2 +- .../luasrc/model/cbi/shadowsocksr/client.lua | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index 015796f8f..88f235341 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=1 -PKG_RELEASE:=79 +PKG_RELEASE:=80 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \ diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua index bb21572dd..02afa2729 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua @@ -21,20 +21,27 @@ uci:foreach(shadowsocksr, "servers", function(s) end end) +local key_table = {} +for key,_ in pairs(server_table) do + table.insert(key_table,key) +end + +table.sort(key_table) + -- [[ Global Setting ]]-- s = m:section(TypedSection, "global") s.anonymous = true o = s:option(ListValue, "global_server", translate("Main Server")) o:value("nil", translate("Disable")) -for k, v in pairs(server_table) do o:value(k, v) end +for _,key in pairs(key_table) do o:value(key,server_table[key]) end o.default = "nil" o.rmempty = false o = s:option(ListValue, "udp_relay_server", translate("Game Mode UDP Server")) o:value("", translate("Disable")) o:value("same", translate("Same as Global Server")) -for k, v in pairs(server_table) do o:value(k, v) end +for _,key in pairs(key_table) do o:value(key,server_table[key]) end o = s:option(ListValue, "threads", translate("Multi Threads Option")) o:value("0", translate("Auto Threads"))