emby-cli 0.7.1__tar.gz → 0.7.2__tar.gz

{emby_cli-0.7.1 → emby_cli-0.7.2}/AGENTS.md

@@ -352,8 +352,10 @@ Read-only entity commands (`item list`, `item search`, `item show`, `item play`)
   Supports `--player`, `--wait`, `--pick-best-item`, `--no-cache`, `--no-parse-query`,
   and comma-separated `--id`. Parent `--id` may appear before the subcommand.
   QUERY defaults to title-line resolution (`resolve_title_items`).
-- `item download` resolves one item by QUERY or `--id` (CSV supported) and downloads
-  via `item_ops` (`download_items`, `download_item_ids`, `download_from_file`).
+- `item download` resolves one item by QUERY or `--id` (CSV supported). A
+  `--id` that refers to a `Series` downloads all episodes in season/episode
+  order. Downloads via `item_ops` (`download_items`, `download_item_ids`,
+  `download_from_file`).
   Supports `--output`, `--method`, `--force`, `--throttle`, `--pick-best-item`,
   `--dry-run`, `--from-file`, `--no-parse-query`, and optional `--mirror-path`.
   QUERY / `--from-file` default to title-line resolution (`resolve_title_items`).

{emby_cli-0.7.1 → emby_cli-0.7.2}/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Unreleased
 
+## 0.7.2
+
+### Added
+
+- `item download --id` expands a `Series` ID into all episodes (sorted by
+  season/episode, then Id) and downloads them sequentially. Duplicate
+  SxxExx versions follow the same rules as title-line downloads
+  (`--pick-best-item` or fail with a disambiguation table).
+
 ## 0.7.1
 
 ### Added

{emby_cli-0.7.1 → emby_cli-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: emby-cli
-Version: 0.7.1
+Version: 0.7.2
 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
@@ -120,6 +120,7 @@ Preview a large operation first, then choose a destination:
 ```bash
 emby-cli item download "breaking bad S01E01" --dry-run
 emby-cli item download --id 123456 --output ./downloads
+emby-cli item download --id 123456 --pick-best-item   # series: one file per SxxExx
 emby-cli item download --from-file titles.txt --dry-run
 emby-cli library download "peliculas 4k" --output ./downloads
 ```

{emby_cli-0.7.1 → emby_cli-0.7.2}/README.md

@@ -85,6 +85,7 @@ Preview a large operation first, then choose a destination:
 ```bash
 emby-cli item download "breaking bad S01E01" --dry-run
 emby-cli item download --id 123456 --output ./downloads
+emby-cli item download --id 123456 --pick-best-item   # series: one file per SxxExx
 emby-cli item download --from-file titles.txt --dry-run
 emby-cli library download "peliculas 4k" --output ./downloads
 ```

{emby_cli-0.7.1 → emby_cli-0.7.2}/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.7.1'
-__version_tuple__ = version_tuple = (0, 7, 1)
+__version__ = version = '0.7.2'
+__version_tuple__ = version_tuple = (0, 7, 2)
 
 __commit_id__ = commit_id = None

{emby_cli-0.7.1 → emby_cli-0.7.2}/src/emby_cli/cli.py

@@ -540,7 +540,10 @@ def build_parser() -> argparse.ArgumentParser:
 
     it_download = it_sub.add_parser("download", help="Download media items")
     it_download.add_argument("query", nargs="?", metavar="QUERY")
-    it_download.add_argument("--id", help="Media item ID to download (comma-separated for multiple)")
+    it_download.add_argument(
+        "--id",
+        help="Media item ID (comma-separated). Series IDs download all episodes",
+    )
     it_download.add_argument(
         "--type",
         dest="item_type",

{emby_cli-0.7.1 → emby_cli-0.7.2}/src/emby_cli/commands/item.py

@@ -248,6 +248,7 @@ def _cmd_download(client: EmbyClient, args: argparse.Namespace) -> None:
             raw_type=_text(args, "item_type"),
             mirror_path=opts.mirror_path,
             path_strip=opts.path_strip,
+            pick_best=pick_best,
         )
         print_done(stats)
         raise SystemExit(stats.exit_code())

{emby_cli-0.7.1 → emby_cli-0.7.2}/src/emby_cli/item_ops.py

@@ -18,9 +18,10 @@ import requests
 
 from emby_cli.client import EmbyClient
 from emby_cli.constants import SEARCH_ITEM_TYPES, SHOW_ITEM_FIELDS
-from emby_cli.media_sort import sort_media_items
+from emby_cli.media_sort import sort_key_id, sort_media_items
 from emby_cli.output import Stats, print_done, print_download, print_error, print_skip
 from emby_cli.resolve import (
+    _pick_episode_versions,
     classify_resolution,
     item_label,
     item_video_width,
@@ -454,6 +455,59 @@ class DownloadOpts:
         )
 
 
+def sort_episodes(episodes: list[dict]) -> list[dict]:
+    """Sort episodes by season, episode number, then Emby Id."""
+
+    def key(ep: dict) -> tuple:
+        season = ep.get("ParentIndexNumber")
+        number = ep.get("IndexNumber")
+        if season is not None and number is not None:
+            return (0, int(season), int(number), sort_key_id(ep))
+        if season is not None:
+            return (1, int(season), 0, sort_key_id(ep))
+        if number is not None:
+            return (2, 0, int(number), sort_key_id(ep))
+        return (3, 0, 0, sort_key_id(ep))
+
+    return sorted(episodes, key=key)
+
+
+def expand_item_for_download(
+    client: EmbyClient,
+    item: dict,
+    *,
+    pick_best: bool = False,
+) -> list[dict] | None:
+    """Return download targets for *item* (one row, or all episodes for Series)."""
+    if item.get("Type") != "Series":
+        return [item]
+
+    name = item.get("Name") or item.get("Id")
+    try:
+        episodes = client.get_show_episodes(item["Id"], season=None)
+    except (requests.RequestException, RuntimeError) as exc:
+        print_error(f"listing episodes for series '{name}': {exc}")
+        return None
+
+    if not episodes:
+        print(f"Series '{name}': no episodes found.")
+        return []
+
+    series_name = item.get("Name")
+    enriched: list[dict] = []
+    for ep in episodes:
+        row = dict(ep)
+        if series_name and not row.get("SeriesName"):
+            row["SeriesName"] = series_name
+        enriched.append(row)
+
+    picked = _pick_episode_versions(sort_episodes(enriched), pick_best=pick_best)
+    if picked is None:
+        return None
+    print(f"Series '{name}': {len(picked)} episode(s)")
+    return picked
+
+
 def resolve_rate(item: dict, throttle: float) -> float | None:
     if not throttle:
         return None
@@ -584,6 +638,7 @@ def download_item_ids(
     raw_type: str | None = None,
     mirror_path: bool = False,
     path_strip: str | None = None,
+    pick_best: bool = False,
 ) -> Stats:
     """Download comma-separated item IDs."""
     item_ids = [part.strip() for part in item_id.split(",") if part.strip()]
@@ -605,7 +660,14 @@ def download_item_ids(
             )
             stats.error += 1
             continue
-        items.append(item)
+        targets = expand_item_for_download(client, item, pick_best=pick_best)
+        if targets is None:
+            stats.error += 1
+            continue
+        if not targets and item.get("Type") == "Series":
+            stats.error += 1
+            continue
+        items.extend(targets)
     if items:
         got = download_items(
             client,
@@ -673,9 +735,21 @@ def download_from_file(
                 totals.error += 1
                 continue
 
-            result = download_one_item(
+            targets = expand_item_for_download(client, item, pick_best=pick_best)
+            if targets is None:
+                elapsed = time.monotonic() - line_t0
+                line_stats.append((label, "ERROR", elapsed, "ambiguous episode versions"))
+                totals.error += 1
+                continue
+            if not targets:
+                elapsed = time.monotonic() - line_t0
+                line_stats.append((label, "ERROR", elapsed, "no episodes"))
+                totals.error += 1
+                continue
+
+            got = download_items(
                 client,
-                item,
+                targets,
                 output,
                 method=method,
                 force=force,
@@ -685,20 +759,20 @@ def download_from_file(
                 path_strip=path_strip,
             )
             elapsed = time.monotonic() - line_t0
-            status_map = {
-                "ok": "OK",
-                "skip": "SKIPPED",
-                "error": "ERROR",
-                "dry_run": "DRY RUN",
-            }
-            status = status_map.get(result, "ERROR")
+            if got.error:
+                status = "ERROR"
+            elif dry_run and got.ok:
+                status = "DRY RUN"
+            elif got.skip and not got.ok:
+                status = "SKIPPED"
+            elif got.skip:
+                status = "PARTIAL"
+            else:
+                status = "OK"
             line_stats.append((label, status, elapsed, item.get("Name", "")))
-            if result == "ok":
-                totals.ok += 1
-            elif result == "skip":
-                totals.skip += 1
-            elif result == "error":
-                totals.error += 1
+            totals.ok += got.ok
+            totals.skip += got.skip
+            totals.error += got.error
             continue
 
         label = raw_line

{emby_cli-0.7.1 → emby_cli-0.7.2}/tests/test_item_ops.py

@@ -14,8 +14,10 @@ from emby_cli.item_ops import (
     ItemListingQuery,
     ItemResolutionError,
     build_item_listing_query,
+    download_item_ids,
     emby_search_term_for_strict_query,
     episodes_for_title_line,
+    expand_item_for_download,
     fetch_item_listing,
     item_types_for_api,
     matches_strict_name_query,
@@ -24,8 +26,10 @@ from emby_cli.item_ops import (
     play_url,
     playable_items_for_parent,
     resolve_item,
+    sort_episodes,
     split_listing_search_query,
 )
+from emby_cli.output import Stats
 
 ITEMS = [
     {"Id": "100", "Name": "The Matrix", "Type": "Movie", "ProductionYear": 1999},
@@ -339,3 +343,60 @@ def test_resolve_item_by_id_prefix_uses_catalog():
         assert resolve_item(client, item_id="20", use_cache=False) == ITEMS[1]
     get.assert_called_once_with("20", fields=SHOW_ITEM_FIELDS, use_cache=False)
     search.assert_called_once_with("", item_types="Movie,Episode,Audio,Video", use_cache=False)
+
+
+def test_sort_episodes_orders_by_season_and_number():
+    episodes = [
+        {"Id": "3", "ParentIndexNumber": 2, "IndexNumber": 1},
+        {"Id": "1", "ParentIndexNumber": 1, "IndexNumber": 2},
+        {"Id": "2", "ParentIndexNumber": 1, "IndexNumber": 1},
+    ]
+    ordered = sort_episodes(episodes)
+    assert [ep["Id"] for ep in ordered] == ["2", "1", "3"]
+
+
+def test_expand_item_for_download_series(capsys):
+    client = MagicMock()
+    series = {"Id": "s1", "Name": "Show", "Type": "Series"}
+    client.get_show_episodes.return_value = [
+        {"Id": "e2", "Type": "Episode", "ParentIndexNumber": 1, "IndexNumber": 2, "Name": "B"},
+        {"Id": "e1", "Type": "Episode", "ParentIndexNumber": 1, "IndexNumber": 1, "Name": "A"},
+    ]
+    targets = expand_item_for_download(client, series)
+    assert targets is not None
+    assert [ep["Id"] for ep in targets] == ["e1", "e2"]
+    assert targets[0]["SeriesName"] == "Show"
+    assert "2 episode(s)" in capsys.readouterr().out
+    client.get_show_episodes.assert_called_once_with("s1", season=None)
+
+
+def test_expand_item_for_download_movie_passthrough():
+    client = MagicMock()
+    movie = {"Id": "m1", "Name": "Film", "Type": "Movie"}
+    assert expand_item_for_download(client, movie) == [movie]
+    client.get_show_episodes.assert_not_called()
+
+
+def test_download_item_ids_expands_series(tmp_path, capsys):
+    client = MagicMock()
+    series = {"Id": "s1", "Name": "Show", "Type": "Series"}
+    episodes = [
+        {"Id": "e1", "Type": "Episode", "ParentIndexNumber": 1, "IndexNumber": 1, "Name": "A"},
+    ]
+    client.get_item_info.return_value = series
+    client.get_show_episodes.return_value = episodes
+    with patch("emby_cli.item_ops.download_items") as download_items:
+        download_items.return_value = Stats(ok=1)
+        stats = download_item_ids(
+            client,
+            "s1",
+            tmp_path,
+            method="download",
+            force=False,
+            throttle=0,
+            dry_run=True,
+        )
+    assert stats.ok == 1
+    passed_items = download_items.call_args.args[1]
+    assert len(passed_items) == 1
+    assert passed_items[0]["Id"] == "e1"