feat: add club selection support and improve mobile API integration

Remove redundant ELIT variants from AgeGroup enum and implement case/spelling tolerant normalization function. The new normalize_age_group function handles case-insensitive matching and spelling variations (Elite/ELIT/Elit) while mapping to canonical enum values.

This reduces the enum from 15 to 13 entries while maintaining full backward compatibility.

README.md

@@ -1,9 +1,9 @@
 # myice
 
-## introduction
+## intro
 
-With this tool, you can fetch kids' schedules from MyIce and generate
+Avec tout ça on va aller chercher sur MyIce les planning des gamins et générer
-the PDFs you need.
+les pdf qu'on veut
 
 ## install
 
@@ -19,102 +19,17 @@ with [pipx](https://pipx.pypa.io/stable/installation/):
 pipx install --extra-index-url https://gitea.parano.ch/api/packages/herel/pypi/simple/ myice
 ```
 
-## configuration
+## récupérer le schedule
-
-Create a `myice.ini` file with your credentials:
-
-```ini
-[default]
-username = your_email@example.com
-password = your_password
-userid = 12345
-token = your_api_token
-club_id = 172
-```
-
-You can also create multiple sections for different users:
-
-```ini
-[default]
-username = user1@example.com
-password = password1
-userid = 12345
-token = token1
-club_id = 172
-
-[second_kid]
-username = charlie@example.com
-password = password2
-userid = 67890
-token = token2
-club_id = 186
-```
-
-Note: The `userid`, `token`, and `club_id` fields are optional. If you don't
-have them, the tool can fetch them automatically using the mobile-login
-command (see below).
-
-To fetch the `token` and `club_id` using mobile-login:
-
-```shell
-myice mobile-login
-```
-
-This will output the necessary information that you can add to your `myice.ini` file.
-
-## web interface
-
-The tool includes a web interface that can be accessed by running the web API server:
-
-```shell
-uv run fastapi run myice/webapi.py
-```
-
-Then open your browser at `http://localhost:8000`. The web interface allows you to:
-
-- Select between different configured accounts
-- View upcoming games and practices
-- See detailed information about events including player rosters
-
-The web API provides the following endpoints:
-
-- `/schedule` - Get the schedule for a specific account
-- `/game/{game_id}` - Get details for a specific game
-- `/accounts` - Get a list of available accounts
-- `/health` - Health check endpoint
-
-All endpoints (except `/health`) require an Authorization header with a Bearer token.
-For development purposes, you can use `abc` as the token.
-
-## mobile functions
-
-The tool includes several mobile API functions that interact with MyIce's
-mobile API:
-
-- `myice mobile-login` - Authenticate and get authentication tokens
-- `myice mobile` - Fetch game data using the mobile API
-- `myice mobile-game {game_id}` - Get detailed information about a specific game
-
-These functions can be useful for debugging or when the regular web
-interface is not available.
-
-## fetch schedule
 
 ```shell
 myice schedule -o schedule.json
 ```
 
-To use a specific configuration section:
-
-```shell
-myice schedule -o schedule.json --config-section isaac
-```
-
 ## data
 
 ### listing
 
-To fetch events for U13 Elite for example:
+Pour récupérer les event des U13 Elite par example:
 
 ```shell
 ❯ myice search "U13 (Elite)"
@@ -140,11 +55,11 @@ practice: On-Ice Patinoire des Vernets - Patinoire Extérieure
 game: Saison HC Ajoie
 ```
 
-And we retrieve the match roster:
+Et on récupère la convoc du match:
 
 ### match
 
-To get the roster for the match against Ajoie, the ID is 117015:
+alors pour avoir la convocation du match contre Ajoie, l'id c'est 117015:
 
 ```shell
 ❯ myice game 117015
@@ -152,15 +67,9 @@ Opening file game_117015.pdf
 
 ```
 
-To use a specific configuration section:
+### entraînement
 
-```shell
+et pour la convoc d'un entraînement:
-❯ myice game 117015 --config-section isaac
-```
-
-### practice
-
-And for a practice roster:
 
 ```shell
 ❯ myice practice 561855
@@ -168,12 +77,6 @@ Opening file practice_561855.pdf
 
 ```
 
-To use a specific configuration section:
-
-```shell
-❯ myice practice 561855 --config-section isaac
-```
-
 ### AI
 
 ```text
@@ -183,9 +86,3 @@ To use a specific configuration section:
 > et les u13 a ?
 < Le prochain match de l'équipe U13 A se déroulera le samedi 9 novembre 2024 contre HC Vallorbe à P. du Frézillon, 1337 Vallorbe VD. Le match débutera à 13h00 et se terminera à 15h00. Le prochain match à domicile de l'équipe U13 A se déroulera le dimanche 10 novembre 2024 contre CP Meyrin à Les Vernets, Glace extérieure, 1227 Les Acacias GE. Le match débutera à 13h00 et se terminera à 15h00.
 ```
-
-To use a specific configuration section:
-
-```shell
-❯ myice ai --config-section isaac
-```

index.html

@@ -16,12 +16,6 @@
         <div id="apikeyContainer" class="mb-3"></div>
 
         <div id="eventFilters" style="display: none;">
-            <div class="mb-3">
-                <label for="account" class="form-label">Sélectionner un compte</label>
-                <select id="account" class="form-select">
-                    <option value="default">Compte par défaut</option>
-                </select>
-            </div>
             <div class="mb-3">
                 <label for="agegroup" class="form-label">Filtrer par groupe d'âge</label>
                 <select id="agegroup" class="form-select">
@@ -52,7 +46,6 @@
         document.addEventListener("DOMContentLoaded", function () {
             const apikeyContainer = document.getElementById("apikeyContainer");
             const eventFilters = document.getElementById("eventFilters");
-            const accountSelect = document.getElementById("account");
             const agegroupSelect = document.getElementById("agegroup");
             const eventList = document.getElementById("eventList");
             const fetchButton = document.getElementById("fetchEvents");
@@ -61,20 +54,16 @@
 
             let storedApiKey = localStorage.getItem("apikey");
             let lastFetchedEvents = [];
-            let storedAccount = localStorage.getItem("account") || "default";
 
             function renderApiKeyInput() {
                 if (storedApiKey) {
                     apikeyContainer.innerHTML = `<button id="disconnect" class="btn btn-danger">Déconnecter</button>`;
                     document.getElementById("disconnect").addEventListener("click", () => {
                         localStorage.removeItem("apikey");
-                        localStorage.removeItem("account");
                         location.reload();
                     });
                     eventFilters.style.display = "block";
-                    // Load available accounts from server or use predefined ones
+                    fetchEvents(storedApiKey);
-                    updateAccountOptions();
-                    fetchEvents(storedApiKey, storedAccount);
                 } else {
                     apikeyContainer.innerHTML = `
                         <label for="apikey" class="form-label">API Key</label>
@@ -101,58 +90,22 @@
                 }
             }
 
-            function updateAccountOptions() {
-                // Fetch available accounts from the server
-                fetch(`${apiBaseUrl}/accounts`, {
-                    headers: { "Authorization": `Bearer ${storedApiKey}` }
-                })
-                .then(response => response.json())
-                .then(accounts => {
-                    accountSelect.innerHTML = '';
-                    accounts.forEach(account => {
-                        const option = document.createElement("option");
-                        option.value = account.name;
-                        option.textContent = account.label;
-                        if (account.name === storedAccount) {
-                            option.selected = true;
-                        }
-                        accountSelect.appendChild(option);
-                    });
-                })
-                .catch(error => {
-                    console.error("Erreur lors du chargement des comptes:", error);
-                    // Fallback to default options
-                    accountSelect.innerHTML = `
-                        <option value="default" ${storedAccount === "default" ? "selected" : ""}>Compte par défaut</option>
-                    `;
-                });
-            }
-
             renderApiKeyInput();
 
-            accountSelect.addEventListener("change", () => {
-                const selectedAccount = accountSelect.value;
-                localStorage.setItem("account", selectedAccount);
-                if (storedApiKey) {
-                    fetchEvents(storedApiKey, selectedAccount);
-                }
-            });
-
             fetchButton.addEventListener("click", () => {
                 if (!storedApiKey) {
                     alert("Veuillez entrer une clé API");
                     return;
                 }
-                const selectedAccount = accountSelect.value;
+                fetchEvents(storedApiKey);
-                fetchEvents(storedApiKey, selectedAccount);
             });
 
             agegroupSelect.addEventListener("change", () => {
                 displayEvents(lastFetchedEvents);
             });
 
-            function fetchEvents(apiKey, account) {
+            function fetchEvents(apiKey) {
-                fetch(`${apiBaseUrl}/schedule?account=${account}`, {
+                fetch(`${apiBaseUrl}/schedule`, {
                     headers: { "Authorization": `Bearer ${apiKey}` }
                 })
                     .then(response => response.json())
@@ -203,8 +156,7 @@
             }
 
             function fetchEventDetails(eventId) {
-                const selectedAccount = accountSelect.value;
+                fetch(`${apiBaseUrl}/game/${eventId}`, {
-                fetch(`${apiBaseUrl}/game/${eventId}?account=${selectedAccount}`, {
                     headers: { "Authorization": `Bearer ${storedApiKey}` }
                 })
                     .then(response => response.json())

myice/myice.py

@@ -165,7 +165,6 @@ def save_cookies(file: str = "cookies.txt"):
 
 def get_login(
     local_file: str = "myice.ini",
-    config_section: str = "default",
 ) -> tuple[str, str, int | None, str | None, int | None]:
     config = configparser.ConfigParser()
     config.read(
@@ -175,29 +174,22 @@ def get_login(
             local_file,
         ]
     )
-    if config_section in config.sections():
+    if "default" in config.sections():
-        selected_config = config[config_section]
+        default_config = config["default"]
-    elif "default" in config.sections():
+
-        # Fallback to default section if specified section doesn't exist
+        username = default_config.get("username")
-        selected_config = config["default"]
+        password = default_config.get("password")
-        print(
+        userid = default_config.getint("userid")
-            f"Warning: Section '{config_section}' not found, using 'default' section",
+        token = default_config.get("token")
-            file=sys.stderr,
+        club_id = default_config.getint("club_id")
-        )
+        if not username or not password:
+            print(
+                "Error: please configure username/password in ini file", file=sys.stderr
+            )
+            sys.exit(1)
     else:
         print("Error: please configure username/password in ini file", file=sys.stderr)
         sys.exit(1)
-
-    username = selected_config.get("username")
-    password = selected_config.get("password")
-    userid = selected_config.getint("userid", fallback=None)
-    token = selected_config.get("token", fallback=None)
-    club_id = selected_config.getint("club_id", fallback=None)
-
-    if not username or not password:
-        print("Error: please configure username/password in ini file", file=sys.stderr)
-        sys.exit(1)
-
     return username, password, userid, token, club_id
 
 
@@ -210,14 +202,10 @@ def select_club(club_id: int = 172):
     r.raise_for_status()
 
 
-def do_login(config_section: str = "default"):
+def do_login():
     global session
     global userid
-    username, password, userid_tmp, token, club_id = get_login(
+    username, password, userid, token, club_id = get_login()
-        config_section=config_section
-    )
-    if userid_tmp is not None:
-        userid = userid_tmp
     r = session.get("https://app.myice.hockey/", headers={"User-Agent": user_agent})
     r.raise_for_status()
     form_data = {
@@ -237,8 +225,7 @@ def do_login(config_section: str = "default"):
     )
     r.raise_for_status()
     # select the club we want
-    if club_id:
+    select_club(club_id)
-        select_club(club_id)
 
 
 def get_userid():
@@ -262,18 +249,15 @@ def get_userid():
 def wrapper_session(func):
     def wrapper(*args, **kwargs):
         global session, userid
-        # Extract config_section from kwargs if present
-        config_section = kwargs.get("config_section", "default")
-
         session = requests.Session()
         # session.verify = False
         session.cookies = load_cookies()
         session.cookies.clear_expired_cookies()
         if not session.cookies.get("mih_v3_cookname"):
             print("login...", file=sys.stderr)
-            do_login(config_section=config_section)
+            do_login()
             save_cookies()
-        _, _, userid, _, _ = get_login(config_section=config_section)
+        _, _, userid, _, _ = get_login()
         if not userid:
             print("get userid...", file=sys.stderr)
             userid = get_userid()
@@ -283,7 +267,7 @@ def wrapper_session(func):
 
 
 @wrapper_session
-def get_schedule(num_days: int, config_section: str = "default") -> str:
+def get_schedule(num_days: int) -> str:
     global session
     global userid
     assert session and userid
@@ -314,7 +298,7 @@ def get_schedule(num_days: int, config_section: str = "default") -> str:
 
 
 @wrapper_session
-def game_pdf(gameid: int, outfile: Path, config_section: str = "default"):
+def game_pdf(gameid: int, outfile: Path):
     global session, userid
     assert session and userid
     r = session.get(
@@ -331,7 +315,7 @@ def game_pdf(gameid: int, outfile: Path, config_section: str = "default"):
 
 
 @wrapper_session
-def practice_pdf(gameid: int, outfile: Path, config_section: str = "default"):
+def practice_pdf(gameid: int, outfile: Path):
     global session, userid
     assert session and userid
     r = session.get(
@@ -356,17 +340,11 @@ def schedule(
         ),
     ] = None,
     num_days: Annotated[int, typer.Option("--days")] = 7,
-    config_section: Annotated[
-        str,
-        typer.Option(
-            "--config-section", "-c", help="Configuration section to use from INI file"
-        ),
-    ] = "default",
 ):
     """
     Fetch schedule as json
     """
-    schedule = get_schedule(num_days, config_section=config_section)
+    schedule = get_schedule(num_days)
     # Sanitize the JSON response using our proven approach
     sanitized_schedule = sanitize_json_response(schedule)
     if outfile:
@@ -405,12 +383,6 @@ def extract_players(pdf_file: Path) -> List[str]:
 def get_game_pdf(
     game_id: Annotated[int, typer.Argument(help="ID of game to gen pdf for")],
     open_file: Annotated[bool, typer.Option("--open", "-o")] = False,
-    config_section: Annotated[
-        str,
-        typer.Option(
-            "--config-section", "-c", help="Configuration section to use from INI file"
-        ),
-    ] = "default",
 ):
     """
     Genate the pdf for the game invitation
@@ -419,7 +391,7 @@ def get_game_pdf(
         output_filename = f"game_{game_id}.pdf"
     else:
         output_filename = tempfile.NamedTemporaryFile().name
-    game_pdf(game_id, Path(output_filename), config_section=config_section)
+    game_pdf(game_id, Path(output_filename))
     if open_file:
         os_open(output_filename)
     else:
@@ -431,18 +403,12 @@ def get_game_pdf(
 @app.command("practice")
 def get_practice_pdf(
     game_id: Annotated[int, typer.Argument(help="ID of practice to gen pdf for")],
-    config_section: Annotated[
-        str,
-        typer.Option(
-            "--config-section", "-c", help="Configuration section to use from INI file"
-        ),
-    ] = "default",
 ):
     """
     Genate the pdf for the practice invitation
     """
     output_filename = f"practice_{game_id}.pdf"
-    practice_pdf(game_id, Path(output_filename), config_section=config_section)
+    practice_pdf(game_id, Path(output_filename))
     os_open(output_filename)
 
 
@@ -456,12 +422,6 @@ def parse_schedule(
     schedule_file: Annotated[
         Path, typer.Option(help="schedule json file to parse")
     ] = Path("schedule.json"),
-    config_section: Annotated[
-        str,
-        typer.Option(
-            "--config-section", "-c", help="Configuration section to use from INI file"
-        ),
-    ] = "default",
 ):
     """
     Parse schedule.json to look for specific games or practices
@@ -511,12 +471,6 @@ def check_with_ai(
     schedule_file: Annotated[
         Path, typer.Option(help="schedule json file to parse")
     ] = Path("schedule.json"),
-    config_section: Annotated[
-        str,
-        typer.Option(
-            "--config-section", "-c", help="Configuration section to use from INI file"
-        ),
-    ] = "default",
 ):
     """
     Search through the schedule with natural language using Infomaniak LLM API
@@ -569,10 +523,10 @@ mobile_headers = {
 }
 
 
-def mobile_login(config_section: str = "default"):
+def mobile_login():
     import base64
 
-    username, password, _, token, club_id = get_login(config_section=config_section)
+    username, password, _, token, club_id = get_login()
     if token and club_id:
         return {"id": 0, "token": token, "id_club": club_id}
 
@@ -604,37 +558,23 @@ def refresh_data():
         "https://app.myice.hockey/api/mobilerest/refreshdata",
         headers=mobile_headers,
         data=f"token={userdata['token']}&id_club={userdata['id_club']}&language=FR",
-        # verify=False,
+        verify=False,
     ) as r:
         r.raise_for_status()
         return r.json()
 
 
 @app.command("mobile-login")
-def do_mobile_login(
+def do_mobile_login():
-    config_section: Annotated[
-        str,
-        typer.Option(
-            "--config-section", "-c", help="Configuration section to use from INI file"
-        ),
-    ] = "default",
-):
     global userdata
-    userdata = mobile_login(config_section=config_section)
+    userdata = mobile_login()
     print(json.dumps(userdata, indent=2))
 
 
 @app.command("mobile")
-def mobile(
+def mobile():
-    config_section: Annotated[
-        str,
-        typer.Option(
-            "--config-section", "-c", help="Configuration section to use from INI file"
-        ),
-    ] = "default",
-):
     global userdata
-    userdata = mobile_login(config_section=config_section)
+    userdata = mobile_login()
     games = [x for x in refresh_data().get("club_games")]
     print(json.dumps(games, indent=2))
 
@@ -643,15 +583,9 @@ def mobile(
 def mobile_game(
     game_id: Annotated[int, typer.Argument(help="game id")],
     raw: Annotated[bool, typer.Option(help="display raw output")] = False,
-    config_section: Annotated[
-        str,
-        typer.Option(
-            "--config-section", "-c", help="Configuration section to use from INI file"
-        ),
-    ] = "default",
 ):
     global userdata
-    userdata = mobile_login(config_section=config_section)
+    userdata = mobile_login()
 
     # data = refresh_data()
     with requests.post(
@@ -667,7 +601,7 @@ def mobile_game(
                 "language=FR",
             ]
         ),
-        # verify=False,
+        verify=False,
     ) as r:
         data = r.json()["eventData"]
         players = data["convocation"]["available"]

myice/webapi.py

@@ -74,86 +74,35 @@ async def favico():
 @app.get("/schedule")
 async def schedule(
     headers: Annotated[AuthHeaders, Header()],
-    account: str = "default",
 ):
     if not headers.authorized():
         raise HTTPException(401, detail="get out")
-    username, password, userid, existing_token, club_id = myice.get_login(
+    username, password, userid, existing_token = myice.get_login()
-        config_section=account
-    )
     if existing_token:
         myice.userdata = {
             "id": userid,
-            "id_club": club_id or 186,
+            "id_club": 186,
             "token": existing_token,
         }
     else:
-        myice.userdata = myice.mobile_login(config_section=account)
+        myice.userdata = myice.mobile_login()
     return myice.refresh_data()["club_games"]
 
 
-@app.get("/accounts")
-async def accounts(
-    headers: Annotated[AuthHeaders, Header()],
-):
-    if not headers.authorized():
-        raise HTTPException(401, detail="get out")
-
-    # Import configparser to read the available sections
-    import configparser
-    from pathlib import Path
-
-    config = configparser.ConfigParser()
-    config_files = [
-        Path("~/.config/myice.ini").expanduser(),
-        Path("myice.ini"),
-    ]
-
-    # Read all config files
-    for config_file in config_files:
-        if config_file.exists():
-            try:
-                config.read(config_file, encoding="utf-8")
-            except Exception:
-                # Try without specifying encoding
-                config.read(config_file)
-
-    # Get all sections (accounts) from the config
-    accounts = []
-    for section in config.sections():
-        if section != "DEFAULT":  # Skip DEFAULT section
-            # Capitalize first letter for display
-            label = (
-                section[0].upper() + section[1:]
-                if len(section) > 1
-                else section.upper()
-            )
-            accounts.append({"name": section, "label": label})
-
-    # If no accounts found, return default
-    if not accounts:
-        accounts = [{"name": "default", "label": "Default"}]
-
-    return accounts
-
-
 @app.get("/game/{game_id}")
 async def game(
     headers: Annotated[AuthHeaders, Header()],
     game_id: int,
-    account: str = "default",
 ):
-    username, password, userid, existing_token, club_id = myice.get_login(
+    username, password, userid, existing_token = myice.get_login()
-        config_section=account
-    )
     if existing_token:
         myice.userdata = {
             "id": userid,
-            "id_club": club_id or 186,
+            "id_club": 186,
             "token": existing_token,
         }
     else:
-        myice.userdata = myice.mobile_login(config_section=account)
+        myice.userdata = myice.mobile_login()
 
     # data = refresh_data()
     with requests.post(

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "myice"
-version = "v0.4.0"
+version = "v0.3.2"
 description = "myice parsing"
 authors = [
     { name = "Rene Luria", "email" = "<rene@luria.ch>"},