update 04-01 09:48

This commit is contained in:
github-actions[bot] 2022-04-01 09:48:14 +08:00
parent 373352649f
commit c13965f705
11 changed files with 99 additions and 19 deletions

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=aliyundrive-fuse
PKG_VERSION:=0.1.8
PKG_VERSION:=0.1.9
PKG_RELEASE:=$(AUTORELEASE)
PKG_LICENSE:=MIT

Binary file not shown.

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-aliyundrive-fuse
PKG_VERSION:=0.1.8
PKG_VERSION:=0.1.9
PKG_RELEASE:=1
PKG_PO_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)

View File

@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall2
PKG_VERSION:=1.2
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_$(PKG_NAME)_Transparent_Proxy \

View File

@ -163,7 +163,7 @@ end
function status()
local e = {}
e["global_status"] = luci.sys.call(string.format("top -bn1 | grep -v -E 'grep|acl/|acl_' | grep '%s/bin/' | grep -i 'global' >/dev/null", appname)) == 0
e["global_status"] = luci.sys.call(string.format("top -bn1 | grep -v -E 'grep|acl/|acl_' | grep '%s/bin/' | grep -i 'global\\.json' >/dev/null", appname)) == 0
luci.http.prepare_content("application/json")
luci.http.write_json(e)
end

View File

@ -464,17 +464,17 @@ if true then
local source = nil
if e.source then
source = {}
string.gsub(e.source, '[^' .. "\r\n" .. ']+', function(w)
string.gsub(e.source, '[^' .. " " .. ']+', function(w)
table.insert(source, w)
end)
end
local rule = {
type = "field",
outboundTag = outboundTag,
network = e["network"],
network = e["network"] or "tcp,udp",
source = source,
sourcePort = e["sourcePort"] and e["sourcePort"] ~= "",
port = e["port"] and e["port"] ~= "",
sourcePort = e["sourcePort"] ~= "" and e["sourcePort"] or nil,
port = e["port"] ~= "" and e["port"] or nil,
protocol = protocols
}
if domains then

View File

@ -23,8 +23,75 @@ network:value("tcp,udp", "TCP UDP")
network:value("tcp", "TCP")
network:value("udp", "UDP")
source = s:option(TextValue, "source", translate("Source"))
source.wrap = "off"
source = s:option(DynamicList, "source", translate("Source"))
source.description = "<ul><li>" .. translate("Example:")
.. "</li><li>" .. translate("IP") .. ": 192.168.1.100"
.. "</li><li>" .. translate("IP CIDR") .. ": 192.168.1.0/24"
.. "</li><li>" .. translate("GeoIP") .. ": geoip:private"
.. "</li></ul>"
source.cast = "string"
source.cfgvalue = function(self, section)
local value
if self.tag_error[section] then
value = self:formvalue(section)
else
value = self.map:get(section, self.option)
if type(value) == "string" then
local value2 = {}
string.gsub(value, '[^' .. " " .. ']+', function(w) table.insert(value2, w) end)
value = value2
end
end
return value
end
source.validate = function(self, value, t)
local err = {}
for _, v in ipairs(value) do
local flag = false
if datatypes.ip4addr(v) then
flag = true
end
if flag == false and v:find("geoip:") and v:find("geoip:") == 1 then
flag = true
end
if flag == false then
err[#err + 1] = v
end
end
if #err > 0 then
self:add_error(t, "invalid", translate("Not true format, please re-enter!"))
for _, v in ipairs(err) do
self:add_error(t, "invalid", v)
end
end
return value
end
local dynamicList_write = function(self, section, value)
local t = {}
local t2 = {}
if type(value) == "table" then
local x
for _, x in ipairs(value) do
if x and #x > 0 then
if not t2[x] then
t2[x] = x
t[#t+1] = x
end
end
end
else
t = { value }
end
t = table.concat(t, " ")
return DynamicList.write(self, section, t)
end
source.write = dynamicList_write
sourcePort = s:option(Value, "sourcePort", translate("Source port"))

View File

@ -57,15 +57,17 @@ config nodes 'myshunt'
option remarks '分流总节点'
option type 'Xray'
option protocol '_shunt'
option AD 'nil'
option BT '_direct'
option TVB 'nil'
option China '_direct'
option default_node 'nil'
option LAN '_direct'
option Direct '_direct'
option Proxy '_default'
option AD 'nil'
option BT '_direct'
option Netflix 'nil'
option TVB 'nil'
option Proxy '_default'
option China '_direct'
option QUIC '_blackhole'
option UDP 'nil'
option default_node 'nil'
option domainStrategy 'IPOnDemand'
option domainMatcher 'hybrid'
@ -194,4 +196,12 @@ config shunt_rules 'China'
option network 'tcp,udp'
option ip_list 'geoip:cn'
option domain_list 'geosite:cn'
config shunt_rules 'QUIC'
option remarks 'QUIC'
option port '80,443'
option network 'udp'
config shunt_rules 'UDP'
option remarks 'UDP'
option network 'udp'

View File

@ -1,6 +1,9 @@
# luci-theme-neobird
## 针对移动端优化的Openwrt主题
For Lean's OpenWRT Only
https://github.com/coolsnowwolf/lede
六年前用OP随手把luci-theme-material改成了自己喜欢的Advancedtomato样式
因为用了很短时间便没再用OP了主题也没再管。
后来便有了lede固件默认使用material主题的修改版做主题包括今天的luci-theme-netgear和luci-theme-argon还是我的思路不过都不是我喜欢的样子。

View File

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mosdns
PKG_VERSION:=c840d4a
PKG_VERSION:=b9a9292
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=natflow
PKG_VERSION:=20220406
PKG_VERSION:=20220407
PKG_SOURCE_URL:=https://codeload.github.com/ptpt52/natflow/tar.gz/$(PKG_VERSION)?
PKG_HASH:=skip