Commit 927cf450 authored by shadMod's avatar shadMod 💬

rm src_directory and replaced with UITWWW_DIR

quick code cleanup
parent 66623a20
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import os import os
import sys
import click import click
import subprocess
import uitwww import uitwww
from uitwww import utils
from .constants import UITWWW_DIR, BASE_DIR
from .utils import ReverseProxied, GunicornInstance
from scss.compiler import compile_file
@click.group() @click.group()
...@@ -33,18 +33,15 @@ def cli(): ...@@ -33,18 +33,15 @@ def cli():
@cli.command("run") @cli.command("run")
@click.argument("data") @click.argument("data")
@click.option("-g", "--gunicorn-config", default=None, help="Path to a" @click.option("-g", "--gunicorn-config", default=None, help="Path to a"
"gunicorn config file") "gunicorn config file")
@click.option("-p", "--port", default=8000, help="Bind that port") @click.option("-p", "--port", default=8000, help="Bind that port")
@click.option("--public", help="Make available to the public", is_flag=True) @click.option("--public", help="Make available to the public", is_flag=True)
@click.option("-w", "--workers", help="Number of workers to start", default=3) @click.option("-w", "--workers", help="Number of workers to start", default=3)
@click.option("-d", "--debug", help="Enable debug mode", is_flag=True) @click.option("-d", "--debug", help="Enable debug mode", is_flag=True)
def run(data, gunicorn_config, port, public, workers, debug): def run(data, gunicorn_config, port, public, workers, debug):
"""Run the application""" """Run the application"""
# Create the application instance
src_directory = os.path.dirname(os.path.abspath(__file__))
app = uitwww.create_app(data) app = uitwww.create_app(data)
app.wsgi_app = utils.ReverseProxied(app.wsgi_app) app.wsgi_app = ReverseProxied(app.wsgi_app)
host = "127.0.0.1" host = "127.0.0.1"
if public: if public:
...@@ -53,22 +50,22 @@ def run(data, gunicorn_config, port, public, workers, debug): ...@@ -53,22 +50,22 @@ def run(data, gunicorn_config, port, public, workers, debug):
# In debug mode, run the flask builtin webserver # In debug mode, run the flask builtin webserver
if debug: if debug:
extra_files = [ extra_files = [
os.path.join(src_directory, "data/navbar.yml"), os.path.join(UITWWW_DIR, "data/navbar.yml"),
os.path.join(src_directory, "data/permissions.yml"), os.path.join(UITWWW_DIR, "data/permissions.yml"),
os.path.join(src_directory, "data/redirects.yml"), os.path.join(UITWWW_DIR, "data/redirects.yml"),
os.path.join(src_directory, "data/downloads.toml"), os.path.join(UITWWW_DIR, "data/downloads.toml"),
] ]
app.run(debug=True, port=port, host=host, extra_files=extra_files) app.run(debug=True, port=port, host=host, extra_files=extra_files)
# Else run the application with gunicorn # Else run the application with gunicorn
else: else:
options = { options = {
"bind": host+":"+str(port), "bind": host + ":" + str(port),
"workers": workers, "workers": workers,
"accesslog": "-", "accesslog": "-",
"errorlog": "-", "errorlog": "-",
} }
server = utils.GunicornInstance(gunicorn_config, options) server = GunicornInstance(gunicorn_config, options)
server.app = app server.app = app
try: try:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment