plex-tui 0.3.35__tar.gz → 0.3.37__tar.gz

{plex_tui-0.3.35 → plex_tui-0.3.37}/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 0.3.37 - 2026-06-15
+
+- Fell back to direct Plex root checks during browser login when PlexAPI's
+  resource connection probe rejects URLs that are reachable from the machine.
+
 ## 0.3.35 - 2026-06-15
 
 - Documented Homebrew 6 tap trust requirements for installing from the

{plex_tui-0.3.35 → plex_tui-0.3.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plex-tui
-Version: 0.3.35
+Version: 0.3.37
 Summary: A small standalone Plex terminal UI.
 Project-URL: Homepage, https://github.com/so1omon563/plex-tui
 Project-URL: Issues, https://github.com/so1omon563/plex-tui/issues
@@ -26,6 +26,7 @@ Requires-Python: >=3.11
 Requires-Dist: pillow>=10.0
 Requires-Dist: platformdirs>=4.2
 Requires-Dist: plexapi>=4.15
+Requires-Dist: requests>=2.0
 Requires-Dist: textual>=0.86
 Provides-Extra: dev
 Requires-Dist: build>=1.2; extra == 'dev'

{plex_tui-0.3.35 → plex_tui-0.3.37}/packaging/aur/.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = plex-tui
 	pkgdesc = Standalone Plex terminal UI with mpv playback
-	pkgver = 0.3.31
+	pkgver = 0.3.35
 	pkgrel = 1
 	url = https://github.com/so1omon563/plex-tui
 	arch = any
@@ -16,7 +16,7 @@ pkgbase = plex-tui
 	depends = python-plexapi
 	depends = python-rich
 	depends = python-textual
-	source = plex-tui-0.3.31.tar.gz::https://github.com/so1omon563/plex-tui/archive/refs/tags/v0.3.31.tar.gz
-	sha256sums = 89cf8080c48c7d57a0bf9f4e6b273e9842fef7ecfdf783bf3add6c2425a30569
+	source = plex-tui-0.3.35.tar.gz::https://github.com/so1omon563/plex-tui/archive/refs/tags/v0.3.35.tar.gz
+	sha256sums = 9ef3e6be46a7fe3176c9d69dc491a006054afe82c79618d9ee2117a088a067fc
 
 pkgname = plex-tui

{plex_tui-0.3.35 → plex_tui-0.3.37}/packaging/aur/PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: so1omon
 pkgname=plex-tui
-pkgver=0.3.31
+pkgver=0.3.35
 pkgrel=1
 pkgdesc="Standalone Plex terminal UI with mpv playback"
 arch=("any")
@@ -22,7 +22,7 @@ makedepends=(
   "python-wheel"
 )
 source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz")
-sha256sums=("89cf8080c48c7d57a0bf9f4e6b273e9842fef7ecfdf783bf3add6c2425a30569")
+sha256sums=("9ef3e6be46a7fe3176c9d69dc491a006054afe82c79618d9ee2117a088a067fc")
 
 build() {
   cd "$pkgname-$pkgver"

{plex_tui-0.3.35 → plex_tui-0.3.37}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "plex-tui"
-version = "0.3.35"
+version = "0.3.37"
 description = "A small standalone Plex terminal UI."
 readme = "README.md"
 license = "MIT"
@@ -32,6 +32,7 @@ dependencies = [
   "Pillow>=10.0",
   "plexapi>=4.15",
   "platformdirs>=4.2",
+  "requests>=2.0",
   "textual>=0.86",
 ]
 

{plex_tui-0.3.35 → plex_tui-0.3.37}/src/plextui/__init__.py

@@ -1,3 +1,3 @@
 """Plex TUI prototype."""
 
-__version__ = "0.3.35"
+__version__ = "0.3.37"

{plex_tui-0.3.35 → plex_tui-0.3.37}/src/plextui/auth.py

@@ -5,6 +5,7 @@ import webbrowser
 from dataclasses import dataclass
 from urllib.parse import SplitResult, urlparse
 
+import requests
 from plexapi.myplex import MyPlexAccount, MyPlexPinLogin, MyPlexResource
 
 from . import __version__
@@ -168,30 +169,57 @@ def reachable_server_choices(resources: list[MyPlexResource], timeout: int = 5)
     choices = []
     seen: set[tuple[str, str]] = set()
     for resource in resources:
-        try:
-            server = resource.connect(timeout=timeout)
-        except Exception:
-            continue
-
-        uri = str(getattr(server, "_baseurl", "") or getattr(server, "baseurl", "") or "").rstrip("/")
-        if not uri:
-            continue
-        key = (resource.name, uri)
-        if key in seen:
-            continue
-        seen.add(key)
-        choices.append(
-            ServerChoice(
-                name=resource.name,
-                uri=uri,
-                source=resource.sourceTitle or "owned",
-                resource=resource,
-                verified=True,
+        for uri in reachable_resource_urls(resource, timeout):
+            key = (resource.name, uri)
+            if key in seen:
+                continue
+            seen.add(key)
+            choices.append(
+                ServerChoice(
+                    name=resource.name,
+                    uri=uri,
+                    source=resource.sourceTitle or "owned",
+                    resource=resource,
+                    verified=True,
+                )
             )
-        )
     return choices
 
 
+def reachable_resource_urls(resource: MyPlexResource, timeout: int) -> list[str]:
+    try:
+        server = resource.connect(timeout=timeout)
+    except Exception:
+        return reachable_advertised_urls(resource, timeout)
+
+    uri = str(getattr(server, "_baseurl", "") or getattr(server, "baseurl", "") or "").rstrip("/")
+    return [uri] if uri else reachable_advertised_urls(resource, timeout)
+
+
+def reachable_advertised_urls(resource: MyPlexResource, timeout: int) -> list[str]:
+    reachable = []
+    for uri in resource.preferred_connections():
+        normalized = uri.rstrip("/")
+        if normalized and plex_root_responds(normalized, resource.accessToken, timeout):
+            reachable.append(normalized)
+    return reachable
+
+
+def plex_root_responds(uri: str, token: str, timeout: int) -> bool:
+    try:
+        response = requests.get(
+            uri,
+            headers={"X-Plex-Token": token},
+            params={"X-Plex-Token": token},
+            timeout=timeout,
+        )
+    except requests.RequestException:
+        return False
+    if response.status_code not in {200, 201, 204}:
+        return False
+    return "MediaContainer" in response.text or response.headers.get("X-Plex-Protocol") == "1.0"
+
+
 def plex_headers(config: AppConfig) -> dict[str, str]:
     return {
         "X-Plex-Product": APP_NAME,

{plex_tui-0.3.35 → plex_tui-0.3.37}/tests/test_auth.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from plextui import __version__
-from plextui.auth import LoginSession, reachable_server_choices, plex_headers
+from plextui.auth import LoginSession, reachable_advertised_urls, reachable_server_choices, plex_headers
 from plextui.config import AppConfig
 
 
@@ -134,6 +134,33 @@ def test_login_wait_fails_when_no_resource_connections_are_reachable(monkeypatch
         raise AssertionError("expected unreachable login resources to fail")
 
 
+def test_login_wait_falls_back_to_reachable_advertised_urls(monkeypatch):
+    resource = FakeResource(
+        "My Plex",
+        "server-token",
+        [
+            "http://192.168.0.13:32400",
+            "http://24.255.40.151:17734",
+        ],
+    )
+    resources = [resource]
+    responses = {
+        "http://192.168.0.13:32400": FakeResponse(200, "<MediaContainer friendlyName='Plex' />"),
+        "http://24.255.40.151:17734": FakeResponse(404, "not found"),
+    }
+
+    monkeypatch.setattr("plextui.auth.MyPlexAccount", lambda token: FakeAccount(resources))
+    monkeypatch.setattr("plextui.auth.requests.get", lambda uri, **kwargs: responses[uri])
+    session = object.__new__(LoginSession)
+    session.config = AppConfig("", "", "client-id")
+    session.pin_login = FakePinLogin("account-token")
+
+    _account_token, choices = session.wait()
+
+    assert [choice.uri for choice in choices] == ["http://192.168.0.13:32400"]
+    assert choices[0].verified
+
+
 def test_reachable_server_choices_deduplicates_connected_urls():
     resources = [
         FakeResource("My Plex", "server-token", [], reachable_uri="http://plex.example:32400"),
@@ -143,3 +170,32 @@ def test_reachable_server_choices_deduplicates_connected_urls():
     choices = reachable_server_choices(resources, timeout=1)
 
     assert [choice.uri for choice in choices] == ["http://plex.example:32400"]
+
+
+def test_reachable_advertised_urls_accepts_plex_protocol_header(monkeypatch):
+    resource = FakeResource("My Plex", "server-token", ["http://plex.example:32400"])
+    seen = {}
+
+    def fake_get(uri, **kwargs):
+        seen["uri"] = uri
+        seen["headers"] = kwargs["headers"]
+        seen["params"] = kwargs["params"]
+        seen["timeout"] = kwargs["timeout"]
+        return FakeResponse(200, "", {"X-Plex-Protocol": "1.0"})
+
+    monkeypatch.setattr("plextui.auth.requests.get", fake_get)
+
+    assert reachable_advertised_urls(resource, timeout=2) == ["http://plex.example:32400"]
+    assert seen == {
+        "uri": "http://plex.example:32400",
+        "headers": {"X-Plex-Token": "server-token"},
+        "params": {"X-Plex-Token": "server-token"},
+        "timeout": 2,
+    }
+
+
+class FakeResponse:
+    def __init__(self, status_code: int, text: str, headers: dict[str, str] | None = None) -> None:
+        self.status_code = status_code
+        self.text = text
+        self.headers = headers or {}