Separate function process_csv_file.

[chrisu/seepark.git] / seewasser.py

diff --git a/seewasser.py b/seewasser.py
index 811ebbeca1b1fdab4440c6f63c765ea8eb74e4e0..ecd67d6ad8d514f1e4428e0bdc6d03cefe54c90d 100755 (executable)
--- a/seewasser.py
+++ b/seewasser.py
@@ -91,22 +91,30 @@ def writesensordatadb(config, sensor_id, sensor_name, timestamp, value_type, val
     conn.close()
 
 
     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)
 def main(configfile, fromcsvfile):
     config = configparser.ConfigParser()
     config.read(configfile)

-    
+    sensors = config.items('temperature')

     value_type = "Wassertemperatur"
     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))
 
 
         logging.info('Sensor {}: {:.1f}°C'.format(sensor_id, value))