typed-ffmpeg-compatible 3.2.1__py3-none-any.whl → 3.2.2__py3-none-any.whl

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/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/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/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.dist-info → typed_ffmpeg_compatible-3.2.2.dist-info}/METADATA

@@ -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.dist-info → typed_ffmpeg_compatible-3.2.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 typed_ffmpeg/__init__.py,sha256=n1SZfENc9xhZ0eA3ZzkBNPuIY-Pt3-rOwB8-uUj5olU,1592
-typed_ffmpeg/_version.py,sha256=XRi79FWoZnvkU9YpUCVq-_6vnTUrxKmzOwOlvrJYqm4,511
+typed_ffmpeg/_version.py,sha256=VfQFwh2Vyb8ry8WT1y6VfXFKIN0E2GC1aed16irkCFQ,511
 typed_ffmpeg/base.py,sha256=C5Tqbx2I0c-09D7aXKZoGkspu-lAAeAhuOns5zr3PXQ,6304
 typed_ffmpeg/exceptions.py,sha256=D4SID6WOwkjVV8O8mAjrEDHWn-8BRDnK_jteaDof1SY,2474
 typed_ffmpeg/filters.py,sha256=_lBpGZgPHK3KgGVrw-TCdQEsBRuEXVIgwggYNGd80MU,110076
@@ -13,7 +13,7 @@ typed_ffmpeg/common/cache.py,sha256=j0JvfX7jewLpdJWxgo7Pwze0BkUJdYGHX2uGR8BZ-9M,
 typed_ffmpeg/common/schema.py,sha256=qM8yfMX9UU3EAQSNsTrr-SAmyqKx8eQCXTtu3RJWkEk,19673
 typed_ffmpeg/common/serialize.py,sha256=dLim0DBP5CdJ1JiMV9xEmmh1XMSIhBOWs61EopAL15s,7719
 typed_ffmpeg/compile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-typed_ffmpeg/compile/compile_cli.py,sha256=wzLW0_JYS6vth-8YGfkzVaGJg1er-_-ekX-X0KxDC_I,29042
+typed_ffmpeg/compile/compile_cli.py,sha256=nLrTV5nuC1ETff8C7_ZgZDKPtvXJoQfZsAbm_oq1WA8,28397
 typed_ffmpeg/compile/compile_json.py,sha256=YCiTyfAnUVSbFr7BiQpmJYs13K5sa-xo77Iih33mb6I,992
 typed_ffmpeg/compile/compile_python.py,sha256=oo4e8Ldwk0OkrZtHucfuGR5JDFF8xY8omNKPMDyUpQ8,11506
 typed_ffmpeg/compile/context.py,sha256=macQ3HhEJ73j_WbWYtU9GCQCzcB_KQGAPimcuU-WOac,10946
@@ -31,9 +31,9 @@ typed_ffmpeg/dag/io/_input.py,sha256=KRLTSQPEfmgPcPEAJdeWRHZhNsClaJCB9Ac6czMOrmE
 typed_ffmpeg/dag/io/_output.py,sha256=_no6ffAOABznbLNTki8CYr7pvr4Sa0LweRfn38-cszs,12470
 typed_ffmpeg/dag/io/output_args.py,sha256=SThIhZh9PXs2m6Fz5JsSy8oS-Te7GM_oz7HRuZo0-eI,13901
 typed_ffmpeg/ffprobe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-typed_ffmpeg/ffprobe/parse.py,sha256=9Lp7VgFOjAlyPOgtyW1iomRrt-O8Hbsm71gqtolpPjs,3706
+typed_ffmpeg/ffprobe/parse.py,sha256=fq1cGFkUpUdvyVi3S-TAQ7qn-tXUdae6ADhymZt7-t4,3791
 typed_ffmpeg/ffprobe/probe.py,sha256=D_opsKp3OgT2HSBzhxgY1b9SIqXpDhz3xh_k9HUGux0,10367
-typed_ffmpeg/ffprobe/schema.py,sha256=QmFN3ZxGvQmE7gRWbRUmgznPMe9HZ28nGc5srxwwUhY,13586
+typed_ffmpeg/ffprobe/schema.py,sha256=PBgBWYGO8wKnI0Lae9oCJ1Nprhv2ciPkdLrumzPVllY,13631
 typed_ffmpeg/ffprobe/xml2json.py,sha256=1TSuxR7SYc-M_-JmE-1khHGbXCapgW0Oap9kzL0nwNg,2455
 typed_ffmpeg/streams/__init__.py,sha256=Nt9uWpcVI1sQLl5Qt_kBCBcWOGZA1vczCQ0qvFbSko0,141
 typed_ffmpeg/streams/audio.py,sha256=2oNRhb5UetWtlPG3NW73AjUZoFPl303yMv-6W1sGWt0,259054
@@ -50,8 +50,9 @@ typed_ffmpeg/utils/view.py,sha256=QCSlQoQkRBI-T0sWjiywGgM9DlKd8Te3CB2ZYX-pEVU,34
 typed_ffmpeg/utils/lazy_eval/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 typed_ffmpeg/utils/lazy_eval/operator.py,sha256=QWybd-UH3VdDa8kgWkqAMi3WV0b0WF1d1JixQr6is2E,4136
 typed_ffmpeg/utils/lazy_eval/schema.py,sha256=WSg-E3MS3itN1AT6Dq4Z9btnRHEReuN3o6zruXou7h4,9623
-typed_ffmpeg_compatible-3.2.1.dist-info/licenses/LICENSE,sha256=8Aaya5i_09Cou2i3QMxTwz6uHGzi_fGA4uhkco07-A4,1066
-typed_ffmpeg_compatible-3.2.1.dist-info/METADATA,sha256=bqpqg08AUkgGm22Htg9TrOjhUrvOJncpspmOCmIzgMk,8385
-typed_ffmpeg_compatible-3.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-typed_ffmpeg_compatible-3.2.1.dist-info/top_level.txt,sha256=vuASJGVRQiNmhWY1pt0RXESWSNkknWXqWLIRAU7H_L4,13
-typed_ffmpeg_compatible-3.2.1.dist-info/RECORD,,
+typed_ffmpeg_compatible-3.2.2.dist-info/licenses/LICENSE,sha256=8Aaya5i_09Cou2i3QMxTwz6uHGzi_fGA4uhkco07-A4,1066
+typed_ffmpeg_compatible-3.2.2.dist-info/METADATA,sha256=eJv1JAMT41NxhuCYDvTZOBNyU5n2XoiFfyDTVtohI28,8385
+typed_ffmpeg_compatible-3.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+typed_ffmpeg_compatible-3.2.2.dist-info/entry_points.txt,sha256=kUQvZ27paV-07qtkIFV-emKsYtjFOTw9kknBRSXPs04,45
+typed_ffmpeg_compatible-3.2.2.dist-info/top_level.txt,sha256=vuASJGVRQiNmhWY1pt0RXESWSNkknWXqWLIRAU7H_L4,13
+typed_ffmpeg_compatible-3.2.2.dist-info/RECORD,,

typed_ffmpeg_compatible-3.2.2.dist-info/entry_points.txt

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