Add version information to qrcode dependency and convert requirements.txt to utf8

VERSION

@@ -1 +1 @@
-0.4.0
+0.3.6

docker-compose.yml

@@ -31,7 +31,6 @@ services:
       - database:/var/lib/mysql
       - ./sql/create_database.sql:/docker-entrypoint-initdb.d/init.sql
       - ./sql:/sql
-      - ./tournament_data:/opt/ezgg-lan-manager/tournament_data
 
 
 volumes:

src/EzggLanManager.py

@@ -1,14 +1,14 @@
 import logging
-from uuid import uuid4
 
 import sys
 
 from pathlib import Path
+from uuid import uuid4
 
 from rio import App, Theme, Color, Font, ComponentPage, Session
 from from_root import from_root
 
-from src.ezgg_lan_manager import pages, init_services, LocalDataService, RefreshService
+from src.ezgg_lan_manager import pages, init_services, LocalDataService
 from src.ezgg_lan_manager.helpers.LoggedInGuard import logged_in_guard, not_logged_in_guard, team_guard
 from src.ezgg_lan_manager.services.LocalDataService import LocalData
 from src.ezgg_lan_manager.types.UserSession import UserSession
@@ -36,13 +36,12 @@ if __name__ == "__main__":
 
     async def on_session_start(session: Session) -> None:
         # Use this line to fake being any user without having to log in
-        session.attach(UserSession(id=uuid4(), user_id=30, is_team_member=True))
+        # session.attach(UserSession(id=uuid4(), user_id=30, is_team_member=True))
         await session.set_title(lan_info.name)
-        session.attach(RefreshService())
-        # if session[LocalData].stored_session_token:
-        #     user_session = session[LocalDataService].verify_token(session[LocalData].stored_session_token)
-        #     if user_session is not None:
-        #         session.attach(user_session)
+        if session[LocalData].stored_session_token:
+            user_session = session[LocalDataService].verify_token(session[LocalData].stored_session_token)
+            if user_session is not None:
+                session.attach(user_session)
 
     async def on_app_start(a: App) -> None:
         init_result = await a.default_attachments[4].init_db_pool()
@@ -178,11 +177,6 @@ if __name__ == "__main__":
                 url_segment="tournament",
                 build=pages.TournamentDetailsPage,
             ),
-            ComponentPage(
-                name="TournamentTreePage",
-                url_segment="tournament-tree",
-                build=pages.TournamentTreePage,
-            ),
             ComponentPage(
                 name="TournamentRulesPage",
                 url_segment="tournament-rules",
@@ -222,14 +216,7 @@ if __name__ == "__main__":
         }
     )
 
-    try:
-        app.run_as_web_server(
-            host="0.0.0.0",
-            port=8000,
-        )
-    except (KeyboardInterrupt, SystemExit):
-        logger.info("EZGG LAN Manager was shut down.")
-        sys.exit(0)
-    except Exception as e:
-        logger.error(e)
-        sys.exit(1)
+    sys.exit(app.run_as_web_server(
+        host="0.0.0.0",
+        port=8000,
+    ))

src/ezgg_lan_manager/__init__.py

@@ -20,7 +20,7 @@ from src.ezgg_lan_manager.services.UserService import UserService
 from src.ezgg_lan_manager.types import *
 
 # Inits services in the correct order
-def init_services() -> tuple[AccountingService, CateringService, ConfigurationService, DatabaseService, MailingService, NewsService, SeatingService, TicketingService, UserService, LocalDataService, ReceiptPrintingService, TournamentService, TeamService]:
+def init_services() -> tuple[AccountingService, CateringService, ConfigurationService, DatabaseService, MailingService, NewsService, SeatingService, TicketingService, UserService, LocalDataService, ReceiptPrintingService, TournamentService, TeamService, RefreshService]:
     logging.basicConfig(level=logging.DEBUG)
     configuration_service = ConfigurationService(from_root("config.toml"))
     db_service = DatabaseService(configuration_service.get_database_configuration())
@@ -37,4 +37,4 @@ def init_services() -> tuple[AccountingService, CateringService, ConfigurationSe
     team_service = TeamService(db_service)
     refresh_service = RefreshService()
 
-    return accounting_service, catering_service, configuration_service, db_service, mailing_service, news_service, seating_service, ticketing_service, user_service, local_data_service, receipt_printing_service, tournament_service, team_service
+    return accounting_service, catering_service, configuration_service, db_service, mailing_service, news_service, seating_service, ticketing_service, user_service, local_data_service, receipt_printing_service, tournament_service, team_service, refresh_service

src/ezgg_lan_manager/components/UserInfoBox.py

@@ -68,10 +68,9 @@ class UserInfoBox(Component):
     @event.on_populate
     async def async_init(self) -> None:
         self.user = await self.session[UserService].get_user(self.user_id)
-        if self.user is not None:
-            self.user_balance = await self.session[AccountingService].get_balance(self.user.user_id)
-            self.user_ticket = await self.session[TicketingService].get_user_ticket(self.user.user_id)
-            self.user_seat = await self.session[SeatingService].get_user_seat(self.user.user_id)
+        self.user_balance = await self.session[AccountingService].get_balance(self.user.user_id)
+        self.user_ticket = await self.session[TicketingService].get_user_ticket(self.user.user_id)
+        self.user_seat = await self.session[SeatingService].get_user_seat(self.user.user_id)
         self.session[AccountingService].add_update_hook(self.update)
 
     async def update(self) -> None:

src/ezgg_lan_manager/pages/Account.py

@@ -233,20 +233,19 @@ class AccountPage(Component):
                         on_press=self._on_paypal_info_press
                     ),
                     paypal_info_revealer,
-                    # Disabled because people did not understand the fee's and kept charging 24.03 € to their accounts
-                    # Link(
-                    #     content=Button(
-                    #         content=Text("PAYPAL (3% Gebühr - Gewerblich)", style=TextStyle(fill=Color.from_hex("121212"), font_size=0.8), justify="center"),
-                    #         shape="rectangle",
-                    #         style="major",
-                    #         color="secondary",
-                    #         grow_x=True,
-                    #         margin=2,
-                    #         margin_top=0
-                    #     ),
-                    #     target_url="https://www.paypal.com/ncp/payment/89YMGVZ4S33RS",
-                    #     open_in_new_tab=True
-                    # )
+                    Link(
+                        content=Button(
+                            content=Text("PAYPAL (3% Gebühr - Gewerblich)", style=TextStyle(fill=Color.from_hex("121212"), font_size=0.8), justify="center"),
+                            shape="rectangle",
+                            style="major",
+                            color="secondary",
+                            grow_x=True,
+                            margin=2,
+                            margin_top=0
+                        ),
+                        target_url="https://www.paypal.com/ncp/payment/89YMGVZ4S33RS",
+                        open_in_new_tab=True
+                    )
                 )
             ),
             MainViewContentBox(

src/ezgg_lan_manager/pages/CateringPage.py

@@ -18,6 +18,7 @@ class CateringPage(Component):
 
     @event.on_populate
     async def on_populate(self) -> None:
+        self.session[RefreshService].subscribe(self.on_populate)
         await self.session.set_title(f"{self.session[ConfigurationService].get_lan_info().name} - Catering")
         self.all_menu_items = await self.session[CateringService].get_menu()
 

src/ezgg_lan_manager/pages/ManageTournamentsPage.py

@@ -11,7 +11,7 @@ from src.ezgg_lan_manager.components.MainViewContentBox import MainViewContentBo
 from src.ezgg_lan_manager.types.DateUtil import weekday_to_display_text
 from src.ezgg_lan_manager.types.Participant import Participant
 from src.ezgg_lan_manager.types.Tournament import Tournament
-from src.ezgg_lan_manager.types.TournamentBase import TournamentStatus, TournamentError
+from src.ezgg_lan_manager.types.TournamentBase import TournamentStatus
 
 logger = logging.getLogger(__name__.split(".")[-1])
 
@@ -29,10 +29,7 @@ class ManageTournamentsPage(Component):
 
     async def on_start_pressed(self, tournament_id: int) -> None:
         logger.info(f"Starting tournament with ID {tournament_id}")
-        try:
-            await self.session[TournamentService].start_tournament(tournament_id)
-        except TournamentError as e:
-            logger.error(f"Error trying to start tournament: {e}")
+        await self.session[TournamentService].start_tournament(tournament_id)
 
     async def on_cancel_pressed(self, tournament_id: int) -> None:
         logger.info(f"Canceling tournament with ID {tournament_id}")
@@ -95,16 +92,8 @@ class ManageTournamentsPage(Component):
                                 font_size=1.2
                             ),
                             margin_top=2,
-                            margin_bottom=1,
-                            align_x=0.5
-                        ),
-                        Button(
-                            content="Cache erneuern",
-                            shape="rectangle",
-                            style="colored-text",
                             margin_bottom=2,
-                            align_x=0.5,
-                            on_press=self.session[TournamentService].queue_cache_renewal
+                            align_x=0.5
                         ),
                         *tournament_rows
                     )

src/ezgg_lan_manager/pages/TournamentDetailsPage.py

@@ -7,13 +7,13 @@ from from_root import from_root
 from rio import Column, Component, event, TextStyle, Text, Row, Image, Spacer, ProgressCircle, Button, Checkbox, ThemeContextSwitcher, Link, Revealer, PointerEventListener, \
     PointerEvent, Rectangle, Color, Popup, Dropdown
 
-from src.ezgg_lan_manager import ConfigurationService, TournamentService, UserService, TicketingService, TeamService, RefreshService
+from src.ezgg_lan_manager import ConfigurationService, TournamentService, UserService, TicketingService, TeamService
 from src.ezgg_lan_manager.components.MainViewContentBox import MainViewContentBox
 from src.ezgg_lan_manager.components.TournamentDetailsInfoRow import TournamentDetailsInfoRow
 from src.ezgg_lan_manager.types.DateUtil import weekday_to_display_text
 from src.ezgg_lan_manager.types.Team import Team, TeamStatus
 from src.ezgg_lan_manager.types.Tournament import Tournament
-from src.ezgg_lan_manager.types.TournamentBase import TournamentStatus, tournament_status_to_display_text, tournament_format_to_display_texts, ParticipantType, TournamentFormat
+from src.ezgg_lan_manager.types.TournamentBase import TournamentStatus, tournament_status_to_display_text, tournament_format_to_display_texts, ParticipantType
 from src.ezgg_lan_manager.types.User import User
 from src.ezgg_lan_manager.types.UserSession import UserSession
 
@@ -44,7 +44,7 @@ class TournamentDetailsPage(Component):
             tournament_id = None
         if tournament_id is not None:
             self.tournament = await self.session[TournamentService].get_tournament_by_id(tournament_id)
-            if isinstance(self.tournament, Tournament):
+            if self.tournament is not None:
                 await self.session.set_title(f"{self.session[ConfigurationService].get_lan_info().name} - {self.tournament.name}")
                 if self.tournament.participant_type == ParticipantType.PLAYER:
                     self.current_tournament_user_or_team_list = await self.session[TournamentService].get_users_from_participant_list(self.tournament.participants)
@@ -61,8 +61,6 @@ class TournamentDetailsPage(Component):
             self.user = None
             self.user_teams = []
 
-        self.session[RefreshService].subscribe(self.on_populate)
-
         self.loading_done()
 
     @staticmethod
@@ -70,14 +68,13 @@ class TournamentDetailsPage(Component):
         await sleep(0.8)  # https://medium.com/design-bootcamp/ux-psychology-of-artificial-waiting-enhancing-user-experiences-through-deliberate-delays-d7822faf3930
 
     async def update(self) -> None:
-        if isinstance(self.tournament, Tournament):
-            self.tournament = await self.session[TournamentService].get_tournament_by_id(self.tournament.id)
-            if self.tournament is None or isinstance(self.tournament, str):
-                return
-            if self.tournament.participant_type == ParticipantType.PLAYER:
-                self.current_tournament_user_or_team_list = await self.session[TournamentService].get_users_from_participant_list(self.tournament.participants)
-            elif self.tournament.participant_type == ParticipantType.TEAM:
-                self.current_tournament_user_or_team_list = await self.session[TournamentService].get_teams_from_participant_list(self.tournament.participants)
+        self.tournament = await self.session[TournamentService].get_tournament_by_id(self.tournament.id)
+        if self.tournament is None:
+            return
+        if self.tournament.participant_type == ParticipantType.PLAYER:
+            self.current_tournament_user_or_team_list = await self.session[TournamentService].get_users_from_participant_list(self.tournament.participants)
+        elif self.tournament.participant_type == ParticipantType.TEAM:
+            self.current_tournament_user_or_team_list = await self.session[TournamentService].get_teams_from_participant_list(self.tournament.participants)
 
     def open_close_participant_revealer(self, _: PointerEvent) -> None:
         self.participant_revealer_open = not self.participant_revealer_open
@@ -91,9 +88,6 @@ class TournamentDetailsPage(Component):
         if user_ticket is None:
             self.is_success = False
             self.message = "Turnieranmeldung nur mit Ticket"
-        elif not isinstance(self.tournament, Tournament):
-            self.is_success = False
-            self.message = "Fehler bei der Anmeldung"
         else:
             # Register single player
             if self.tournament.participant_type == ParticipantType.PLAYER:
@@ -131,15 +125,12 @@ class TournamentDetailsPage(Component):
             await self.on_team_register_canceled()
             return
         try:
-            if isinstance(self.tournament, Tournament):
-                await self.session[TournamentService].register_team_for_tournament(self.team_selected_for_register.id, self.tournament.id)
-                await self.artificial_delay()
-                self.is_success = True
-                self.message = f"Erfolgreich angemeldet!"
-                self.team_dialog_open = False
-                self.team_selected_for_register = None
-            else:
-                raise ValueError("Turnier nicht gefunden")
+            await self.session[TournamentService].register_team_for_tournament(self.team_selected_for_register.id, self.tournament.id)
+            await self.artificial_delay()
+            self.is_success = True
+            self.message = f"Erfolgreich angemeldet!"
+            self.team_dialog_open = False
+            self.team_selected_for_register = None
         except Exception as e:
             logger.error(e)
             self.message = f"Fehler: {e}"
@@ -158,9 +149,9 @@ class TournamentDetailsPage(Component):
             return
 
         try:
-            if isinstance(self.tournament, Tournament) and self.tournament.participant_type == ParticipantType.PLAYER:
+            if self.tournament.participant_type == ParticipantType.PLAYER:
                 await self.session[TournamentService].unregister_user_from_tournament(self.user.user_id, self.tournament.id)
-            elif isinstance(self.tournament, Tournament) and self.tournament.participant_type == ParticipantType.TEAM:
+            elif self.tournament.participant_type == ParticipantType.TEAM:
                 if team.members[self.user] == TeamStatus.OFFICER or team.members[self.user] == TeamStatus.LEADER:
                     await self.session[TournamentService].unregister_team_from_tournament(team.id, self.tournament.id)
                 else:
@@ -175,8 +166,7 @@ class TournamentDetailsPage(Component):
         self.loading = False
 
     async def tree_button_clicked(self) -> None:
-        if isinstance(self.tournament, Tournament):
-            self.session.navigate_to(f"tournament-tree?id={self.tournament.id}")
+        pass  # ToDo: Implement tournament tree view
 
     def loading_done(self) -> None:
         if self.tournament is None:
@@ -215,17 +205,16 @@ class TournamentDetailsPage(Component):
                 tournament_status_color = self.session.theme.danger_color
             elif self.tournament.status == TournamentStatus.ONGOING or self.tournament.status == TournamentStatus.COMPLETED:
                 tournament_status_color = self.session.theme.warning_color
-                if self.tournament.format != TournamentFormat.FFA:
-                    tree_button = Button(
-                        content="Turnierbaum anzeigen",
-                        shape="rectangle",
-                        style="minor",
-                        color="hud",
-                        margin_left=4,
-                        margin_right=4,
-                        margin_top=1,
-                        on_press=self.tree_button_clicked
-                    )
+                tree_button = Button(
+                    content="Turnierbaum anzeigen",
+                    shape="rectangle",
+                    style="minor",
+                    color="hud",
+                    margin_left=4,
+                    margin_right=4,
+                    margin_top=1,
+                    on_press=self.tree_button_clicked
+                )
 
             ids_of_participants = [p.id for p in self.tournament.participants]
             color_key: Literal["hud", "danger"] = "hud"
@@ -360,7 +349,7 @@ class TournamentDetailsPage(Component):
                 button
             )
 
-        if isinstance(self.tournament, Tournament) and self.tournament.participant_type == ParticipantType.TEAM:
+        if self.tournament and self.tournament.participant_type == ParticipantType.TEAM:
             content = Popup(
                 anchor=content,
                 content=Rectangle(

src/ezgg_lan_manager/pages/TournamentTreePage.py

@@ -1,280 +0,0 @@
-import json
-import logging
-from typing import Optional, Union
-
-from from_root import from_root
-from rio import Column, Component, event, TextStyle, Text, Row, Spacer, ProgressCircle, Rectangle, Stack
-
-from src.ezgg_lan_manager import ConfigurationService, TournamentService, UserService, TeamService, RefreshService, SeatingService
-from src.ezgg_lan_manager.components.MainViewContentBox import MainViewContentBox
-from src.ezgg_lan_manager.types.Team import Team, TeamStatus
-from src.ezgg_lan_manager.types.Tournament import Tournament
-from src.ezgg_lan_manager.types.TournamentBase import ParticipantType, TournamentFormat
-from src.ezgg_lan_manager.types.User import User
-from src.ezgg_lan_manager.types.UserSession import UserSession
-
-logger = logging.getLogger(__name__.split(".")[-1])
-
-class MatchInfo(Component):
-    opponent_1: str = ""
-    opponent_2: str = ""
-    opponent_1_seat: str = ""
-    opponent_2_seat: str = ""
-    winner: str = ""
-
-    def build(self) -> Component:
-        return Rectangle(
-            content=Column(
-                Stack(
-                    Row(
-                        Row(
-                            Text(
-                                text=self.opponent_1,
-                                style=TextStyle(fill=self.session.theme.success_color if self.winner == self.opponent_1 else self.session.theme.background_color),
-                                justify="left",
-                                margin_right=0.6,
-                                font_size=0.9
-                            ),
-                            Text(
-                                text=f"({self.opponent_1_seat})" if self.opponent_1_seat else "Freilos",
-                                style=TextStyle(fill=self.session.theme.background_color),
-                                justify="left",
-                                font_size=0.9
-                            )
-                        ),
-                        Spacer(),
-                        Row(
-                            Text(
-                                text=self.opponent_2,
-                                style=TextStyle(fill=self.session.theme.success_color if self.winner == self.opponent_2 else self.session.theme.background_color),
-                                justify="right",
-                                margin_right=0.6,
-                                font_size=0.9
-                            ),
-                            Text(
-                                text=f"({self.opponent_2_seat})" if self.opponent_2_seat else "Freilos",
-                                style=TextStyle(fill=self.session.theme.background_color),
-                                justify="right",
-                                font_size=0.9
-                            )
-                        ),
-                        margin=0.3
-                    ),
-                    Row(
-                        Text(
-                            text=f"vs.",
-                            style=TextStyle(fill=self.session.theme.background_color),
-                            justify="center"
-                        ),
-                        margin=0.3
-                    )
-                )
-            ),
-            margin=1,
-            stroke_width=0.2,
-            stroke_color=self.session.theme.background_color,
-            fill=self.session.theme.hud_color,
-        )
-
-class TournamentTreePage(Component):
-    tournament: Optional[Union[Tournament, str]] = None
-    user: Optional[User] = None
-    teams: list[Team] = []
-    id_to_username_map: dict[int, str] = {}
-    id_to_seat_map: dict[int, str] = {}
-    is_fully_loaded: bool = False
-
-    @event.on_populate
-    async def on_populate(self) -> None:
-        try:
-            tournament_id = int(self.session.active_page_url.query_string.split("id=")[-1])
-        except (ValueError, AttributeError, TypeError):
-            tournament_id = None
-        if tournament_id is not None:
-            self.tournament = await self.session[TournamentService].get_tournament_by_id(tournament_id)
-            if isinstance(self.tournament, Tournament):
-                await self.session.set_title(f"{self.session[ConfigurationService].get_lan_info().name} - {self.tournament.name}")
-        else:
-            await self.session.set_title(f"{self.session[ConfigurationService].get_lan_info().name} - Turniere")
-
-        try:
-            user_id = self.session[UserSession].user_id
-            self.user = await self.session[UserService].get_user(user_id)
-        except KeyError:
-            self.user = None
-
-        self.teams = await self.session[TeamService].get_all_teams()
-
-        all_users = await self.session[UserService].get_all_users()
-        id_to_username_map = {}
-        id_to_seat_map = {}
-        for user in all_users:
-            id_to_username_map[user.user_id] = user.user_name
-            seat = await self.session[SeatingService].get_user_seat(user.user_id)
-            if seat is not None:
-                id_to_seat_map[user.user_id] = seat.seat_id
-
-        self.id_to_username_map = id_to_username_map
-        self.id_to_seat_map = id_to_seat_map
-        self.session[RefreshService].subscribe(self.on_populate)
-        self.is_fully_loaded = True
-
-    def _get_seat_for_team(self, team: Team) -> str:
-        # Retrieves seat id for leader of a team
-        leader = list(team.members.keys())[0]
-        for member, rank in team.members.items():
-            if rank == TeamStatus.LEADER:
-                leader = member
-                break
-
-        return self.id_to_seat_map[leader.user_id]
-
-
-    def build(self) -> Component:
-        if self.tournament is None or not self.is_fully_loaded:
-            return Column(
-                MainViewContentBox(
-                    Column(
-                        Spacer(min_height=1),
-                        Column(
-                            ProgressCircle(
-                                color="secondary",
-                                align_x=0.5,
-                                margin_top=0,
-                                margin_bottom=0
-                            ),
-                            min_height=10
-                        ),
-                        Spacer(min_height=1)
-                    )
-                ),
-                align_y=0
-            )
-        elif isinstance(self.tournament, str):
-            content = Row(
-                Text(
-                    text=self.tournament,
-                    style=TextStyle(
-                        fill=self.session.theme.background_color,
-                        font_size=1
-                    ),
-                    margin_top=2,
-                    margin_bottom=2,
-                    align_x=0.5
-                )
-            )
-        else:
-            if self.tournament.format == TournamentFormat.FFA:
-                content = Column(
-                    Text(
-                        text=f"Dieses Turnier hat keinen Turnierbaum.",
-                        style=TextStyle(fill=self.session.theme.background_color),
-                        margin_top=1,
-                        margin_bottom=1,
-                        align_x=0.5,
-                        overflow="wrap",
-                        min_width=30,
-                        justify="center"
-                    )
-                )
-            else:
-                try:
-                    file_name = self.tournament.name.replace(" ", "_") + ".json"
-                    games_per_matchup = int(self.tournament.format.name[-1])
-                    logger.info(f"Trying to read tournament data from {file_name}")
-                    with open(from_root("tournament_data", file_name), "r") as f:
-                        json_data = json.load(f)
-
-                    last_valid_round = None
-                    round_num = 0
-                    for round_ in json_data["rounds"]:
-                        if all(
-                                match["opponent_1_id"] is not None or match["opponent_2_id"] is not None
-                                for match in round_
-                        ):
-                            last_valid_round = round_
-                            round_num += 1
-
-                    if last_valid_round is None:
-                        last_valid_round = json_data["rounds"][0]
-
-                    match_infos = []
-                    if self.tournament.participant_type == ParticipantType.PLAYER:
-                        match_infos = [MatchInfo(
-                            opponent_1=self.id_to_username_map.get(match["opponent_1_id"], ""),
-                            opponent_2=self.id_to_username_map.get(match["opponent_2_id"], ""),
-                            winner=self.id_to_username_map.get(match["winner"], ""),
-                            opponent_1_seat=self.id_to_seat_map.get(match["opponent_1_id"], ""),
-                            opponent_2_seat=self.id_to_seat_map.get(match["opponent_2_id"], ""),
-                        ) for match in last_valid_round]
-                    elif self.tournament.participant_type == ParticipantType.TEAM:
-                        for match in last_valid_round:
-                            team_1: Optional[Team] = next(filter(lambda t: t.id == match["opponent_1_id"], self.teams), None)
-                            team_2: Optional[Team] = next(filter(lambda t: t.id == match["opponent_2_id"], self.teams), None)
-                            winner: Union[str, Team] = next(filter(lambda t: t.id == match["winner"], self.teams), "")
-                            match_infos.append(
-                                MatchInfo(
-                                    opponent_1=team_1.name if team_1 is not None else "",
-                                    opponent_2=team_2.name if team_2 is not None else "",
-                                    winner=winner if isinstance(winner, str) else winner.name,
-                                    opponent_1_seat=self._get_seat_for_team(team_1) if team_1 is not None else "",
-                                    opponent_2_seat=self._get_seat_for_team(team_2) if team_2 is not None else "",
-                                )
-                            )
-                    else:
-                        raise ValueError("Unknown participant type")
-
-
-
-                    content = Column(
-                        Text(
-                            text=f"{self.tournament.name}",
-                            style=TextStyle(fill=self.session.theme.background_color),
-                            justify="center",
-                            font_size=1.2
-                        ),
-                        Text(
-                            text="Finale" if len(json_data["rounds"]) == round_num else f"Runde {round_num}",
-                            style=TextStyle(fill=self.session.theme.background_color),
-                            justify="center",
-                            font_size=0.9,
-                            margin_bottom=1
-                        ),
-                        Text(
-                            text=f"Spiele pro Matchup: {games_per_matchup}",
-                            style=TextStyle(fill=self.session.theme.background_color),
-                            justify="center",
-                            font_size=0.8
-                        ),
-                        Text(
-                            text=f"Melde als Verlierer deinen Matchausgang\nim Discord oder an der Orga-Ecke",
-                            style=TextStyle(fill=self.session.theme.background_color),
-                            justify="center",
-                            font_size=0.8
-                        ),
-                        *match_infos
-                    )
-                except (FileNotFoundError, ValueError, AttributeError):
-                    content = Column(
-                        Text(
-                            text=f"Der Turnierbaum für dieses Turnier steht leider nicht zur Verfügung.\n\nBitte melde sich beim Orga-Team.",
-                            style=TextStyle(fill=self.session.theme.background_color),
-                            margin_top=1,
-                            margin_bottom=1,
-                            align_x=0.5,
-                            overflow="wrap",
-                            min_width=30,
-                            justify="center"
-                        )
-                    )
-
-        return Column(
-            MainViewContentBox(
-                Column(
-                    Spacer(min_height=1),
-                    content,
-                    Spacer(min_height=1)
-                )
-            ),
-            align_y=0
-        )

src/ezgg_lan_manager/pages/__init__.py

@@ -25,4 +25,3 @@ from .TournamentRulesPage import TournamentRulesPage
 from .ConwayPage import ConwayPage
 from .TeamsPage import TeamsPage
 from .AdminNavigationPage import AdminNavigationPage
-from .TournamentTreePage import TournamentTreePage

src/ezgg_lan_manager/services/DatabaseService.py

@@ -1,6 +1,6 @@
 import logging
 
-from datetime import date, datetime, UTC
+from datetime import date, datetime
 from typing import Optional
 from decimal import Decimal
 
@@ -16,7 +16,7 @@ from src.ezgg_lan_manager.types.Seat import Seat
 from src.ezgg_lan_manager.types.Team import TeamStatus, Team
 from src.ezgg_lan_manager.types.Ticket import Ticket
 from src.ezgg_lan_manager.types.Tournament import Tournament
-from src.ezgg_lan_manager.types.TournamentBase import GameTitle, TournamentFormat, TournamentStatus, ParticipantType, MatchStatus
+from src.ezgg_lan_manager.types.TournamentBase import GameTitle, TournamentFormat, TournamentStatus, ParticipantType
 from src.ezgg_lan_manager.types.Transaction import Transaction
 from src.ezgg_lan_manager.types.User import User
 
@@ -1185,18 +1185,3 @@ class DatabaseService:
                     if not pool_init_result:
                         raise NoDatabaseConnectionError
                     return await self.remove_user_from_team(team, user)
-
-    async def change_tournament_status(self, tournament_id: int, status: TournamentStatus) -> None:
-        async with self._connection_pool.acquire() as conn:
-            async with conn.cursor(aiomysql.Cursor) as cursor:
-                try:
-                    await cursor.execute(
-                        "UPDATE tournaments SET status = %s WHERE (id = %s)",
-                        (status.name, tournament_id)
-                    )
-                    await conn.commit()
-                except aiomysql.InterfaceError:
-                    pool_init_result = await self.init_db_pool()
-                    if not pool_init_result:
-                        raise NoDatabaseConnectionError
-                    return await self.change_tournament_status(tournament_id, status)

src/ezgg_lan_manager/services/RefreshService.py

@@ -1,17 +1,17 @@
-from typing import Callable, Optional
+from typing import Callable
 
 
 class RefreshService:
     """
-    The active rio.Components can subscribe to this service with their on_populate method.
-    This methods get called whenever a overall refresh is needed. Usually when the user logs in or out.
+    rio.Components can subscribe to this service with their on_populate method.
+    Those methods get called whenever a overall refresh is needed. Usually when the user logs in or out.
     """
     def __init__(self) -> None:
-        self.subscriber: Optional[Callable] = None
+        self.subscribers: set[Callable] = set()
 
     def subscribe(self, refresh_cb: Callable) -> None:
-        self.subscriber = refresh_cb
+        self.subscribers.add(refresh_cb)
 
     async def trigger_refresh(self) -> None:
-        if self.subscriber is not None:
-            await self.subscriber()
+        for refresh_cb in self.subscribers:
+            await refresh_cb()

src/ezgg_lan_manager/services/TournamentService.py

@@ -1,9 +1,5 @@
-import json
-from pprint import pprint
 from typing import Optional
 
-from from_root import from_root
-
 from src.ezgg_lan_manager.services.DatabaseService import DatabaseService
 from src.ezgg_lan_manager.services.UserService import UserService
 from src.ezgg_lan_manager.types.Participant import Participant
@@ -21,10 +17,6 @@ class TournamentService:
         # Crude cache mechanism. If performance suffers, maybe implement a queue with Single-Owner-Pattern or a Lock
         self._cache: dict[int, Tournament] = {}
         self._cache_dirty: bool = True  # Setting this flag invokes cache update on next read
-        
-    async def queue_cache_renewal(self) -> None:
-        # Used in admin UI to provoke cache renewal after direct database access
-        self._cache_dirty = True
 
     async def _update_cache(self) -> None:
         tournaments = await self._db_service.get_all_tournaments()
@@ -98,47 +90,12 @@ class TournamentService:
         tournament = await self.get_tournament_by_id(tournament_id)
         if tournament:
             tournament.start()
-            await self._generate_initial_json_file(tournament)
-            await self._db_service.change_tournament_status(tournament_id, tournament.status)
+        # ToDo: Write matches/round to database
         self._cache_dirty = True
 
     async def cancel_tournament(self, tournament_id: int):
         tournament = await self.get_tournament_by_id(tournament_id)
         if tournament:
             tournament.cancel()
-            await self._db_service.change_tournament_status(tournament_id, tournament.status)
+        # ToDo: Update to database
         self._cache_dirty = True
-
-    async def _generate_initial_json_file(self, tournament: Tournament) -> None:
-        """
-        Generates the initial JSON file for the tournament. Won't generate a new one if one already exists.
-        ToDo: Remove this method when final tournament system is completed.
-        """
-        p = tournament.participants
-        pairs = [
-            (p[i], p[i + 1]) if i + 1 < len(p) else (p[i], None)
-            for i in range(0, len(p), 2)
-        ]
-        data = {
-            "rounds": [
-                [
-                    {
-                        "opponent_1_id": pair[0].id if pair[0] is not None else None,
-                        "opponent_2_id": pair[1].id if pair[1] is not None else None,
-                        "winner": None
-                    } for pair in pairs
-                ]
-            ]
-        }
-
-        # Resolve byes
-        for match in data["rounds"][0]:
-            if match["opponent_2_id"] is None:
-                match["winner"] = match["opponent_1_id"]
-
-        file_name = tournament.name.replace(" ", "_") + ".json"
-        try:
-            with open(from_root("tournament_data", file_name), "x") as f:
-                json.dump(data, f, indent=4)
-        except FileExistsError:
-            pass

src/ezgg_lan_manager/types/Match.py

@@ -49,14 +49,6 @@ class Match:
             games.append(Game(game_id, self._match_id, game_number, None, None, False))
         return tuple(games)
 
-    @property
-    def round_number(self) -> int:
-        return self._round_number
-
-    @property
-    def best_of(self) -> int:
-        return self._best_of
-
     @property
     def status(self) -> MatchStatus:
         if self._status == MatchStatus.COMPLETED:

src/ezgg_lan_manager/types/Tournament.py

@@ -1,4 +1,3 @@
-import logging
 import uuid
 from datetime import datetime
 from typing import Optional
@@ -8,7 +7,6 @@ from src.ezgg_lan_manager.types.Match import Match, FFAMatch
 from src.ezgg_lan_manager.types.Participant import Participant
 from src.ezgg_lan_manager.types.TournamentBase import GameTitle, TournamentFormat, TournamentStatus, TournamentError, Bracket, MatchStatus, ParticipantType
 
-logger = logging.getLogger(__name__.split(".")[-1])
 
 class Tournament:
     def __init__(self,
@@ -355,7 +353,6 @@ class Tournament:
             raise TournamentError(f"Unknown bracket type: {bracket_type}")
 
         self._status = TournamentStatus.ONGOING
-        logger.info(f"New tournament status for {self._name}: {self._status}")
         for match in self._matches:
             match.check_completion()
 

src/ezgg_lan_manager/types/UserSession.py

@@ -1,9 +1,9 @@
+from dataclasses import dataclass
 from uuid import UUID
 
-from rio import Dataclass
 
-
-class UserSession(Dataclass):
+@dataclass
+class UserSession:
     id: UUID
     user_id: int
     is_team_member: bool

tournament_data/.gitignore

@@ -1 +0,0 @@
-*.json

tournament_data/README.md

@@ -1,43 +0,0 @@
-# Tournament data
-
-This directory contains JSON files for tournament trees.
-
-This is a temporary solution until the automatic tournament tree generation is completed.
-
-# Structure
-
-## Naming
-
-Tournament name with `_` as separators and `.json` suffix.
-
-## JSON structure
-
-```json
-{
-  "rounds": [
-    [
-      {
-        "opponent_1_id": 1,
-        "opponent_2_id": 2,
-        "winner": 1
-      },
-      {
-        "opponent_1_id": 3,
-        "opponent_2_id": 4,
-        "winner": null
-      }
-    ],
-    [
-      {
-        "opponent_1_id": 1,
-        "opponent_2_id": null,
-        "winner": null
-      }
-    ]
-  ]
-}
-```
-
-## ToDo
-
-- Make start button in UI generate initial `.json` file for started tournament