potato
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
|
||||
@@ -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),
|
||||
]
|
||||
|
||||
@@ -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"<Game Table {self.game_table_name}>"
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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,
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user