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

auto_editor/edit.py

@@ -6,7 +6,7 @@ from fractions import Fraction
 from heapq import heappop, heappush
 from os.path import splitext
 from subprocess import run
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import av
 from av import AudioResampler, Codec
@@ -24,7 +24,9 @@ from auto_editor.utils.chunks import Chunk, Chunks
 from auto_editor.utils.cmdkw import ParserError, parse_with_palet, pAttr, pAttrs
 from auto_editor.utils.container import Container, container_constructor
 from auto_editor.utils.log import Log
-from auto_editor.utils.types import Args
+
+if TYPE_CHECKING:
+    from auto_editor.__main__ import Args
 
 
 def set_output(
@@ -206,7 +208,7 @@ def edit_media(paths: list[str], args: Args, log: Log) -> None:
 
     del paths
 
-    output, export_ops = set_output(args.output_file, args.export, src, log)
+    output, export_ops = set_output(args.output, args.export, src, log)
     assert "export" in export_ops
     export = export_ops["export"]
 
@@ -219,10 +221,6 @@ def edit_media(paths: list[str], args: Args, log: Log) -> None:
         if os.path.isdir(output):
             log.error("Output path already has an existing directory!")
 
-        if os.path.isfile(output) and src is not None and src.path != output:  # type: ignore
-            log.debug(f"Removing already existing file: {output}")
-            os.remove(output)
-
     if args.sample_rate is None:
         if tl is None:
             samplerate = 48000 if src is None else src.get_sr()
@@ -297,7 +295,19 @@ 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")
+        options = {}
+        mov_flags = []
+        if args.fragmented and not args.no_fragmented:
+            mov_flags.extend(["default_base_moof", "frag_keyframe", "separate_moof"])
+            options["frag_duration"] = "0.2"
+            if args.faststart:
+                log.warning("Fragmented is enabled, will not apply faststart.")
+        elif not args.no_faststart:
+            mov_flags.append("faststart")
+        if mov_flags:
+            options["movflags"] = "+".join(mov_flags)
+
+        output = av.open(output_path, "w", container_options=options)
 
         if ctr.default_sub != "none" and not args.sn:
             sub_paths = make_new_subtitles(tl, log)
@@ -444,6 +454,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 +491,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 +504,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,18 +6,19 @@ 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
 from auto_editor.utils.func import mut_margin
-from auto_editor.utils.types import Args, CoerceError, time
+from auto_editor.utils.types import CoerceError, time
 
 if TYPE_CHECKING:
     from numpy.typing import NDArray
 
+    from auto_editor.__main__ import Args
     from auto_editor.utils.bar import Bar
     from auto_editor.utils.chunks import Chunks
     from auto_editor.utils.log import Log
@@ -122,7 +123,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 +137,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 +145,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/output.py

@@ -9,12 +9,12 @@ from av.audio.resampler import AudioResampler
 from auto_editor.ffwrapper import FileInfo
 from auto_editor.utils.bar import Bar
 from auto_editor.utils.log import Log
-from auto_editor.utils.types import _split_num_str
+from auto_editor.utils.types import split_num_str
 
 
 def parse_bitrate(input_: str, log: Log) -> int:
     try:
-        val, unit = _split_num_str(input_)
+        val, unit = split_num_str(input_)
     except Exception as e:
         log.error(e)
 

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/render/audio.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import io
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 import av
 import numpy as np
@@ -18,9 +19,11 @@ from auto_editor.utils.bar import Bar
 from auto_editor.utils.cmdkw import ParserError, parse_with_palet, pAttr, pAttrs
 from auto_editor.utils.container import Container
 from auto_editor.utils.log import Log
-from auto_editor.utils.types import Args
 from auto_editor.wavfile import AudioData, read, write
 
+if TYPE_CHECKING:
+    from auto_editor.__main__ import Args
+
 norm_types = {
     "ebu": pAttrs(
         "ebu",

auto_editor/render/video.py

@@ -13,10 +13,10 @@ if TYPE_CHECKING:
     from collections.abc import Iterator
     from typing import Any
 
+    from auto_editor.__main__ import Args
     from auto_editor.ffwrapper import FileInfo
     from auto_editor.timeline import v3
     from auto_editor.utils.log import Log
-    from auto_editor.utils.types import Args
 
 
 @dataclass(slots=True)

auto_editor/timeline.py

@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING
 from auto_editor.ffwrapper import initFileInfo, mux
 from auto_editor.lib.contracts import *
 from auto_editor.utils.cmdkw import Required, pAttr, pAttrs
-from auto_editor.utils.types import natural, number, parse_color, threshold
+from auto_editor.utils.types import CoerceError, natural, number, parse_color
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
@@ -128,6 +128,13 @@ class TlRect:
         }
 
 
+def threshold(val: str | float) -> float:
+    num = number(val)
+    if num > 1 or num < 0:
+        raise CoerceError(f"'{val}': Threshold must be between 0 and 1 (0%-100%)")
+    return num
+
+
 video_builder = pAttrs(
     "video",
     pAttr("start", Required, is_nat, natural),

auto_editor/utils/types.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import re
-from dataclasses import dataclass, field
 from fractions import Fraction
 
 
@@ -9,16 +8,7 @@ class CoerceError(Exception):
     pass
 
 
-def _comma_coerce(name: str, val: str, num_args: int) -> list[str]:
-    vals = val.strip().split(",")
-    if num_args > len(vals):
-        raise CoerceError(f"Too few arguments for {name}.")
-    if len(vals) > num_args:
-        raise CoerceError(f"Too many arguments for {name}.")
-    return vals
-
-
-def _split_num_str(val: str | float) -> tuple[float, str]:
+def split_num_str(val: str | float) -> tuple[float, str]:
     if isinstance(val, float | int):
         return val, ""
 
@@ -35,14 +25,9 @@ def _split_num_str(val: str | float) -> tuple[float, str]:
     return float(num), unit
 
 
-def _unit_check(unit: str, allowed_units: tuple[str, ...]) -> None:
-    if unit not in allowed_units:
-        raise CoerceError(f"Unknown unit: '{unit}'")
-
-
 # Numbers: 0, 1, 2, 3, ...
 def natural(val: str | float) -> int:
-    num, unit = _split_num_str(val)
+    num, unit = split_num_str(val)
     if unit != "":
         raise CoerceError(f"'{val}': Natural does not allow units.")
     if not isinstance(num, int) and not num.is_integer():
@@ -69,25 +54,12 @@ def number(val: str | float) -> float:
             raise CoerceError(f"'{val}': Denominator must not be zero.")
         return vs[0] / vs[1]
 
-    num, unit = _split_num_str(val)
+    num, unit = split_num_str(val)
     if unit == "%":
         return num / 100
-    _unit_check(unit, ("",))
-    return num
-
-
-def speed(val: str) -> float:
-    _s = number(val)
-    if _s <= 0 or _s > 99999:
-        return 99999.0
-    return _s
-
-
-def threshold(val: str | float) -> float:
-    num = number(val)
-    if num > 1 or num < 0:
-        raise CoerceError(f"'{val}': Threshold must be between 0 and 1 (0%-100%)")
-    return num
+    if unit == "":
+        return num
+    raise CoerceError(f"Unknown unit: '{unit}'")
 
 
 def frame_rate(val: str) -> Fraction:
@@ -102,14 +74,6 @@ def frame_rate(val: str) -> Fraction:
     return Fraction(val)
 
 
-def sample_rate(val: str) -> int:
-    num, unit = _split_num_str(val)
-    if unit in {"kHz", "KHz"}:
-        return natural(num * 1000)
-    _unit_check(unit, ("", "Hz"))
-    return natural(num)
-
-
 def time(val: str, tb: Fraction) -> int:
     if ":" in val:
         boxes = val.split(":")
@@ -121,7 +85,7 @@ def time(val: str, tb: Fraction) -> int:
             )
         raise CoerceError(f"'{val}': Invalid time format")
 
-    num, unit = _split_num_str(val)
+    num, unit = split_num_str(val)
     if unit in {"s", "sec", "secs", "second", "seconds"}:
         return round(num * tb)
     if unit in {"min", "mins", "minute", "minutes"}:
@@ -136,25 +100,6 @@ def time(val: str, tb: Fraction) -> int:
     return int(num)
 
 
-def margin(val: str) -> tuple[str, str]:
-    vals = val.strip().split(",")
-    if len(vals) == 1:
-        vals.append(vals[0])
-    if len(vals) != 2:
-        raise CoerceError("--margin has too many arguments.")
-    return vals[0], vals[1]
-
-
-def time_range(val: str) -> tuple[str, str]:
-    a = _comma_coerce("time_range", val, 2)
-    return a[0], a[1]
-
-
-def speed_range(val: str) -> tuple[float, str, str]:
-    a = _comma_coerce("speed_range", val, 3)
-    return number(a[0]), a[1], a[2]
-
-
 def parse_color(val: str) -> str:
     """
     Convert a color str into an RGB tuple
@@ -179,60 +124,6 @@ def parse_color(val: str) -> str:
     raise ValueError(f"Invalid Color: '{color}'")
 
 
-def resolution(val: str | None) -> tuple[int, int] | None:
-    if val is None:
-        return None
-    vals = val.strip().split(",")
-    if len(vals) != 2:
-        raise CoerceError(f"'{val}': Resolution takes two numbers")
-
-    return natural(vals[0]), natural(vals[1])
-
-
-@dataclass(slots=True)
-class Args:
-    yt_dlp_location: str = "yt-dlp"
-    download_format: str | None = None
-    output_format: str | None = None
-    yt_dlp_extras: str | None = None
-    video_codec: str = "auto"
-    audio_codec: str = "auto"
-    video_bitrate: str = "auto"
-    vprofile: str | None = None
-    audio_bitrate: str = "auto"
-    scale: float = 1.0
-    sn: bool = False
-    dn: bool = False
-    no_seek: bool = False
-    cut_out: list[tuple[str, str]] = field(default_factory=list)
-    add_in: list[tuple[str, str]] = field(default_factory=list)
-    set_speed_for_range: list[tuple[float, str, str]] = field(default_factory=list)
-    frame_rate: Fraction | None = None
-    sample_rate: int | None = None
-    resolution: tuple[int, int] | None = None
-    background: str = "#000000"
-    edit: str = "audio"
-    keep_tracks_separate: bool = False
-    audio_normalize: str = "#f"
-    export: str | None = None
-    player: str | None = None
-    no_open: bool = False
-    temp_dir: str | None = None
-    progress: str = "modern"
-    version: bool = False
-    debug: bool = False
-    config: bool = False
-    quiet: bool = False
-    preview: bool = False
-    no_cache: bool = False
-    margin: tuple[str, str] = ("0.2s", "0.2s")
-    silent_speed: float = 99999.0
-    video_speed: float = 1.0
-    output_file: str | None = None
-    help: bool = False
-    input: list[str] = field(default_factory=list)
-
-
 colormap = {
     # Taken from https://www.w3.org/TR/css-color-4/#named-color
     "aliceblue": "#f0f8ff",

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: auto-editor
-Version: 26.3.1
+Version: 26.3.3
 Summary: Auto-Editor: Effort free video editing!
 Author-email: WyattBlue <wyattblue@auto-editor.com>
 License: Unlicense
@@ -21,7 +21,7 @@ Requires-Dist: pyav==14.2.*
 ---
 
 [![Actions Status](https://github.com/wyattblue/auto-editor/workflows/build/badge.svg)](https://github.com/wyattblue/auto-editor/actions)
-<a href="https://github.com/psf/black"><img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg"></a>
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 
 Before doing the real editing, you first cut out the "dead space" which is typically silence. This is known as a "first pass". Cutting these is a boring task, especially if the video is very long.