mirror of
https://github.com/Dvorinka/swingmusic-extended.git
synced 2026-06-03 20:13:02 +00:00
fix: default user inserted before userId is created
moved application setup function calls before flask app creation
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
"""
|
||||
Prepares the server for use.
|
||||
"""
|
||||
|
||||
import uuid
|
||||
from app.db.sqlite.settings import load_settings
|
||||
from app.setup.files import create_config_dir
|
||||
@@ -14,6 +15,14 @@ from app.config import UserConfig
|
||||
|
||||
def run_setup():
|
||||
create_config_dir()
|
||||
|
||||
# setup config file
|
||||
config = UserConfig()
|
||||
config.setup_config_file()
|
||||
|
||||
if not config.userId:
|
||||
config.userId = str(uuid.uuid4())
|
||||
|
||||
setup_sqlite()
|
||||
run_migrations()
|
||||
|
||||
@@ -23,13 +32,6 @@ def run_setup():
|
||||
# settings table is empty
|
||||
pass
|
||||
|
||||
# setup config file
|
||||
config = UserConfig()
|
||||
config.setup_config_file()
|
||||
|
||||
if not config.userId:
|
||||
config.userId = str(uuid.uuid4())
|
||||
|
||||
instance_key = get_random_str()
|
||||
|
||||
# INFO: Load all tracks, albums, and artists into memory
|
||||
|
||||
@@ -47,8 +47,37 @@ mimetypes.add_type("application/manifest+json", ".webmanifest")
|
||||
werkzeug = logging.getLogger("werkzeug")
|
||||
werkzeug.setLevel(logging.ERROR)
|
||||
|
||||
# Set up the application
|
||||
HandleArgs()
|
||||
|
||||
@background
|
||||
def bg_run_setup() -> None:
|
||||
run_periodic_scans()
|
||||
|
||||
|
||||
@background
|
||||
def start_watchdog():
|
||||
WatchDog().run()
|
||||
|
||||
|
||||
@background
|
||||
def run_swingmusic():
|
||||
log_startup_info()
|
||||
run_setup()
|
||||
bg_run_setup()
|
||||
register_plugins()
|
||||
|
||||
start_watchdog()
|
||||
|
||||
setproctitle.setproctitle(f"swingmusic ::{FLASKVARS.get_flask_port()}")
|
||||
|
||||
|
||||
Info.load()
|
||||
run_swingmusic()
|
||||
|
||||
|
||||
# Create the Flask app
|
||||
|
||||
app = create_api()
|
||||
app.static_folder = get_home_res_path("client")
|
||||
|
||||
@@ -160,31 +189,9 @@ def print_memory_usage(response: Response):
|
||||
return response
|
||||
|
||||
|
||||
@background
|
||||
def bg_run_setup() -> None:
|
||||
run_periodic_scans()
|
||||
|
||||
|
||||
@background
|
||||
def start_watchdog():
|
||||
WatchDog().run()
|
||||
|
||||
|
||||
@background
|
||||
def run_swingmusic():
|
||||
log_startup_info()
|
||||
run_setup()
|
||||
bg_run_setup()
|
||||
register_plugins()
|
||||
|
||||
start_watchdog()
|
||||
|
||||
setproctitle.setproctitle(f"swingmusic ::{FLASKVARS.get_flask_port()}")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
Info.load()
|
||||
run_swingmusic()
|
||||
|
||||
host = FLASKVARS.get_flask_host()
|
||||
port = FLASKVARS.get_flask_port()
|
||||
|
||||
Reference in New Issue
Block a user