emby-cli 0.2.2__tar.gz → 0.3.0__tar.gz

{emby_cli-0.2.2 → emby_cli-0.3.0}/.env.example

@@ -9,6 +9,7 @@ EMBY_PASSWORD=
 # Optional defaults
 # EMBY_OUTPUT=./downloads
 # EMBY_ITEM_ID=
-# EMBY_LIBRARY=
 # EMBY_METHOD=download
 # EMBY_PLAYER=vlc
+# EMBY_CACHE_DIR=
+# EMBY_NO_AUTH_CACHE=

{emby_cli-0.2.2 → emby_cli-0.3.0}/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 ## Unreleased
 
+## 0.3.0
+
+Breaking:
+
+- Removed `batch`, `sync`, and `list` subcommands (`search --library --all` lists all libraries).
+- `download` uses modes: `--media-item`, `--library`, or `--from-file` / `-F`, plus selectors `--id` or `--search`.
+- `play` uses `--id` or `--search` (no positional query; `--item-id` removed).
+- `search` uses `--media-item` / `--library` plus exactly one of `--id`, `--search`, or `--all`.
+- `search --count` / `-n` defaults to 30 for both `--media-item` and `--library`.
+- `search --media-item --all` probes `TotalRecordCount` and refuses if more than `--count` items (asks to use `--search`).
+- `--dry-run` / `-n` works for all `download` modes.
+- `--pick-best-item` for item title resolution (`download --media-item --search`, `--from-file`, `play --search`); not with `--library`.
+- `help`: list available commands with a short summary (no server required).
+
+Added:
+
+- Credential store: single kubeconfig-style `auth.json` (`contexts` + `current_context`); legacy `*.cache` migrated on first use.
+- `login` / `logout` (logout calls `POST /Sessions/Logout` when possible and always clears the local context).
+- `emby-cli config`: `current-server`, `get-servers`, `use-server`, `view` (tokens redacted).
+- Without `--server` / `EMBY_SERVER`, operational commands use the active context server.
+- Selectors for `search` / `download` / `play` validated before authenticating.
+- `info`: Connection / Server / Content sections; libraries shown as count only.
+- Silent username auth (no `Authenticating…` / `OK`); transparent re-login on HTTP 401 when password is known.
+
 ## 0.2.2
 
 - `version`: show emby-cli version; with valid server credentials also show Emby `/System/Info` version.

{emby_cli-0.2.2 → emby_cli-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emby-cli
-Version: 0.2.2
+Version: 0.3.0
 Summary: CLI to list, search, play, and download/backup original media from an Emby server via its REST API.
 Project-URL: Homepage, https://github.com/soukron/emby-cli
 Project-URL: Repository, https://github.com/soukron/emby-cli
@@ -37,7 +37,7 @@ Description-Content-Type: text/markdown
 [PyPI](https://pypi.org/project/emby-cli/)
 [License: CC BY-NC 4.0](https://creativecommons.org/licenses/by-nc/4.0/)
 
-CLI to **list, search, play, and download/backup** original media files from an [Emby](https://emby.media/) server via its REST API. Only HTTP access is required (default port 8096) — no SSH or rsync.
+CLI to **search, play, and download/backup** original media files from an [Emby](https://emby.media/) server via its REST API. Only HTTP access is required (default port 8096) — no SSH or rsync.
 
 ## Install
 
@@ -58,34 +58,55 @@ Set environment variables (or pass CLI flags):
 
 | Variable | Description |
 |----------|-------------|
-| `EMBY_SERVER` | Server URL (required) |
+| `EMBY_SERVER` | Server URL (required for most commands) |
 | `EMBY_API_KEY` | API key (or use username/password) |
 | `EMBY_USERNAME` / `EMBY_PASSWORD` | Name/password auth |
 | `EMBY_OUTPUT` | Download directory (default `./downloads`) |
 | `EMBY_METHOD` | `download`, `stream`, or `hls` |
 | `EMBY_PLAYER` | External player for `play` |
+| `EMBY_ITEM_ID` | Default for `--id` (item mode / play) |
+| `EMBY_CACHE_DIR` | Credentials directory (default `~/.cache/emby-cli`; file `auth.json`) |
+| `EMBY_NO_AUTH_CACHE` | Set to `1` to disable reading/writing the AccessToken cache |
 
 See `.env.example`. The app does not load `.env` itself — `source` it or export vars.
 
+With username/password, sessions are stored in a single kubeconfig-style `auth.json` (`contexts` + `current_context`). `emby-cli login` saves a server entry and makes it active. Without `--server`, commands use the active server. Manage entries with `emby-cli config` (`current-server`, `get-servers`, `use-server`, `view`). API keys are not stored.
+
 ## Usage
 
 ```bash
+emby-cli help
+emby-cli login
+emby-cli logout
+emby-cli config get-servers
+emby-cli config use-server 'user@http://emby:8096'
+emby-cli config current-server
+emby-cli config view
 emby-cli version
 emby-cli info
-emby-cli list
-emby-cli search "Title"
-emby-cli search "Title" --count 50
-emby-cli download -i <itemId> -o ./downloads
-emby-cli sync -l "Movies"
-emby-cli batch -F titles.txt -n
-emby-cli batch -F titles.txt --pick-best-item
-emby-cli play "Movie (2010)"
-emby-cli play "Show S01E01" --pick-best-item
+emby-cli search --media-item --search "Title"
+emby-cli search --media-item --search "Title" --count 50
+emby-cli search --media-item --id 123456
+emby-cli search --media-item --all
+emby-cli search --library --all
+emby-cli search --library --id 614156
+emby-cli search --library --search "PELICULAS"
+
+emby-cli download --media-item --id 123456
+emby-cli download --media-item --search "californication S01E01" --pick-best-item
+emby-cli download --library --id 12345
+emby-cli download --library --search "PELICULAS 4K"
+emby-cli download --from-file titles.txt --dry-run
+
+emby-cli play --id 123456
+emby-cli play --search "Pelicula (1980)" --pick-best-item
 ```
 
 `info` reports libraries and totals from `GET /Items/Counts` (totals may include multiple versions of the same title).
 
-Title resolution (`play` / `batch`) is **strict** by default (year mismatch or multiple matches fail that line). Pass `--pick-best-item` to auto-select the best ≤1080p version. In `batch`, a season line like `Show S01` downloads the whole season (with the same pick-best rule per episode version).
+Title resolution (`play --search`, `download --media-item --search`, `download --from-file`) is **strict** by default (year mismatch or multiple matches fail). Pass `--pick-best-item` to auto-select the best ≤1080p version. With `--from-file` / `--media-item --search`, a season line like `Show S01` downloads the whole season (same pick-best rule per episode version). Library `--search` requires an exact name match (case-insensitive); no pick-best.
+
+`--dry-run` / `-n` works for all `download` modes (no files written).
 
 Download methods (`-m` / `EMBY_METHOD`):
 

emby_cli-0.3.0/README.md

@@ -0,0 +1,95 @@
+# emby-cli
+
+[PyPI](https://pypi.org/project/emby-cli/)
+[License: CC BY-NC 4.0](https://creativecommons.org/licenses/by-nc/4.0/)
+
+CLI to **search, play, and download/backup** original media files from an [Emby](https://emby.media/) server via its REST API. Only HTTP access is required (default port 8096) — no SSH or rsync.
+
+## Install
+
+```bash
+pip install emby-cli
+```
+
+Development (from a clone of this repo):
+
+```bash
+python3 -m venv .venv && source .venv/bin/activate
+pip install -e ".[dev]"
+```
+
+## Configuration
+
+Set environment variables (or pass CLI flags):
+
+| Variable | Description |
+|----------|-------------|
+| `EMBY_SERVER` | Server URL (required for most commands) |
+| `EMBY_API_KEY` | API key (or use username/password) |
+| `EMBY_USERNAME` / `EMBY_PASSWORD` | Name/password auth |
+| `EMBY_OUTPUT` | Download directory (default `./downloads`) |
+| `EMBY_METHOD` | `download`, `stream`, or `hls` |
+| `EMBY_PLAYER` | External player for `play` |
+| `EMBY_ITEM_ID` | Default for `--id` (item mode / play) |
+| `EMBY_CACHE_DIR` | Credentials directory (default `~/.cache/emby-cli`; file `auth.json`) |
+| `EMBY_NO_AUTH_CACHE` | Set to `1` to disable reading/writing the AccessToken cache |
+
+See `.env.example`. The app does not load `.env` itself — `source` it or export vars.
+
+With username/password, sessions are stored in a single kubeconfig-style `auth.json` (`contexts` + `current_context`). `emby-cli login` saves a server entry and makes it active. Without `--server`, commands use the active server. Manage entries with `emby-cli config` (`current-server`, `get-servers`, `use-server`, `view`). API keys are not stored.
+
+## Usage
+
+```bash
+emby-cli help
+emby-cli login
+emby-cli logout
+emby-cli config get-servers
+emby-cli config use-server 'user@http://emby:8096'
+emby-cli config current-server
+emby-cli config view
+emby-cli version
+emby-cli info
+emby-cli search --media-item --search "Title"
+emby-cli search --media-item --search "Title" --count 50
+emby-cli search --media-item --id 123456
+emby-cli search --media-item --all
+emby-cli search --library --all
+emby-cli search --library --id 614156
+emby-cli search --library --search "PELICULAS"
+
+emby-cli download --media-item --id 123456
+emby-cli download --media-item --search "californication S01E01" --pick-best-item
+emby-cli download --library --id 12345
+emby-cli download --library --search "PELICULAS 4K"
+emby-cli download --from-file titles.txt --dry-run
+
+emby-cli play --id 123456
+emby-cli play --search "Pelicula (1980)" --pick-best-item
+```
+
+`info` reports libraries and totals from `GET /Items/Counts` (totals may include multiple versions of the same title).
+
+Title resolution (`play --search`, `download --media-item --search`, `download --from-file`) is **strict** by default (year mismatch or multiple matches fail). Pass `--pick-best-item` to auto-select the best ≤1080p version. With `--from-file` / `--media-item --search`, a season line like `Show S01` downloads the whole season (same pick-best rule per episode version). Library `--search` requires an exact name match (case-insensitive); no pick-best.
+
+`--dry-run` / `-n` works for all `download` modes (no files written).
+
+Download methods (`-m` / `EMBY_METHOD`):
+
+- `download` — `GET /Items/{id}/Download`
+- `stream` — DirectStreamUrl / `original.*` (Emby Web style)
+- `hls` — HLS segments remuxed to `.mkv` (needs `static-ffmpeg`)
+
+## Development
+
+```bash
+pip install -e ".[dev]"
+pytest -q
+python -m build && twine check dist/*
+```
+
+To publish a release, tag `vX.Y.Z` and push it (or create a GitHub Release). CI builds the package and publishes to PyPI via Trusted Publisher.
+
+## License
+
+[CC BY-NC 4.0](https://creativecommons.org/licenses/by-nc/4.0/)

{emby_cli-0.2.2 → emby_cli-0.3.0}/src/emby_cli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.2.2'
-__version_tuple__ = version_tuple = (0, 2, 2)
+__version__ = version = '0.3.0'
+__version_tuple__ = version_tuple = (0, 3, 0)
 
 __commit_id__ = commit_id = None

emby_cli-0.3.0/src/emby_cli/auth_cache.py

@@ -0,0 +1,323 @@
+"""Persist Emby AccessToken sessions in a single kubeconfig-style store."""
+
+from __future__ import annotations
+
+import json
+import os
+from dataclasses import asdict, dataclass, field
+from datetime import datetime, timezone
+from pathlib import Path
+
+
+@dataclass
+class AuthCacheEntry:
+    server_url: str
+    username: str
+    access_token: str
+    user_id: str
+    saved_at: str
+    name: str = ""
+
+    def __post_init__(self) -> None:
+        self.server_url = self.server_url.rstrip("/")
+        if not self.name:
+            self.name = context_name(self.server_url, self.username)
+
+    @classmethod
+    def create(
+        cls,
+        server_url: str,
+        username: str,
+        access_token: str,
+        user_id: str,
+    ) -> AuthCacheEntry:
+        return cls(
+            server_url=server_url.rstrip("/"),
+            username=username,
+            access_token=access_token,
+            user_id=user_id,
+            saved_at=datetime.now(timezone.utc).isoformat(),
+            name=context_name(server_url, username),
+        )
+
+
+@dataclass
+class AuthStore:
+    current_context: str = ""
+    contexts: list[AuthCacheEntry] = field(default_factory=list)
+
+
+def context_name(server_url: str, username: str) -> str:
+    return f"{username}@{server_url.rstrip('/')}"
+
+
+def cache_dir() -> Path:
+    return Path(os.environ.get("EMBY_CACHE_DIR", Path.home() / ".cache" / "emby-cli"))
+
+
+def auth_store_path() -> Path:
+    return cache_dir() / "auth.json"
+
+
+def _auth_cache_disabled() -> bool:
+    return os.environ.get("EMBY_NO_AUTH_CACHE") == "1"
+
+
+def _entry_from_dict(data: dict) -> AuthCacheEntry | None:
+    try:
+        entry = AuthCacheEntry(
+            server_url=str(data["server_url"]),
+            username=str(data["username"]),
+            access_token=str(data["access_token"]),
+            user_id=str(data["user_id"]),
+            saved_at=str(data.get("saved_at") or ""),
+            name=str(data.get("name") or ""),
+        )
+    except (KeyError, TypeError, ValueError):
+        return None
+    if not entry.access_token or not entry.user_id or not entry.server_url:
+        return None
+    if not entry.saved_at:
+        entry.saved_at = datetime.now(timezone.utc).isoformat()
+    return entry
+
+
+def _parse_legacy_cache_file(path: Path) -> AuthCacheEntry | None:
+    if not path.is_file():
+        return None
+    try:
+        data = json.loads(path.read_text(encoding="utf-8"))
+    except (OSError, json.JSONDecodeError, TypeError, ValueError):
+        return None
+    if not isinstance(data, dict):
+        return None
+    return _entry_from_dict(data)
+
+
+def _migrate_legacy_cache_files() -> AuthStore | None:
+    """Import ``*.cache`` files into a new store; delete them on success."""
+    root = cache_dir()
+    if not root.is_dir():
+        return None
+    legacy = sorted(root.glob("*.cache"))
+    if not legacy:
+        return None
+
+    entries: list[AuthCacheEntry] = []
+    for path in legacy:
+        entry = _parse_legacy_cache_file(path)
+        if entry is not None:
+            entries.append(entry)
+    if not entries:
+        return None
+
+    by_name: dict[str, AuthCacheEntry] = {}
+    for entry in entries:
+        prev = by_name.get(entry.name)
+        if prev is None or entry.saved_at >= prev.saved_at:
+            by_name[entry.name] = entry
+    merged = list(by_name.values())
+    merged.sort(key=lambda e: e.saved_at, reverse=True)
+    store = AuthStore(current_context=merged[0].name, contexts=merged)
+    save_store(store)
+    for path in legacy:
+        try:
+            path.unlink()
+        except OSError:
+            pass
+    return store
+
+
+def load_store() -> AuthStore:
+    """Load ``auth.json``, migrating legacy ``*.cache`` files if needed."""
+    if _auth_cache_disabled():
+        return AuthStore()
+
+    path = auth_store_path()
+    if path.is_file():
+        try:
+            data = json.loads(path.read_text(encoding="utf-8"))
+        except (OSError, json.JSONDecodeError, TypeError, ValueError):
+            return AuthStore()
+        contexts: list[AuthCacheEntry] = []
+        for item in data.get("contexts") or []:
+            if isinstance(item, dict):
+                entry = _entry_from_dict(item)
+                if entry is not None:
+                    contexts.append(entry)
+        current = str(data.get("current_context") or "")
+        if current and not any(c.name == current for c in contexts):
+            current = contexts[0].name if contexts else ""
+        elif not current and contexts:
+            current = max(contexts, key=lambda e: e.saved_at).name
+        return AuthStore(current_context=current, contexts=contexts)
+
+    migrated = _migrate_legacy_cache_files()
+    return migrated if migrated is not None else AuthStore()
+
+
+def save_store(store: AuthStore) -> None:
+    if _auth_cache_disabled():
+        return
+    path = auth_store_path()
+    path.parent.mkdir(parents=True, exist_ok=True)
+    payload = {
+        "current_context": store.current_context,
+        "contexts": [asdict(c) for c in store.contexts],
+    }
+    path.write_text(json.dumps(payload, indent=2) + "\n", encoding="utf-8")
+    path.chmod(0o600)
+
+
+def list_contexts() -> list[AuthCacheEntry]:
+    store = load_store()
+    return sorted(store.contexts, key=lambda e: (e.server_url, e.username))
+
+
+def get_active_entry() -> AuthCacheEntry | None:
+    store = load_store()
+    if not store.current_context:
+        return None
+    for entry in store.contexts:
+        if entry.name == store.current_context:
+            return entry
+    return None
+
+
+def upsert_context(entry: AuthCacheEntry, *, activate: bool = True) -> None:
+    if _auth_cache_disabled():
+        return
+    store = load_store()
+    entry = AuthCacheEntry(
+        server_url=entry.server_url,
+        username=entry.username,
+        access_token=entry.access_token,
+        user_id=entry.user_id,
+        saved_at=entry.saved_at or datetime.now(timezone.utc).isoformat(),
+        name=entry.name or context_name(entry.server_url, entry.username),
+    )
+    store.contexts = [c for c in store.contexts if c.name != entry.name]
+    store.contexts.append(entry)
+    if activate:
+        store.current_context = entry.name
+    save_store(store)
+
+
+def remove_context(
+    *,
+    name: str | None = None,
+    server_url: str | None = None,
+    username: str | None = None,
+) -> bool:
+    """Remove a context. Returns True if something was removed."""
+    if _auth_cache_disabled():
+        return False
+    store = load_store()
+    if name is None and server_url is not None and username is not None:
+        name = context_name(server_url, username)
+    if not name:
+        return False
+    before = len(store.contexts)
+    store.contexts = [c for c in store.contexts if c.name != name]
+    if len(store.contexts) == before:
+        return False
+    if store.current_context == name:
+        if store.contexts:
+            store.current_context = max(
+                store.contexts, key=lambda e: e.saved_at
+            ).name
+        else:
+            store.current_context = ""
+    save_store(store)
+    return True
+
+
+def set_current_context(name: str) -> AuthCacheEntry:
+    """Set ``current_context`` by exact name or unique server URL match."""
+    store = load_store()
+    needle = name.strip()
+    matches = [c for c in store.contexts if c.name == needle]
+    if not matches:
+        # Unique match by server_url or username@server fragment.
+        by_server = [
+            c for c in store.contexts
+            if c.server_url == needle.rstrip("/") or c.name.endswith(f"@{needle.rstrip('/')}")
+        ]
+        if len(by_server) == 1:
+            matches = by_server
+        else:
+            by_user_server = [
+                c for c in store.contexts
+                if c.name == needle or c.username == needle
+            ]
+            if len(by_user_server) == 1:
+                matches = by_user_server
+    if len(matches) != 1:
+        raise KeyError(f"context '{name}' not found")
+    entry = matches[0]
+    store.current_context = entry.name
+    save_store(store)
+    return entry
+
+
+def load_auth_cache(
+    *,
+    server_url: str,
+    username: str | None = None,
+    cache_file: Path | None = None,
+) -> AuthCacheEntry | None:
+    """Load a session for *server_url* (optional *username*).
+
+    *cache_file* is ignored (legacy API); the unified store is always used.
+    """
+    del cache_file  # legacy kwarg
+    if _auth_cache_disabled():
+        return None
+    store = load_store()
+    server = server_url.rstrip("/")
+    matches = [c for c in store.contexts if c.server_url == server]
+    if username is not None:
+        matches = [c for c in matches if c.username == username]
+    if not matches:
+        return None
+    if username is not None:
+        return matches[0]
+    # Prefer active context if it matches this server.
+    for c in matches:
+        if c.name == store.current_context:
+            return c
+    return max(matches, key=lambda e: e.saved_at)
+
+
+def save_auth_cache(
+    entry: AuthCacheEntry,
+    cache_file: Path | None = None,
+) -> None:
+    del cache_file
+    upsert_context(entry, activate=True)
+
+
+def clear_auth_cache(
+    *,
+    server_url: str | None = None,
+    username: str | None = None,
+    cache_file: Path | None = None,
+) -> None:
+    del cache_file
+    if server_url is not None and username is not None:
+        remove_context(server_url=server_url, username=username)
+
+
+def list_auth_cache_entries() -> list[AuthCacheEntry]:
+    return list_contexts()
+
+
+# Back-compat aliases used by older tests / docs.
+def auth_cache_file(server_url: str, username: str) -> Path:
+    """Deprecated path helper; returns store path (not per-user files)."""
+    del server_url, username
+    return auth_store_path()
+
+
+def unique_cached_server_urls() -> list[str]:
+    return sorted({e.server_url for e in list_auth_cache_entries()})