From 3963401717063a304b01898d2ee9f63583a7f16a Mon Sep 17 00:00:00 2001 From: nega Date: Wed, 10 Jul 2019 13:00:19 -0400 Subject: [PATCH] reformat "Drive Model" in the disk info block --- wrapper-scripts/megaclisas-status | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/wrapper-scripts/megaclisas-status b/wrapper-scripts/megaclisas-status index 1d8e881..df26203 100755 --- a/wrapper-scripts/megaclisas-status +++ b/wrapper-scripts/megaclisas-status @@ -476,6 +476,21 @@ def returnDiskInfo(output,controllerid): elif re.match(r'Inquiry Data: .*$',line.strip()): model = line.split(':')[1].strip() model = re.sub(' +', ' ', model) + + # re-define our "sub-code" + # our seagate drives have an ID string of + # 'Z1E19S2QST2000DM001-1CH164 CC43' + # or + # '6XW02738ST32000542AS CC32' + + m = re.match(r'(\w{8})(ST\w+)(?:-(\w{6}))?(?:\s+(\w+))', model) + if m: + if m.group(3): + model = '{}-{} {} {}'.format(m.group(2), m.group(3), m.group(4), m.group(1)) + else: + model = '{} {:>10} {}'.format(m.group(2), m.group(4), m.group(1)) + continue + # Sub code manuf = re.sub(' .*', '', model) dtype = re.sub(manuf+' ', '', model)