dev_league_seasons #42

Merged
daniel merged 4 commits from dev_league_seasons into master 2026-05-28 11:20:54 +02:00
10 changed files with 421 additions and 4 deletions

116
alembic.ini Normal file
View File

@ -0,0 +1,116 @@
# A generic, single database configuration.
[alembic]
# path to migration scripts
script_location = migrations
# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
# Uncomment the line below if you want the files to be prepended with date and time
# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
# for all available tokens
# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
# sys.path path, will be prepended to sys.path if present.
# defaults to the current working directory.
prepend_sys_path = .
# timezone to use when rendering the date within the migration file
# as well as the filename.
# If specified, requires the python>=3.9 or backports.zoneinfo library.
# Any required deps can installed by adding `alembic[tz]` to the pip requirements
# string value is passed to ZoneInfo()
# leave blank for localtime
# timezone =
# max length of characters to apply to the
# "slug" field
# truncate_slug_length = 40
# set to 'true' to run the environment during
# the 'revision' command, regardless of autogenerate
# revision_environment = false
# set to 'true' to allow .pyc and .pyo files without
# a source .py file to be detected as revisions in the
# versions/ directory
# sourceless = false
# version location specification; This defaults
# to migrations/versions. When using multiple version
# directories, initial revisions must be specified with --version-path.
# The path separator used here should be the separator specified by "version_path_separator" below.
# version_locations = %(here)s/bar:%(here)s/bat:migrations/versions
# version path separator; As mentioned above, this is the character used to split
# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
# Valid values for version_path_separator are:
#
# version_path_separator = :
# version_path_separator = ;
# version_path_separator = space
version_path_separator = os # Use os.pathsep. Default configuration used for new projects.
# set to 'true' to search source files recursively
# in each "version_locations" directory
# new in Alembic version 1.10
# recursive_version_locations = false
# the output encoding used when revision files
# are written from script.py.mako
# output_encoding = utf-8
sqlalchemy.url = mysql+pymysql://admin:PWM_556rtX@192.168.0.113:3306/league_db
[post_write_hooks]
# post_write_hooks defines scripts or Python functions that are run
# on newly generated revision scripts. See the documentation for further
# detail and examples
# format using "black" - use the console_scripts runner, against the "black" entrypoint
# hooks = black
# black.type = console_scripts
# black.entrypoint = black
# black.options = -l 79 REVISION_SCRIPT_FILENAME
# lint with attempts to fix using "ruff" - use the exec runner, execute a binary
# hooks = ruff
# ruff.type = exec
# ruff.executable = %(here)s/.venv/bin/ruff
# ruff.options = --fix REVISION_SCRIPT_FILENAME
# Logging configuration
[loggers]
keys = root,sqlalchemy,alembic
[handlers]
keys = console
[formatters]
keys = generic
[logger_root]
level = WARN
handlers = console
qualname =
[logger_sqlalchemy]
level = WARN
handlers =
qualname = sqlalchemy.engine
[logger_alembic]
level = INFO
handlers =
qualname = alembic
[handler_console]
class = StreamHandler
args = (sys.stderr,)
level = NOTSET
formatter = generic
[formatter_generic]
format = %(levelname)-5.5s [%(name)s] %(message)s
datefmt = %H:%M:%S

View File

@ -21,7 +21,9 @@ def setup_routes(admin_discord_id):
ui.navigate.reload()
return
# -----------------------------------------
# ---------------------------
# --- NAVIGATIONSLEISTE (HEADER)
# ---------------------------

13
main.py
View File

@ -1,4 +1,5 @@
import os
import schedule
from dotenv import load_dotenv
from nicegui import ui, app
@ -6,6 +7,7 @@ from data import database
from gui import main_gui, match_gui, discord_login, league_statistic_gui, admin_gui, match_history_gui, imprint_gui, league_statistic_visitor_gui
from wood import logger
from gui.info_text import info_system
from utils import season_scheduler
# 1. Lade die geheimen Variablen aus der .env Datei in den Speicher
load_dotenv()
@ -35,5 +37,16 @@ match_history_gui.setup_routes()
imprint_gui.setup_routes()
league_statistic_visitor_gui.setup_routes()
# Timer der schedule regelmäßig prüft
@app.on_startup
def setup_scheduler():
import threading
from utils.season_scheduler import run_scheduler
thread = threading.Thread(target=run_scheduler, daemon=True)
thread.start()
# 4. Starten der App Runtime auf dem Server.
ui.run(title="Westside Diceghost Liga", port=9000, storage_secret="EIN_super-geheimes_Pa$$wort#!", favicon="gui/pictures/wsdg.png")

1
migrations/README Normal file
View File

@ -0,0 +1 @@
Generic single-database configuration.

78
migrations/env.py Normal file
View File

@ -0,0 +1,78 @@
from logging.config import fileConfig
from sqlalchemy import engine_from_config
from sqlalchemy import pool
from alembic import context
# this is the Alembic Config object, which provides
# access to the values within the .ini file in use.
config = context.config
# Interpret the config file for Python logging.
# This line sets up loggers basically.
if config.config_file_name is not None:
fileConfig(config.config_file_name)
# add your model's MetaData object here
# for 'autogenerate' support
# from myapp import mymodel
# target_metadata = mymodel.Base.metadata
target_metadata = None
# other values from the config, defined by the needs of env.py,
# can be acquired:
# my_important_option = config.get_main_option("my_important_option")
# ... etc.
def run_migrations_offline() -> None:
"""Run migrations in 'offline' mode.
This configures the context with just a URL
and not an Engine, though an Engine is acceptable
here as well. By skipping the Engine creation
we don't even need a DBAPI to be available.
Calls to context.execute() here emit the given string to the
script output.
"""
url = config.get_main_option("sqlalchemy.url")
context.configure(
url=url,
target_metadata=target_metadata,
literal_binds=True,
dialect_opts={"paramstyle": "named"},
)
with context.begin_transaction():
context.run_migrations()
def run_migrations_online() -> None:
"""Run migrations in 'online' mode.
In this scenario we need to create an Engine
and associate a connection with the context.
"""
connectable = engine_from_config(
config.get_section(config.config_ini_section, {}),
prefix="sqlalchemy.",
poolclass=pool.NullPool,
)
with connectable.connect() as connection:
context.configure(
connection=connection, target_metadata=target_metadata
)
with context.begin_transaction():
context.run_migrations()
if context.is_offline_mode():
run_migrations_offline()
else:
run_migrations_online()

View File

@ -0,0 +1,16 @@
from sqlalchemy import create_engine, MetaData
DATABASE_URL = "mysql+pymysql://admin:PWM_556rtX@192.168.0.113:3306/league_db"
engine = create_engine(DATABASE_URL)
metadata = MetaData()
metadata.reflect(bind=engine)
print("Kopiere das hier in dein Alembic-Script:")
for table in metadata.tables.values():
print(f"\n# Tabellen-Definition für: {table.name}")
print(f"op.create_table('{table.name}',")
for column in table.columns:
col_type = str(column.type)
nullable = "True" if column.nullable else "False"
print(f" sa.Column('{column.name}', sa.{col_type.split('(')[0].upper()}(), nullable={nullable}),")
print(")")

28
migrations/script.py.mako Normal file
View File

@ -0,0 +1,28 @@
"""${message}
Revision ID: ${up_revision}
Revises: ${down_revision | comma,n}
Create Date: ${create_date}
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
${imports if imports else ""}
# revision identifiers, used by Alembic.
revision: str = ${repr(up_revision)}
down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)}
branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
def upgrade() -> None:
"""Upgrade schema."""
${upgrades if upgrades else "pass"}
def downgrade() -> None:
"""Downgrade schema."""
${downgrades if downgrades else "pass"}

View File

@ -0,0 +1,129 @@
"""initial_setup
Revision ID: 47a1e41aa62f
Revises:
Create Date: 2026-05-28 08:32:26.064485
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision: str = '47a1e41aa62f'
down_revision: Union[str, Sequence[str], None] = None
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None:
# Tabellen-Definition für: achievements
op.create_table('achievements',
sa.Column('id', sa.INTEGER(), nullable=False),
sa.Column('name', sa.VARCHAR(), nullable=False),
sa.Column('description', sa.TEXT(), nullable=False),
sa.Column('icon', sa.TEXT(), nullable=True),
sa.Column('misc', sa.TEXT(), nullable=True),
)
# Tabellen-Definition für: gamesystems
op.create_table('gamesystems',
sa.Column('id', sa.INTEGER(), nullable=False),
sa.Column('name', sa.VARCHAR(), nullable=False),
sa.Column('picture', sa.TEXT(), nullable=True),
sa.Column('description', sa.TEXT(), nullable=True),
sa.Column('active_players', sa.INTEGER(), nullable=True),
sa.Column('min_score', sa.INTEGER(), nullable=True),
sa.Column('max_score', sa.INTEGER(), nullable=True),
)
# Tabellen-Definition für: matches
op.create_table('matches',
sa.Column('id', sa.INTEGER(), nullable=False),
sa.Column('gamesystem_id', sa.INTEGER(), nullable=True),
sa.Column('player1_id', sa.INTEGER(), nullable=True),
sa.Column('score_player1', sa.INTEGER(), nullable=True),
sa.Column('player2_id', sa.INTEGER(), nullable=True),
sa.Column('score_player2', sa.INTEGER(), nullable=True),
sa.Column('played_at', sa.TIMESTAMP(), nullable=True),
sa.Column('player1_base_change', sa.INTEGER(), nullable=True),
sa.Column('player1_khorne', sa.INTEGER(), nullable=True),
sa.Column('player1_slaanesh', sa.INTEGER(), nullable=True),
sa.Column('player1_tzeentch', sa.INTEGER(), nullable=True),
sa.Column('player1_mmr_change', sa.INTEGER(), nullable=True),
sa.Column('player2_base_change', sa.INTEGER(), nullable=True),
sa.Column('player2_khorne', sa.INTEGER(), nullable=True),
sa.Column('player2_slaanesh', sa.INTEGER(), nullable=True),
sa.Column('player2_tzeentch', sa.INTEGER(), nullable=True),
sa.Column('player2_mmr_change', sa.INTEGER(), nullable=True),
sa.Column('player2_check', sa.INTEGER(), nullable=True),
sa.Column('match_is_counted', sa.INTEGER(), nullable=True),
sa.Column('rust_factor', sa.DOUBLE(), nullable=True),
sa.Column('point_inflation', sa.DOUBLE(), nullable=True),
sa.Column('elo_factor', sa.DOUBLE(), nullable=True),
)
# Tabellen-Definition für: players
op.create_table('players',
sa.Column('id', sa.INTEGER(), nullable=False),
sa.Column('discord_id', sa.VARCHAR(), nullable=True),
sa.Column('discord_name', sa.VARCHAR(), nullable=False),
sa.Column('discord_avatar_url', sa.TEXT(), nullable=True),
sa.Column('display_name', sa.VARCHAR(), nullable=True),
)
# Tabellen-Definition für: player_achievements
op.create_table('player_achievements',
sa.Column('id', sa.INTEGER(), nullable=False),
sa.Column('player_id', sa.INTEGER(), nullable=True),
sa.Column('achievement_id', sa.INTEGER(), nullable=True),
sa.Column('earned_at', sa.TIMESTAMP(), nullable=True),
sa.Column('earned_in', sa.INTEGER(), nullable=True),
)
# Tabellen-Definition für: player_game_statistic
op.create_table('player_game_statistic',
sa.Column('id', sa.INTEGER(), nullable=False),
sa.Column('player_id', sa.INTEGER(), nullable=True),
sa.Column('gamesystem_id', sa.INTEGER(), nullable=True),
sa.Column('mmr', sa.INTEGER(), nullable=True),
sa.Column('games_in_system', sa.INTEGER(), nullable=True),
sa.Column('points', sa.INTEGER(), nullable=True),
sa.Column('avv_points', sa.INTEGER(), nullable=True),
sa.Column('last_played', sa.TIMESTAMP(), nullable=True),
sa.Column('win_rate', sa.INTEGER(), nullable=True),
sa.Column('win_streak', sa.INTEGER(), nullable=True),
sa.Column('wins', sa.INTEGER(), nullable=True),
sa.Column('loss', sa.INTEGER(), nullable=True),
sa.Column('draws', sa.INTEGER(), nullable=True),
sa.Column('trend', sa.INTEGER(), nullable=True),
sa.Column('tyrann_id', sa.INTEGER(), nullable=True),
sa.Column('pushover_id', sa.INTEGER(), nullable=True),
sa.Column('nemesis_id', sa.INTEGER(), nullable=True),
sa.Column('season_id', sa.INTEGER(), nullable=False),
)
# Tabellen-Definition für: seasons
op.create_table('seasons',
sa.Column('id', sa.INTEGER(), nullable=False),
sa.Column('gamesystem_id', sa.INTEGER(), nullable=False),
sa.Column('name', sa.VARCHAR(), nullable=False),
sa.Column('start_date', sa.DATE(), nullable=False),
sa.Column('end_date', sa.DATE(), nullable=True),
)
# Tabellen-Definition für: season_schedule
op.create_table('season_schedule',
sa.Column('id', sa.INTEGER(), nullable=False),
sa.Column('gamesystem_id', sa.INTEGER(), nullable=False),
sa.Column('start_month', sa.INTEGER(), nullable=False),
sa.Column('start_day', sa.INTEGER(), nullable=False),
)
def downgrade() -> None:
"""Downgrade schema."""
pass

View File

@ -31,7 +31,8 @@ sudo apt install -y \
python3-venv \
python3-full \
libmariadb3 \
libmariadb-dev
libmariadb-dev \
alembic
echo "✅ Updates installiert. Überprüfe Softwarestand von Git ..."
@ -60,8 +61,10 @@ pip install \
nicegui \
requests \
python-dotenv \
mariadb \
schedule
pymysql \
schedule \
sqlalchemy \
alembic
echo "✅ Pakete installiert. Starte Liga Service ..."

31
utils/season_scheduler.py Normal file
View File

@ -0,0 +1,31 @@
import schedule
import time
from datetime import date
from data import database
def check_new_seasons():
today = date.today()
conn = database.db_connection()
cursor = conn.cursor(dictionary=True)
cursor.execute(
"SELECT id, gamesystem_id FROM season_schedule "
"WHERE start_month = %s AND start_day = %s",
(today.month, today.day)
)
triggers = cursor.fetchall()
print(f"[Season Check] {today} {len(triggers)} Treffer gefunden")
cursor.close()
conn.close()
def run_scheduler():
"""Läuft in einem Hintergrund-Thread."""
schedule.every().day.at("00:01").do(check_new_seasons)
while True:
schedule.run_pending()
time.sleep(60)