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: cad3d3ec96
This commit is contained in:
gitea-action 2025-04-17 22:30:30 +08:00
parent 35797793ec
commit 6a957b17b2
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
luci-app-passwall/luasrc/controller/passwall.lua
View File

@ -584,7 +584,7 @@ function geo_view()
else else
geo_type, file_path = "geosite", geosite_path geo_type, file_path = "geosite", geosite_path
end end
cmd = string.format("geoview -type %s -action lookup -input '%s' -value '%s'", geo_type, file_path, value) cmd = string.format("geoview -type %s -action lookup -input '%s' -value '%s' -lowmem=true", geo_type, file_path, value)
geo_string = luci.sys.exec(cmd):lower() geo_string = luci.sys.exec(cmd):lower()
if geo_string ~= "" then if geo_string ~= "" then
local lines = {} local lines = {}
@ -603,7 +603,7 @@ function geo_view()
if prefix and list and list ~= "" then if prefix and list and list ~= "" then
geo_type = prefix:sub(1, -2) geo_type = prefix:sub(1, -2)
file_path = (geo_type == "geoip") and geoip_path or geosite_path file_path = (geo_type == "geoip") and geoip_path or geosite_path
cmd = string.format("geoview -type %s -action extract -input '%s' -list '%s'", geo_type, file_path, list) cmd = string.format("geoview -type %s -action extract -input '%s' -list '%s' -lowmem=true", geo_type, file_path, list)
geo_string = luci.sys.exec(cmd) geo_string = luci.sys.exec(cmd)
end end
end end

14
luci-app-passwall/luasrc/view/passwall/rule_list/geoview.htm
View File

@ -78,5 +78,19 @@ local api = require "luci.passwall.api"
btn.value = QueryText; btn.value = QueryText;
}) })
} }
document.getElementById("geoview.lookup").addEventListener("keydown", function(event) {
if (event.key === "Enter") {
event.preventDefault();
lookup_btn.click();
}
});
document.getElementById("geoview.extract").addEventListener("keydown", function(event) {
if (event.key === "Enter") {
event.preventDefault();
extract_btn.click();
}
});
//]]> //]]>
</script> </script>