From b76df14f11491a4086d08ad5ff4bdb8f203e647f Mon Sep 17 00:00:00 2001 From: HombreLaser Date: Sun, 3 Mar 2024 11:04:03 -0600 Subject: Fix programming error exception --- config/__init__.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/config/__init__.py b/config/__init__.py index 8037060..4d7971c 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -33,10 +33,10 @@ def database_connection_string(app): def initialize_blogs(app): with app.app_context(): for domain in user_config['Blogs']['domains']: - blog = Blog(domain=domain) - db.session.add(blog) # It may be worth it to research a better way to do this... try: + blog = Blog(domain=domain) + db.session.add(blog) db.session.commit() # The blog's already been registered. except sqlalchemy_exceptions.IntegrityError: @@ -50,15 +50,20 @@ def initialize_blogs(app): def configured_blogs(app): statement = select(Blog.domain).where(Blog.domain.in_(user_config['Blogs']['domains'])) with app.app_context(): - return [r for r, in db.session.execute(statement)] + try: + return [r for r, in db.session.execute(statement)] + except sqlalchemy_exceptions.ProgrammingError: + return None def initialize_cors_policies(app): allowed_origins = configured_blogs(app) - cors_settings = {'resources': {r"/api/*": {'origins': allowed_origins}, - r"/static/*": {'origins': allowed_origins}} - } - CORS(app, **cors_settings) + + if allowed_origins: + cors_settings = {'resources': {r"/api/*": {'origins': allowed_origins}, + r"/static/*": {'origins': allowed_origins}} + } + CORS(app, **cors_settings) def initialize_blueprints(app): -- cgit v1.2.3