X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/d6635fd886f723050b0031b70f22e1b04c3fb96d..26256314244db4e501c6514d46ee65b88d65675c:/seewasser.py

diff --git a/seewasser.py b/seewasser.py
index f2ab4a7..7b58c05 100755
--- a/seewasser.py
+++ b/seewasser.py
@@ -3,15 +3,18 @@
 import argparse
 import logging
 import datetime
+import time
 import re
 import sys
 import csv
 import os
 import configparser
-from sqlalchemy import create_engine, exc
+from sqlalchemy import create_engine
 import warnings
 import MySQLdb.cursors
 
+logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.INFO)
+
 #May 27 21:32 /sys/bus/w1/devices/28-0416a1bab9ff
 #May 27 21:33 /sys/bus/w1/devices/28-0416a1ac66ff
 #May 27 21:35 /sys/bus/w1/devices/28-0516a207a4ff
@@ -54,6 +57,13 @@ def readsensor(sensor_id):
 
     return jetzt, temp_raw, temp
 
+def read_buggy_sensor(sensor_id):
+    for i in range(120):
+        jetzt, temp_raw, temp = readsensor(sensor_id)
+        if temp < 30:
+            return jetzt, temp_raw, temp
+        time.sleep(1)
+    raise ReadsensorError('Zu hoch')
 
 def writesensordatacsv(config, sensor_id, sensor_name, timestamp, value_type, value_raw, value):
     # Schreiben des csv-files
@@ -64,9 +74,7 @@ def writesensordatacsv(config, sensor_id, sensor_name, timestamp, value_type, va
 
 def readcsvfile(csvfile):
     with open(csvfile, "r", newline="") as file:
-        reader = csv.DictReader(file, dialect = "excel", fieldnames=("timestamp", "sensor_id", "sensor_name", "value"))
-        for row in reader:
-            yield row
+        yield from csv.DictReader(file, dialect = "excel", fieldnames=("timestamp", "sensor_id", "sensor_name", "value"))
 
 
 def writesensordatadb(config, sensor_id, sensor_name, timestamp, value_type, value_raw, value):
@@ -79,37 +87,40 @@ def writesensordatadb(config, sensor_id, sensor_name, timestamp, value_type, val
     engine = create_engine('mysql+mysqldb://{}:{}@{}/{}'.format(user, pwd, host, db), echo=False)
     conn = engine.connect()
     with warnings.catch_warnings():
-        # ignore _mysql_exceptions.IntegrityError: (1062, "Duplicate entry '0316a2193bff-2018-08-29 14:30:00' for key 'sensorid_timestamp'")
-        # TODO: the following doesn't work
+        # ignore _mysql_exceptions.Warning: Duplicate entry '0316a2193bff-2018-08-29 14:30:00' for key 'sensorid_timestamp'
         warnings.simplefilter("ignore", category=MySQLdb.cursors.Warning)
-        # TODO: this does but …?!
-        try:
-            conn.execute("insert into sensors (sensor_id, sensor_name, value_type, value_raw, value, timestamp) values (%s,%s,%s,%s,%s,%s)", sensor_id, sensor_name, value_type, value_raw, value, timestamp)
-        except exc.IntegrityError as e:
-            if "1062" in str(e):
-                pass
-            else:
-                raise
+        if args.verbose:
+            logging.info("Writing to database: sensor_id={}, sensor_name={}, value_type={}, value_raw={}, value={}, timestamp={}".format(sensor_id, sensor_name, value_type, value_raw, value, timestamp))
+        conn.execute("insert ignore into sensors (sensor_id, sensor_name, value_type, value_raw, value, timestamp) values (%s,%s,%s,%s,%s,%s)", sensor_id, sensor_name, value_type, value_raw, value, timestamp)
     conn.close()
 
 
+def process_csv_file(config, fromcsvfile, value_type, sensors):
+    # "timestamp", "sensor_id", "sensor_name", "value"
+    sensors_ids = [sensor_id for sensor_id, sensor_name in sensors]
+    for record in readcsvfile(fromcsvfile):
+        timestamp, sensor_id, sensor_name, value = (record["timestamp"], record["sensor_id"], record["sensor_name"], float(record["value"]))
+        if sensor_id in sensors_ids:
+            value_raw = None
+            writesensordatadb(config, sensor_id, sensor_name, timestamp, value_type, value_raw, value)
+
+
 def main(configfile, fromcsvfile):
     config = configparser.ConfigParser()
     config.read(configfile)
-    
+    sensors = config.items('temperature')
     value_type = "Wassertemperatur"
-    for sensor_id, sensor_name in config.items('temperature'):
-        if fromcsvfile:
-            # "timestamp", "sensor_id", "sensor_name", "value"
-            for record in readcsvfile(fromcsvfile):
-                timestamp, sensor_id, sensor_name, value = (record["timestamp"], record["sensor_id"], record["sensor_name"], float(record["value"]))
-                value_raw = None
-                writesensordatadb(config, sensor_id, sensor_name, timestamp, value_type, value_raw, value)
-        else:
-            timestamp, value_raw, value = readsensor(sensor_id)
-            writesensordatacsv(config, sensor_id, sensor_name, timestamp, value_type, value_raw, value)
-            writesensordatadb(config, sensor_id, sensor_name, timestamp, value_type, value_raw, value)
-        logging.info('Sensor {}: {:.1f}°C'.format(sensor_id, value))
+
+    if fromcsvfile:
+        process_csv_file(config, fromcsvfile, value_type, sensors)
+        return
+
+    for sensor_id, sensor_name in sensors:
+        timestamp, value_raw, value = read_buggy_sensor(sensor_id)
+        writesensordatacsv(config, sensor_id, sensor_name, timestamp, value_type, value_raw, value)
+        writesensordatadb(config, sensor_id, sensor_name, timestamp, value_type, value_raw, value)
+        if args.verbose:
+            logging.info('Sensor {}: {:.1f}°C'.format(sensor_id, value))
 
 
 if __name__ == '__main__':
@@ -117,6 +128,7 @@ if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Read sensor data')
     parser.add_argument('--config', default=default_config_file, help='configuration file')
     parser.add_argument('--fromcsvfile', help='write values from csv file to database')
+    parser.add_argument("--verbose", help='write some output', action='store_true')
     args = parser.parse_args()
     main(args.config, args.fromcsvfile)