[script.punchplay] 1.0.0

Author: PunchPlay

script.punchplay/api.py

@@ -153,6 +153,16 @@ def _do_refresh(self) -> bool:
     # Scrobble POST (with offline queue fallback)
     # ------------------------------------------------------------------
 
+    def _should_drop_client_error(self, status_code: int) -> bool:
+        """
+        Return True when a client error is permanent and retrying will not help.
+
+        401 is handled specially: if a queued replay still gets a 401 after the
+        built-in refresh attempt, keep the event so it can be retried after the
+        user logs in again.
+        """
+        return 400 <= status_code < 500 and status_code != 401
+
     def post(self, path: str, payload: dict[str, Any]) -> dict[str, Any] | None:
         """
         POST *payload* to *path*.  On network error, writes the event to the
@@ -177,6 +187,13 @@ def post(self, path: str, payload: dict[str, Any]) -> dict[str, Any] | None:
                 )
                 if self._cache is not None:
                     self._cache.enqueue_scrobble(path, payload)
+            elif not self._should_drop_client_error(exc.code):
+                xbmc.log(
+                    f"[PunchPlay] HTTP {exc.code} on {path} — preserving for retry",
+                    xbmc.LOGWARNING,
+                )
+                if self._cache is not None:
+                    self._cache.enqueue_scrobble(path, payload)
             else:
                 # Permanent client error (4xx) — drop, retrying won't help.
                 xbmc.log(
@@ -211,13 +228,19 @@ def flush_queue(self) -> None:
                 xbmc.log("[PunchPlay] Still offline — stopping queue flush", xbmc.LOGDEBUG)
                 break  # remain offline; try again later
             except urllib.error.HTTPError as exc:
+                if self._should_drop_client_error(exc.code):
+                    xbmc.log(
+                        f"[PunchPlay] HTTP {exc.code} replaying id={scrobble_id} — dropping",
+                        xbmc.LOGWARNING,
+                    )
+                    self._cache.delete_pending_scrobble(scrobble_id)
+                    continue
+
                 xbmc.log(
-                    f"[PunchPlay] HTTP {exc.code} replaying id={scrobble_id} — dropping",
+                    f"[PunchPlay] HTTP {exc.code} replaying id={scrobble_id} — keeping queued",
                     xbmc.LOGWARNING,
                 )
-                # Drop unrecoverable server errors (4xx) so they don't block the queue.
-                if 400 <= exc.code < 500:
-                    self._cache.delete_pending_scrobble(scrobble_id)
+                break
 
     # ------------------------------------------------------------------
     # Device-code login
@@ -228,6 +251,8 @@ def device_code_login(self) -> bool:
         Run the full device-code OAuth flow with Kodi dialogs.
         Returns True on success, False on failure/cancellation.
         """
+        addon = xbmcaddon.Addon(_ADDON_ID)
+        _s = addon.getLocalizedString
         dialog = xbmcgui.Dialog()
 
         # Step 1 — request a device code.
@@ -236,7 +261,7 @@ def device_code_login(self) -> bool:
                 "POST", "/api/auth/device/code", {}, retry_on_401=False
             )
         except Exception as exc:
-            dialog.ok("PunchPlay — Login", f"Could not reach the server:\n{exc}")
+            dialog.ok(_s(32000), f"{_s(32001)}\n{exc}")
             return False
 
         user_code = resp.get("user_code", "")
@@ -245,27 +270,26 @@ def device_code_login(self) -> bool:
         expires_in: int = int(resp.get("expires_in", 600))
 
         if not user_code or not device_code:
-            dialog.ok("PunchPlay — Login", "Invalid response from server. Try again.")
+            dialog.ok(_s(32000), _s(32002))
             return False
 
         # Step 2 — show the code to the user.
         dialog.ok(
-            "PunchPlay — Login",
+            _s(32000),
             (
-                f"Open your browser and visit:\n"
+                f"{_s(32003)}\n"
                 f"[B]{verification_uri}[/B]\n\n"
-                f"Enter this code:\n"
+                f"{_s(32004)}\n"
                 f"[B]{user_code}[/B]\n\n"
-                f"The code expires in [B]{expires_in // 60}[/B] minutes.\n"
-                f"Press OK — then this dialog will wait for approval."
+                + _s(32005).format(expires_in // 60)
             ),
         )
 
         # Step 3 — poll for the token with a cancellable progress dialog.
         monitor = xbmc.Monitor()
         deadline = time.monotonic() + expires_in
         progress = xbmcgui.DialogProgress()
-        progress.create("PunchPlay — Waiting for Login", "Waiting for approval…")
+        progress.create(_s(32006), _s(32007))
 
         try:
             while time.monotonic() < deadline and not monitor.abortRequested():
@@ -275,7 +299,7 @@ def device_code_login(self) -> bool:
 
                 remaining = max(0, int(deadline - time.monotonic()))
                 pct = int(100 * (1 - remaining / expires_in))
-                progress.update(pct, f"Waiting for approval… ({remaining}s remaining)")
+                progress.update(pct, _s(32008).format(remaining))
 
                 try:
                     token_resp = self._request(
@@ -293,17 +317,14 @@ def device_code_login(self) -> bool:
                         self._save_tokens(token_resp)
                         xbmc.log("[PunchPlay] Device-code login succeeded", xbmc.LOGINFO)
                         xbmcgui.Dialog().notification(
-                            "PunchPlay",
-                            "Login successful!",
-                            xbmcgui.NOTIFICATION_INFO,
-                            4000,
+                            "PunchPlay", _s(32011), xbmcgui.NOTIFICATION_INFO, 4000
                         )
                         return True
 
                     error = token_resp.get("error", "")
                     if error in ("expired", "access_denied"):
                         progress.close()
-                        dialog.ok("PunchPlay — Login", f"Login failed ({error}). Please try again.")
+                        dialog.ok(_s(32000), _s(32009).format(error))
                         return False
                     # 'authorization_pending' or 'slow_down' → keep polling.
 
@@ -319,7 +340,7 @@ def device_code_login(self) -> bool:
             except Exception:
                 pass
 
-        dialog.ok("PunchPlay — Login", "Login timed out. Please try again.")
+        dialog.ok(_s(32000), _s(32010))
         return False
 
     # ------------------------------------------------------------------
@@ -333,7 +354,8 @@ def logout(self) -> None:
         self._tokens = {}
         xbmc.log("[PunchPlay] Tokens cleared (logged out)", xbmc.LOGINFO)
         xbmcgui.Dialog().notification(
-            "PunchPlay", "Logged out.", xbmcgui.NOTIFICATION_INFO, 3000
+            "PunchPlay", xbmcaddon.Addon(_ADDON_ID).getLocalizedString(32012),
+            xbmcgui.NOTIFICATION_INFO, 3000
         )
 
     # ------------------------------------------------------------------

script.punchplay/fanart.jpg

@@ -317,14 +317,18 @@ def _emit_stop(self, settings: dict[str, Any]) -> None:
             )
             self._api.post("/api/scrobble/stop", payload)
             if watched:
-                title = self._metadata.get("title", "Unknown")
+                _s = xbmcaddon.Addon(_ADDON_ID).getLocalizedString
+                title = self._metadata.get("title", "")
                 media_type = self._metadata.get("media_type", "movie")
                 if media_type == "episode":
                     season = self._metadata.get("season")
                     episode = self._metadata.get("episode")
-                    msg = f"✓ {title} S{season:02d}E{episode:02d} scrobbled"
+                    if isinstance(season, int) and isinstance(episode, int):
+                        msg = _s(32014).format(title, f"{season:02d}", f"{episode:02d}")
+                    else:
+                        msg = _s(32013).format(title)
                 else:
-                    msg = f"✓ {title} scrobbled"
+                    msg = _s(32013).format(title)
                 self._notify(msg, settings)
         except Exception as exc:
             xbmc.log(f"[PunchPlay] Stop emit error: {exc}", xbmc.LOGDEBUG)

script.punchplay/player.py

@@ -0,0 +1,67 @@
+# PunchPlay Scrobble
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32000"
+msgid "PunchPlay — Login"
+msgstr ""
+
+msgctxt "#32001"
+msgid "Could not reach the server:"
+msgstr ""
+
+msgctxt "#32002"
+msgid "Invalid response from server. Try again."
+msgstr ""
+
+msgctxt "#32003"
+msgid "Open your browser and visit:"
+msgstr ""
+
+msgctxt "#32004"
+msgid "Enter this code:"
+msgstr ""
+
+msgctxt "#32005"
+msgid "The code expires in {0} minutes. Press OK — then this dialog will wait for approval."
+msgstr ""
+
+msgctxt "#32006"
+msgid "PunchPlay — Waiting for Login"
+msgstr ""
+
+msgctxt "#32007"
+msgid "Waiting for approval…"
+msgstr ""
+
+msgctxt "#32008"
+msgid "Waiting for approval… ({0}s remaining)"
+msgstr ""
+
+msgctxt "#32009"
+msgid "Login failed ({0}). Please try again."
+msgstr ""
+
+msgctxt "#32010"
+msgid "Login timed out. Please try again."
+msgstr ""
+
+msgctxt "#32011"
+msgid "Login successful!"
+msgstr ""
+
+msgctxt "#32012"
+msgid "Logged out."
+msgstr ""
+
+msgctxt "#32013"
+msgid "{0} scrobbled"
+msgstr ""
+
+msgctxt "#32014"
+msgid "{0} S{1}E{2} scrobbled"
+msgstr ""

script.punchplay/resources/language/resource.language.en_gb/strings.po

@@ -81,7 +81,8 @@ def run(self) -> None:
                     self._api.flush_queue()
                 except Exception as exc:
                     xbmc.log(f"[PunchPlay] Queue flush error: {exc}", xbmc.LOGDEBUG)
-                self._last_flush = now
+                else:
+                    self._last_flush = now
 
             # Prune stale identifier cache entries once a day.
             if now - self._last_prune >= _PRUNE_INTERVAL: