Realm: better value handling

This commit is contained in:
Jed Reynolds
2020-05-27 15:00:44 -07:00
parent 2429d42ea0
commit 31a63ceca0

View File

@@ -68,25 +68,40 @@ class Realm:
matchedList = [] matchedList = []
for name in list: prefix = ""
for portname in list:
if (pattern.index("+") > 0): if (pattern.index("+") > 0):
prefix = re.search(r"^([^+]+)[+]$", pattern) try:
if prefix: match = re.search(r"^([^+]+)[+]$", pattern)
print(prefix) if match.group(1):
if (name.index(prefix) == 0): print("name:", portname, " Group 1: ",match.group(1))
matchedList.append(name) prefix = match.group(1)
elif (pattern.index("*") > 0): if (portname.index(prefix) == 0):
prefix = re.search(r"^([^\*]+)[\*]$", pattern) matchedList.append(portname)
if prefix: except ValueError as e:
print(prefix) print(e)
if (name.index(prefix) == 0):
matchedList.append(name)
if (pattern.index("[") > 0):
match3 = re.search(r"^([^\[]+)\[(\d+)\.\.(\d+)\]$", pattern)
if match3:
print(match3)
matchedList.append(name)
elif (pattern.index("*") > 0):
try:
match = re.search(r"^([^\*]+)[\*]$", pattern)
if match.group(1):
prefix = match.group(1)
print("group 1: ",prefix)
if (portname.index(prefix) == 0):
matchedList.append(portname)
except ValueError as e:
print(e)
elif (pattern.index("[") > 0):
try:
match = re.search(r"^([^\[]+)\[(\d+)\.\.(\d+)\]$", pattern)
if match.group(0):
print("[group1]: ", match.group(1))
prefix = match.group(1)
if (portname.index(prefix)):
matchedList.append(portname) # wrong but better
except ValueError as e:
print(e)
return matchedList return matchedList
class CxProfile: class CxProfile: