🟢 LICENSE.txt (New MIT license added)

🛠️ pyproject.toml -> Updated poetry dependencies, authors email changed, added license info

.mdlrc

@@ -1 +0,0 @@
-style "#{File.dirname(__FILE__)}/mdl.rb"

README.md

@@ -1,24 +1,5 @@
 # myice
 
-## intro
-
-Avec tout ça on va aller chercher sur MyIce les planning des gamins et générer
-les pdf qu'on veut
-
-## install
-
-with [uv](https://docs.astral.sh/uv/getting-started/installation/):
-
-```shell
-uv tool install --extra-index-url https://gitea.parano.ch/api/packages/herel/pypi/simple/ myice
-```
-
-with [pipx](https://pipx.pypa.io/stable/installation/):
-
-```shell
-pipx install --extra-index-url https://gitea.parano.ch/api/packages/herel/pypi/simple/ myice
-```
-
 ## récupérer le schedule
 
 ```shell

mdl.rb

@@ -1,2 +0,0 @@
-all
-rule 'MD013', :ignore_code_blocks => true

myice/myice.py

@@ -31,11 +31,6 @@ class AgeGroup(str, Enum):
     u15a = "U15 (A)"
 
 
-class EventType(str, Enum):
-    game = "game"
-    practice = "practice"
-
-
 def load_cookies(file: str = "cookies.txt") -> requests.cookies.RequestsCookieJar:
     cookie_jar_file = Path(file)
     cj_dict = {}
@@ -45,9 +40,8 @@ def load_cookies(file: str = "cookies.txt") -> requests.cookies.RequestsCookieJa
     return requests.cookies.cookiejar_from_dict(cj_dict)
 
 
-def save_cookies(file: str = "cookies.txt"):
-    cookie_jar_file = Path(file)
-    with cookie_jar_file.open("w") as f:
+def save_cookies():
+    with open("cookies.txt", "w") as f:
         f.write(json.dumps(requests.utils.dict_from_cookiejar(session.cookies)))
 
 
@@ -67,12 +61,10 @@ def get_login(local_file: str = "myice.ini") -> tuple[str, str, int]:
         password = default_config.get("password")
         userid = default_config.getint("userid")
         if not username or not password:
-            print(
-                "Error: please configure username/password in ini file", file=sys.stderr
-            )
+            print("Error: please configure username/password in ini file")
             sys.exit(1)
     else:
-        print("Error: please configure username/password in ini file", file=sys.stderr)
+        print("Error: please configure username/password in ini file")
         sys.exit(1)
     return username, password, userid
 
@@ -126,12 +118,12 @@ def wrapper_session(func):
         session.cookies = load_cookies()
         session.cookies.clear_expired_cookies()
         if not session.cookies.get("mih_v3_cookname"):
-            print("login...", file=sys.stderr)
+            print("login...")
             do_login()
             save_cookies()
         _, _, userid = get_login()
         if not userid:
-            print("get userid...", file=sys.stderr)
+            print("get userid...")
             userid = get_userid()
         return func(*args, **kwargs)
 
@@ -215,10 +207,11 @@ def schedule(
         with outfile.open("w") as f:
             f.write(schedule)
     else:
+        print("Schedule:", file=sys.stderr)
         print(schedule)
 
 
-def os_open(file: str) -> None:
+def open(file: str) -> None:
     if os.uname().sysname == "Linux":
         os.system(f"xdg-open {file}")
     else:
@@ -235,7 +228,7 @@ def get_game_pdf(
     """
     output_filename = f"game_{game_id}.pdf"
     game_pdf(game_id, Path(output_filename))
-    os_open(output_filename)
+    open(output_filename)
 
 
 @app.command("practice")
@@ -247,16 +240,12 @@ def get_practice_pdf(
     """
     output_filename = f"practice_{game_id}.pdf"
     practice_pdf(game_id, Path(output_filename))
-    os_open(output_filename)
+    open(output_filename)
 
 
 @app.command("search")
 def parse_schedule(
-    age_group: Annotated[AgeGroup | None, typer.Option(...)] = None,
-    event_type_filter: Annotated[
-        EventType | None,
-        typer.Option("--type", help="Only display events of this type"),
-    ] = None,
+    age_group: Annotated[AgeGroup, typer.Argument(...)],
     schedule_file: Annotated[
         Path, typer.Option(help="schedule json file to parse")
     ] = Path("schedule.json"),
@@ -266,22 +255,9 @@ def parse_schedule(
     """
     with schedule_file.open("r") as f:
         data = json.load(f)
-    # age_group filter
-    if age_group:
-        events = [x for x in data if x["agegroup"] == age_group]
-    else:
-        events = [x for x in data if x["agegroup"] in AgeGroup]
-    # event_type filter
-    if event_type_filter:
-        if event_type_filter.value == EventType.game:
-            events = [x for x in events if "event" in x and x["event"] == "Jeu"]
-        else:
-            events = [x for x in events if "event" not in x or x["event"] == "Jeu"]
-    for event in events:
-        if age_group:
+    for event in [x for x in data if x["agegroup"] == age_group]:
+        # print(json.dumps(event, indent=2))
         raw_title = event["title"].removeprefix(age_group + "\n")
-        else:
-            raw_title = event["title"]
         title = " ".join(raw_title.split("\n"))
         start = datetime.datetime.fromisoformat(event["start"])
         start_fmt = start.strftime("%H:%M")

poetry.lock

@@ -1025,4 +1025,4 @@ files = [
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.12"
-content-hash = "32eb77391a5bfd29bed30f4a384ccd08ca307923ac47c48eaad6bfee18798081"
+content-hash = "e11a9960c50f8b210bd0942533a30915eb56bed47cf5f67ac33f405cb1ef5859"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "myice"
-version = "v0.1.6"
+version = "0.1.0"
 description = "myice parsing"
 authors = ["Rene Luria <rene@luria.ch>"]
 license = "MIT"
@@ -9,7 +9,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.12"
 requests = "^2.32.3"
-typer = "^0.12.5"
+typer = {extras = ["all"], version = "^0.12.5"}
 
 
 [tool.poetry.group.dev.dependencies]