Merge a5ef099539 into f3ec24d655

improve docker support
Modified pattern coloring process to apply coloring in an order consistent with configured color lists and regex groups.
2024-03-20 03:55:30 -06:00 · 2024-03-11 14:07:45 +01:00 · 2022-06-06 08:51:07 -07:00
2 changed files with 3 additions and 6 deletions
--- a/grc.conf
+++ b/grc.conf
@ -161,7 +161,7 @@ conf.json
 # docker

 # docker ps
-^([/\w\.]+\/)?(docker|podman)(-compose)? ps\b
+^([/\w\.]+\/)?(docker|podman)((-| +)compose( +-f +("[^"]*"|'[^']*'|[^'" ]*))? +ps| +container +ls| +ps)\b
 conf.dockerps

 ^([/\w\.]+\/)?(docker|podman) image(s| ls| list)\b
--- a/7
+++ b/7
@ -101,11 +101,8 @@ for c in range(0, 256):
 signal.signal(signal.SIGINT, signal.SIG_IGN)

 def add2list(clist, m, patterncolour):
-    for group in range(0, len(m.groups()) +1):
-        if group < len(patterncolour):
-            clist.append((m.start(group), m.end(group), patterncolour[group]))
-        else:
-            clist.append((m.start(group), m.end(group), patterncolour[0]))
+    for group in range(len(m.groups())):
+        clist.append((m.start(group+1), m.end(group+1), patterncolour[group]))

 def get_colour(x):
    if x in colours:
Author	SHA1	Message	Date
Jacob Menashe	3a8299533e	Merge `a5ef099539` into `f3ec24d655`	2024-03-20 03:55:30 -06:00
Radovan Garabík	f3ec24d655	improve docker support	2024-03-11 14:07:45 +01:00
Jake Menashe	a5ef099539	Modified pattern coloring process to apply coloring in an order consistent with configured color lists and regex groups.	2022-06-06 08:51:07 -07:00