applications/luci-qos: cope with reorganized L7 patterns

2 files changed, 8 insertions, 6 deletions

diff --git a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
index af481fd3aa..4891dbbdc8 100644
--- a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
+++ b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
@@ -64,11 +64,12 @@ wa.cbi_add_knownips(dsth)
 l7 = s:option(ListValue, "layer7", translate("Service"))
 l7.rmempty = true
 l7:value("", translate("all"))
-local pats = fs.dir("/etc/l7-protocols")
+local pats = fs.glob("/etc/l7-protocols/*/*.pat")
 if pats then
 	for f in pats do
-		if f:sub(-4) == ".pat" then
-			l7:value(f:sub(1, #f-4))
+		f = f:match("([^/]+)%.pat$")
+		if f then
+			l7:value(f)
 		end
 	end
 end
diff --git a/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua b/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
index 503ad10a28..c775ece730 100644
--- a/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
+++ b/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
@@ -50,11 +50,12 @@ wa.cbi_add_knownips(dsth)
 l7 = s:option(ListValue, "layer7", translate("Service"))
 l7.rmempty = true
 l7:value("", translate("all"))
-local pats = fs.dir("/etc/l7-protocols")
+local pats = fs.glob("/etc/l7-protocols/*/*.pat")
 if pats then
 	for f in pats do
-		if f:sub(-4) == ".pat" then
-			l7:value(f:sub(1, #f-4))
+		f = f:match("([^/]+)%.pat$")
+		if f then
+			l7:value(f)
 		end
 	end
 end