X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/aa525e265c768dd0a046086685c47c6a238cf436..7419f864747b4cb78abcdf86b6f6f5cd523d334c:/seewasser.py

diff --git a/seewasser.py b/seewasser.py
index 600bf3d..be5f149 100755
--- a/seewasser.py
+++ b/seewasser.py
@@ -8,7 +8,7 @@ import sys
 import csv
 import os
 import configparser
-from sqlalchemy import create_engine, exc
+from sqlalchemy import create_engine
 import warnings
 import MySQLdb.cursors
 
@@ -64,11 +64,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"))
-        records = []
-        for row in reader:
-            records.append(row)
-    return records
+        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):
@@ -81,36 +77,36 @@ 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
+        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)
+
+    if fromcsvfile:
+        process_csv_file(config, fromcsvfile, value_type, sensors)
+        return
+
+    for sensor_id, sensor_name in sensors:
+        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))