From c9018003ecdbd208d0806a2af9503586cbbcfd64 Mon Sep 17 00:00:00 2001
From: songmeo <songmeo.k-space.ee>
Date: Sat, 3 Apr 2021 17:09:51 +0300
Subject: [PATCH] clean up requirements, small tweak

---
 main.py          | 34 +++++++++++++++++-----------------
 requirements.txt |  3 ---
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/main.py b/main.py
index 26785b4..886d0fe 100644
--- a/main.py
+++ b/main.py
@@ -1,17 +1,13 @@
 from datetime import datetime
 from sanic import Sanic, response
-import uvloop, asyncio
+from sanic.response import text, json, stream
 from motor.motor_asyncio import AsyncIOMotorClient
+import uvloop, asyncio
 import pymongo
-import hashlib
-import jinja2
-import json
 import os
-import smtplib
 import const
 
 app = Sanic(__name__)
-asyncio.set_event_loop_policy(uvloop.EventLoopPolicy()) # swap default event loop to uvloop
 
 #mongodb = MongoClient('mongodb://172.21.27.1,172.21.27.2,172.21.27.3:27017/', replicaSet="kspace-mongo-set").kspace_accounting
 mongodb = AsyncIOMotorClient(const.MONGO_URI)
@@ -24,24 +20,26 @@ assert len(DOORBOY_SECRET) > 10
 @app.route("/allowed")
 async def view_doorboy_uids(request):
     if request.headers.get('KEY') != DOORBOY_SECRET:
-        return "how about no"
-    allowed_names = [o["_id"] for o in await mongodb.member.find({"enabled": True}).to_list()]
+        return text("how about no")
+    allowed_names = []
+    async for obj in mongodb.member.find({"enabled": True}):
+        allowed_names.append(obj["_id"])
     allowed_uids = []
-    for obj in await mongodb.inventory.find({"token.uid_hash": {"$exists":True}, "inventory.owner_id": {"$exists":True}, "token.enabled": True}, {"inventory.owner_id": True, "token.uid_hash": True }):
+    async for obj in mongodb.inventory.find({"token.uid_hash": {"$exists":True}, "inventory.owner_id": {"$exists":True}, "token.enabled": True}, {"inventory.owner_id": True, "token.uid_hash": True }):
         if obj["inventory"].pop("owner_id") in allowed_names:
             del obj["_id"]
             del obj["inventory"]
             allowed_uids.append(obj)
-    return response.json(allowed_uids=allowed_uids)
+    return json({"allowed_uids": allowed_uids})
 
 
 @app.route("/longpoll")
 async def view_longpoll(request):
     if request.headers.get('KEY') != DOORBOY_SECRET:
-        return "how about no"
+        return text("how about no")
 
-    async def g():
-        yield "data: response-generator-started\n\n"
+    async def g(response):
+        await response.write("data: response-generator-started\n\n")
         pipeline = [
             {
                 '$match': {
@@ -53,13 +51,15 @@ async def view_longpoll(request):
         ]
         try:
             async with mongodb.eventlog.watch(pipeline) as stream:
-                yield "data: watch-stream-opened\n\n"
+                await response.write("data: watch-stream-opened\n\n")
                 async for event in stream:
                     if event["fullDocument"].get("type") == "open-door":
-                        yield "data: %s\n\n" % event["fullDocument"]["door"]
+                        await response.write("data: %s\n\n" % event["fullDocument"]["door"])
         except pymongo.errors.PyMongoError:
-            return "urror"
+            return
     return stream(g, content_type="text/event-stream")
 
 if __name__ == '__main__':
-    app.run(debug=False, host='::')
+    asyncio.set_event_loop_policy(uvloop.EventLoopPolicy()) # swap default event loop to uvloop
+    loop = asyncio.get_event_loop()
+    app.run(host='::', debug=False, loop=loop)
diff --git a/requirements.txt b/requirements.txt
index 5e3178d..ce59ef1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,3 @@
-Flask
-Flask-WTF
-pymongo
 gunicorn
 sanic
 motor