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

luci-app-passwall: sync upstream

Browse Source 
last commit: dc9a016b61
This commit is contained in:
gitea-action 2025-03-13 00:00:26 +08:00
parent bbe95bf0c6
commit 66b31f8b3f
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1639,7 +1639,7 @@ local function parse_link(raw, add_mode, add_from, cfgid)
log('成功解析【' .. add_from .. '】节点数量: ' .. #node_list) log('成功解析【' .. add_from .. '】节点数量: ' .. #node_list)
else else
if add_mode == "2" then if add_mode == "2" then
log('获取到的【' .. add_from .. '】订阅内容为空，可能是订阅地址失效，或是网络问题，请请检测。') log('获取到的【' .. add_from .. '】订阅内容为空，可能是订阅地址无效，或是网络问题，请诊断！')
end end
end end
end end
@ -1715,23 +1715,38 @@ local execute = function()
log('正在订阅:【' .. remark .. '】' .. url .. ' [' .. result .. ']') log('正在订阅:【' .. remark .. '】' .. url .. ' [' .. result .. ']')
local tmp_file = "/tmp/" .. cfgid local tmp_file = "/tmp/" .. cfgid
local raw = curl(url, tmp_file, ua, access_mode) local raw = curl(url, tmp_file, ua, access_mode)
if raw == 0 then if raw ~= 0 then
fail_list[#fail_list + 1] = value
else
if luci.sys.call("[ -f " .. tmp_file .. " ] && sed -i -e '/^[ \t]*$/d' -e '/^[ \t]*\r$/d' " .. tmp_file) == 0 then
local f = io.open(tmp_file, "r") local f = io.open(tmp_file, "r")
local count = 0
for _ in f:lines() do
count = count + 1
end
if count == 1 then
f:seek("set")
local stdout = f:read("*all") local stdout = f:read("*all")
f:close() f:close()
raw = trim(stdout) local raw_data = trim(stdout)
local old_md5 = value.md5 or "" local old_md5 = value.md5 or ""
local new_md5 = luci.sys.exec("[ -f " .. tmp_file .. " ] && md5sum " .. tmp_file .. " | awk '{print $1}' || echo 0"):gsub("\n", "") local new_md5 = luci.sys.exec("md5sum " .. tmp_file .. " 2>/dev/null | awk '{print $1}'"):gsub("\n", "")
os.remove(tmp_file) os.remove(tmp_file)
if old_md5 == new_md5 then if old_md5 == new_md5 then
log('订阅:【' .. remark .. '】没有变化，无需更新。') log('订阅:【' .. remark .. '】没有变化，无需更新。')
else else
parse_link(raw, "2", remark, cfgid) parse_link(raw_data, "2", remark, cfgid)
uci:set(appname, cfgid, "md5", new_md5) uci:set(appname, cfgid, "md5", new_md5)
end end
else else
f:close()
os.remove(tmp_file)
fail_list[#fail_list + 1] = value fail_list[#fail_list + 1] = value
end end
else
fail_list[#fail_list + 1] = value
end
end
allowInsecure_default = nil allowInsecure_default = nil
filter_keyword_mode_default = uci:get(appname, "@global_subscribe[0]", "filter_keyword_mode") or "0" filter_keyword_mode_default = uci:get(appname, "@global_subscribe[0]", "filter_keyword_mode") or "0"
filter_keyword_discard_list_default = uci:get(appname, "@global_subscribe[0]", "filter_discard_list") or {} filter_keyword_discard_list_default = uci:get(appname, "@global_subscribe[0]", "filter_discard_list") or {}
@ -1745,7 +1760,7 @@ local execute = function()
if #fail_list > 0 then if #fail_list > 0 then
for index, value in ipairs(fail_list) do for index, value in ipairs(fail_list) do
log(string.format('【%s】订阅失败，可能是订阅地址失效，或是网络问题，请诊断！', value.remark)) log(string.format('【%s】订阅失败，可能是订阅地址无效，或是网络问题，请诊断！', value.remark))
end end
end end
update_node(0) update_node(0)