luci: app_update add passwall version check (#2398)

- app_update add passwall version show & check. ([Feature Request]: 能不能在ui上增加版本显示 #2384)
- add chinadns-ng path in default config.

luci-app-passwall/luasrc/controller/passwall.lua

@@ -69,6 +69,7 @@ function index()
 	entry({"admin", "services", appname, "update_rules"}, call("update_rules")).leaf = true
 
 	--[[Components update]]
+	entry({"admin", "services", appname, "check_passwall"}, call("app_check")).leaf = true
 	local coms = require "luci.passwall.com"
 	local com
 	for com, _ in pairs(coms) do
@@ -403,6 +404,11 @@ function server_clear_log()
 	luci.sys.call("echo '' > /tmp/log/passwall_server.log")
 end
 
+function app_check()
+	local json = api.to_check_self()
+	http_write_json(json)
+end
+
 function com_check(comname)
 	local json = api.to_check("",comname)
 	http_write_json(json)

luci-app-passwall/luasrc/passwall/api.lua

@@ -831,3 +831,40 @@ function to_move(app_name,file)
 
 	return {code = 0}
 end
+
+function get_version()
+	return sys.exec("echo -n $(opkg info luci-app-passwall |grep 'Version'|awk '{print $2}')")
+end
+
+function to_check_self()
+	local url = "https://raw.githubusercontent.com/xiaorouji/openwrt-passwall/luci/luci-app-passwall/Makefile"
+	local tmp_file = "/tmp/passwall_makefile"
+	local return_code, result = curl_logic(url, tmp_file, curl_args)
+	result = return_code == 0
+	if not result then
+		exec("/bin/rm", {"-f", tmp_file})
+		return {
+			code = 1,
+			error = i18n.translatef("Failed")
+		}
+	end
+	local local_version  = get_version()
+	local remote_version = sys.exec("echo -n $(grep 'PKG_VERSION' /tmp/passwall_makefile|awk -F '=' '{print $2}')")
+				.. "-" ..  sys.exec("echo -n $(grep 'PKG_RELEASE' /tmp/passwall_makefile|awk -F '=' '{print $2}')")
+
+	local has_update = compare_versions(local_version, "<", remote_version)
+	if not has_update then
+		return {
+			code = 0,
+			local_version = local_version,
+			remote_version = remote_version
+		}
+	end
+	return {
+		code = 1,
+		has_update = true,
+		local_version = local_version,
+		remote_version = remote_version,
+		error = remote_version
+	}
+end

luci-app-passwall/luasrc/view/passwall/app_update/app_version.htm

@@ -174,6 +174,18 @@ local version = {}
 //]]>
 </script>
 
+<div class="cbi-value">
+	<label class="cbi-value-title">Passwall <%:Version%></label>
+	<div class="cbi-value-field">
+		<div class="cbi-value-description">
+			<span>【 <%=api.get_version()%> 】</span>
+			<input class="btn cbi-button cbi-button-apply" type="button" id="passwall-check_btn"
+				onclick="onBtnClick(this,'passwall');" value="<%:Manually update%>" />
+			<span id="passwall-check_btn-detail"></span>
+		</div>
+	</div>
+</div>
+
 <%for k, v in pairs(com) do
 	version[k] = api.get_app_version(k)%>
 <div class="cbi-value">

luci-app-passwall/root/usr/share/passwall/0_default_config

@@ -68,6 +68,7 @@ config global_app
 	option trojan_go_file '/usr/bin/trojan-go'
 	option brook_file '/usr/bin/brook'
 	option hysteria_file '/usr/bin/hysteria'
+	option chinadns_ng '/usr/bin/chinadns-ng'
 
 config global_subscribe
 	option filter_keyword_mode '1'