verbump to 0.0.6

setup.py

@@ -21,7 +21,7 @@
 import setuptools
 
 name = "steckie"
-ver = "0.0.3"
+ver = "0.0.6"
 desc = 'Read state from Tasmota smart plugs'
 
 setuptools.setup(

steckie/steckie.py

@@ -20,14 +20,13 @@ import sys
 import json
 import pytz
 import logging
-import urllib.request
+import dateutil
+import urllib
 from datetime import datetime
 from deichapp import Deichapp
 from deichflux import Deichflux
 from apscheduler.schedulers.blocking import BlockingScheduler
 
-import dateutil
-
 CONFIG_DEFAULT = {
     "interval": 5.0,
 }
@@ -57,9 +56,7 @@ class Steckie(Deichapp):
                     f'ORDER BY DESC LIMIT 1'
             res = self.db.query(query, None)
             for p in res.get_points():
-                print(p)
-                last = pytz.UTC.localize(datetime.utcfromtimestamp(p["time"] / 1e9))
-                self.counters[name]["last"] = last
+                self.counters[name]["last"] = dateutil.parser.isoparse(p["time"])
                 total = p["e_total_kwh"]
                 self.counters[name]["year"] = total - p["e_year_kwh"]
                 self.counters[name]["month"] = total - p["e_month_kwh"]
@@ -79,7 +76,8 @@ class Steckie(Deichapp):
         now = pytz.UTC.localize(datetime.utcnow())
 
         try:
-            with urllib.request.urlopen(f'{url}/cm?cmnd=Status%208') as raw:
+            with urllib.request.urlopen(f'{url}/cm?cmnd=Status%208',
+                                        timeout=self.cfg["timeout"]) as raw:
                 resp = json.loads(raw.read().decode("utf-8"))
         except Exception as e:
             logging.warning(f'{name} - no response: {e}')
@@ -97,14 +95,14 @@ class Steckie(Deichapp):
         now_local = now.astimezone(pytz.timezone("Europe/Berlin"))
         last_local = cnt["last"].astimezone(pytz.timezone("Europe/Berlin"))
         if now_local.date().year != last_local.date().year:
-            self.cnt["year"] = total
-            self.cnt["month"] = total
-            self.cnt["day"] = total
+            cnt["year"] = total
+            cnt["month"] = total
+            cnt["day"] = total
         elif now_local.date().month != last_local.date().month:
-            self.cnt["month"] = total
-            self.cnt["day"] = total
+            cnt["month"] = total
+            cnt["day"] = total
         elif now_local.date().day != last_local.date().day:
-            self.cnt["day"] = total
+            cnt["day"] = total
         cnt["last"] = now
 
         # write data to DB