diff --git a/luci-app-passwall/luasrc/controller/passwall.lua b/luci-app-passwall/luasrc/controller/passwall.lua index 23ad0bbae..5a9025c18 100644 --- a/luci-app-passwall/luasrc/controller/passwall.lua +++ b/luci-app-passwall/luasrc/controller/passwall.lua @@ -584,7 +584,7 @@ function geo_view() else geo_type, file_path = "geosite", geosite_path 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() if geo_string ~= "" then local lines = {} @@ -603,7 +603,7 @@ function geo_view() if prefix and list and list ~= "" then geo_type = prefix:sub(1, -2) 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) end end diff --git a/luci-app-passwall/luasrc/view/passwall/rule_list/geoview.htm b/luci-app-passwall/luasrc/view/passwall/rule_list/geoview.htm index 7b95b42c1..bbb2c12d7 100644 --- a/luci-app-passwall/luasrc/view/passwall/rule_list/geoview.htm +++ b/luci-app-passwall/luasrc/view/passwall/rule_list/geoview.htm @@ -78,5 +78,19 @@ local api = require "luci.passwall.api" 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(); + } + }); //]]>