audiometa-python 1.1.2__tar.gz → 1.2.0__tar.gz

{audiometa_python-1.1.2/audiometa_python.egg-info → audiometa_python-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: audiometa-python
-Version: 1.1.2
+Version: 1.2.0
 Summary: A comprehensive Python library for reading and writing audio metadata across multiple formats
 Author: AudioMeta Python Contributors
 Author-email: Andreas Garcia <garcia.andreas.1991@gmail.com>
@@ -1429,11 +1429,13 @@ AudioMeta provides a powerful command-line interface for quick metadata operatio
 
 ### Installation {#cli-installation}
 
-After installing the package, the `audiometa` command will be available:
+After installing the package, the `audiometa` command will be available. Commands: `read`, `unified`, `write`, `delete`, `help`. Use `audiometa --help` or `audiometa help` for main help; `audiometa help read` (or another command) for subcommand help.
 
 ```bash
 pip install audiometa-python
 audiometa --help
+# or: audiometa help
+# or: audiometa help read
 ```
 
 ### Basic Usage

{audiometa_python-1.1.2 → audiometa_python-1.2.0}/README.md

@@ -1387,11 +1387,13 @@ AudioMeta provides a powerful command-line interface for quick metadata operatio
 
 ### Installation {#cli-installation}
 
-After installing the package, the `audiometa` command will be available:
+After installing the package, the `audiometa` command will be available. Commands: `read`, `unified`, `write`, `delete`, `help`. Use `audiometa --help` or `audiometa help` for main help; `audiometa help read` (or another command) for subcommand help.
 
 ```bash
 pip install audiometa-python
 audiometa --help
+# or: audiometa help
+# or: audiometa help read
 ```
 
 ### Basic Usage

{audiometa_python-1.1.2 → audiometa_python-1.2.0}/audiometa/cli.py

@@ -378,6 +378,14 @@ Examples:
 
     subparsers = parser.add_subparsers(dest="command", help="Available commands")
 
+    help_parser = subparsers.add_parser("help", help="Show help and exit")
+    help_parser.add_argument(
+        "subcommand",
+        nargs="?",
+        choices=["read", "unified", "write", "delete"],
+        help="Subcommand to show help for",
+    )
+
     # Read command
     read_parser = subparsers.add_parser("read", help="Read metadata from audio file(s)")
     read_parser.add_argument("files", nargs="+", help="Audio file(s) or pattern(s)")
@@ -489,6 +497,18 @@ Examples:
     return parser
 
 
+def _print_cli_help(parser: argparse.ArgumentParser, subcommand: str | None) -> None:
+    subparsers_action = next(
+        (a for a in parser._actions if getattr(a, "dest", None) == "command"),
+        None,
+    )
+    subparsers_choices = getattr(subparsers_action, "choices", None) if subparsers_action else None
+    if subcommand and subparsers_choices and subcommand in subparsers_choices:
+        subparsers_choices[subcommand].print_help()
+    else:
+        parser.print_help()
+
+
 def main() -> None:
     """Main CLI entry point."""
     parser = _create_parser()
@@ -498,6 +518,10 @@ def main() -> None:
         parser.print_help()
         sys.exit(1)
 
+    if args.command == "help":
+        _print_cli_help(parser, getattr(args, "subcommand", None))
+        sys.exit(0)
+
     try:
         args.func(args)
     except KeyboardInterrupt:

{audiometa_python-1.1.2 → audiometa_python-1.2.0}/audiometa/test/tests/e2e/cli/test_help.py

@@ -11,6 +11,23 @@ class TestCLIHelp:
         assert result.returncode == 1  # Should exit with error
         assert "usage:" in result.stdout.lower() or "help" in result.stdout.lower()
 
+    def test_cli_help_subcommand_shows_main_help(self):
+        result = subprocess.run(
+            [sys.executable, "-m", "audiometa", "help"], capture_output=True, text=True, check=False
+        )
+        assert result.returncode == 0
+        assert "usage:" in result.stdout.lower()
+        assert "read" in result.stdout.lower()
+        assert "write" in result.stdout.lower()
+
+    def test_cli_help_subcommand_shows_subcommand_help(self):
+        result = subprocess.run(
+            [sys.executable, "-m", "audiometa", "help", "read"], capture_output=True, text=True, check=False
+        )
+        assert result.returncode == 0
+        assert "read" in result.stdout.lower()
+        assert "--format" in result.stdout or "format" in result.stdout.lower()
+
     def test_cli_read_help(self):
         result = subprocess.run(
             [sys.executable, "-m", "audiometa", "read", "--help"], capture_output=True, text=True, check=False

{audiometa_python-1.1.2 → audiometa_python-1.2.0}/audiometa/utils/os_dependencies_checker/macos.py

@@ -99,16 +99,19 @@ class MacOSDependenciesChecker(OsDependenciesChecker):
 
     def _get_ffmpeg_version(self) -> str | None:
         """Get ffmpeg version (special handling for keg-only package)."""
-        ffprobe_paths = ["ffprobe"]
+        candidates = ["ffprobe", "ffmpeg"]
         brew_prefix = self._get_brew_prefix()
-        if brew_prefix:
-            for version in ["7", "6", "5"]:
-                ffprobe_paths.append(f"{brew_prefix}/opt/ffmpeg@{version}/bin/ffprobe")
+        paths_to_try: list[str] = []
+        for cmd in candidates:
+            paths_to_try.append(cmd)
+            if brew_prefix:
+                for version in ["7", "6", "5"]:
+                    paths_to_try.append(f"{brew_prefix}/opt/ffmpeg@{version}/bin/{cmd}")
 
-        for ffprobe_path in ffprobe_paths:
+        for tool_path in paths_to_try:
             try:
                 result = subprocess.run(
-                    [ffprobe_path, "-version"],
+                    [tool_path, "-version"],
                     capture_output=True,
                     text=True,
                     check=False,
@@ -118,6 +121,9 @@ class MacOSDependenciesChecker(OsDependenciesChecker):
                     match = re.search(r"version\s+(\d+(?:\.\d+)*)", output)
                     if match:
                         return match.group(1)
+                    match = re.search(r"(\d+\.\d+(?:\.\d+)*)", output)
+                    if match:
+                        return match.group(1)
             except FileNotFoundError:
                 continue
         return None

{audiometa_python-1.1.2 → audiometa_python-1.2.0}/audiometa/utils/os_dependencies_checker/ubuntu.py

@@ -1,5 +1,6 @@
 """Ubuntu-specific dependency checker using dpkg."""
 
+import re
 import subprocess
 
 from audiometa.utils.os_dependencies_checker.base import OsDependenciesChecker
@@ -15,8 +16,9 @@ class UbuntuDependenciesChecker(OsDependenciesChecker):
     def check_tool_available(self, tool_name: str) -> bool:
         """Check if tool is available in PATH."""
         try:
+            version_flag = "-version" if tool_name == "ffprobe" else "--version"
             result = subprocess.run(
-                [tool_name, "--version"],
+                [tool_name, version_flag],
                 capture_output=True,
                 text=True,
                 check=False,
@@ -36,6 +38,30 @@ class UbuntuDependenciesChecker(OsDependenciesChecker):
                         return parts[2]
         except (subprocess.CalledProcessError, FileNotFoundError):
             pass
+        if package == "ffmpeg":
+            return self._get_ffmpeg_version_from_executable()
+        return None
+
+    def _get_ffmpeg_version_from_executable(self) -> str | None:
+        """Get ffmpeg version from ffprobe/ffmpeg when not installed via dpkg (e.g. snap, source)."""
+        for cmd in ["ffprobe", "ffmpeg"]:
+            try:
+                result = subprocess.run(
+                    [cmd, "-version"],
+                    capture_output=True,
+                    text=True,
+                    check=False,
+                )
+                if result.stdout or result.stderr:
+                    output = result.stdout + result.stderr
+                    match = re.search(r"version\s+(\d+(?:\.\d+)*)", output)
+                    if match:
+                        return match.group(1)
+                    match = re.search(r"(\d+\.\d+(?:\.\d+)*)", output)
+                    if match:
+                        return match.group(1)
+            except FileNotFoundError:
+                continue
         return None
 
     @staticmethod

{audiometa_python-1.1.2 → audiometa_python-1.2.0/audiometa_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: audiometa-python
-Version: 1.1.2
+Version: 1.2.0
 Summary: A comprehensive Python library for reading and writing audio metadata across multiple formats
 Author: AudioMeta Python Contributors
 Author-email: Andreas Garcia <garcia.andreas.1991@gmail.com>
@@ -1429,11 +1429,13 @@ AudioMeta provides a powerful command-line interface for quick metadata operatio
 
 ### Installation {#cli-installation}
 
-After installing the package, the `audiometa` command will be available:
+After installing the package, the `audiometa` command will be available. Commands: `read`, `unified`, `write`, `delete`, `help`. Use `audiometa --help` or `audiometa help` for main help; `audiometa help read` (or another command) for subcommand help.
 
 ```bash
 pip install audiometa-python
 audiometa --help
+# or: audiometa help
+# or: audiometa help read
 ```
 
 ### Basic Usage

{audiometa_python-1.1.2 → audiometa_python-1.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "audiometa-python"
-version = "1.1.2"
+version = "1.2.0"
 description = "A comprehensive Python library for reading and writing audio metadata across multiple formats"
 readme = "README.md"
 requires-python = ">=3.12"