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

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

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## 0.4.0
+
+Added:
+
+- `show`: detail view for `--item` / `--library` (QUERY or `--id`); multiple matches print a disambiguation table with IDs. Libraries include total item count and the last 10 added (`DateCreated`), limited to Movie/Episode/Audio (no Studio, etc.).
+- `search` / `download`: `--item QUERY` / `--library QUERY` (query on the mode flag); `--media-item` is an alias of `--item`. `--search` still works as an alternative selector.
+
 ## 0.3.0
 
 Breaking:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emby-cli
-Version: 0.3.0
+Version: 0.4.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
@@ -84,18 +84,22 @@ 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 --item "Title"
+emby-cli search --item "Title" --count 50
+emby-cli search --item --id 123456
+emby-cli search --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 search --library "PELICULAS"
+emby-cli show --item "Title"
+emby-cli show --item --id 123456
+emby-cli show --library "PELICULAS"
+emby-cli show --library --id 614156
+
+emby-cli download --item --id 123456
+emby-cli download --item "californication S01E01" --pick-best-item
 emby-cli download --library --id 12345
-emby-cli download --library --search "PELICULAS 4K"
+emby-cli download --library "PELICULAS 4K"
 emby-cli download --from-file titles.txt --dry-run
 
 emby-cli play --id 123456
@@ -104,7 +108,7 @@ 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.
+Title resolution (`play --search`, `download --item` with a query, `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` or `--item` + query, a season line like `Show S01` downloads the whole season (same pick-best rule per episode version). Library query requires an exact name match (case-insensitive); no pick-best.
 
 `--dry-run` / `-n` works for all `download` modes (no files written).
 

{emby_cli-0.3.0 → emby_cli-0.4.0}/README.md

@@ -50,18 +50,22 @@ 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 --item "Title"
+emby-cli search --item "Title" --count 50
+emby-cli search --item --id 123456
+emby-cli search --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 search --library "PELICULAS"
+emby-cli show --item "Title"
+emby-cli show --item --id 123456
+emby-cli show --library "PELICULAS"
+emby-cli show --library --id 614156
+
+emby-cli download --item --id 123456
+emby-cli download --item "californication S01E01" --pick-best-item
 emby-cli download --library --id 12345
-emby-cli download --library --search "PELICULAS 4K"
+emby-cli download --library "PELICULAS 4K"
 emby-cli download --from-file titles.txt --dry-run
 
 emby-cli play --id 123456
@@ -70,7 +74,7 @@ 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.
+Title resolution (`play --search`, `download --item` with a query, `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` or `--item` + query, a season line like `Show S01` downloads the whole season (same pick-best rule per episode version). Library query requires an exact name match (case-insensitive); no pick-best.
 
 `--dry-run` / `-n` works for all `download` modes (no files written).
 

{emby_cli-0.3.0 → emby_cli-0.4.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.3.0'
-__version_tuple__ = version_tuple = (0, 3, 0)
+__version__ = version = '0.4.0'
+__version_tuple__ = version_tuple = (0, 4, 0)
 
 __commit_id__ = commit_id = None

{emby_cli-0.3.0 → emby_cli-0.4.0}/src/emby_cli/cli.py

@@ -21,6 +21,7 @@ from emby_cli.commands.login import cmd_login
 from emby_cli.commands.logout import cmd_logout
 from emby_cli.commands.play import cmd_play, validate_play_args
 from emby_cli.commands.search import cmd_search, validate_search_args
+from emby_cli.commands.show import cmd_show, validate_show_args
 from emby_cli.commands.version import cmd_version
 from emby_cli.constants import DEFAULT_OUTPUT, SEARCH_COUNT_DEFAULT
 from emby_cli.credentials import (
@@ -82,14 +83,23 @@ def build_parser() -> argparse.ArgumentParser:
     )
     mode = dl.add_mutually_exclusive_group(required=True)
     mode.add_argument(
+        "--item",
         "--media-item",
-        action="store_true",
-        help="Download media items; use with --id or --search",
+        nargs="?",
+        const="",
+        default=None,
+        metavar="QUERY",
+        dest="item",
+        help="Download media items; optional QUERY, or use with --id "
+             "(--media-item is an alias)",
     )
     mode.add_argument(
         "--library",
-        action="store_true",
-        help="Download a library; use with --id or --search",
+        nargs="?",
+        const="",
+        default=None,
+        metavar="QUERY",
+        help="Download a library; optional QUERY, or use with --id",
     )
     mode.add_argument(
         "--from-file",
@@ -105,7 +115,7 @@ def build_parser() -> argparse.ArgumentParser:
     )
     dl.add_argument(
         "--search",
-        help="Search query for media item or library",
+        help="Search query (alternative to QUERY on --item / --library)",
     )
     dl.add_argument(
         "--dry-run",
@@ -146,14 +156,23 @@ def build_parser() -> argparse.ArgumentParser:
     sr = sub.add_parser("search", help=_help_by_name["search"])
     sr_mode = sr.add_mutually_exclusive_group(required=True)
     sr_mode.add_argument(
+        "--item",
         "--media-item",
-        action="store_true",
-        help="Search media items; use with --id, --search, or --all",
+        nargs="?",
+        const="",
+        default=None,
+        metavar="QUERY",
+        dest="item",
+        help="Search media items; optional QUERY, or use with --id / --all "
+             "(--media-item is an alias)",
     )
     sr_mode.add_argument(
         "--library",
-        action="store_true",
-        help="Search libraries; use with --id, --search, or --all",
+        nargs="?",
+        const="",
+        default=None,
+        metavar="QUERY",
+        help="Search libraries; optional QUERY, or use with --id / --all",
     )
     sr.add_argument(
         "--id",
@@ -162,7 +181,7 @@ def build_parser() -> argparse.ArgumentParser:
     )
     sr.add_argument(
         "--search",
-        help="Search query for media item or library",
+        help="Search query (alternative to QUERY on --item / --library)",
     )
     sr.add_argument(
         "--all",
@@ -206,6 +225,37 @@ def build_parser() -> argparse.ArgumentParser:
              "(default: list matches and fail)",
     )
 
+    sh = sub.add_parser("show", help=_help_by_name["show"])
+    sh_mode = sh.add_mutually_exclusive_group(required=True)
+    sh_mode.add_argument(
+        "--item",
+        "--media-item",
+        nargs="?",
+        const="",
+        default=None,
+        metavar="QUERY",
+        dest="item",
+        help="Show a media item; optional QUERY, or use with --id "
+             "(--media-item is an alias)",
+    )
+    sh_mode.add_argument(
+        "--library",
+        nargs="?",
+        const="",
+        default=None,
+        metavar="QUERY",
+        help="Show a library; optional QUERY, or use with --id",
+    )
+    sh.add_argument(
+        "--id",
+        default=None,
+        help="Media item or library ID",
+    )
+    sh.add_argument(
+        "--search",
+        help="Search query (alternative to QUERY on --item / --library)",
+    )
+
     sub.add_parser("version", help=_help_by_name["version"])
     sub.add_parser("info", help=_help_by_name["info"])
 
@@ -249,6 +299,8 @@ def _validate_command_args(command: str, args: argparse.Namespace) -> str | None
         return validate_download_args(args)
     if command == "play":
         return validate_play_args(args)
+    if command == "show":
+        return validate_show_args(args)
     return None
 
 
@@ -293,6 +345,7 @@ def main() -> None:
         "download": cmd_download,
         "search": cmd_search,
         "play": cmd_play,
+        "show": cmd_show,
     }
     commands[args.command](client, args)
 

{emby_cli-0.3.0 → emby_cli-0.4.0}/src/emby_cli/client.py

@@ -458,15 +458,19 @@ class EmbyClient:
         recursive: bool = True,
         start: int = 0,
         limit: int = 200,
+        *,
+        sort_by: str = "SortName",
+        sort_order: str = "Ascending",
+        fields: str | None = None,
     ) -> dict:
         uid = self.resolve_user_id()
         params: dict = {
             "StartIndex": start,
             "Limit": limit,
             "Recursive": str(recursive).lower(),
-            "Fields": ITEM_FIELDS,
-            "SortBy": "SortName",
-            "SortOrder": "Ascending",
+            "Fields": fields or ITEM_FIELDS,
+            "SortBy": sort_by,
+            "SortOrder": sort_order,
         }
         if parent_id:
             params["ParentId"] = parent_id
@@ -493,11 +497,11 @@ class EmbyClient:
                 break
         return items
 
-    def get_item_info(self, item_id: str) -> dict:
+    def get_item_info(self, item_id: str, *, fields: str | None = None) -> dict:
         uid = self.resolve_user_id()
         resp = self._get(
             f"/Users/{uid}/Items/{item_id}",
-            params={"Fields": ITEM_FIELDS},
+            params={"Fields": fields or ITEM_FIELDS},
         )
         return resp.json()
 

{emby_cli-0.3.0 → emby_cli-0.4.0}/src/emby_cli/commands/download.py

@@ -15,6 +15,7 @@ from emby_cli.download_ops import (
     download_one_item,
     find_library,
 )
+from emby_cli.mode_args import mode_is_item, mode_is_library, resolve_query
 from emby_cli.output import Stats, print_done, print_error
 from emby_cli.resolve import resolve_title_items
 from emby_cli.util import format_duration
@@ -60,22 +61,26 @@ def _download_items(
 
 def validate_download_args(args: argparse.Namespace) -> str | None:
     """Return an error message if mode/selectors are invalid; else ``None``."""
-    if getattr(args, "media_item", False):
-        search = (getattr(args, "search", None) or "").strip() or None
+    if mode_is_item(args):
+        query, err = resolve_query(args)
+        if err:
+            return err
         item_id = (getattr(args, "id", None) or "").strip() or None
-        if not item_id and not search:
+        if not item_id and not query:
             item_id = (os.environ.get("EMBY_ITEM_ID") or "").strip() or None
-        if bool(item_id) == bool(search):
-            return "With --media-item, provide exactly one of --id or --search"
+        if bool(item_id) == bool(query):
+            return "With --item, provide exactly one of --id or QUERY/--search"
         return None
 
-    if getattr(args, "library", False):
+    if mode_is_library(args):
         if bool(getattr(args, "pick_best_item", False)):
             return "--pick-best-item cannot be used with --library"
+        query, err = resolve_query(args)
+        if err:
+            return err
         library_id = (getattr(args, "id", None) or "").strip() or None
-        search = (getattr(args, "search", None) or "").strip() or None
-        if bool(library_id) == bool(search):
-            return "With --library, provide exactly one of --id or --search"
+        if bool(library_id) == bool(query):
+            return "With --library, provide exactly one of --id or QUERY/--search"
         return None
 
     if getattr(args, "from_file", None):
@@ -85,7 +90,7 @@ def validate_download_args(args: argparse.Namespace) -> str | None:
             return "With --from-file, do not pass --id or --search"
         return None
 
-    return "Specify --media-item, --library, or --from-file"
+    return "Specify --item, --library, or --from-file"
 
 
 def _cmd_download_item(client: EmbyClient, args: argparse.Namespace) -> None:
@@ -94,7 +99,7 @@ def _cmd_download_item(client: EmbyClient, args: argparse.Namespace) -> None:
     method = getattr(args, "method", "download")
     dry_run = bool(getattr(args, "dry_run", False))
     pick_best = bool(getattr(args, "pick_best_item", False))
-    search = (getattr(args, "search", None) or "").strip() or None
+    search, _ = resolve_query(args)
     item_id = (getattr(args, "id", None) or "").strip() or None
     if not item_id and not search:
         item_id = (os.environ.get("EMBY_ITEM_ID") or "").strip() or None
@@ -157,7 +162,7 @@ def _cmd_download_library(client: EmbyClient, args: argparse.Namespace) -> None:
     method = getattr(args, "method", "download")
     dry_run = bool(getattr(args, "dry_run", False))
     library_id = (getattr(args, "id", None) or "").strip() or None
-    search = (getattr(args, "search", None) or "").strip() or None
+    search, _ = resolve_query(args)
 
     if dry_run:
         print("*** DRY RUN — no files will be downloaded ***\n")
@@ -335,14 +340,14 @@ def cmd_download(client: EmbyClient, args: argparse.Namespace) -> None:
         print(err)
         sys.exit(1)
 
-    if getattr(args, "media_item", False):
+    if mode_is_item(args):
         _cmd_download_item(client, args)
         return
-    if getattr(args, "library", False):
+    if mode_is_library(args):
         _cmd_download_library(client, args)
         return
     if getattr(args, "from_file", None):
         _cmd_download_from_file(client, args)
         return
-    print("Specify --media-item, --library, or --from-file")
+    print("Specify --item, --library, or --from-file")
     sys.exit(1)

{emby_cli-0.3.0 → emby_cli-0.4.0}/src/emby_cli/commands/help.py

@@ -11,6 +11,7 @@ COMMAND_SUMMARIES: tuple[tuple[str, str], ...] = (
     ("version", "Show emby-cli version"),
     ("info", "Show session user, server details, libraries, and item counts"),
     ("search", "Search media items or libraries"),
+    ("show", "Show details for a media item or library"),
     ("download", "Download media items or libraries"),
     ("play", "Play a media item using an external player"),
 )

{emby_cli-0.3.0 → emby_cli-0.4.0}/src/emby_cli/commands/search.py

@@ -1,4 +1,4 @@
-"""search command — media items or libraries (--media-item/--library + --id/--search/--all)."""
+"""search command — media items or libraries (--item/--library + QUERY/--id/--all)."""
 
 from __future__ import annotations
 
@@ -8,6 +8,7 @@ import sys
 from emby_cli.client import EmbyClient
 from emby_cli.constants import SEARCH_COUNT_DEFAULT, SEARCH_ITEM_TYPES
 from emby_cli.download_ops import find_library
+from emby_cli.mode_args import mode_is_library, resolve_query
 from emby_cli.resolve import print_item_choices, print_library_choices
 
 
@@ -39,9 +40,8 @@ def _print_libraries(
     print()
 
 
-def _selector_count(args: argparse.Namespace) -> int:
+def _selector_count(args: argparse.Namespace, query: str | None) -> int:
     item_id = (getattr(args, "id", None) or "").strip()
-    query = (getattr(args, "search", None) or "").strip()
     use_all = bool(getattr(args, "all", False))
     return sum(bool(x) for x in (item_id, query, use_all))
 
@@ -52,8 +52,14 @@ def validate_search_args(args: argparse.Namespace) -> str | None:
     count = SEARCH_COUNT_DEFAULT if raw_count is None else int(raw_count)
     if count < 1:
         return "error: --count must be >= 1"
-    if _selector_count(args) != 1:
-        return "Provide exactly one of --id, --search, or --all"
+    query, err = resolve_query(args)
+    if err:
+        return err
+    if _selector_count(args, query) != 1:
+        return (
+            "Provide exactly one of QUERY on --item/--library, "
+            "--search, --id, or --all"
+        )
     return None
 
 
@@ -69,10 +75,10 @@ def cmd_search(client: EmbyClient, args: argparse.Namespace) -> None:
     raw_count = getattr(args, "count", SEARCH_COUNT_DEFAULT)
     count = SEARCH_COUNT_DEFAULT if raw_count is None else int(raw_count)
     item_id = (getattr(args, "id", None) or "").strip() or None
-    query = (getattr(args, "search", None) or "").strip() or None
+    query, _ = resolve_query(args)
     use_all = bool(getattr(args, "all", False))
 
-    if getattr(args, "library", False):
+    if mode_is_library(args):
         libraries = client.get_libraries()
         if use_all:
             _print_libraries(client, libraries, count=count)
@@ -87,7 +93,7 @@ def cmd_search(client: EmbyClient, args: argparse.Namespace) -> None:
             _print_libraries(client, [lib], count=count)
             return
 
-        needle = query.lower()
+        needle = (query or "").lower()
         matches = [
             lib for lib in libraries
             if needle in (lib.get("Name") or "").lower()
@@ -95,15 +101,15 @@ def cmd_search(client: EmbyClient, args: argparse.Namespace) -> None:
         _print_libraries(client, matches, count=count)
         return
 
-    # --media-item
+    # --item / --media-item
     if use_all:
         probe = client.get_items(item_type=SEARCH_ITEM_TYPES, limit=0)
         total = int(probe.get("TotalRecordCount") or 0)
         if total > count:
             print(
                 f"There are {total} media items on this server. "
-                "Please narrow the results with --search, for example:\n"
-                '  emby-cli search --media-item --search "title"'
+                "Please narrow the results with a query, for example:\n"
+                '  emby-cli search --item "title"'
             )
             sys.exit(1)
         if total == 0: