[get][post] /config/mac

pyheatpump/app.py

@@ -4,7 +4,7 @@ from starlette.routing import Router, Mount, Route
 from starlette.responses import HTMLResponse
 from starlette.exceptions import HTTPException
 
-from pyheatpump.config import config
+from pyheatpump.config import app as config
 from pyheatpump.heatpump import app as heatpump
 from pyheatpump.variable_types import app as types
 from pyheatpump.variables import app as variables

pyheatpump/config.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import os
+import re
 from datetime import datetime
 from configparser import ConfigParser
 from starlette.routing import Route, Router
@@ -39,11 +40,10 @@ default_config = {
 }
 
 CONFIG_FILES=[
-    './pyheatpump.ini',
-    '/etc/pyheatpump.ini']
+    '/etc/pyheatpump.ini',
+    './pyheatpump.ini']
 
-config = ConfigParser(
-    default_section='heatpump')
+config = ConfigParser()#default_section='heatpump')
 config.read_dict(default_config)
 config.read(filenames=CONFIG_FILES)
 
@@ -51,11 +51,20 @@ API_HOST=config.get('api', 'host')
 API_PORT=config.get('api', 'port')
 
 def save_config():
-    with open(CONFIG_FILES[0], 'w') as conf_file:
+    print(get_config_dict())
+    with open(CONFIG_FILES[1], 'w') as conf_file:
         config.write(conf_file)
 
+
+def get_mac():
+    config.read(filenames=CONFIG_FILES)
+    return config.get('heatpump', 'mac_address')
+
+
 def mac_address_init():
     from netifaces import gateways, ifaddresses, AF_INET, AF_LINK
+    global config
+
     interface = gateways()['default'][AF_INET][1]
     if len(ifaddresses(interface)) == 0:
         logger.error("Can't find interface")
@@ -71,16 +80,24 @@ def mac_address_init():
 
     return addr
 
+
+def get_config_dict():
+    c = config
+    return dict([ (s, dict([ (i, j) for i, j in c.items(s) ]) ) for s in c.sections() ])
+
+
 async def get_config(request):
-    items = dict([ (
-        section, dict([ (key, config.get(section, key)) for key in items ])
-        ) for section, items in config.items() ])
-    return JSONResponse(items)
+    return JSONResponse(get_config_dict())
+
 
 async def set_config(request):
-    body = json.loads(await request.json())
+    global config
+    body = await request.json()
+    #return PlainTextResponse(body)
 
     for sect in body.keys():
+        if type(body[sect]) is not dict:
+            continue
         for item in body[sect].keys():
             if not config.has_option(sect, item):
                 raise HTTPException(404, f'The option {sect}.{item} does not exists')
@@ -96,8 +113,32 @@ async def config_route(request, *args, **kwargs):
     elif request['method'] == 'POST':
         return await set_config(request)
 
+
+async def mac_route(request, *args, **kwargs):
+    global config
+    if request['method'] == 'GET':
+        return PlainTextResponse(get_mac())
+    elif request['method'] == 'POST':
+        body = await request.body()
+        mac_address = body.decode()
+        if len(mac_address) == 0:
+            mac_address = mac_address_init()
+
+        elif re.match('^([0-9a-f]{2}:?){6}$',
+            mac_address, re.I) is not None:
+
+            config.set('heatpump','mac_address',mac_address)
+            save_config()
+
+        return PlainTextResponse(' '.join((
+            'Current ->',
+            get_mac(),
+            ', New -> ', mac_address)))
+
+
 ROUTES=[
-    Route('/', config_route, methods=['GET', 'POST'])
+    Route('/', config_route, methods=['GET', 'POST']),
+    Route('/mac', mac_route, methods=['GET', 'POST'])
 ]
 
 app = Router(routes=ROUTES)