2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Fix issue #38

Browse source
This commit is contained in:
2Shirt 2019-01-07 16:13:24 -07:00
parent b1e5727d54
commit 83e96f9135
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.bin/Scripts/functions/osticket.py
View file

@ -14,7 +14,7 @@ KNOWN_DEV_TYPES = ('CPU', 'Disk')
# Regex # Regex
REGEX_BLOCK_GRAPH = re.compile(r'(▁|▂|▃|▄|▅|▆|▇|█)') REGEX_BLOCK_GRAPH = re.compile(r'(▁|▂|▃|▄|▅|▆|▇|█)')
REGEX_NVME_SMART_ATTRIBUTES = re.compile(r'^\s*(\d+) / (\w+): (.{28})(.*)$') REGEX_NVME_SMART_ATTRIBUTES = re.compile(r'^\s*(\d+) / (\w+): (.{28})(.*)$')
REGEX_TEMPS = re.compile(r'^\s*(.*?)\s+(idle.*)$') REGEX_TEMPS = re.compile(r'^\s*(.*?)\s+(idle:)(.*)$')
REGEX_SENSOR = re.compile(r'^(.*?)(\s*)$') REGEX_SENSOR = re.compile(r'^(.*?)(\s*)$')
@ -113,6 +113,7 @@ class osTicket():
if r: if r:
_sensor = '{:<20}'.format(r.group(1)) _sensor = '{:<20}'.format(r.group(1))
_temps = r.group(2) _temps = r.group(2)
_temps += re.sub(r'\s+(\w+:)', r' ...... \1', r.group(3))
r2 = REGEX_SENSOR.match(_sensor) r2 = REGEX_SENSOR.match(_sensor)
_sensor = r2.group(1) _sensor = r2.group(1)
_spacer = pad_with_dots(r2.group(2)) _spacer = pad_with_dots(r2.group(2))