From 6eb2e35f45fb58e8debcf9dffc9ff647b1e64000 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <ste.pigozzi@gmail.com>
Date: Sat, 1 Jun 2019 19:14:13 +0200
Subject: [PATCH] im lost

---
 royalnet/royalgamesweb.py             |  5 ++++-
 royalnet/web/__init__.py              |  3 ++-
 royalnet/web/alchemyhandler.py        | 18 ------------------
 royalnet/web/blueprints/helloworld.py | 19 +++++++++++++++++--
 royalnet/web/flaskserver.py           |  9 ++++++---
 royalnet/web/royalprint.py            | 16 ++++++++++++++++
 6 files changed, 45 insertions(+), 25 deletions(-)
 delete mode 100644 royalnet/web/alchemyhandler.py
 create mode 100644 royalnet/web/royalprint.py

diff --git a/royalnet/royalgamesweb.py b/royalnet/royalgamesweb.py
index 2a010031..23aebb00 100644
--- a/royalnet/royalgamesweb.py
+++ b/royalnet/royalgamesweb.py
@@ -9,4 +9,7 @@ class TestConfig:
 
 
 app = create_app(TestConfig, [helloworld.bp])
-app.run()
+
+
+if __name__ == "__main__":
+    app.run()
diff --git a/royalnet/web/__init__.py b/royalnet/web/__init__.py
index 3501800d..d3899afd 100644
--- a/royalnet/web/__init__.py
+++ b/royalnet/web/__init__.py
@@ -1,3 +1,4 @@
 from .flaskserver import create_app
+from .royalprint import Royalprint
 
-__all__ = ["create_app"]
+__all__ = ["create_app", "Royalprint"]
diff --git a/royalnet/web/alchemyhandler.py b/royalnet/web/alchemyhandler.py
deleted file mode 100644
index 46d850a8..00000000
--- a/royalnet/web/alchemyhandler.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import flask as f
-import werkzeug.local
-
-
-def get_alchemy_session():
-    if "alchemy_session" not in f.g:
-        f.g.alchemy_session = f.g.alchemy.Session()
-    return f.g.alchemy_session
-
-
-@f.current_app.teardown_appcontext
-def teardown_alchemy_session(*_, **__):
-    _alchemy_session = f.g.pop("alchemy_session", None)
-    if _alchemy_session is not None:
-        _alchemy_session.close()
-
-
-alchemy_session = werkzeug.local.LocalProxy(get_alchemy_session)
diff --git a/royalnet/web/blueprints/helloworld.py b/royalnet/web/blueprints/helloworld.py
index 13cb720a..fa5e6607 100644
--- a/royalnet/web/blueprints/helloworld.py
+++ b/royalnet/web/blueprints/helloworld.py
@@ -1,9 +1,24 @@
 import flask as f
+from .. import Royalprint
+from ...database.tables import Royal
 
 
-bp = f.Blueprint("helloworld", __name__, url_prefix="/helloworld")
+bp = Royalprint("helloworld", __name__, url_prefix="/helloworld", required_tables={Royal})
 
 
 @bp.route("/")
 def helloworld():
-    return "Hello world!"
+    royals = f.g.alchemy_session.query(f.g.alchemy.Royal).all()
+    return repr(royals)
+
+
+@bp.before_request
+def before_request():
+    f.g.alchemy_session = f.g.alchemy.Session()
+
+
+@bp.after_request
+def after_request():
+    alchemy_session = f.g.pop("alchemy_session", None)
+    if alchemy_session is not None:
+        alchemy_session.close()
diff --git a/royalnet/web/flaskserver.py b/royalnet/web/flaskserver.py
index 4cac9ca2..2f9cbc4a 100644
--- a/royalnet/web/flaskserver.py
+++ b/royalnet/web/flaskserver.py
@@ -1,13 +1,16 @@
 import typing
 import flask as f
 from ..database import Alchemy
+from .royalprint import Royalprint
 
 
-def create_app(config_obj: typing.Type, blueprints: typing.List[f.Blueprint]):
+def create_app(config_obj: typing.Type, blueprints: typing.List[Royalprint]):
     app = f.Flask(__name__)
     app.config.from_object(config_obj)
-    with app.app_context():
-        f.g.alchemy = Alchemy(app.config["DB_PATH"], app.config["REQUIRED_TABLES"])
+    required_tables = set()
     for blueprint in blueprints:
+        required_tables.union(blueprint.required_tables)
         app.register_blueprint(blueprint)
+    with app.app_context():
+        f.g.alchemy = Alchemy(app.config["DB_PATH"], required_tables)
     return app
diff --git a/royalnet/web/royalprint.py b/royalnet/web/royalprint.py
new file mode 100644
index 00000000..d4b1fb14
--- /dev/null
+++ b/royalnet/web/royalprint.py
@@ -0,0 +1,16 @@
+import typing
+import flask as f
+
+
+class Royalprint(f.Blueprint):
+    def __init__(self, name, import_name, static_folder=None,
+                 static_url_path=None, template_folder=None,
+                 url_prefix=None, subdomain=None, url_defaults=None,
+                 root_path=None, required_tables: typing.Optional[set] = None):
+        super().__init__(name, import_name, static_folder=static_folder,
+                         static_url_path=static_url_path, template_folder=template_folder,
+                         url_prefix=url_prefix, subdomain=subdomain, url_defaults=url_defaults,
+                         root_path=root_path)
+        self.required_tables = required_tables
+        if self.required_tables is None:
+            self.required_tables = set()