From 617a68714545e554269b65c56e4bf8b0a0d14ef8 Mon Sep 17 00:00:00 2001 From: n9k Date: Thu, 16 Jun 2022 03:15:21 +0000 Subject: [PATCH] Give `create_app` a dictionary, not a file location --- anonstream/__init__.py | 6 +----- anonstream/__main__.py | 5 ++++- asgi.py | 5 ++++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/anonstream/__init__.py b/anonstream/__init__.py index 89d1918..58b318d 100644 --- a/anonstream/__init__.py +++ b/anonstream/__init__.py @@ -3,7 +3,6 @@ from collections import OrderedDict -import toml from quart_compress import Compress from anonstream.config import update_flask_from_toml @@ -12,15 +11,12 @@ from anonstream.quart import Quart compress = Compress() -def create_app(config_file): +def create_app(toml_config): app = Quart('anonstream') app.jinja_options['trim_blocks'] = True app.jinja_options['lstrip_blocks'] = True - with open(config_file) as fp: - toml_config = toml.load(fp) auth_password = update_flask_from_toml(toml_config, app.config) - print('Broadcaster username:', app.config['AUTH_USERNAME']) print('Broadcaster password:', auth_password) diff --git a/anonstream/__main__.py b/anonstream/__main__.py index 922e04d..212bdce 100644 --- a/anonstream/__main__.py +++ b/anonstream/__main__.py @@ -1,6 +1,7 @@ import argparse import os +import toml import uvicorn from anonstream import create_app @@ -44,5 +45,7 @@ parser.add_argument( ) args = parser.parse_args() -app = create_app(args.config) +with open(args.config) as fp: + config = toml.load(fp) +app = create_app(config) uvicorn.run(app, port=args.port) diff --git a/asgi.py b/asgi.py index 4034f64..7fbc404 100644 --- a/asgi.py +++ b/asgi.py @@ -12,12 +12,15 @@ if __name__ == '__main__': exit(1) import os +import toml import anonstream -config = os.environ.get( +config_file = os.environ.get( 'ANONSTREAM_CONFIG', os.path.join(os.path.dirname(__file__), 'config.toml'), ) def create_app(): + with open(config_file) as fp: + config = toml.load(fp) return anonstream.create_app(config)