typed-ffmpeg-compatible 3.2.1__tar.gz → 3.2.2__tar.gz

{typed_ffmpeg_compatible-3.2.1/src/typed_ffmpeg_compatible.egg-info → typed_ffmpeg_compatible-3.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: typed-ffmpeg-compatible
-Version: 3.2.1
+Version: 3.2.2
 Summary: Modern Python FFmpeg wrappers offer comprehensive support for complex filters, complete with detailed typing and documentation.
 Author-email: lucemia <lucemia@gmail.com>
 License-Expression: MIT

{typed_ffmpeg_compatible-3.2.1 → typed_ffmpeg_compatible-3.2.2}/pyproject.toml

@@ -32,6 +32,9 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Application Frameworks",
 ]
 
+[project.scripts]
+scripts = "scripts.main:app"
+
 [project.urls]
 Homepage = "https://livingbio.github.io/typed-ffmpeg/"
 Repository = "https://github.com/livingbio/typed-ffmpeg"

{typed_ffmpeg_compatible-3.2.1 → typed_ffmpeg_compatible-3.2.2}/src/typed_ffmpeg/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.2.1'
-__version_tuple__ = version_tuple = (3, 2, 1)
+__version__ = version = '3.2.2'
+__version_tuple__ = version_tuple = (3, 2, 2)

{typed_ffmpeg_compatible-3.2.1 → typed_ffmpeg_compatible-3.2.2}/src/typed_ffmpeg/compile/compile_cli.py

@@ -317,37 +317,21 @@ def parse_global(
         For tokens like ['-y', '-loglevel', 'quiet', '-i', 'input.mp4']:
         Returns ({'y': True, 'loglevel': 'quiet'}, ['-i', 'input.mp4'])
     """
-    global_params: dict[str, str | bool] = {}
-    remaining_tokens = tokens.copy()
-
-    # Process tokens until we hit an input file marker (-i)
-    while remaining_tokens and remaining_tokens[0] != "-i":
-        if remaining_tokens[0].startswith("-"):
-            option_name = remaining_tokens[0][1:]
-            assert option_name in ffmpeg_options, (
-                f"Unknown global option: {option_name}"
-            )
-            option = ffmpeg_options[option_name]
-
-            if not option.is_global_option:
-                continue
-
-            if len(remaining_tokens) > 1 and not remaining_tokens[1].startswith("-"):
-                # Option with value
-                global_params[option_name] = remaining_tokens[1]
-                remaining_tokens = remaining_tokens[2:]
+    options = parse_options(tokens[: tokens.index("-i")])
+    remaining_tokens = tokens[tokens.index("-i") :]
+    parameters: dict[str, str | bool] = {}
+
+    for key, value in options.items():
+        assert key in ffmpeg_options, f"Unknown option: {key}"
+        option = ffmpeg_options[key]
+
+        if option.is_global_option:
+            # Process only recognized global options
+            if value[-1] is None:
+                parameters[key] = True
             else:
-                # Boolean option
-                if option_name.startswith("no"):
-                    global_params[option_name[2:]] = False
-                else:
-                    global_params[option_name] = True
-                remaining_tokens = remaining_tokens[1:]
-        else:
-            # Skip non-option tokens
-            remaining_tokens = remaining_tokens[1:]
-
-    return global_params, remaining_tokens
+                parameters[key] = value[-1]
+    return parameters, remaining_tokens
 
 
 def parse(cli: str) -> Stream:
@@ -356,7 +340,7 @@ def parse(cli: str) -> Stream:
     ffmpeg_filters = get_filter_dict()
 
     tokens = shlex.split(cli)
-    assert tokens[0] == "ffmpeg"
+    assert tokens[0].lower().split(".")[0] == "ffmpeg"
     tokens = tokens[1:]
 
     # Parse global options first

{typed_ffmpeg_compatible-3.2.1 → typed_ffmpeg_compatible-3.2.2}/src/typed_ffmpeg/ffprobe/parse.py

@@ -72,7 +72,6 @@ def _parse_obj_from_dict(data: Any, cls: type[T]) -> T | None:
     Returns:
         The parsed dataclass instance
     """
-
     if data is None:
         return None
 
@@ -104,6 +103,7 @@ def _parse_obj_from_dict(data: Any, cls: type[T]) -> T | None:
                 continue
             item_type = tuple_args[0]
             value = data.get(field_name, [])
+            # NOTE: if the value is a single item, convert it to a list (xml's issue)
             if not isinstance(value, list):
                 value = [value]
             kwargs[field_name] = tuple(

{typed_ffmpeg_compatible-3.2.1 → typed_ffmpeg_compatible-3.2.2}/src/typed_ffmpeg/ffprobe/schema.py

@@ -26,15 +26,15 @@ class packetsType:
 
 @dataclass(kw_only=True, frozen=True)
 class framesType:
-    frame: Optional["frameType"] = None
-    subtitle: Optional["subtitleType"] = None
+    frame: tuple["frameType", ...] | None = None
+    subtitle: tuple["subtitleType", ...] | None = None
 
 
 @dataclass(kw_only=True, frozen=True)
 class packetsAndFramesType:
-    packet: Optional["packetType"] = None
-    frame: Optional["frameType"] = None
-    subtitle: Optional["subtitleType"] = None
+    packet: tuple["packetType", ...] | None = None
+    frame: tuple["frameType", ...] | None = None
+    subtitle: tuple["subtitleType", ...] | None = None
 
 
 @dataclass(kw_only=True, frozen=True)

{typed_ffmpeg_compatible-3.2.1 → typed_ffmpeg_compatible-3.2.2/src/typed_ffmpeg_compatible.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: typed-ffmpeg-compatible
-Version: 3.2.1
+Version: 3.2.2
 Summary: Modern Python FFmpeg wrappers offer comprehensive support for complex filters, complete with detailed typing and documentation.
 Author-email: lucemia <lucemia@gmail.com>
 License-Expression: MIT

{typed_ffmpeg_compatible-3.2.1 → typed_ffmpeg_compatible-3.2.2}/src/typed_ffmpeg_compatible.egg-info/SOURCES.txt

@@ -57,5 +57,6 @@ src/typed_ffmpeg/utils/lazy_eval/schema.py
 src/typed_ffmpeg_compatible.egg-info/PKG-INFO
 src/typed_ffmpeg_compatible.egg-info/SOURCES.txt
 src/typed_ffmpeg_compatible.egg-info/dependency_links.txt
+src/typed_ffmpeg_compatible.egg-info/entry_points.txt
 src/typed_ffmpeg_compatible.egg-info/requires.txt
 src/typed_ffmpeg_compatible.egg-info/top_level.txt

typed_ffmpeg_compatible-3.2.2/src/typed_ffmpeg_compatible.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+scripts = scripts.main:app