From f18a52174724ada02d8ebb10197d3e973f139ca1 Mon Sep 17 00:00:00 2001 From: iamBadgers Date: Sun, 24 May 2026 20:55:48 -0700 Subject: [PATCH] potato --- requirements.txt | 17 +++++++++-------- src/auth.py | 4 +++- src/container_managment.py | 6 +++--- src/game_table_model.py | 1 - src/tables.py | 3 ++- src/user_model.py | 2 +- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5d08106..12552e3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,15 @@ +bcrypt==5.0.0 black==26.3.1 blinker==1.9.0 -certifi==2026.2.25 -charset-normalizer==3.4.6 +certifi==2026.5.20 +charset-normalizer==3.4.7 click==8.3.1 -docker @ git+https://github.com/docker/docker-py@df3f8e2abc5a03de482e37214dddef9e0cee1bb1 +docker==7.1.0 Flask==3.1.3 Flask-Login==0.6.3 Flask-SQLAlchemy==3.1.1 -greenlet==3.4.0 -idna==3.11 +greenlet==3.5.1 +idna==3.16 itsdangerous==2.2.0 Jinja2==3.1.6 MarkupSafe==3.0.3 @@ -17,8 +18,8 @@ packaging==26.0 pathspec==1.0.4 platformdirs==4.9.4 pytokens==0.4.1 -requests==2.33.0 -SQLAlchemy==2.0.49 +requests==2.34.2 +SQLAlchemy==2.0.50 typing_extensions==4.15.0 -urllib3==2.6.3 +urllib3==2.7.0 Werkzeug==3.1.6 diff --git a/src/auth.py b/src/auth.py index ae9d99a..27663fd 100644 --- a/src/auth.py +++ b/src/auth.py @@ -34,7 +34,9 @@ def get_current_user(): if current_user.is_authenticated: return jsonify(current_user.to_dict()) else: - return jsonify({"username": "NONE", "is_admin": "false", "authenticated": False}) + return jsonify( + {"username": "NONE", "is_admin": "false", "authenticated": False} + ) return "Unauthd", 403 diff --git a/src/container_managment.py b/src/container_managment.py index 54b2815..cb94fe5 100644 --- a/src/container_managment.py +++ b/src/container_managment.py @@ -22,7 +22,7 @@ def build_container_routing_labels(prefix: str, strip_prefix=True): ) labels = {} - labels[router_key] = "Host(`{prefix}.{host_name}`)".format( + labels[router_key] = "Host(`{host_name}`) && PathPrefix(`/{prefix}`)".format( host_name=host_name, prefix=prefix ) if strip_prefix: @@ -38,7 +38,7 @@ def delete_file_package(table: GameTable) -> bool: if not os.path.exists("/data/{prefix}".format(prefix=table.game_table_link)): return False shutil.rmtree("/data/{prefix}".format(prefix=table.game_table_link)) - os.removedir("/data/{prefix}") + os.removedirs("/data/{prefix}") return True @@ -86,7 +86,7 @@ def start_foundry_container(table: GameTable, key: TableKey): else: environment = [ - #"FOUNDRY_ROUTE_PREFIX={prefix}".format(prefix=table.game_table_link), + "FOUNDRY_ROUTE_PREFIX={prefix}".format(prefix=table.game_table_link), "FOUNDRY_TELEMETRY=FALSE", "FOUNDRY_LICENSE_KEY={key_value}".format(key_value=key.key), ] diff --git a/src/game_table_model.py b/src/game_table_model.py index 69f79f5..9ab336f 100644 --- a/src/game_table_model.py +++ b/src/game_table_model.py @@ -13,7 +13,6 @@ class GameTable(db.Model): docker_id = db.Column(db.Integer) owning_user_id = db.Column(db.Integer) - def __repr__(self): return f"" diff --git a/src/tables.py b/src/tables.py index 25a4f4b..04b00ec 100644 --- a/src/tables.py +++ b/src/tables.py @@ -26,7 +26,7 @@ def create_table(): version=request.get_json()["version"], active=False, docker_id=None, - owning_user_id=user.id + owning_user_id=user.id, ) potato.session.add(table) potato.session.commit() @@ -69,6 +69,7 @@ def delete_table(table_id): return "Not auth'd to mod table.", 403 + @tables.route("/tables/active") def list_active_tables(): tables = GameTable.query.filter_by(active=True).all() diff --git a/src/user_model.py b/src/user_model.py index 3a8fe76..1d13aa4 100644 --- a/src/user_model.py +++ b/src/user_model.py @@ -30,7 +30,7 @@ class User(UserMixin, db.Model): "id": self.id, "username": self.user_name, "authenticated": self.is_authenticated, - "is_admin": self.is_admin + "is_admin": self.is_admin, }