X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/081052516499e0c845c9364342c75b87dc204ad5..c2d6644af7c47c6eb86bccb5a3611678a0901ba3:/seewasser.py?ds=sidebyside

diff --git a/seewasser.py b/seewasser.py
index a65d8c7..b8a23b6 100755
--- a/seewasser.py
+++ b/seewasser.py
@@ -1,5 +1,6 @@
 #! /usr/bin/python3
 
+import argparse
 import logging
 import datetime
 import re
@@ -7,7 +8,9 @@ import sys
 import csv
 import os
 import configparser
-from sqlalchemy import create_engine
+from sqlalchemy import create_engine, exc
+import warnings
+import MySQLdb.cursors
 
 #May 27 21:32 /sys/bus/w1/devices/28-0416a1bab9ff
 #May 27 21:33 /sys/bus/w1/devices/28-0416a1ac66ff
@@ -54,13 +57,24 @@ def readsensor(sensor_id):
 
 def writesensordatacsv(config, sensor_id, sensor_name, timestamp, value_type, value_raw, value):
     # Schreiben des csv-files
-    file = open(config.get("csv", "filename"), "a", newline = "")
+    file = open(os.path.expanduser(config.get("csv", "filename")), "a", newline = "")
     writer = csv.writer(file, dialect = "excel")
-    writer.writerow([timestamp.strftime("%Y-%m-%d %H:%M"), sensor_id, "{:.1f}".format(value)])
+    writer.writerow([timestamp.strftime("%Y-%m-%d %H:%M"), sensor_id, sensor_name, "{:.1f}".format(value)])
 
     file.close()
 
 
+def readcsvfile(csvfile):
+    file = open(csvfile, "r", newline="")
+    reader = csv.DictReader(file, dialect = "excel", fieldnames=("timestamp", "sensor_id", "sensor_name", "value"))
+    records = []
+    for row in reader:
+        records.append(row)
+
+    file.close()
+    return records
+
+
 def writesensordatadb(config, sensor_id, sensor_name, timestamp, value_type, value_raw, value):
     # Schreiben des db-files
     user = config.get('database', 'user')
@@ -68,22 +82,47 @@ def writesensordatadb(config, sensor_id, sensor_name, timestamp, value_type, val
     host = config.get('database','hostname')
     db = config.get('database','database')
     
-    engine = create_engine('mysql+mysqldb://{}:{}@{}/{}'.format(user, pwd, host, db), echo=True)
+    engine = create_engine('mysql+mysqldb://{}:{}@{}/{}'.format(user, pwd, host, db), echo=False)
     conn = engine.connect()
-    conn.execute("insert into sensors (sensor_id, sensor_name, value_type, value_raw, value, timestamp) values (?,?,?,?,?,?)", sensor_id, sensor_name, value_type, value_raw, value, timestamp)
+    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
+        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.close()
 
 
-def main():
+def main(configfile, fromcsvfile):
     config = configparser.ConfigParser()
-    config.read(os.path.expanduser('~/seewasser.ini'))
+    config.read(configfile)
     
     value_type = "Wassertemperatur"
     for sensor_id, sensor_name in config.items('temperature'):
-        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:
+            # "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))
 
 
-main()
+if __name__ == '__main__':
+    default_config_file = os.path.expanduser('~/seewasser.ini')
+    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')
+    args = parser.parse_args()
+    main(args.config, args.fromcsvfile)
+