diff --git a/server.py b/server.py index 8c3d02f..2ddf379 100644 --- a/server.py +++ b/server.py @@ -1,26 +1,19 @@ import os import sys -import yaml from flask import Flask, request, render_template, send_file, redirect, send_from_directory import source # take a look in source/__init__.py -from brewSensor import BME680Sensor, DHT11Sensor, BrewSensor from brewCamera import BrewCamera +from brewSensor import BrewSensor from brewRelay import BrewRelay +import source.loader as loader app = Flask(__name__) brewCamera = BrewCamera(20) -def readYaml(filePath): - loader = yaml.SafeLoader - loader.add_constructor('!Relay', BrewRelay.fromYaml) - loader.add_constructor('!bme680', BME680Sensor.fromYaml) - loader.add_constructor('!dht11', DHT11Sensor.fromYaml) - return yaml.load(open(filePath, "rb"), Loader=loader) - -rangers = readYaml('brew.yaml') -sensors = rangers['sensors'] -relays = rangers['relays'] +externalPeripherals = loader.load('brew.yaml') +sensors = externalPeripherals['sensors'] +relays = externalPeripherals['relays'] if sys.argv[-1] == '-c': brewCamera.spawnBackgroundCapture() diff --git a/source/loader.py b/source/loader.py new file mode 100644 index 0000000..a0e1563 --- /dev/null +++ b/source/loader.py @@ -0,0 +1,12 @@ +import yaml + +from brewSensor import BME680Sensor, DHT11Sensor +from brewRelay import BrewRelay + +def load(filePath): + loader = yaml.SafeLoader + loader.add_constructor('!Relay', BrewRelay.fromYaml) + loader.add_constructor('!bme680', BME680Sensor.fromYaml) + loader.add_constructor('!dht11', DHT11Sensor.fromYaml) + return yaml.load(open(filePath, "rb"), Loader=loader) +