From 07120b7dc42463b5dfe46b2a778e094035d7e888 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Wed, 23 Oct 2019 16:28:55 -0700
Subject: [PATCH] Fixed Disk() description and SMART data

---
 scripts/wk/obj.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/wk/obj.py b/scripts/wk/obj.py
index 46cc1cd8..a0ce2db1 100644
--- a/scripts/wk/obj.py
+++ b/scripts/wk/obj.py
@@ -153,6 +153,12 @@ class Disk():
       if not isinstance(self.lsblk[attr], int):
         self.lsblk[attr] = int(self.lsblk[attr])
 
+    # Set description
+    self.description = '{size_str} ({tran}) {model} {serial}'.format(
+      size_str = bytes_to_string(self.lsblk['size'], use_binary=False),
+      **self.lsblk,
+      )
+
   def get_labels(self):
     """Build list of labels for this disk, returns list."""
     labels = []
@@ -179,7 +185,7 @@ class Disk():
       '--json',
       self.path,
       ]
-    self.smartctl = get_json_from_command(cmd)
+    self.smartctl = get_json_from_command(cmd, check=False)
 
     # Check for attributes
     if KEY_NVME in self.smartctl: