From ed88ad78c0e12e51a4d01df8654555cd175e6109 Mon Sep 17 00:00:00 2001
From: gitea-action <git@cooluc.com>
Date: Sun, 13 Apr 2025 13:30:31 +0800
Subject: [PATCH] luci-app-passwall: sync upstream

last commit: https://github.com/xiaorouji/openwrt-passwall/commit/992017ed58bd507d38ca2f60d5b7201c249d0d30
---
 .../luasrc/controller/passwall.lua            |  2 +-
 .../model/cbi/passwall/client/app_update.lua  | 11 +++++----
 luci-app-passwall/luasrc/passwall/com.lua     | 23 +++++++++++++++++++
 .../view/passwall/app_update/app_version.htm  |  3 ++-
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/luci-app-passwall/luasrc/controller/passwall.lua b/luci-app-passwall/luasrc/controller/passwall.lua
index 1712f4dd7..23ad0bbae 100644
--- a/luci-app-passwall/luasrc/controller/passwall.lua
+++ b/luci-app-passwall/luasrc/controller/passwall.lua
@@ -88,7 +88,7 @@ function index()
 	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
+	for _, com in ipairs(coms.order) do
 		entry({"admin", "services", appname, "check_" .. com}, call("com_check", com)).leaf = true
 		entry({"admin", "services", appname, "update_" .. com}, call("com_update", com)).leaf = true
 	end
diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/app_update.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/app_update.lua
index 8a59a4310..f36ee513c 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/app_update.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/app_update.lua
@@ -14,10 +14,13 @@ s:append(Template(appname .. "/app_update/app_version"))
 
 local k, v
 local com = require "luci.passwall.com"
-for k, v in pairs(com) do
-	o = s:option(Value, k:gsub("%-","_") .. "_file", translatef("%s App Path", v.name))
-	o.default = v.default_path or ("/usr/bin/" .. k)
-	o.rmempty = false
+for _, k in ipairs(com.order) do
+	v = com[k]
+	if k ~= "geoview" then
+		o = s:option(Value, k:gsub("%-","_") .. "_file", translatef("%s App Path", v.name))
+		o.default = v.default_path or ("/usr/bin/" .. k)
+		o.rmempty = false
+	end
 end
 
 o = s:option(DummyValue, "tips", " ")
diff --git a/luci-app-passwall/luasrc/passwall/com.lua b/luci-app-passwall/luasrc/passwall/com.lua
index 8f658899d..476874d21 100644
--- a/luci-app-passwall/luasrc/passwall/com.lua
+++ b/luci-app-passwall/luasrc/passwall/com.lua
@@ -8,6 +8,15 @@ local function gh_pre_release_url(self)
 	return "https://api.github.com/repos/" .. self.repo .. "/releases?per_page=1"
 end
 
+-- 排序顺序定义
+_M.order = {
+	"geoview",
+	"chinadns-ng",
+	"xray",
+	"sing-box",
+	"hysteria"
+}
+
 _M.hysteria = {
 	name = "Hysteria",
 	repo = "HyNetwork/hysteria",
@@ -81,4 +90,18 @@ _M["chinadns-ng"] = {
 	}
 }
 
+_M.geoview = {
+	name = "Geoview",
+	repo = "snowie2000/geoview",
+	get_url = gh_release_url,
+	cmd_version = '-version 2>/dev/null | awk \'NR==1 && $1=="Geoview" {print $2}\'',
+	zipped = false,
+	default_path = "/usr/bin/geoview",
+	match_fmt_str = "linux%%-%s",
+	file_tree = {
+		mipsel = "mipsle",
+		mips64el = "mips64le"
+	}
+}
+
 return _M
diff --git a/luci-app-passwall/luasrc/view/passwall/app_update/app_version.htm b/luci-app-passwall/luasrc/view/passwall/app_update/app_version.htm
index 3769e7ded..4bedcc840 100644
--- a/luci-app-passwall/luasrc/view/passwall/app_update/app_version.htm
+++ b/luci-app-passwall/luasrc/view/passwall/app_update/app_version.htm
@@ -189,7 +189,8 @@ local version = {}
 	</div>
 </div>
 
-<%for k, v in pairs(com) do
+<%for _, k in ipairs(com.order) do
+	local v = com[k]
 	version[k] = api.get_app_version(k)%>
 <div class="cbi-value">
 	<label class="cbi-value-title"><%=v.name%>