potato
This commit is contained in:
@@ -1,14 +1,15 @@
|
|||||||
|
bcrypt==5.0.0
|
||||||
black==26.3.1
|
black==26.3.1
|
||||||
blinker==1.9.0
|
blinker==1.9.0
|
||||||
certifi==2026.2.25
|
certifi==2026.5.20
|
||||||
charset-normalizer==3.4.6
|
charset-normalizer==3.4.7
|
||||||
click==8.3.1
|
click==8.3.1
|
||||||
docker @ git+https://github.com/docker/docker-py@df3f8e2abc5a03de482e37214dddef9e0cee1bb1
|
docker==7.1.0
|
||||||
Flask==3.1.3
|
Flask==3.1.3
|
||||||
Flask-Login==0.6.3
|
Flask-Login==0.6.3
|
||||||
Flask-SQLAlchemy==3.1.1
|
Flask-SQLAlchemy==3.1.1
|
||||||
greenlet==3.4.0
|
greenlet==3.5.1
|
||||||
idna==3.11
|
idna==3.16
|
||||||
itsdangerous==2.2.0
|
itsdangerous==2.2.0
|
||||||
Jinja2==3.1.6
|
Jinja2==3.1.6
|
||||||
MarkupSafe==3.0.3
|
MarkupSafe==3.0.3
|
||||||
@@ -17,8 +18,8 @@ packaging==26.0
|
|||||||
pathspec==1.0.4
|
pathspec==1.0.4
|
||||||
platformdirs==4.9.4
|
platformdirs==4.9.4
|
||||||
pytokens==0.4.1
|
pytokens==0.4.1
|
||||||
requests==2.33.0
|
requests==2.34.2
|
||||||
SQLAlchemy==2.0.49
|
SQLAlchemy==2.0.50
|
||||||
typing_extensions==4.15.0
|
typing_extensions==4.15.0
|
||||||
urllib3==2.6.3
|
urllib3==2.7.0
|
||||||
Werkzeug==3.1.6
|
Werkzeug==3.1.6
|
||||||
|
|||||||
@@ -34,7 +34,9 @@ def get_current_user():
|
|||||||
if current_user.is_authenticated:
|
if current_user.is_authenticated:
|
||||||
return jsonify(current_user.to_dict())
|
return jsonify(current_user.to_dict())
|
||||||
else:
|
else:
|
||||||
return jsonify({"username": "NONE", "is_admin": "false", "authenticated": False})
|
return jsonify(
|
||||||
|
{"username": "NONE", "is_admin": "false", "authenticated": False}
|
||||||
|
)
|
||||||
return "Unauthd", 403
|
return "Unauthd", 403
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ def build_container_routing_labels(prefix: str, strip_prefix=True):
|
|||||||
)
|
)
|
||||||
|
|
||||||
labels = {}
|
labels = {}
|
||||||
labels[router_key] = "Host(`{prefix}.{host_name}`)".format(
|
labels[router_key] = "Host(`{host_name}`) && PathPrefix(`/{prefix}`)".format(
|
||||||
host_name=host_name, prefix=prefix
|
host_name=host_name, prefix=prefix
|
||||||
)
|
)
|
||||||
if strip_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)):
|
if not os.path.exists("/data/{prefix}".format(prefix=table.game_table_link)):
|
||||||
return False
|
return False
|
||||||
shutil.rmtree("/data/{prefix}".format(prefix=table.game_table_link))
|
shutil.rmtree("/data/{prefix}".format(prefix=table.game_table_link))
|
||||||
os.removedir("/data/{prefix}")
|
os.removedirs("/data/{prefix}")
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
@@ -86,7 +86,7 @@ def start_foundry_container(table: GameTable, key: TableKey):
|
|||||||
else:
|
else:
|
||||||
|
|
||||||
environment = [
|
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_TELEMETRY=FALSE",
|
||||||
"FOUNDRY_LICENSE_KEY={key_value}".format(key_value=key.key),
|
"FOUNDRY_LICENSE_KEY={key_value}".format(key_value=key.key),
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ class GameTable(db.Model):
|
|||||||
docker_id = db.Column(db.Integer)
|
docker_id = db.Column(db.Integer)
|
||||||
owning_user_id = db.Column(db.Integer)
|
owning_user_id = db.Column(db.Integer)
|
||||||
|
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return f"<Game Table {self.game_table_name}>"
|
return f"<Game Table {self.game_table_name}>"
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ def create_table():
|
|||||||
version=request.get_json()["version"],
|
version=request.get_json()["version"],
|
||||||
active=False,
|
active=False,
|
||||||
docker_id=None,
|
docker_id=None,
|
||||||
owning_user_id=user.id
|
owning_user_id=user.id,
|
||||||
)
|
)
|
||||||
potato.session.add(table)
|
potato.session.add(table)
|
||||||
potato.session.commit()
|
potato.session.commit()
|
||||||
@@ -69,6 +69,7 @@ def delete_table(table_id):
|
|||||||
|
|
||||||
return "Not auth'd to mod table.", 403
|
return "Not auth'd to mod table.", 403
|
||||||
|
|
||||||
|
|
||||||
@tables.route("/tables/active")
|
@tables.route("/tables/active")
|
||||||
def list_active_tables():
|
def list_active_tables():
|
||||||
tables = GameTable.query.filter_by(active=True).all()
|
tables = GameTable.query.filter_by(active=True).all()
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ class User(UserMixin, db.Model):
|
|||||||
"id": self.id,
|
"id": self.id,
|
||||||
"username": self.user_name,
|
"username": self.user_name,
|
||||||
"authenticated": self.is_authenticated,
|
"authenticated": self.is_authenticated,
|
||||||
"is_admin": self.is_admin
|
"is_admin": self.is_admin,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user