Merge pull request #81 from cdesouza71/master

Fix datetime serialization issue

moisture_sensor_data_mqtt/README.md

@@ -59,6 +59,8 @@ week.
 
 ## Version information
 
+- v0.0.4
+ - Fix datetime serialization issue
 - v0.0.3
  - Fixed issue with sensor rename and last_reading
 - v0.0.2

moisture_sensor_data_mqtt/moisture_sensor_data_mqtt-docs.html

@@ -105,6 +105,10 @@ <h2>Retention period</h2>
 <h2>Version information</h2>
 
 <ul>
+<li>v0.0.4
+<ul>
+<li>Fix datetime serialization issue</li>
+</ul></li>
 <li>v0.0.3
 <ul>
 <li>Fixed issue with sensor rename and last_reading</li>

moisture_sensor_data_mqtt/moisture_sensor_data_mqtt.py

@@ -13,6 +13,7 @@
 from webpages import ProtectedPage # Needed for security
 
 import datetime
+import copy
 import os
 from plugins import mqtt
 
@@ -152,7 +153,6 @@ def mqtt_reader(client, msg):
  reading = round(reading)
 
  # Store reading for display purposes
- # TODO save settings
  last_reading[sensor] = {"ts": ts, "reading": reading}
 
  # Send msd signal
@@ -259,14 +259,16 @@ class get_settings(ProtectedPage):
  """
 
  def GET(self):
- # Inject last reading as it is currently not saved
+ # If we add this to settings we run into datetime
+ # serialization issues when dumping settings, hence the copy.
+ display_sensors = copy.deepcopy(settings["sensors"])
+
  for sensor in last_reading.keys():
- settings["sensors"][sensor]["reading_ts"] = last_reading[sensor]["ts"]
- settings["sensors"][sensor]["reading_value"] = last_reading[sensor][
- "reading"
- ]
+ display_sensors[sensor]["reading_ts"] = last_reading[sensor]["ts"]
+ display_sensors[sensor]["reading_value"] = last_reading[sensor]["reading"]
+
  # open settings page
- return template_render.moisture_sensor_data_mqtt(settings["sensors"])
+ return template_render.moisture_sensor_data_mqtt(display_sensors)
 
 
 class save_settings(ProtectedPage):
@@ -291,6 +293,7 @@ def GET(self):
  global settings
 
  qdict = web.input()
+
  new_settings = {}
 
  index = 0