iou1name/Juice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactored network topology

Browse Source
This commit is contained in:
iou1name 2019-06-18 13:44:35 -04:00
parent c70e57c69d
commit 33f071accd
2 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
juice.py
View File

@ -23,10 +23,11 @@ class RelayDevice:
""" """
def __init__(self): def __init__(self):
self.id = "" self.id = ""
self.type = ""
self.description = "" self.description = ""
self.location = "" self.location = ""
self.ip_address = "" self.ip_address = ""
self.sub_devices = {} self.sub_devices = []
self.update() self.update()
@ -35,16 +36,16 @@ class RelayDevice:
Queries the physical device and updates the internal model as Queries the physical device and updates the internal model as
appropriate. appropriate.
""" """
for name, device in self.sub_devices.items(): for sub_dev in self.sub_devices:
res = requests.get(self.ip_address) res = requests.get(self.ip_address)
gpio0 = re.search(r"GPIO0: (\bLow|\bHigh)", res.text).groups()[0] gpio0 = re.search(r"GPIO0: (\bLow|\bHigh)", res.text).groups()[0]
device.state = gpio0 == 'High' sub_dev.state = gpio0 == 'High'
def toggle(self, sub_dev_id): def toggle(self, sub_dev_id):
""" """
Toggles the state of a sub device. Toggles the state of a sub device.
""" """
for sub_dev in sum(self.sub_devices.values(), []): for sub_dev in self.sub_devices:
if sub_dev.id == sub_dev_id: if sub_dev.id == sub_dev_id:
break break
else: else:
@ -68,14 +69,14 @@ class RelayDevice:
""" """
for key, value in data.items(): for key, value in data.items():
setattr(self, key, value) setattr(self, key, value)
for sub_dev_type, sub_devs in data['sub_devices'].items(): self.sub_devices = []
if sub_dev_type == 'RelayOutlet': for sub_dev_dict in data.get('sub_devices'):
self.sub_devices[sub_dev_type] = [] if sub_dev_dict.get('type') == 'RelayOutlet':
for sub_dev in sub_devs: sub_dev = RelayOutlet().from_dict(sub_dev_dict)
sub_dev = RelayOutlet().from_dict(sub_dev) self.sub_devices.append(sub_dev)
self.sub_devices[sub_dev_type].append(sub_dev)
else: else:
raise ValueError(f"Unknown sub_device type {dev_name}") typ = sub_dev.get('type')
raise ValueError(f"Unknown sub_device type {typ}")
return self return self
@ -85,6 +86,7 @@ class RelayOutlet:
""" """
def __init__(self): def __init__(self):
self.id = "" self.id = ""
self.type = ""
self.description = "" self.description = ""
self.gpio = "" self.gpio = ""
self.state = False self.state = False
@ -113,15 +115,13 @@ def init_network(filepath="devices.json"):
with open(filepath, 'r') as file: with open(filepath, 'r') as file:
data = file.read() data = file.read()
data = json.loads(data) data = json.loads(data)
network = {} network = []
for dev_type, devices in data.items(): for device_dict in data:
if dev_type == 'RelayDevice': if device_dict.get('type') == 'RelayDevice':
network[dev_type] = [] device = RelayDevice().from_dict(device_dict)
for device in devices: network.append(device)
device = RelayDevice().from_dict(device)
network[dev_type].append(device)
else: else:
raise ValueError(f"Unknown device type {dev_name}") raise ValueError(f"Unknown device type {device.get('type')}")
return network return network
@ -152,7 +152,7 @@ def toggle():
device_id = request.args.get('device_id') device_id = request.args.get('device_id')
sub_dev_id = request.args.get('sub_dev_id') sub_dev_id = request.args.get('sub_dev_id')
for device in sum(network.values(), []): for device in network:
if device.id == device_id: if device.id == device_id:
break break
else: else:
@ -174,14 +174,14 @@ def edit():
field = request.args.get('field') field = request.args.get('field')
value = request.args.get('value') value = request.args.get('value')
for device in sum(network.values(), []): for device in network:
if device.id == device_id: if device.id == device_id:
break break
else: else:
return make_error(404, "device_id not found") return make_error(404, "device_id not found")
if sub_dev_id: if sub_dev_id:
for sub_dev in sum(device.sub_devices.values(), []): for sub_dev in device.sub_devices:
if sub_dev.id == sub_dev_id: if sub_dev.id == sub_dev_id:
break break
else: else:

12
templates/index.html
View File

@ -8,27 +8,23 @@
<body> <body>
<main> <main>
<div id="devices"> <div id="devices">
{% for dev_type, devices in network.items() %} {% for device in network %}
{% for device in devices %} <div class="device {{ device.type }}" id="{{ device.id }}">
<div class="device {{ dev_type }}" id="{{ device.id }}">
<div class="id">{{ device.id }}</div> <div class="id">{{ device.id }}</div>
<div class="description"><span class="field_value">{{ device.description }}</span> <span class="edit" onclick="edit_field(this.parentElement)">&#xe800;</span></div> <div class="description"><span class="field_value">{{ device.description }}</span> <span class="edit" onclick="edit_field(this.parentElement)">&#xe800;</span></div>
<div class="location"><span class="field_value">{{ device.location }}</span> <span class="edit" onclick="edit_field(this.parentElement)">&#xe800;</span></div> <div class="location"><span class="field_value">{{ device.location }}</span> <span class="edit" onclick="edit_field(this.parentElement)">&#xe800;</span></div>
<div class="ip_address"><i>{{ device.ip_address }}</i></div> <div class="ip_address"><i>{{ device.ip_address }}</i></div>
<div class="sub_devices"> <div class="sub_devices">
{% for sub_dev_type, sub_devs in device.sub_devices.items() %} {% for sub_dev in device.sub_devices %}
{% for sub_dev in sub_devs %} <div class="sub_device {{ sub_dev.type }}" id="{{ sub_dev.id }}">
<div class="sub_device {{ sub_dev_type }}" id="{{ sub_dev.id }}">
<div class="id">{{ sub_dev.id }}</div> <div class="id">{{ sub_dev.id }}</div>
<object class="outlet_image" data="/static/outlet.svg"></object> <object class="outlet_image" data="/static/outlet.svg"></object>
<div class="description"><span class="field_value">{{ sub_dev.description }}</span> <span class="edit" onclick="edit_field(this.parentElement)">&#xe800;</span></div> <div class="description"><span class="field_value">{{ sub_dev.description }}</span> <span class="edit" onclick="edit_field(this.parentElement)">&#xe800;</span></div>
</div> </div>
{% endfor %} {% endfor %}
{% endfor %}
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
{% endfor %}
</div> </div>
</main> </main>
</body> </body>