auto-editor 25.3.1__py3-none-any.whl → 26.0.1__py3-none-any.whl

auto_editor/utils/container.py

@@ -55,12 +55,9 @@ def codec_type(x: str) -> str:
         return "subtitle"
 
     try:
-        return Codec(x, "r").type
+        return Codec(x, "w").type
     except Exception:
-        try:
-            return Codec(x, "w").type
-        except Exception:
-            return ""
+        return ""
 
 
 def container_constructor(ext: str) -> Container:
@@ -80,6 +77,8 @@ def container_constructor(ext: str) -> Container:
     scodecs = set()
 
     for codec in codecs:
+        if ext == "wav" and codec == "aac":
+            continue
         kind = codec_type(codec)
         if kind == "video":
             vcodecs.add(codec)

auto_editor/utils/func.py

@@ -41,7 +41,7 @@ def to_timecode(secs: float | Fraction, fmt: str) -> str:
         if h == 0:
             return f"{sign}{m:02d}:{s:06.3f}"
         return f"{sign}{h:02d}:{m:02d}:{s:06.3f}"
-    if fmt == "mov_text":
+    if fmt == "srt" or fmt == "mov_text":
         return f"{sign}{h:02d}:{m:02d}:" + f"{s:06.3f}".replace(".", ",", 1)
     if fmt == "standard":
         return f"{sign}{h:02d}:{m:02d}:{s:06.3f}"
@@ -81,21 +81,10 @@ def mut_margin(arr: BoolList, start_m: int, end_m: int) -> None:
             arr[max(i + end_m, 0) : i] = False
 
 
-def merge(start_list: np.ndarray, end_list: np.ndarray) -> BoolList:
-    result = np.zeros((len(start_list)), dtype=np.bool_)
-
-    for i, item in enumerate(start_list):
-        if item == True:
-            where = np.where(end_list[i:])[0]
-            if len(where) > 0:
-                result[i : where[0]] = True
-    return result
-
-
 def get_stdout(cmd: list[str]) -> str:
     from subprocess import DEVNULL, PIPE, Popen
 
-    stdout, _ = Popen(cmd, stdin=DEVNULL, stdout=PIPE, stderr=PIPE).communicate()
+    stdout = Popen(cmd, stdin=DEVNULL, stdout=PIPE, stderr=PIPE).communicate()[0]
     return stdout.decode("utf-8", "replace")
 
 
@@ -116,25 +105,3 @@ def aspect_ratio(width: int, height: int) -> tuple[int, int]:
 
     c = gcd(width, height)
     return width // c, height // c
-
-
-def human_readable_time(time_in_secs: float) -> str:
-    units = "seconds"
-    if time_in_secs >= 3600:
-        time_in_secs = round(time_in_secs / 3600, 1)
-        if time_in_secs % 1 == 0:
-            time_in_secs = round(time_in_secs)
-        units = "hours"
-    if time_in_secs >= 60:
-        time_in_secs = round(time_in_secs / 60, 1)
-        if time_in_secs >= 10 or time_in_secs % 1 == 0:
-            time_in_secs = round(time_in_secs)
-        units = "minutes"
-    return f"{time_in_secs} {units}"
-
-
-def append_filename(path: str, val: str) -> str:
-    from os.path import splitext
-
-    root, ext = splitext(path)
-    return root + val + ext

auto_editor/utils/types.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import re
 from dataclasses import dataclass, field
 from fractions import Fraction
-from typing import Literal
 
 
 class CoerceError(Exception):
@@ -111,17 +110,6 @@ def sample_rate(val: str) -> int:
     return natural(num)
 
 
-def bitrate(val: str) -> str:
-    if val == "unset":
-        return val
-    _num, unit = _split_num_str(val)
-    num = int(_num) if _num.is_integer() else _num
-    if unit not in ("", "k", "K", "M"):
-        extra = f". Did you mean `{num}M`?" if unit == "m" else ""
-        raise CoerceError(f"`{val}` is not a valid bitrate format{extra}")
-    return val
-
-
 def time(val: str, tb: Fraction) -> int:
     if ":" in val:
         boxes = val.split(":")
@@ -167,16 +155,7 @@ def speed_range(val: str) -> tuple[float, str, str]:
     return number(a[0]), a[1], a[2]
 
 
-Stream = int | Literal["all"]
-
-
-def stream(val: str) -> Stream:
-    if val == "all" or val == "'all":
-        return "all"
-    return natural(val)
-
-
-def color(val: str) -> str:
+def parse_color(val: str) -> str:
     """
     Convert a color str into an RGB tuple
 
@@ -218,11 +197,9 @@ class Args:
     yt_dlp_extras: str | None = None
     video_codec: str = "auto"
     audio_codec: str = "auto"
-    video_bitrate: str = "10M"
-    audio_bitrate: str = "unset"
-    video_quality_scale: str = "unset"
+    video_bitrate: str = "auto"
+    audio_bitrate: str = "auto"
     scale: float = 1.0
-    extras: str | None = None
     sn: bool = False
     dn: bool = False
     no_seek: bool = False
@@ -232,7 +209,7 @@ class Args:
     frame_rate: Fraction | None = None
     sample_rate: int | None = None
     resolution: tuple[int, int] | None = None
-    background: str = "#000"
+    background: str = "#000000"
     edit_based_on: str = "audio"
     keep_tracks_separate: bool = False
     audio_normalize: str = "#f"
@@ -241,13 +218,10 @@ class Args:
     no_open: bool = False
     temp_dir: str | None = None
     ffmpeg_location: str | None = None
-    my_ffmpeg: bool = False
     progress: str = "modern"
     version: bool = False
     debug: bool = False
     config: bool = False
-    show_ffmpeg_commands: bool = False
-    show_ffmpeg_output: bool = False
     quiet: bool = False
     preview: bool = False
     no_cache: bool = False

{auto_editor-25.3.1.dist-info → auto_editor-26.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-editor
-Version: 25.3.1
+Version: 26.0.1
 Summary: Auto-Editor: Effort free video editing!
 Author-email: WyattBlue <wyattblue@auto-editor.com>
 License: Unlicense
@@ -13,7 +13,6 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy <3.0,>=1.23.0
 Requires-Dist: pyav ==13.1.*
-Requires-Dist: ae-ffmpeg ==1.2.*
 
 <p align="center"><img src="https://auto-editor.com/img/auto-editor-banner.webp" title="Auto-Editor" width="700"></p>
 

{auto_editor-25.3.1.dist-info → auto_editor-26.0.1.dist-info}/RECORD

@@ -1,18 +1,18 @@
-auto_editor/__init__.py,sha256=2StKlE00iLSdWP1B73T1WJb76-2gk0h3rPFRqAk5ZXM,23
-auto_editor/__main__.py,sha256=0t_yI-o11iwDm_LlUW_u84LsX89cv0GuHMfc0NKlp68,12228
+auto_editor/__init__.py,sha256=IVlNYVWUewREksm_90yLqKeN61i9bI8Lx_lWZz4SObk,23
+auto_editor/__main__.py,sha256=vSvw0fWi4GOIsak_RuOBnMB_CrtNNp8COh7i8LV4acE,11541
 auto_editor/analyze.py,sha256=uCi21659BB-lbPwZ6yxNLekS6Q3yoB2ypLNXPhmhTfg,11688
-auto_editor/edit.py,sha256=9G2_g_8FEzQrvB3Ez9M5vtgrIS0feZeA4DdxT9cdObA,12319
-auto_editor/ffwrapper.py,sha256=K-gs5mAdcwPaaZVdU1yOl7ckptO7eJ_zLQM8V7vwxaA,7491
-auto_editor/help.py,sha256=BFiP7vBz42TUzum4-zaQIrV1OY7kHeN0pe0MPE0T5xw,7997
+auto_editor/edit.py,sha256=_fjvs2UzK84Wl6DVZwyRBbqbxh16z4VPNTHUlvjU9iQ,15977
+auto_editor/ffwrapper.py,sha256=Sx1-9OmAStR73I-RR2XPwWPTmGywM7ssqT9-U0sffA4,5615
+auto_editor/help.py,sha256=62s3L0rlhA7nkkOjtXItRUl779EJ__A7_6E-VFH3J_E,7924
 auto_editor/make_layers.py,sha256=8uFy5SvMArAP-5slYJrxa_iGAEwimQBFeM-T01VORVw,8995
-auto_editor/output.py,sha256=TbwiFL7CQnPv5_Pv0bSaE2faLvepxaIf5_xMvDAFXjQ,7997
+auto_editor/output.py,sha256=ho8Lpqz4Sv_Gw0Vj2OvG39s83xHpyZlvtRNryTPbXqc,2563
 auto_editor/preview.py,sha256=HUsjmV9Fx73rZ26BXrpz9z-z_e4oiui3u9e7qbbGoBY,3037
-auto_editor/timeline.py,sha256=tIty8O8jD6TR2Sw2bivUtYtdnpplfuOXT7Dfc-gekr8,8174
+auto_editor/timeline.py,sha256=XfaH9cH-RB-MObOpMr5IfLcqJcjmabO1XwkUkT3_FQM,8186
 auto_editor/vanparse.py,sha256=f0vViZ-aYtDxEyVrFHJ5X2pPTQAfqtw3N2gZgzn51kU,10002
 auto_editor/wavfile.py,sha256=1HbZ4L8IBD6Fbg3pd5MQG4ZXy48YZA05t8XllSplhWk,9499
 auto_editor/formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 auto_editor/formats/fcp11.py,sha256=qzo-qpHYsiHjOPjGBWjBeJUAACDmo8ijJkjslHTQH6Q,5196
-auto_editor/formats/fcp7.py,sha256=vd7cW8vwoTvFlp4Tc5DYSn-A7i9ck3jJJdKNqWVtFVQ,20285
+auto_editor/formats/fcp7.py,sha256=LYkGtZC_dmbHQDg1wYP7XQYS74NEon6ws8c5MDdTd90,20275
 auto_editor/formats/json.py,sha256=Br-xHVHj59C0OPP2FwfJeht_fImepRXsaw0iDFvK7-w,7693
 auto_editor/formats/shotcut.py,sha256=-ES854LLFCMCBe100JRJedDmuk8zPev17aQMTrzPv-g,4923
 auto_editor/formats/utils.py,sha256=LYXDiqOk9WwUorLGw2D0M7In9BNDkoKikNawuks7hqE,1648
@@ -20,37 +20,36 @@ auto_editor/lang/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 auto_editor/lang/json.py,sha256=OsNcYlfEj8ZLlzLK-gkLcrCCKI7mJz9rpe-6XLr4f9U,9231
 auto_editor/lang/libintrospection.py,sha256=6H1rGp0wqaCud5IPaoEmzULGnYt6ec7_0h32ATcw2oY,261
 auto_editor/lang/libmath.py,sha256=z33A161Oe6vYYK7R6pgYjdZZe63dQkN38Qf36TL3prg,847
-auto_editor/lang/palet.py,sha256=5S6RVNH8SHa3K7mf9GjWlLsnswmdp7xomkOR4LHV3Dg,24330
-auto_editor/lang/stdenv.py,sha256=2pd1br3ijuIayXHKOitU6DOm-5yBxQFA1aCJgq_XWfU,43972
+auto_editor/lang/palet.py,sha256=jHSO8R4eAbMeiQaGwCLih6z0pPGoJEcmPgSvsTpF8EA,24139
+auto_editor/lang/stdenv.py,sha256=3UnVgLaTT7hQMhquDmv-mQx82jtr_YOYstwZAwvXfJY,43754
 auto_editor/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 auto_editor/lib/contracts.py,sha256=lExGQymcQUmwG5lC1lO4qm4GY8W0q_yzK_miTaAoPA4,7586
 auto_editor/lib/data_structs.py,sha256=dcsXgsLLzbmFDUZucoirzewPALsKzoxz7z5L22_QJM8,7091
 auto_editor/lib/err.py,sha256=UlszQJdzMZwkbT8x3sY4GkCV_5x9yrd6uVVUzvA8iiI,35
 auto_editor/render/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_editor/render/audio.py,sha256=QF3nQMChIxL0GVy4AONvsnqrX_nqT31RrogLwxwWAO8,9650
-auto_editor/render/subtitle.py,sha256=HCWL9HvFXZPeGUd0mI1K5okHnKf1f6hw-DgPFFPOKA0,4499
-auto_editor/render/video.py,sha256=gQJx_zcqvL__WJNG8mfFWblSr8XFkuCeIW3nCXoIdKU,12487
+auto_editor/render/audio.py,sha256=KvhAJf-5_HFkRoaYaKOYraT2uQr65gdayuicWYOpjgk,13376
+auto_editor/render/subtitle.py,sha256=qyP_AZHwGToVBeH8qMSa9LUenMaNmsnJN8w0Y7SXQ3o,6235
+auto_editor/render/video.py,sha256=dje0RNW2dKILfTzt0VAF0WR6REfGOsc6l17pP1Z4ooA,12215
 auto_editor/subcommands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 auto_editor/subcommands/desc.py,sha256=GDrKJYiHMaeTrplZAceXl1JwoqD78XsV2_5lc0Xd7po,869
 auto_editor/subcommands/info.py,sha256=t5n43HLt9hpMFSIfGV777X4zIPBAFugOKlpCfRjiKxY,6921
 auto_editor/subcommands/levels.py,sha256=ChJMDTd34-jgxewqHRmmd3VNhFdy964w0DcQG0ls-hY,4079
 auto_editor/subcommands/palet.py,sha256=ONzTqemaQq9YEfIOsDRNnwzfqnEMUMSXIQrETxyroRU,749
-auto_editor/subcommands/repl.py,sha256=DuMz5kImoZFSVMZh6sPQxqZXMbRXPCvXoW3G-MJfivc,3166
+auto_editor/subcommands/repl.py,sha256=TF_I7zsFY7-KdgidrqjafTz7o_eluVbLvgTcOBG-UWQ,3449
 auto_editor/subcommands/subdump.py,sha256=af_XBf7kaevqHn1A71z8C-7x8pS5WKD9FE_ugkCw6rk,665
-auto_editor/subcommands/test.py,sha256=ovYMX5_Fm1qSq8_ojnBj78W9vqkZImoNkbdCSIFFft0,25668
+auto_editor/subcommands/test.py,sha256=bR3MQvW1P_cKDwd1hRa2t-n3GqgRGGv5D3IBnfrH8-0,25787
 auto_editor/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 auto_editor/utils/bar.py,sha256=hG_NiYeuM90TdILzAJORft-UOS5grwWN3SbRuj6upsI,3998
 auto_editor/utils/chunks.py,sha256=J-eGKtEz68gFtRrj1kOSgH4Tj_Yz6prNQ7Xr-d9NQJw,52
-auto_editor/utils/cmdkw.py,sha256=uW_qDGQ6UzLPRbB20HTLrCmhMlWVXSfgyQMr4MyGErU,5734
-auto_editor/utils/container.py,sha256=RnpoMmMYmn7o69LmMbBFHW4TsP3K52jYDhG9qzWXmAs,2720
-auto_editor/utils/encoder.py,sha256=auNYo7HXbcU4iTUCc0LE5lpwFmSvdWvBm6-5KIaRK8w,2983
-auto_editor/utils/func.py,sha256=3p5f6BxC6wMjsolLSfrcx7OwVQnMRAprwBI7MQ8TjB0,3725
+auto_editor/utils/cmdkw.py,sha256=aUGBvBel2Ko1o6Rwmr4rEL-BMc5hEnzYLbyZ1GeJdcY,5729
+auto_editor/utils/container.py,sha256=Wf1ZL0tvXWl6m1B9mK_SkgVl89ilV_LpwlQq0TVroCc,2704
+auto_editor/utils/func.py,sha256=kB-pNDn20M6YT7sljyd_auve5teK-E2G4TgwVOAIuJw,2754
 auto_editor/utils/log.py,sha256=M2QKeQHMRNLm3HMVUKedZPRprT2u5dipOStiO4miPBk,3613
-auto_editor/utils/types.py,sha256=BWj0YalUpWwXfEN7AEL5s_j22lscZOH-eb7x_dYuXfY,11471
+auto_editor/utils/types.py,sha256=ecjTQmTlKoT9Wbwb_N4p6wC7s3bxiKPmq8sF15WfyVs,10772
 docs/build.py,sha256=CM-ZWgQk8wSNjivx_-6wGIaG7cstrNKsX2d4TzFVivE,1642
-auto_editor-25.3.1.dist-info/LICENSE,sha256=yiq99pWITHfqS0pbZMp7cy2dnbreTuvBwudsU-njvIM,1210
-auto_editor-25.3.1.dist-info/METADATA,sha256=0GOm0ktkMSsxqnTtALdMBcxK_IrYPMgFuSjUN-Xs9F0,6148
-auto_editor-25.3.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-auto_editor-25.3.1.dist-info/entry_points.txt,sha256=-H7zdTw4MqnAcwrN5xTNkGIhzZtJMxS9r6lTMeR9-aA,240
-auto_editor-25.3.1.dist-info/top_level.txt,sha256=jBV5zlbWRbKOa-xaWPvTD45QL7lGExx2BDzv-Ji4dTw,17
-auto_editor-25.3.1.dist-info/RECORD,,
+auto_editor-26.0.1.dist-info/LICENSE,sha256=yiq99pWITHfqS0pbZMp7cy2dnbreTuvBwudsU-njvIM,1210
+auto_editor-26.0.1.dist-info/METADATA,sha256=e_JZKirHFmWBAXaCDqXHIOB4J-IIpbuoK72fzhlXMtw,6115
+auto_editor-26.0.1.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+auto_editor-26.0.1.dist-info/entry_points.txt,sha256=-H7zdTw4MqnAcwrN5xTNkGIhzZtJMxS9r6lTMeR9-aA,240
+auto_editor-26.0.1.dist-info/top_level.txt,sha256=jBV5zlbWRbKOa-xaWPvTD45QL7lGExx2BDzv-Ji4dTw,17
+auto_editor-26.0.1.dist-info/RECORD,,

{auto_editor-25.3.1.dist-info → auto_editor-26.0.1.dist-info}/WHEEL

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

auto_editor/utils/encoder.py

@@ -1,135 +0,0 @@
-encoders = {
-    "libx264": (
-        "yuv420p",
-        "yuvj420p",
-        "yuv422p",
-        "yuvj422p",
-        "yuv444p",
-        "yuvj444p",
-        "nv12",
-        "nv16",
-        "nv21",
-        "yuv420p10le",
-        "yuv422p10le",
-        "yuv444p10le",
-        "nv20le",
-        "gray",
-        "gray10le",
-    ),
-    "libx264rgb": ("bgr0", "bgr24", "rgb24"),
-    "h264_videotoolbox": ("videotoolbox_vld", "nv12", "yuv420p"),
-    "h264": ("videotoolbox_vld", "nv12", "yuv420p"),
-    "libx265": (
-        "yuv420p",
-        "yuvj420p",
-        "yuv422p",
-        "yuvj422p",
-        "yuv444p",
-        "yuvj444p",
-        "gbrp",
-        "yuv420p10le",
-        "yuv422p10le",
-        "yuv444p10le",
-        "gbrp10le",
-        "yuv420p12le",
-        "yuv422p12le",
-        "yuv444p12le",
-        "gbrp12le",
-        "gray",
-        "gray10le",
-        "gray12le",
-    ),
-    "hevc_videotoolbox": ("videotoolbox_vld", "nv12", "yuv420p", "bgra", "p010le"),
-    "hevc": (
-        "yuv420p",
-        "yuvj420p",
-        "yuv422p",
-        "yuvj422p",
-        "yuv444p",
-        "yuvj444p",
-        "gbrp",
-        "yuv420p10le",
-        "yuv422p10le",
-        "yuv444p10le",
-        "gbrp10le",
-        "yuv420p12le",
-        "yuv422p12le",
-        "yuv444p12le",
-        "gbrp12le",
-        "gray",
-        "gray10le",
-        "gray12le",
-    ),
-    "hevc_nvenc": (
-        "yuv420p",
-        "nv12",
-        "p010le",
-        "yuv444p",
-        "p016le",
-        "yuv444p16le",
-        "bgr0",
-        "rgb0",
-        "gbrp",
-        "gbrp16le",
-        "cuda",
-        "d3d11",
-    ),
-    "hevc_amf": ("yuv420p", "nv12", "d3d11", "dxva2_vld"),
-    "h264_nvenc": (
-        "yuv420p",
-        "nv12",
-        "p010le",
-        "yuv444p",
-        "p016le",
-        "yuv444p16le",
-        "bgr0",
-        "rgb0",
-        "gbrp",
-        "gbrp16le",
-        "cuda",
-        "d3d11",
-    ),
-    "h264_amf": ("yuv420p", "nv12", "d3d11", "dxva2_vld"),
-    "hevc_qsv": ("nv12", "p010le", "yuyv422", "y210le", "qsv", "bgra", "x2rgb10le"),
-    "h264_qsv": ("nv12", "p010le", "qsv"),
-    "vp9": (
-        "yuv420p",
-        "yuva420p",
-        "yuv422p",
-        "yuv440p",
-        "yuv444p",
-        "yuv420p10le",
-        "yuv422p10le",
-        "yuv440p10le",
-        "yuv444p10le",
-        "yuv420p12le",
-        "yuv422p12le",
-        "yuv440p12le",
-        "yuv444p12le",
-        "gbrp",
-        "gbrp10le",
-        "gbrp12le",
-    ),
-    "vp8": ("yuv420p", "yuva420p"),
-    "prores": ("yuv422p10le", "yuv444p10le", "yuva444p10le"),
-    "av1": (
-        "yuv420p",
-        "yuv422p",
-        "yuv444p",
-        "gbrp",
-        "yuv420p10le",
-        "yuv422p10le",
-        "yuv444p10le",
-        "yuv420p12le",
-        "yuv422p12le",
-        "yuv444p12le",
-        "gbrp10le",
-        "gbrp12le",
-        "gray",
-        "gray10le",
-        "gray12le",
-    ),
-    "mpeg4": ("yuv420p"),
-    "mpeg2video": ("yuv420p", "yuv422p"),
-    "mjpeg": ("yuvj420p", "yuvj422p", "yuvj444p"),
-}