Update ISP-RPi-mqtt-daemon.py

Added this pull request
ironsheep#149

Author: Adarack

ISP-RPi-mqtt-daemon.py

@@ -1591,6 +1591,9 @@ def isPeriodTimerRunning():
 K_RPI_DRV_NFS = "device-nfs"
 K_RPI_DVC_IP = "ip"
 K_RPI_DVC_PATH = "dvc"
+# new block devices dictionary
+K_RPI_BLK_DEVICES = "block_devices"
+K_RPI_BLK_DEV_TEMP = "temperature_c"
 # new memory dictionary
 K_RPI_MEMORY = "memory"
 K_RPI_MEM_TOTAL = "size_mb"
@@ -1647,6 +1650,10 @@ def send_status(timestamp, nothing):
 
     rpiData[K_RPI_NETWORK] = getNetworkDictionary()
 
+    rpiBlockDevices = getBlockDevicesDictionary()
+    if len(rpiBlockDevices) > 0:
+        rpiData[K_RPI_BLK_DEVICES] = rpiBlockDevices
+
     rpiDrives = getDrivesDictionary()
     if len(rpiDrives) > 0:
         rpiData[K_RPI_DRIVES] = rpiDrives
@@ -1685,10 +1692,25 @@ def forceSingleDigit(temperature):
     tempInterp = '{:.1f}'.format(temperature)
     return float(tempInterp)
 
+def getBlockDevicesDictionary():
+    rpiDevices = OrderedDict()
+
+    smartctlHelper = os.path.join(os.path.dirname(__file__), 'smartctl-helper')
+    stdout, stderr, returncode = invoke_shell_cmd("sudo " + smartctlHelper)
+    if returncode != 0:
+        print_line('Could not query SMART data: {}'.format(stderr), warning=True)
+        return rpiDevices
+
+    for device in stdout.decode('utf-8').splitlines():
+        [ name, temp ] = device.split(':')
+        if len(temp) > 0:
+            rpiDevices[name] = { K_RPI_BLK_DEV_TEMP: float(temp) }
+    return rpiDevices
 
 def getDrivesDictionary():
     global rpi_filesystem
     rpiDrives = OrderedDict()
+    
 
     # tuple { total blocks, used%, mountPoint, device }
     for driveTuple in rpi_filesystem: