openwrt/openwrt-passwall2
1
0
Fork 0
mirror of https://github.com/xiaorouji/openwrt-passwall2.git synced 2025-05-01 05:29:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

luci: fix md5 fetching error in subscribe code under certain conditions

Browse Source 
fix: https://github.com/xiaorouji/openwrt-passwall/issues/3696#issuecomment-2629459470
fix: https://github.com/xiaorouji/openwrt-passwall2/issues/771
This commit is contained in:
lwb1978 2025-02-05 17:46:45 +08:00 committed by xiaorouji
parent c5079c002f
commit 2a133b09dd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
View File

@ -1676,18 +1676,19 @@ local execute = function()
local access_mode = value.access_mode
local result = (not access_mode) and "自动" or (access_mode == "direct" and "直连访问" or (access_mode == "proxy" and "通过代理" or "自动"))
log('正在订阅:【' .. remark .. '】' .. url .. ' [' .. result .. ']')
local raw = curl(url, "/tmp/" .. cfgid, ua, access_mode)
local tmp_file = "/tmp/" .. cfgid
local raw = curl(url, tmp_file, ua, access_mode)
if raw == 0 then
local f = io.open("/tmp/" .. cfgid, "r")
local f = io.open(tmp_file, "r")
local stdout = f:read("*all")
f:close()
raw = trim(stdout)
local old_md5 = value.md5 or ""
local new_md5 = luci.sys.exec(string.format("echo -n $(echo '%s' | md5sum | awk '{print $1}')", raw))
local new_md5 = luci.sys.exec("[ -f " .. tmp_file .. " ] && md5sum " .. tmp_file .. " | awk '{print $1}' || echo 0")
os.remove(tmp_file)
if old_md5 == new_md5 then
log('订阅:【' .. remark .. '】没有变化，无需更新。')
else
os.remove("/tmp/" .. cfgid)
parse_link(raw, "2", remark, cfgid)
uci:set(appname, cfgid, "md5", new_md5)
end