zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci: update api finded_com func

Browse Source
This commit is contained in:
xiaorouji 2023-09-06 15:34:06 +08:00 committed by sbwml
parent 83f5115cb7
commit 56157adaf1
18 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua
View File

@ -1,8 +1,8 @@
local api = require "luci.passwall.api" local api = require "luci.passwall.api"
local appname = api.appname local appname = api.appname
local sys = api.sys local sys = api.sys
local has_v2ray = api.is_finded("v2ray") local has_v2ray = api.finded_com("v2ray")
local has_xray = api.is_finded("xray") local has_xray = api.finded_com("xray")
local has_chnlist = api.fs.access("/usr/share/passwall/rules/chnlist") local has_chnlist = api.fs.access("/usr/share/passwall/rules/chnlist")
m = Map(appname) m = Map(appname)

4
luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
View File

@ -2,8 +2,8 @@ local api = require "luci.passwall.api"
local appname = api.appname local appname = api.appname
local uci = api.uci local uci = api.uci
local datatypes = api.datatypes local datatypes = api.datatypes
local has_v2ray = api.is_finded("v2ray") local has_v2ray = api.finded_com("v2ray")
local has_xray = api.is_finded("xray") local has_xray = api.finded_com("xray")
local has_chnlist = api.fs.access("/usr/share/passwall/rules/chnlist") local has_chnlist = api.fs.access("/usr/share/passwall/rules/chnlist")
m = Map(appname) m = Map(appname)

6
luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua
View File

@ -3,9 +3,9 @@ local appname = api.appname
local has_ss = api.is_finded("ss-redir") local has_ss = api.is_finded("ss-redir")
local has_ss_rust = api.is_finded("sslocal") local has_ss_rust = api.is_finded("sslocal")
local has_trojan_plus = api.is_finded("trojan-plus") local has_trojan_plus = api.is_finded("trojan-plus")
local has_v2ray = api.is_finded("v2ray") local has_v2ray = api.finded_com("v2ray")
local has_xray = api.is_finded("xray") local has_xray = api.finded_com("xray")
local has_trojan_go = api.is_finded("trojan-go") local has_trojan_go = api.finded_com("trojan-go")
local ss_aead_type = {} local ss_aead_type = {}
local trojan_type = {} local trojan_type = {}
if has_ss then if has_ss then

6
luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua
View File

@ -4,9 +4,9 @@ local sys = api.sys
local has_ss = api.is_finded("ss-redir") local has_ss = api.is_finded("ss-redir")
local has_ss_rust = api.is_finded("sslocal") local has_ss_rust = api.is_finded("sslocal")
local has_trojan_plus = api.is_finded("trojan-plus") local has_trojan_plus = api.is_finded("trojan-plus")
local has_v2ray = api.is_finded("v2ray") local has_v2ray = api.finded_com("v2ray")
local has_xray = api.is_finded("xray") local has_xray = api.finded_com("xray")
local has_trojan_go = api.is_finded("trojan-go") local has_trojan_go = api.finded_com("trojan-go")
local ss_aead_type = {} local ss_aead_type = {}
local trojan_type = {} local trojan_type = {}
if has_ss then if has_ss then

4
luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua
View File

@ -1,8 +1,8 @@
local api = require "luci.passwall.api" local api = require "luci.passwall.api"
local appname = api.appname local appname = api.appname
local fs = api.fs local fs = api.fs
local has_v2ray = api.is_finded("v2ray") local has_v2ray = api.finded_com("v2ray")
local has_xray = api.is_finded("xray") local has_xray = api.finded_com("xray")
local has_fw3 = api.is_finded("fw3") local has_fw3 = api.is_finded("fw3")
local has_fw4 = api.is_finded("fw4") local has_fw4 = api.is_finded("fw4")

4
luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua
View File

@ -1,7 +1,7 @@
local api = require "luci.passwall.api" local api = require "luci.passwall.api"
local appname = api.appname local appname = api.appname
local has_v2ray = api.is_finded("v2ray") local has_v2ray = api.finded_com("v2ray")
local has_xray = api.is_finded("xray") local has_xray = api.finded_com("xray")
m = Map(appname) m = Map(appname)
-- [[ Rule Settings ]]-- -- [[ Rule Settings ]]--

4
luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua
View File

@ -1,8 +1,8 @@
local api = require "luci.passwall.api" local api = require "luci.passwall.api"
local appname = api.appname local appname = api.appname
local uci = api.uci local uci = api.uci
local has_v2ray = api.is_finded("v2ray") local has_v2ray = api.finded_com("v2ray")
local has_xray = api.is_finded("xray") local has_xray = api.finded_com("xray")
m = Map(appname) m = Map(appname)

2
luci-app-passwall/luasrc/model/cbi/passwall/client/type/brook.lua
View File

@ -2,7 +2,7 @@ local m, s = ...
local api = require "luci.passwall.api" local api = require "luci.passwall.api"
if not api.is_finded("brook") then if not api.finded_com("brook") then
return return
end end

2
luci-app-passwall/luasrc/model/cbi/passwall/client/type/hysteria.lua
View File

@ -2,7 +2,7 @@ local m, s = ...
local api = require "luci.passwall.api" local api = require "luci.passwall.api"
if not api.is_finded("hysteria") then if not api.finded_com("hysteria") then
return return
end end

6
luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua
View File

@ -2,7 +2,7 @@ local m, s = ...
local api = require "luci.passwall.api" local api = require "luci.passwall.api"
if not api.is_finded("xray") and not api.is_finded("v2ray") then if not api.finded_com("xray") and not api.finded_com("v2ray") then
return return
end end
@ -79,10 +79,10 @@ local header_type_list = {
-- [[ Xray ]] -- [[ Xray ]]
if api.is_finded("xray") then if api.finded_com("xray") then
s.fields["type"]:value("Xray", translate("Xray")) s.fields["type"]:value("Xray", translate("Xray"))
end end
if api.is_finded("v2ray") then if api.finded_com("v2ray") then
s.fields["type"]:value("V2ray", translate("V2ray")) s.fields["type"]:value("V2ray", translate("V2ray"))
end end

2
luci-app-passwall/luasrc/model/cbi/passwall/client/type/trojan-go.lua
View File

@ -2,7 +2,7 @@ local m, s = ...
local api = require "luci.passwall.api" local api = require "luci.passwall.api"
if not api.is_finded("trojan-go") then if not api.finded_com("trojan-go") then
return return
end end

2
luci-app-passwall/luasrc/model/cbi/passwall/server/type/brook.lua
View File

@ -2,7 +2,7 @@ local m, s = ...
local api = require "luci.passwall.api" local api = require "luci.passwall.api"
if not api.is_finded("brook") then if not api.finded_com("brook") then
return return
end end

2
luci-app-passwall/luasrc/model/cbi/passwall/server/type/hysteria.lua
View File

@ -2,7 +2,7 @@ local m, s = ...
local api = require "luci.passwall.api" local api = require "luci.passwall.api"
if not api.is_finded("hysteria") then if not api.finded_com("hysteria") then
return return
end end

6
luci-app-passwall/luasrc/model/cbi/passwall/server/type/ray.lua
View File

@ -2,7 +2,7 @@ local m, s = ...
local api = require "luci.passwall.api" local api = require "luci.passwall.api"
if not api.is_finded("xray") and not api.is_finded("v2ray")then if not api.finded_com("xray") and not api.finded_com("v2ray")then
return return
end end
@ -74,10 +74,10 @@ local header_type_list = {
-- [[ Xray ]] -- [[ Xray ]]
if api.is_finded("v2ray") then if api.finded_com("v2ray") then
s.fields["type"]:value("V2ray", translate("V2ray")) s.fields["type"]:value("V2ray", translate("V2ray"))
end end
if api.is_finded("xray") then if api.finded_com("xray") then
s.fields["type"]:value("Xray", translate("Xray")) s.fields["type"]:value("Xray", translate("Xray"))
end end

2
luci-app-passwall/luasrc/model/cbi/passwall/server/type/trojan-go.lua
View File

@ -2,7 +2,7 @@ local m, s = ...
local api = require "luci.passwall.api" local api = require "luci.passwall.api"
if not api.is_finded("trojan-go") then if not api.finded_com("trojan-go") then
return return
end end

10
luci-app-passwall/luasrc/passwall/api.lua
View File

@ -397,8 +397,14 @@ function get_customed_path(e)
return uci_get_type("global_app", e .. "_file") return uci_get_type("global_app", e .. "_file")
end end
function finded_com(e)
local bin = get_app_path(e)
if not bin then return end
return luci.sys.exec('echo -n $(type -t -p "%s" | head -n1)' % { bin })
end
function finded(e) function finded(e)
return luci.sys.exec('echo -n $(type -t -p "/bin/%s" -p "/usr/bin/%s" -p "%s" "%s" | head -n1)' % {e, e, get_customed_path(e), e}) return luci.sys.exec('echo -n $(type -t -p "/bin/%s" -p "/usr/bin/%s" "%s" | head -n1)' % {e, e, e})
end end
function is_finded(e) function is_finded(e)
@ -441,10 +447,12 @@ local function get_bin_version_cache(file, cmd)
end end
function get_app_path(app_name) function get_app_path(app_name)
if com[app_name] then
local def_path = com[app_name].default_path local def_path = com[app_name].default_path
local path = uci_get_type("global_app", app_name:gsub("%-","_") .. "_file") local path = uci_get_type("global_app", app_name:gsub("%-","_") .. "_file")
path = path and (#path>0 and path or def_path) or def_path path = path and (#path>0 and path or def_path) or def_path
return path return path
end
end end
function get_app_version(app_name, file) function get_app_version(app_name, file)

4
luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm
View File

@ -1,8 +1,8 @@
<%+cbi/valueheader%> <%+cbi/valueheader%>
<% <%
local api = require "luci.passwall.api" local api = require "luci.passwall.api"
local has_v2ray = api.is_finded("v2ray") local has_v2ray = api.finded_com("v2ray")
local has_xray = api.is_finded("xray") local has_xray = api.finded_com("xray")
-%> -%>
<script type="text/javascript">//<![CDATA[ <script type="text/javascript">//<![CDATA[
function padright(str, cnt, pad) { function padright(str, cnt, pad) {

6
luci-app-passwall/root/usr/share/passwall/subscribe.lua
View File

@ -24,9 +24,9 @@ uci:revert(appname)
local has_ss = api.is_finded("ss-redir") local has_ss = api.is_finded("ss-redir")
local has_ss_rust = api.is_finded("sslocal") local has_ss_rust = api.is_finded("sslocal")
local has_trojan_plus = api.is_finded("trojan-plus") local has_trojan_plus = api.is_finded("trojan-plus")
local has_v2ray = api.is_finded("v2ray") local has_v2ray = api.finded_com("v2ray")
local has_xray = api.is_finded("xray") local has_xray = api.finded_com("xray")
local has_trojan_go = api.is_finded("trojan-go") local has_trojan_go = api.finded_com("trojan-go")
local allowInsecure_default = nil local allowInsecure_default = nil
local ss_aead_type_default = uci:get(appname, "@global_subscribe[0]", "ss_aead_type") or "shadowsocks-libev" local ss_aead_type_default = uci:get(appname, "@global_subscribe[0]", "ss_aead_type") or "shadowsocks-libev"
local trojan_type_default = uci:get(appname, "@global_subscribe[0]", "trojan_type") or "trojan-plus" local trojan_type_default = uci:get(appname, "@global_subscribe[0]", "trojan_type") or "trojan-plus"