polyhattrick 0.2.0__tar.gz → 0.2.1__tar.gz

{polyhattrick-0.2.0 → polyhattrick-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyhattrick
-Version: 0.2.0
+Version: 0.2.1
 Summary: Live Hattrick scores in your terminal and polybar
 License-Expression: MIT
 License-File: LICENSE
@@ -159,17 +159,10 @@ Optional, in `~/.config/polyhattrick/configuration.toml`:
 
 ```toml
 server = "https://api.polyhattrick.sesamemonster.de"   # the polyhattrick server to use
-tips = false                      # never show the support reminder
 ```
 
 `POLYHATTRICK_SERVER` overrides `server` for a single run.
 
-## Support
-
-polyhattrick is free. `polyhattrick support` tells you how to support it.
-Now and then, after a command, one line reminds you of that; it never shows
-in scripts, and `tips = false` turns it off.
-
 ## Notes
 
 - Made for Linux.

{polyhattrick-0.2.0 → polyhattrick-0.2.1}/README.md

@@ -88,17 +88,10 @@ Optional, in `~/.config/polyhattrick/configuration.toml`:
 
 ```toml
 server = "https://api.polyhattrick.sesamemonster.de"   # the polyhattrick server to use
-tips = false                      # never show the support reminder
 ```
 
 `POLYHATTRICK_SERVER` overrides `server` for a single run.
 
-## Support
-
-polyhattrick is free. `polyhattrick support` tells you how to support it.
-Now and then, after a command, one line reminds you of that; it never shows
-in scripts, and `tips = false` turns it off.
-
 ## Notes
 
 - Made for Linux.

{polyhattrick-0.2.0 → polyhattrick-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "polyhattrick"
-version = "0.2.0"
+version = "0.2.1"
 description = "Live Hattrick scores in your terminal and polybar"
 authors = [
     {name = "Peter Toth",email = "work@petertoth.de"}

polyhattrick-0.2.1/src/polyhattrick/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.1"

{polyhattrick-0.2.0 → polyhattrick-0.2.1}/src/polyhattrick/api/client.py

@@ -60,8 +60,8 @@ class Client:
 
     # Data
 
-    def about(self):
-        return self._request("GET", "/v1/about", authenticated=False)
+    def about(self, timeout=TIMEOUT_SECONDS):
+        return self._request("GET", "/v1/about", authenticated=False, timeout=timeout)
 
     def my_teams(self):
         return self._request("GET", "/v1/me/teams")
@@ -102,13 +102,13 @@ class Client:
             headers["Authorization"] = f"Bearer {self.secret}"
         return headers
 
-    def _send(self, method, path, headers, **arguments):
+    def _send(self, method, path, headers, timeout=TIMEOUT_SECONDS, **arguments):
         try:
             return requests.request(
                 method,
                 f"{self.server}{path}",
                 headers=headers,
-                timeout=TIMEOUT_SECONDS,
+                timeout=timeout,
                 **arguments,
             )
         except requests.RequestException as error:

{polyhattrick-0.2.0 → polyhattrick-0.2.1}/src/polyhattrick/interactive/application.py

@@ -80,6 +80,7 @@ class PolyhattrickApplication(App):
         Binding("r", "refresh", "Refresh"),
         Binding("t", "switch_team", "Next team"),
         Binding("q", "quit", "Quit"),
+        Binding("escape", "focus_sections", "Sections", show=False),
     ]
 
     def __init__(self, client=None):
@@ -131,11 +132,21 @@ class PolyhattrickApplication(App):
         view.display = True
         view.update(f"[red]{error.message}[/red]")
 
-    @on(OptionList.OptionSelected, "#sections")
     @on(OptionList.OptionHighlighted, "#sections")
-    def _section_chosen(self, event):
+    def _section_highlighted(self, event):
+        if event.option.id != self.section:
+            self.show_section(event.option.id)
+
+    @on(OptionList.OptionSelected, "#sections")
+    def _section_entered(self, event):
+        """Enter moves the cursor into the section, so arrows and Enter act there."""
         if event.option.id != self.section:
             self.show_section(event.option.id)
+        target = "#squad" if event.option.id == "squad" else "#content"
+        self.query_one(target).focus()
+
+    def action_focus_sections(self):
+        self.query_one("#sections", OptionList).focus()
 
     def show_section(self, section):
         self.section = section

{polyhattrick-0.2.0 → polyhattrick-0.2.1}/src/polyhattrick/polyhattrick.py

@@ -21,7 +21,6 @@ application.command("support")(support.support)
 def _version(value: bool):
     if value:
         print(f"polyhattrick {__version__}")
-        print("Support the project: polyhattrick support")
         raise typer.Exit()
 
 

polyhattrick-0.2.1/src/polyhattrick/tips.py

@@ -0,0 +1,65 @@
+"""The occasional line asking for support.
+
+Never in the first `INTERVAL_DAYS` after the first use, then at most once
+every `INTERVAL_DAYS`, after a command succeeded, and only to a person:
+never with `--json`, never when stderr is not a terminal (pipes, scripts,
+polybar). `tips = false` in the configuration file turns it off for good.
+
+It only appears when the server announces a funding link: a reminder with
+nowhere to send support is just noise. The server is asked only when a
+reminder is due, and at most once a day while it has no link.
+"""
+
+import sys
+from datetime import date, timedelta
+
+from polyhattrick import output, settings
+from polyhattrick.api.client import ApiError, Client
+
+INTERVAL_DAYS = 14
+ABOUT_TIMEOUT_SECONDS = 3
+LINE = (
+    "Enjoying polyhattrick? See `polyhattrick support` for how to help keep it running."
+)
+
+
+def _day(state, key):
+    value = state.get(key)
+    return date.fromisoformat(value) if value else None
+
+
+def due(state, today):
+    """Whether `INTERVAL_DAYS` have passed since the first use and the last reminder."""
+    starts = [
+        day for day in (_day(state, "first_used"), _day(state, "tip_shown")) if day
+    ]
+    return bool(starts) and max(starts) + timedelta(days=INTERVAL_DAYS) <= today
+
+
+def _funding_url():
+    try:
+        return Client().about(timeout=ABOUT_TIMEOUT_SECONDS).get("funding_url")
+    except ApiError:
+        return None
+
+
+def maybe_show(as_json, today=None):
+    if as_json or not sys.stderr.isatty() or not settings.configuration().tips:
+        return
+
+    today = today or date.today()
+    state = settings.read_state()
+    if "first_used" not in state:
+        state["first_used"] = today.isoformat()
+        settings.write_state(state)
+        return
+
+    if not due(state, today) or _day(state, "funding_checked") == today:
+        return
+
+    if _funding_url():
+        output.error_output.print(f"\n[dim]{LINE}[/dim]", highlight=False)
+        state["tip_shown"] = today.isoformat()
+    else:
+        state["funding_checked"] = today.isoformat()
+    settings.write_state(state)

{polyhattrick-0.2.0 → polyhattrick-0.2.1}/src/polyhattrick/views.py

@@ -309,6 +309,41 @@ def club(club):
     )
 
 
+# Short labels for the server's match types; `--json` keeps the server's values.
+MATCH_TYPE_LABELS = {
+    "league": "League",
+    "qualification": "Qualification",
+    "cup": "Cup",
+    "friendly": "Friendly",
+    "friendly_cup_rules": "Friendly (cup)",
+    "international_friendly": "Friendly (int)",
+    "international_friendly_cup_rules": "Friendly (int) (cup)",
+    "hattrick_masters": "Masters",
+    "national_teams_competition": "National team",
+    "national_teams_competition_cup_rules": "National team (cup)",
+    "national_teams_friendly": "National team friendly",
+    "tournament_league": "Tournament",
+    "tournament_playoff": "Tournament (playoff)",
+    "duel": "Duel",
+    "ladder": "Ladder",
+    "preparation": "Preparation",
+    "youth_league": "Youth league",
+    "youth_friendly": "Youth friendly",
+    "youth_friendly_cup_rules": "Youth friendly (cup)",
+    "youth_international_friendly": "Youth friendly (int)",
+    "youth_international_friendly_cup_rules": "Youth friendly (int) (cup)",
+}
+
+
+def match_type(value):
+    """`international_friendly` → `Friendly (int)`; `unknown_63` → `Other (63)`."""
+    if value is None:
+        return "-"
+    if value.startswith("unknown_"):
+        return f"Other ({value.removeprefix('unknown_')})"
+    return MATCH_TYPE_LABELS.get(value, words(value))
+
+
 def matches(matches):
     table = Table(title="Matches")
     table.add_column("Date")
@@ -324,7 +359,7 @@ def matches(matches):
         )
         table.add_row(
             date(match["date"]),
-            words(match["match_type"]),
+            match_type(match["match_type"]),
             match["home_team"] and match["home_team"]["name"],
             score,
             match["away_team"] and match["away_team"]["name"],

polyhattrick-0.2.0/src/polyhattrick/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.0"

polyhattrick-0.2.0/src/polyhattrick/tips.py

@@ -1,37 +0,0 @@
-"""The occasional line asking for support.
-
-Shown at most once every `INTERVAL_DAYS`, after a command succeeded, and
-only to a person: never with `--json`, never when stderr is not a terminal
-(pipes, scripts, polybar). `tips = false` in the configuration file turns
-it off for good.
-"""
-
-import sys
-from datetime import date, timedelta
-
-from polyhattrick import output, settings
-
-INTERVAL_DAYS = 30
-LINE = (
-    "Enjoying polyhattrick? See `polyhattrick support` for how to help keep it running."
-)
-
-
-def due(today=None):
-    today = today or date.today()
-    last = settings.read_state().get("tip_shown")
-    return (
-        last is None
-        or date.fromisoformat(last) + timedelta(days=INTERVAL_DAYS) <= today
-    )
-
-
-def maybe_show(as_json, today=None):
-    if as_json or not sys.stderr.isatty() or not settings.configuration().tips:
-        return
-    if not due(today):
-        return
-    output.error_output.print(f"\n[dim]{LINE}[/dim]", highlight=False)
-    state = settings.read_state()
-    state["tip_shown"] = (today or date.today()).isoformat()
-    settings.write_state(state)