From 7824ca8c33dcb317dd153f0eb94565b1e92ad223 Mon Sep 17 00:00:00 2001
From: Kai Vogelgesang <s8kavoge@stud.uni-saarland.de>
Date: Fri, 17 Apr 2020 02:01:45 +0200
Subject: [PATCH] Implement API magic

---
 main.py  |  6 ++++--
 model.py | 33 ++++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/main.py b/main.py
index 5005814..03fe7ea 100644
--- a/main.py
+++ b/main.py
@@ -40,9 +40,10 @@ async def handler(request: aiohttp.web.Request):
     return aiohttp.web.FileResponse('ui.html')
 
 
-@routes.post(CLIENT_REGEX + '/api')
+@routes.post(CLIENT_REGEX + '/api/{method}')
 async def handler(request: aiohttp.web.Request):
     client = get_client(request)
+    method = request.match_info.get('method', None)
     model = request.app['model']
 
     data = await request.json()
@@ -50,7 +51,8 @@ async def handler(request: aiohttp.web.Request):
     print(f'{client=} {data=}')
 
     try:
-        assert await model.handle_post(client, data)
+        assert method in model.ApiMethod.dict
+        await model.ApiMethod.dict[method](model, client, **data)
         return aiohttp.web.Response(status=200)
     except Exception as e:
         print(e)
diff --git a/model.py b/model.py
index 07fee8a..5bee14b 100644
--- a/model.py
+++ b/model.py
@@ -13,18 +13,17 @@ def generate_random_id(_s=set()):
 
 
 class Model(object):
+    class ApiMethod:
+        dict = dict()
 
-    global api_methods
-    api_methods = {}
+        def __init__(self, fun):
+            self.dict[fun.__name__] = fun
 
-    def api_method():
-        global api_methods
-        def wrapper(fun):
-            api_methods[fun.__name__] = fun
-        return wrapper
+        def __contains__(self, item):
+            return item in self.dict
 
-    def __init__(self, filename = "tehmodel.json"):
-        self.sockets = {} # mapping: client -> socket
+    def __init__(self, filename="tehmodel.json"):
+        self.sockets = {}  # mapping: client -> socket
         self.filename = filename
         self.model = None
         if os.path.isfile(filename):
@@ -36,20 +35,28 @@ class Model(object):
         else:
             self.model = {}
         self.assert_model()
-    
+
     def assert_model(self):
         if not "clients" in self.model:
             self.model["clients"] = {}
         if not "sessions" in self.model:
             self.model["sessions"] = {}
 
-    @api_method()
+    @ApiMethod
+    async def test_api(self, clientid):
+        print(f'test_api {clientid=}')
+
+    @ApiMethod
+    async def test_yeet(self, clientid):
+        raise Exception('yeet')
+
+    @ApiMethod
     async def create_session(self, clientid) -> str:
         sessionname = generate_random_id()
         newsession = {"id": sessionname, "owner": clientid, "clients": []}
         self.model["sessions"][sessionname] = newsession
 
-    @api_method()
+    @ApiMethod
     async def join_session(self, clientid, sessionid):
         if sessionid in self.model["sessions"]:
             self.model["sessions"][sessionid].append(clientid)
@@ -87,7 +94,7 @@ class Model(object):
         if not clientid in self.sockets:
             self.sockets[clientid] = []
         self.sockets[clientid].append(socket)
-    
+
     def unsubscribe(self, socket):
         for client in self.sockets:
             if socket in self.sockets[client]: