auto-editor 26.3.1__py3-none-any.whl → 26.3.2__py3-none-any.whl

auto_editor/edit.py

@@ -297,7 +297,15 @@ def edit_media(paths: list[str], args: Args, log: Log) -> None:
     def make_media(tl: v3, output_path: str) -> None:
         assert src is not None
 
-        output = av.open(output_path, "w")
+        if args.fragmented and not args.no_fragmented:
+            log.debug("Enabling fragmented mp4/mov")
+            options = {
+                "movflags": "+default_base_moof+faststart+frag_keyframe+separate_moof",
+                "frag_duration": "0.2",
+            }
+        else:
+            options = {"movflags": "faststart"}
+        output = av.open(output_path, "w", options=options)
 
         if ctr.default_sub != "none" and not args.sn:
             sub_paths = make_new_subtitles(tl, log)
@@ -444,6 +452,9 @@ def edit_media(paths: list[str], args: Args, log: Log) -> None:
 
             if should_get_audio:
                 audio_frames = [next(frames, None) for frames in audio_gen_frames]
+                if output_stream is None and audio_frames and audio_frames[-1]:
+                    assert audio_frames[-1].time is not None
+                    index = round(audio_frames[-1].time * tl.tb)
             else:
                 audio_frames = [None]
             if should_get_sub:
@@ -478,8 +489,11 @@ def edit_media(paths: list[str], args: Args, log: Log) -> None:
             while frame_queue and frame_queue[0].index <= index:
                 item = heappop(frame_queue)
                 frame_type = item.frame_type
+                bar_index = None
                 try:
                     if frame_type in {"video", "audio"}:
+                        if item.frame.time is not None:
+                            bar_index = round(item.frame.time * tl.tb)
                         output.mux(item.stream.encode(item.frame))
                     elif frame_type == "subtitle":
                         output.mux(item.frame)
@@ -488,10 +502,13 @@ def edit_media(paths: list[str], args: Args, log: Log) -> None:
                         f"Generic error for encoder: {item.stream.name}\n"
                         f"at {item.index} time_base\nPerhaps video quality settings are too low?"
                     )
+                except av.FileNotFoundError:
+                    log.error(f"File not found: {output_path}")
                 except av.FFmpegError as e:
                     log.error(e)
 
-            bar.tick(index)
+                if bar_index:
+                    bar.tick(bar_index)
 
         # Flush streams
         if output_stream is not None:

auto_editor/lang/palet.py

@@ -9,11 +9,11 @@ from dataclasses import dataclass
 from difflib import get_close_matches
 from fractions import Fraction
 from io import StringIO
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, cast
 
 import numpy as np
 
-from auto_editor.analyze import LevelError, mut_remove_small
+from auto_editor.analyze import LevelError, Levels, mut_remove_small
 from auto_editor.lib.contracts import *
 from auto_editor.lib.data_structs import *
 from auto_editor.lib.err import MyError
@@ -21,7 +21,7 @@ from auto_editor.utils.func import boolop
 
 if TYPE_CHECKING:
     from collections.abc import Callable
-    from typing import Any, NoReturn
+    from typing import Any, NoReturn, TypeGuard
 
     from numpy.typing import NDArray
 
@@ -510,15 +510,16 @@ def p_slice(
     return seq[start:end:step]
 
 
+def is_boolean_array(v: object) -> TypeGuard[np.ndarray]:
+    return isinstance(v, np.ndarray) and v.dtype.kind == "b"
+
+
 is_iterable = Contract(
     "iterable?",
     lambda v: type(v) in {str, range, list, tuple, dict, Quoted}
     or isinstance(v, np.ndarray),
 )
-is_boolarr = Contract(
-    "bool-array?",
-    lambda v: isinstance(v, np.ndarray) and v.dtype.kind == "b",
-)
+is_boolarr = Contract("bool-array?", is_boolean_array)
 
 
 def raise_(msg: str | Exception) -> NoReturn:
@@ -568,13 +569,10 @@ def edit_audio(
     if "@levels" not in env:
         raise MyError("Can't use `audio` if there's no input media")
 
-    levels = env["@levels"]
-    src = levels.src
-    strict = levels.strict
-
+    levels = cast(Levels, env["@levels"])
     stream_data: NDArray[np.bool_] | None = None
     if stream == Sym("all"):
-        stream_range = range(0, len(src.audios))
+        stream_range = range(0, len(levels.container.streams.audio))
     else:
         assert isinstance(stream, int)
         stream_range = range(stream, stream + 1)
@@ -586,17 +584,15 @@ def edit_audio(
                 stream_data = audio_list
             else:
                 stream_data = boolop(stream_data, audio_list, np.logical_or)
-    except LevelError as e:
-        raise_(e) if strict else levels.all()
-
-    if stream_data is not None:
-        mut_remove_small(stream_data, minclip, replace=1, with_=0)
-        mut_remove_small(stream_data, mincut, replace=0, with_=1)
+    except LevelError:
+        return np.array([], dtype=np.bool_)
 
-        return stream_data
+    if stream_data is None:
+        return np.array([], dtype=np.bool_)
 
-    stream = 0 if stream == Sym("all") else stream
-    return raise_(f"audio stream '{stream}' does not exist") if strict else levels.all()
+    mut_remove_small(stream_data, minclip, replace=1, with_=0)
+    mut_remove_small(stream_data, mincut, replace=0, with_=1)
+    return stream_data
 
 
 def edit_motion(
@@ -608,18 +604,18 @@ def edit_motion(
     if "@levels" not in env:
         raise MyError("Can't use `motion` if there's no input media")
 
-    levels = env["@levels"]
+    levels = cast(Levels, env["@levels"])
     try:
         return levels.motion(stream, blur, width) >= threshold
-    except LevelError as e:
-        return raise_(e) if levels.strict else levels.all()
+    except LevelError:
+        return np.array([], dtype=np.bool_)
 
 
 def edit_subtitle(pattern, stream=0, **kwargs):
     if "@levels" not in env:
         raise MyError("Can't use `subtitle` if there's no input media")
 
-    levels = env["@levels"]
+    levels = cast(Levels, env["@levels"])
     if "ignore-case" not in kwargs:
         kwargs["ignore-case"] = False
     if "max-count" not in kwargs:
@@ -628,8 +624,8 @@ def edit_subtitle(pattern, stream=0, **kwargs):
     max_count = kwargs["max-count"]
     try:
         return levels.subtitle(pattern, stream, ignore_case, max_count)
-    except LevelError as e:
-        return raise_(e) if levels.strict else levels.all()
+    except LevelError:
+        return np.array([], dtype=np.bool_)
 
 
 class StackTraceManager:

auto_editor/make_layers.py

@@ -6,9 +6,9 @@ from typing import TYPE_CHECKING, NamedTuple
 
 import numpy as np
 
-from auto_editor.analyze import Levels
+from auto_editor.analyze import initLevels
 from auto_editor.ffwrapper import FileInfo
-from auto_editor.lang.palet import Lexer, Parser, env, interpret, is_boolarr
+from auto_editor.lang.palet import Lexer, Parser, env, interpret, is_boolean_array
 from auto_editor.lib.data_structs import print_str
 from auto_editor.lib.err import MyError
 from auto_editor.timeline import ASpace, TlAudio, TlVideo, VSpace, v1, v3
@@ -122,7 +122,6 @@ def make_timeline(
 
     has_loud = np.array([], dtype=np.bool_)
     src_index = np.array([], dtype=np.int32)
-    concat = np.concatenate
 
     try:
         stdenv = __import__("auto_editor.lang.stdenv", fromlist=["lang"])
@@ -137,6 +136,7 @@ def make_timeline(
             parser = Parser(Lexer("config.pal", file.read()))
             interpret(env, parser)
 
+    results = []
     for i, src in enumerate(sources):
         try:
             parser = Parser(Lexer("`--edit`", args.edit))
@@ -144,32 +144,43 @@ def make_timeline(
                 log.debug(f"edit: {parser}")
 
             env["timebase"] = tb
-            env["src"] = f"{src.path}"
-            env["@levels"] = Levels(src, tb, bar, args.no_cache, log, len(sources) < 2)
+            env["@levels"] = initLevels(src, tb, bar, args.no_cache, log)
 
-            results = interpret(env, parser)
-
-            if len(results) == 0:
+            inter_result = interpret(env, parser)
+            if len(inter_result) == 0:
                 log.error("Expression in --edit must return a bool-array, got nothing")
 
-            result = results[-1]
+            result = inter_result[-1]
             if callable(result):
                 result = result()
         except MyError as e:
             log.error(e)
 
-        if not is_boolarr(result):
+        if not is_boolean_array(result):
             log.error(
                 f"Expression in --edit must return a bool-array, got {print_str(result)}"
             )
-        assert isinstance(result, np.ndarray)
-
         mut_margin(result, start_margin, end_margin)
-
-        has_loud = concat((has_loud, result))
-        src_index = concat((src_index, np.full(len(result), i, dtype=np.int32)))
-
-    assert len(has_loud) > 0
+        results.append(result)
+
+    if all(len(result) == 0 for result in results):
+        if "subtitle" in args.edit:
+            log.error("No file(s) have the selected subtitle stream.")
+        if "motion" in args.edit:
+            log.error("No file(s) have the selected video stream.")
+        if "audio" in args.edit:
+            log.error("No file(s) have the selected audio stream.")
+
+    src_indexes = []
+    for i in range(0, len(results)):
+        if len(results[i]) == 0:
+            results[i] = initLevels(sources[i], tb, bar, args.no_cache, log).all()
+        src_indexes.append(np.full(len(results[i]), i, dtype=np.int32))
+
+    has_loud = np.concatenate(results)
+    src_index = np.concatenate(src_indexes)
+    if len(has_loud) == 0:
+        log.error("Empty timeline. Nothing to do.")
 
     # Setup for handling custom speeds
     speed_index = has_loud.astype(np.uint)

auto_editor/preview.py

@@ -5,7 +5,7 @@ from fractions import Fraction
 from statistics import fmean, median
 from typing import TextIO
 
-from auto_editor.analyze import Levels
+from auto_editor.analyze import initLevels
 from auto_editor.timeline import v3
 from auto_editor.utils.bar import initBar
 from auto_editor.utils.func import to_timecode
@@ -64,8 +64,9 @@ def preview(tl: v3, log: Log) -> None:
                 all_sources.add(aclip.src)
 
     in_len = 0
+    bar = initBar("none")
     for src in all_sources:
-        in_len += Levels(src, tb, initBar("none"), False, log, False).media_length
+        in_len += initLevels(src, tb, bar, False, log).media_length
 
     out_len = tl.out_len()
 

auto_editor/utils/types.py

@@ -201,6 +201,8 @@ class Args:
     vprofile: str | None = None
     audio_bitrate: str = "auto"
     scale: float = 1.0
+    fragmented: bool = False
+    no_fragmented: bool = False
     sn: bool = False
     dn: bool = False
     no_seek: bool = False

{auto_editor-26.3.1.dist-info → auto_editor-26.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: auto-editor
-Version: 26.3.1
+Version: 26.3.2
 Summary: Auto-Editor: Effort free video editing!
 Author-email: WyattBlue <wyattblue@auto-editor.com>
 License: Unlicense

{auto_editor-26.3.1.dist-info → auto_editor-26.3.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
-auto_editor/__init__.py,sha256=cbuXE-xYiZp6P9Ipk0EAUgPxPvaOpg-ve_HurO96fCM,23
-auto_editor/__main__.py,sha256=g-9q3i6oFeNPeFMeNJEwZua6ZloOPLcaLN-B0FlxWXo,11371
-auto_editor/analyze.py,sha256=tkNZdRz1Nf1mQfC3jKHaiLbHRkacX_7-2TrKTKvwpxY,12463
-auto_editor/edit.py,sha256=unOxLPiPUMoLgM_ScdRA3rNnxOicUUu7iLO1lG0zcfc,20260
+auto_editor/__init__.py,sha256=bDmtpN3tJ_1R818Djb_PZ7H7ZIgSCXSdbTx5GJ009SU,23
+auto_editor/__main__.py,sha256=BQRStgcJxNVUOisP4JpcaxaM_KTGFS04Qgklyy9fumc,12012
+auto_editor/analyze.py,sha256=YY3Io-IDdlliawx03w-L9AW5nZSOtmbXX_la1HanYmY,12658
+auto_editor/edit.py,sha256=wjs1qj13Rx8JGgf7b_dPgVEmd_vDyU-N5GDQhVGSJX8,21130
 auto_editor/ffwrapper.py,sha256=1lYYfq8gVgMVkYWeAEYDPAHCwFCYbKQwy0FxYBxMzk8,4765
 auto_editor/help.py,sha256=CzfDTsL4GuGu596ySHKj_wKnxGR9h8B0KUdkZpo33oE,8044
-auto_editor/make_layers.py,sha256=vEeJt0PnE1vc9-cQZ_AlXVDjvWhObRCWJSCQGraoMvU,9016
+auto_editor/make_layers.py,sha256=Yl4xYkMHume_VvRW8Ii48hyx-ZtFr8WMmVYXJMSUmg0,9581
 auto_editor/output.py,sha256=ho8Lpqz4Sv_Gw0Vj2OvG39s83xHpyZlvtRNryTPbXqc,2563
-auto_editor/preview.py,sha256=HUsjmV9Fx73rZ26BXrpz9z-z_e4oiui3u9e7qbbGoBY,3037
+auto_editor/preview.py,sha256=cqQdozM2IB-5qXHNxeqiSrSdEIzlMfjD4SU-NX9sYZ0,3052
 auto_editor/timeline.py,sha256=XfaH9cH-RB-MObOpMr5IfLcqJcjmabO1XwkUkT3_FQM,8186
 auto_editor/vanparse.py,sha256=Ug5A2QaRqGiw4l55Z_h9T2QU1x0WqRibR7yY5rQ0WTk,10002
 auto_editor/wavfile.py,sha256=afFfje8cK9lFjIkYoBbQHfvQIpsEPxWvspCtFhUKlAw,9499
@@ -14,11 +14,11 @@ auto_editor/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 auto_editor/cmds/cache.py,sha256=bViYbtVXefTeEIUvSanDfA6cG35ep1N_Jvtz7ZjgIkY,1959
 auto_editor/cmds/desc.py,sha256=GDrKJYiHMaeTrplZAceXl1JwoqD78XsV2_5lc0Xd7po,869
 auto_editor/cmds/info.py,sha256=vYa1hYdE8kDTE8AS3kwXlnd59X6CrE2GtIEQ7UmlpRY,7010
-auto_editor/cmds/levels.py,sha256=RBBs0YM8Qb7XteCy7Pr4QpU9b5maMsDe6xEkAuyGs1c,5644
+auto_editor/cmds/levels.py,sha256=6LqXfNBca__KGeA8kJqJqH0MBR3GudaFoWU0_dnv5bI,5635
 auto_editor/cmds/palet.py,sha256=ONzTqemaQq9YEfIOsDRNnwzfqnEMUMSXIQrETxyroRU,749
-auto_editor/cmds/repl.py,sha256=TF_I7zsFY7-KdgidrqjafTz7o_eluVbLvgTcOBG-UWQ,3449
+auto_editor/cmds/repl.py,sha256=8DgMw-XyfR5XctSmwtk4_1-zxs3ooMs72BfMRlVqLvY,3412
 auto_editor/cmds/subdump.py,sha256=af_XBf7kaevqHn1A71z8C-7x8pS5WKD9FE_ugkCw6rk,665
-auto_editor/cmds/test.py,sha256=D8l4Zr0UjrUtFkqsADqlVQ1wvNP3s97ifNnyf1UBTFU,26327
+auto_editor/cmds/test.py,sha256=SzjtsEteztXFbkvLRfL9BPSgK8Qez_-yXPR5ts_tu9E,26465
 auto_editor/formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 auto_editor/formats/fcp11.py,sha256=sqjC36jI47ICPLjZJYiqGwY7foOnWOiNjkPFLdgSnI4,5208
 auto_editor/formats/fcp7.py,sha256=x5cagTzGCAW3i3M6m7TZC1h8gLfSmX1UK-iiDuCpdfs,20289
@@ -29,7 +29,7 @@ auto_editor/lang/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 auto_editor/lang/json.py,sha256=D84vwyLtX5t5xl8S4r4jFXGVkbIg1L4IcexlS_a_k6w,9231
 auto_editor/lang/libintrospection.py,sha256=6H1rGp0wqaCud5IPaoEmzULGnYt6ec7_0h32ATcw2oY,261
 auto_editor/lang/libmath.py,sha256=z33A161Oe6vYYK7R6pgYjdZZe63dQkN38Qf36TL3prg,847
-auto_editor/lang/palet.py,sha256=ZOzNxLfzY8FTCYlF_mZtU2XoNzdg-eseUVkMtnWkVaI,24139
+auto_editor/lang/palet.py,sha256=XKMVMybHZK5c_iB368T4pFqI7Yfl5o4eDVa5XMNLEow,24082
 auto_editor/lang/stdenv.py,sha256=sQyOD3bttjcieWMtTMNpE6blEZriAfHtSZHbuvC09R8,43762
 auto_editor/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 auto_editor/lib/contracts.py,sha256=lExGQymcQUmwG5lC1lO4qm4GY8W0q_yzK_miTaAoPA4,7586
@@ -46,11 +46,11 @@ auto_editor/utils/cmdkw.py,sha256=aUGBvBel2Ko1o6Rwmr4rEL-BMc5hEnzYLbyZ1GeJdcY,57
 auto_editor/utils/container.py,sha256=C_Ahh7nlMEX4DNQ2M_cITPPbYcIL68r4I_AgFy0OD6o,2487
 auto_editor/utils/func.py,sha256=C8ucgsSEzPyBc-8obhsCXd_uQW0cnCdBn1KVxB7FHjU,2747
 auto_editor/utils/log.py,sha256=wPNf6AabV-0cnoS_bPLv1Lh7llQBtNqPKeh07einOuc,3701
-auto_editor/utils/types.py,sha256=r5f6QB81xH7NRwGntITIOCVx-fupOl8l3X3LSFkt3nE,10756
+auto_editor/utils/types.py,sha256=HxFafTgmL_5HQbfR7AR_4Q6o8iHk1z-T6WT90PgQHiY,10817
 docs/build.py,sha256=POy8X8QOBYe_8A8HI_yiVI_Qg9E5mLpn1z7AHQr0_vQ,1888
-auto_editor-26.3.1.dist-info/LICENSE,sha256=yiq99pWITHfqS0pbZMp7cy2dnbreTuvBwudsU-njvIM,1210
-auto_editor-26.3.1.dist-info/METADATA,sha256=4r9rtkLWEDaVMcJauMcljdAw-cnz2h6xS9sixAnWVlQ,6111
-auto_editor-26.3.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-auto_editor-26.3.1.dist-info/entry_points.txt,sha256=UAsTc7qJQbnAzHd7KWg-ALo_X9Hj2yDs3M9I2DV3eyI,212
-auto_editor-26.3.1.dist-info/top_level.txt,sha256=jBV5zlbWRbKOa-xaWPvTD45QL7lGExx2BDzv-Ji4dTw,17
-auto_editor-26.3.1.dist-info/RECORD,,
+auto_editor-26.3.2.dist-info/LICENSE,sha256=yiq99pWITHfqS0pbZMp7cy2dnbreTuvBwudsU-njvIM,1210
+auto_editor-26.3.2.dist-info/METADATA,sha256=lxdGmJqB_b7J1myUG1CFUnXFKo0Vt2Kr8cG7rl58xK8,6111
+auto_editor-26.3.2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+auto_editor-26.3.2.dist-info/entry_points.txt,sha256=UAsTc7qJQbnAzHd7KWg-ALo_X9Hj2yDs3M9I2DV3eyI,212
+auto_editor-26.3.2.dist-info/top_level.txt,sha256=jBV5zlbWRbKOa-xaWPvTD45QL7lGExx2BDzv-Ji4dTw,17
+auto_editor-26.3.2.dist-info/RECORD,,

{auto_editor-26.3.1.dist-info → auto_editor-26.3.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any