From 2fe829588d2dea39b19d2154c3a4b607cef7e2ce Mon Sep 17 00:00:00 2001 From: Andrea Cecchi Date: Sun, 26 Jan 2020 15:04:01 +0100 Subject: [PATCH] test for double config --- app.py | 31 +++++++++---------------------- local.py | 4 ++-- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/app.py b/app.py index 948f09f..0047ae3 100644 --- a/app.py +++ b/app.py @@ -1,31 +1,14 @@ # -*- coding: utf-8 -*- -from flask import Blueprint from flask import Flask -from flask import current_app -from flask import render_template -from flask import request -from flask_restful import abort +from flask_jwt_extended import JWTManager from flask_restful import Api from flask_restful import reqparse -from flask_restful import Resource -from functools import wraps from routes.api import api_bp from routes.frontend import frontend from utils import createSocketMessage from utils import mqtt from utils import socketio -from flask_jwt_extended import ( - JWTManager, - jwt_required, - create_access_token, - get_jwt_identity, -) - -import logging -import os -import re - parser = reqparse.RequestParser() parser.add_argument("command", type=str, help="") @@ -48,22 +31,26 @@ def connect_handler(): def create_app(debug=False, local=False): """Create an application.""" - app = Flask(__name__, instance_relative_config=True, static_folder="static/build") + app = Flask( + __name__, instance_relative_config=True, static_folder="static/build" + ) app.config.from_pyfile("config.py") - api = Api(api_bp) + Api(api_bp) app.register_blueprint(api_bp) if local: app.config["LOCAL"] = True app.register_blueprint(frontend) - jwt = JWTManager(app) + JWTManager(app) socketio.init_app(app) mqtt.init_app(app) for blind in app.config.get("BLINDS", []): mqtt.subscribe("shellies/{id}/online".format(id=blind.get("id", ""))) - mqtt.subscribe("shellies/{id}/roller/0/pos".format(id=blind.get("id", ""))) + mqtt.subscribe( + "shellies/{id}/roller/0/pos".format(id=blind.get("id", "")) + ) mqtt.subscribe("shellies/{id}/roller/0".format(id=blind.get("id", ""))) return app diff --git a/local.py b/local.py index ca60ed7..bb1e54f 100644 --- a/local.py +++ b/local.py @@ -3,5 +3,5 @@ app = create_app(debug=False, local=True) -# if __name__ == "__main__": -# socketio.run(app) +if __name__ == "__main__": + socketio.run(app)