auto-editor 25.0.0__py3-none-any.whl → 25.1.0__py3-none-any.whl

auto_editor/make_layers.py

@@ -124,6 +124,19 @@ def make_timeline(
     src_index = np.array([], dtype=np.int32)
     concat = np.concatenate
 
+    try:
+        stdenv = __import__("auto_editor.lang.stdenv", fromlist=["lang"])
+        env.update(stdenv.make_standard_env())
+    except ImportError:
+        func = log.error if args.config else log.debug
+        func("Failed to import standard env")
+
+    if args.config:
+        # Edit `env` with user-defined code.
+        with open("config.pal") as file:
+            parser = Parser(Lexer("config.pal", file.read()))
+            interpret(env, parser)
+
     for i, src in enumerate(sources):
         try:
             parser = Parser(Lexer("`--edit`", args.edit_based_on))
@@ -131,6 +144,7 @@ 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)
 
             results = interpret(env, parser)

auto_editor/render/subtitle.py

@@ -83,7 +83,9 @@ class SubtitleParser:
     def edit(self, chunks: Chunks) -> None:
         for cut in reversed(chunks):
             the_speed = cut[2]
-            speed_factor = 1 if the_speed == 99999 else 1 - (1 / the_speed)
+            speed_factor = (
+                1 if (the_speed == 0 or the_speed >= 99999) else 1 - (1 / the_speed)
+            )
 
             new_content = []
             for content in self.contents:

auto_editor/subcommands/info.py

@@ -47,7 +47,7 @@ class VideoJson(TypedDict):
 class AudioJson(TypedDict):
     codec: str
     samplerate: int
-    channels: int
+    layout: str
     duration: float
     bitrate: int
     lang: str | None
@@ -150,8 +150,8 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
         for track, a in enumerate(src.audios):
             aud: AudioJson = {
                 "codec": a.codec,
+                "layout": a.layout,
                 "samplerate": a.samplerate,
-                "channels": a.channels,
                 "duration": a.duration,
                 "bitrate": a.bitrate,
                 "lang": a.lang,

auto_editor/subcommands/palet.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import sys
 
 from auto_editor.lang.palet import Lexer, Parser, env, interpret
+from auto_editor.lang.stdenv import make_standard_env
 from auto_editor.lib.err import MyError
 
 
@@ -11,6 +12,7 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
         with open(sys_args[0], encoding="utf-8", errors="ignore") as file:
             program_text = file.read()
 
+        env.update(make_standard_env())
         try:
             interpret(env, Parser(Lexer(sys_args[0], program_text, True)))
         except (MyError, ZeroDivisionError) as e:

auto_editor/subcommands/repl.py

@@ -8,6 +8,7 @@ import auto_editor
 from auto_editor.analyze import Levels
 from auto_editor.ffwrapper import initFileInfo
 from auto_editor.lang.palet import ClosingError, Lexer, Parser, env, interpret
+from auto_editor.lang.stdenv import make_standard_env
 from auto_editor.lib.data_structs import print_str
 from auto_editor.lib.err import MyError
 from auto_editor.utils.bar import Bar
@@ -67,6 +68,7 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
         env["timebase"] = tb
         env["@levels"] = Levels(src, tb, bar, False, log, strict)
 
+    env.update(make_standard_env())
     print(f"Auto-Editor {auto_editor.__version__}")
     text = None
 
@@ -85,8 +87,7 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
                 continue
 
             try:
-                lexer = Lexer("repl", text)
-                parser = Parser(lexer)
+                parser = Parser(Lexer("repl", text))
                 if args.debug_parser:
                     print(f"parser: {parser}")
 

auto_editor/subcommands/test.py

@@ -13,6 +13,7 @@ import numpy as np
 
 from auto_editor.ffwrapper import FileInfo, initFileInfo
 from auto_editor.lang.palet import Lexer, Parser, env, interpret
+from auto_editor.lang.stdenv import make_standard_env
 from auto_editor.lib.data_structs import Char
 from auto_editor.lib.err import MyError
 from auto_editor.utils.log import Log
@@ -309,7 +310,7 @@ def main(sys_args: list[str] | None = None):
         """Input file must have an extension. Throw error if none is given."""
 
         shutil.copy("example.mp4", "example")
-        run.check(["example", "--no-open"], "must have an extension.")
+        run.check(["example", "--no-open"], "must have an extension")
 
         return "example"
 
@@ -355,6 +356,13 @@ def main(sys_args: list[str] | None = None):
     def premiere_named_export():
         run.main(["example.mp4"], ["--export", 'premiere:name="Foo Bar"'])
 
+    def export_subtitles():
+        cn = fileinfo(run.main(["resources/subtitle.mp4"], []))
+
+        assert len(cn.videos) == 1
+        assert len(cn.audios) == 1
+        assert len(cn.subtitles) == 1
+
     def resolution_and_scale():
         cn = fileinfo(run.main(["example.mp4"], ["--scale", "1.5"]))
 
@@ -544,6 +552,8 @@ def main(sys_args: list[str] | None = None):
         )
 
     def palet_python_bridge():
+        env.update(make_standard_env())
+
         def cases(*cases: tuple[str, Any]) -> None:
             for text, expected in cases:
                 try:
@@ -743,6 +753,7 @@ def main(sys_args: list[str] | None = None):
                 track_tests,
                 codec_tests,
                 premiere_named_export,
+                export_subtitles,
                 export,
                 motion,
                 resolution_and_scale,

auto_editor/utils/container.py

@@ -72,6 +72,8 @@ def container_constructor(ext: str) -> Container:
             vdefault = container.default_video_codec
         adefault = container.default_audio_codec
         sdefault = container.default_subtitle_codec
+        if sdefault == "none" and ext == "mp4":
+            sdefault = "srt"
 
     vcodecs = set()
     acodecs = set()

auto_editor/utils/types.py

@@ -251,6 +251,7 @@ class Args:
     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

auto_editor/validate_input.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-import os
 import re
 import subprocess
 import sys
+from os.path import exists, isdir, isfile, lexists, splitext
 
 from auto_editor.ffwrapper import FFmpeg
 from auto_editor.utils.func import get_stdout
@@ -27,7 +27,7 @@ def download_video(my_input: str, args: Args, ffmpeg: FFmpeg, log: Log) -> str:
         download_format = "bestvideo[ext=mp4]+bestaudio[ext=m4a]"
 
     if args.output_format is None:
-        output_format = re.sub(r"\W+", "-", os.path.splitext(my_input)[0]) + ".%(ext)s"
+        output_format = re.sub(r"\W+", "-", splitext(my_input)[0]) + ".%(ext)s"
     else:
         output_format = args.output_format
 
@@ -57,10 +57,10 @@ def download_video(my_input: str, args: Args, ffmpeg: FFmpeg, log: Log) -> str:
             msg += "pip or your favorite package manager and make sure it's in PATH."
         log.error(msg)
 
-    if not os.path.isfile(location):
+    if not isfile(location):
         subprocess.run([yt_dlp_path] + cmd)
 
-    if not os.path.isfile(location):
+    if not isfile(location):
         log.error(f"Download file wasn't created: {location}")
 
     return location
@@ -73,11 +73,16 @@ def valid_input(inputs: list[str], ffmpeg: FFmpeg, args: Args, log: Log) -> list
         if my_input.startswith("http://") or my_input.startswith("https://"):
             result.append(download_video(my_input, args, ffmpeg, log))
         else:
-            _, ext = os.path.splitext(my_input)
+            _, ext = splitext(my_input)
             if ext == "":
-                if os.path.isdir(my_input):
+                if isdir(my_input):
                     log.error("Input must be a file or a URL, not a directory.")
-                log.error("Input file must have an extension.")
+                if exists(my_input):
+                    log.error(f"Input file must have an extension: {my_input}")
+                if lexists(my_input):
+                    log.error(f"Input file is a broken symbolic link: {my_input}")
+                if my_input.startswith("-"):
+                    log.error(f"Option/Input file doesn't exist: {my_input}")
             result.append(my_input)
 
     return result

{auto_editor-25.0.0.dist-info → auto_editor-25.1.0.dist-info}/METADATA

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

{auto_editor-25.0.0.dist-info → auto_editor-25.1.0.dist-info}/RECORD

@@ -1,55 +1,58 @@
-auto_editor/__init__.py,sha256=hNpKYQArhnrmhf1u3TNPTwtZw8XS7EeDs-TfBLusM-s,23
-auto_editor/__main__.py,sha256=89pW_zaFB8WEyKTGadkALLuv_MFONIcfEu8t0jKqeWI,9774
+auto_editor/__init__.py,sha256=fCfst7bcslfPZvO0BbrT9lF_JtNpW3F_ycN7xJnpJis,23
+auto_editor/__main__.py,sha256=OlPCTG3t8phhLnyXT8bQlqsA4O97mDhmJTanJCgb82Q,9964
 auto_editor/analyze.py,sha256=pHoSZ_-wyV1hLJyJpPg9Ha7oecjdGHGJ0a4hbKnb9NY,11779
-auto_editor/edit.py,sha256=ihyCi9YyIV-WYP81pOnc5jG8n-e8m5aMogg27XVxPVY,11268
-auto_editor/ffwrapper.py,sha256=RU74pfZUMEIVdpvZVVoJt92AILBGkYaPLZbI94Y0i60,7832
+auto_editor/edit.py,sha256=-AtEOHTvBnLlvvYkDyDbh9weGOOui6vsbyJZbEoYljI,11447
+auto_editor/ffwrapper.py,sha256=NnhD4TvKyaap0Y2MQ7aIUQfeLJwfNbjTj5bLUpoMEI4,7888
 auto_editor/help.py,sha256=BFiP7vBz42TUzum4-zaQIrV1OY7kHeN0pe0MPE0T5xw,7997
-auto_editor/make_layers.py,sha256=ybTxPRD6bDbEX-7e9qu4OYUvYkrdNb4BjnN9hzwkRiQ,8496
+auto_editor/make_layers.py,sha256=8uFy5SvMArAP-5slYJrxa_iGAEwimQBFeM-T01VORVw,8995
 auto_editor/output.py,sha256=D8NCJwwmcjDf5rvoBnWKu5XY7QtxF3thxbnTxKAxGu8,8043
 auto_editor/preview.py,sha256=noWkgyzdE14zwG8ZDYxLDual5iVt6zYTt4HTe-QAgFY,3029
 auto_editor/timeline.py,sha256=d9Qhup2pBwsj7j9kF-Iw22xHbQvGx-keDq2eLI11Mt4,7117
-auto_editor/validate_input.py,sha256=JQt7J5xOBJDp6lnd2sQptpYhf7Z_hyxNEzLsE9E7LKU,2596
+auto_editor/validate_input.py,sha256=_9vtbNxodhVPf4PzTAH67LSj2K-HS6kShJOARmUMJdY,2904
 auto_editor/vanparse.py,sha256=f0vViZ-aYtDxEyVrFHJ5X2pPTQAfqtw3N2gZgzn51kU,10002
 auto_editor/wavfile.py,sha256=7N2LX_WfFVRnoXrKveLvuyTYpIz2htpGqfCD8tR4kJ8,9168
 auto_editor/formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_editor/formats/fcp11.py,sha256=VwJWJs1qNDIVC8-pswipmKCk0e4V3LnE5fAMA0pPWVg,5857
-auto_editor/formats/fcp7.py,sha256=fH86sxhlUysWisjvlqzZJgDrRpj3dSzFG-Eho2sehdc,17610
+auto_editor/formats/fcp11.py,sha256=Sff8fLZw0s0G88EVeBsn9vwzzga_KHIt2pGMww3V5jA,5411
+auto_editor/formats/fcp7.py,sha256=vd7cW8vwoTvFlp4Tc5DYSn-A7i9ck3jJJdKNqWVtFVQ,20285
 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=GIZw28WHuCIaZ_zMI0v6Kxbq0QaIpbLsdSegdYwQxQ8,1990
 auto_editor/lang/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=m22TQnKomUM2quxIH4bz7ya_gM166rbJ5pW7Ei-43IA,59712
+auto_editor/lang/palet.py,sha256=5sSVPHmQ0o501GvJngYMQWtc7LLbryHKC64JQZmQvVY,22020
+auto_editor/lang/stdenv.py,sha256=k_O1vQX9kk4WENuTtmnLoowuxRkcnNmwOEwXqscriU0,42079
 auto_editor/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 auto_editor/lib/contracts.py,sha256=a3ZT-bGMa3-UjWKKFrEwLayw2Gl-rhqd5Bmvmrj85oE,7413
 auto_editor/lib/data_structs.py,sha256=xyB6aEcpdB9NNWp_dU3d2ds5Z8zOfHXNX4mNQLh2pNw,6977
 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=darKvlglNXkknSUaPnH-qEUyccM1Awnv03_Px4yY81I,8844
-auto_editor/render/subtitle.py,sha256=g195kDN0LcwKlZeQMCflXPH5n_74iwCk1RPLSQ5eP34,4373
+auto_editor/render/subtitle.py,sha256=CNcU_hmLwfZ2yvmSllIK-pB7ge_YdXHR-fnnOVUO9m8,4425
 auto_editor/render/video.py,sha256=gMVcLehC_QpdtIzNLR_7tv2CZmYeEWisS_5as4ceHV0,12971
 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=7Sgt9WR0rWxe7juCRKseMxW6gKv3z3voqFcL8-MOVVM,6927
+auto_editor/subcommands/info.py,sha256=t5n43HLt9hpMFSIfGV777X4zIPBAFugOKlpCfRjiKxY,6921
 auto_editor/subcommands/levels.py,sha256=ZB8_9jbOA5s1AQUcUNZDiLAjyJOKl7Be2YeVWdkOr0Q,4071
-auto_editor/subcommands/palet.py,sha256=tbQoRWoT4jR3yu0etGApfprM-oQgXIjC-rIY-QG3nM0,655
-auto_editor/subcommands/repl.py,sha256=OfxIOBjE7W12UemfaaxMnzHcmV5cUTt7g5328R7rAYU,3116
+auto_editor/subcommands/palet.py,sha256=ONzTqemaQq9YEfIOsDRNnwzfqnEMUMSXIQrETxyroRU,749
+auto_editor/subcommands/repl.py,sha256=hpdF-CrOzdkChmj7zhx8P-lNWLmFfVR_VAnSUt0aaNU,3176
 auto_editor/subcommands/subdump.py,sha256=af_XBf7kaevqHn1A71z8C-7x8pS5WKD9FE_ugkCw6rk,665
-auto_editor/subcommands/test.py,sha256=Qg_zY1Cg8Mo7JXsUWFEJxJZAe5pkkXyK4ydnBVpG0I8,24992
+auto_editor/subcommands/test.py,sha256=PdJAIR6HRTL_FGVPYlQMq4uW-5U4Hz515O29nPbSZyg,25322
 auto_editor/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 auto_editor/utils/bar.py,sha256=RJqkJ8gNr8op_Z-2hh48ExjSonmTPX-RshctK_itv14,3988
 auto_editor/utils/chunks.py,sha256=J-eGKtEz68gFtRrj1kOSgH4Tj_Yz6prNQ7Xr-d9NQJw,52
 auto_editor/utils/cmdkw.py,sha256=XApxw7FZBOEJV9N4LHhdw1GVfHbFfCjr-zCZ1gJsSvY,6002
-auto_editor/utils/container.py,sha256=qSoS5d8JqLRH4_BIWfnJ-37eCKKe_J290yrUNULGT94,2643
+auto_editor/utils/container.py,sha256=RnpoMmMYmn7o69LmMbBFHW4TsP3K52jYDhG9qzWXmAs,2720
 auto_editor/utils/encoder.py,sha256=auNYo7HXbcU4iTUCc0LE5lpwFmSvdWvBm6-5KIaRK8w,2983
 auto_editor/utils/func.py,sha256=kcxCOqe-tg6k-kxutIran8LpffRiHDjKB6rm-ngFiSU,4460
 auto_editor/utils/log.py,sha256=M2QKeQHMRNLm3HMVUKedZPRprT2u5dipOStiO4miPBk,3613
 auto_editor/utils/subtitle_tools.py,sha256=TjjVPiT8bWzZJcrZjF7ddpgfIsVkLE4LyxXzBswHAGU,693
-auto_editor/utils/types.py,sha256=JdAwfuT9Ty_FXUm89GUTo0M8FPFrXbqnlk-g4pWP1_k,11609
-auto_editor-25.0.0.dist-info/LICENSE,sha256=yiq99pWITHfqS0pbZMp7cy2dnbreTuvBwudsU-njvIM,1210
-auto_editor-25.0.0.dist-info/METADATA,sha256=ucOoacVK0LCr-DKicxIkO9w6Zx2LWvlfMPgBiXucYkk,6137
-auto_editor-25.0.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-auto_editor-25.0.0.dist-info/entry_points.txt,sha256=-H7zdTw4MqnAcwrN5xTNkGIhzZtJMxS9r6lTMeR9-aA,240
-auto_editor-25.0.0.dist-info/top_level.txt,sha256=ky1HUkqq9i034c4CUU_0wBw0xZsxxyGEak1eTbdvpyA,12
-auto_editor-25.0.0.dist-info/RECORD,,
+auto_editor/utils/types.py,sha256=sw78iiERM5aDjkCvgBcVaRCen0OTd-04GYYfhzX1PmA,11634
+docs/build.py,sha256=8nJM_CgkSL5ilvzcJDGNjzoWpCphPJKZKguHazG6YK8,1641
+auto_editor-25.1.0.dist-info/LICENSE,sha256=yiq99pWITHfqS0pbZMp7cy2dnbreTuvBwudsU-njvIM,1210
+auto_editor-25.1.0.dist-info/METADATA,sha256=-ykd7lb64wdOX5OM7-ZsOhGr_CV4nmJKDomNyPzzvbY,6137
+auto_editor-25.1.0.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+auto_editor-25.1.0.dist-info/entry_points.txt,sha256=-H7zdTw4MqnAcwrN5xTNkGIhzZtJMxS9r6lTMeR9-aA,240
+auto_editor-25.1.0.dist-info/top_level.txt,sha256=jBV5zlbWRbKOa-xaWPvTD45QL7lGExx2BDzv-Ji4dTw,17
+auto_editor-25.1.0.dist-info/RECORD,,

{auto_editor-25.0.0.dist-info → auto_editor-25.1.0.dist-info}/WHEEL

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

{auto_editor-25.0.0.dist-info → auto_editor-25.1.0.dist-info}/top_level.txt

@@ -1 +1,2 @@
 auto_editor
+docs

docs/build.py

@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+
+# Put 'auto_editor' in Python path
+sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+
+import auto_editor.vanparse as vanparse
+from auto_editor.__main__ import main_options
+from auto_editor.lang.palet import Lexer, Parser, env, interpret
+from auto_editor.lang.stdenv import make_standard_env
+from auto_editor.vanparse import OptionText
+
+
+def main():
+    parser = vanparse.ArgumentParser("Auto-Editor")
+    parser = main_options(parser)
+
+    with open("src/ref/options.html", "w") as file:
+        file.write(
+            '{{ header-desc "Options" "These are the options and flags that auto-editor uses." }}\n'
+            "<body>\n"
+            "{{ nav }}\n"
+            '<section class="section">\n'
+            '<div class="container">\n'
+        )
+        for op in parser.args:
+            if isinstance(op, OptionText):
+                file.write(f"<h2>{op.text}</h2>\n")
+            else:
+                file.write(f"<h3><code>{op.names[0]}</code></h3>\n")
+                if len(op.names) > 1:
+                    file.write(
+                        "<h4><code>"
+                        + "</code> <code>".join(op.names[1:])
+                        + "</code></h4>\n"
+                    )
+
+                file.write(f"<p>{op.help}</p>\n")
+
+        file.write("</div>\n</section>\n</body>\n</html>\n\n")
+
+    env.update(make_standard_env())
+    with open("doc.pal") as sourcefile:
+        try:
+            interpret(env, Parser(Lexer("doc.pal", sourcefile.read())))
+        except Exception as e:
+            print(e)
+            quit(1)
+
+if __name__ == "__main__":
+    main()