From c2d6644af7c47c6eb86bccb5a3611678a0901ba3 Mon Sep 17 00:00:00 2001 From: gregor herrmann Date: Wed, 29 Aug 2018 14:51:07 +0200 Subject: [PATCH] seewasser.py: add --fromcsvfile option Reads (preivously written) values from csv file instead from the sensors and writes them into the database. --- seewasser.py | 46 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/seewasser.py b/seewasser.py index ef7f401..b8a23b6 100755 --- a/seewasser.py +++ b/seewasser.py @@ -8,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 @@ -62,6 +64,17 @@ def writesensordatacsv(config, sensor_id, sensor_name, timestamp, value_type, va 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') @@ -71,19 +84,37 @@ 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() - 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) + 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(configfile): +def main(configfile, fromcsvfile): config = configparser.ConfigParser() 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)) @@ -91,6 +122,7 @@ 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) + main(args.config, args.fromcsvfile) -- 2.47.3