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

auto_editor/__init__.py

@@ -1 +1 @@
-__version__ = "25.0.0"
+__version__ = "25.0.1"

auto_editor/__main__.py

@@ -305,9 +305,11 @@ def main() -> None:
 
         import av
 
+        license = av._core.library_meta["libavcodec"]["license"]
+
         print(f"OS: {plat.system()} {plat.release()} {plat.machine().lower()}")
         print(f"Python: {plat.python_version()}")
-        print(f"PyAV: {av.__version__}")
+        print(f"PyAV: {av.__version__} ({license})")
         print(f"Auto-Editor: {auto_editor.__version__}")
         return
 

auto_editor/edit.py

@@ -262,7 +262,6 @@ def edit_media(paths: list[str], ffmpeg: FFmpeg, args: Args, log: Log) -> None:
         apply_later = False
 
         ensure = Ensure(ffmpeg, bar, samplerate, log)
-
         if ctr.default_sub != "none" and not args.sn:
             sub_output = make_new_subtitles(tl, ensure, log.temp)
 

auto_editor/ffwrapper.py

@@ -149,6 +149,7 @@ class VideoStream:
 class AudioStream:
     codec: str
     samplerate: int
+    layout: str
     channels: int
     duration: float
     bitrate: int
@@ -195,7 +196,7 @@ def initFileInfo(path: str, log: Log) -> FileInfo:
     try:
         cont = av.open(path, "r")
     except av.error.FileNotFoundError:
-        log.error(f"Could not find '{path}'")
+        log.error(f"Input file doesn't exist: {path}")
     except av.error.IsADirectoryError:
         log.error(f"Expected a media file, but got a directory: {path}")
     except av.error.InvalidDataError:
@@ -252,6 +253,7 @@ def initFileInfo(path: str, log: Log) -> FileInfo:
             AudioStream(
                 a_cc.name,
                 0 if a_cc.sample_rate is None else a_cc.sample_rate,
+                a.layout.name,
                 a_cc.channels,
                 adur,
                 0 if a_cc.bit_rate is None else a_cc.bit_rate,

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/test.py

@@ -309,7 +309,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 +355,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"]))
 
@@ -743,6 +750,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/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.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-editor
-Version: 25.0.0
+Version: 25.0.1
 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.0.1.dist-info}/RECORD

@@ -1,14 +1,14 @@
-auto_editor/__init__.py,sha256=hNpKYQArhnrmhf1u3TNPTwtZw8XS7EeDs-TfBLusM-s,23
-auto_editor/__main__.py,sha256=89pW_zaFB8WEyKTGadkALLuv_MFONIcfEu8t0jKqeWI,9774
+auto_editor/__init__.py,sha256=HQ6qfTf_xOT2gRqJKN_PWXCV49oRXl228FqZ7w9Haeg,23
+auto_editor/__main__.py,sha256=aXFUlP7v15CzBeYtLdEPyIX2hxtynXo_UKWUQlxQGbM,9852
 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=fe6YT6O8B_hPOb4r4FdubvswbTuyx4_qlzlJTyMKuVc,11267
+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/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
@@ -31,25 +31,25 @@ auto_editor/render/subtitle.py,sha256=g195kDN0LcwKlZeQMCflXPH5n_74iwCk1RPLSQ5eP3
 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/subdump.py,sha256=af_XBf7kaevqHn1A71z8C-7x8pS5WKD9FE_ugkCw6rk,665
-auto_editor/subcommands/test.py,sha256=Qg_zY1Cg8Mo7JXsUWFEJxJZAe5pkkXyK4ydnBVpG0I8,24992
+auto_editor/subcommands/test.py,sha256=d-StLyIZHkvJVaiXmr1gYTzUIwLhbG34tJfYosobmps,25227
 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-25.0.1.dist-info/LICENSE,sha256=yiq99pWITHfqS0pbZMp7cy2dnbreTuvBwudsU-njvIM,1210
+auto_editor-25.0.1.dist-info/METADATA,sha256=FsEPvrdesILZ7duMkfSr7kRBhXEEN6dJ2ttjSr4Z9qw,6137
+auto_editor-25.0.1.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+auto_editor-25.0.1.dist-info/entry_points.txt,sha256=-H7zdTw4MqnAcwrN5xTNkGIhzZtJMxS9r6lTMeR9-aA,240
+auto_editor-25.0.1.dist-info/top_level.txt,sha256=ky1HUkqq9i034c4CUU_0wBw0xZsxxyGEak1eTbdvpyA,12
+auto_editor-25.0.1.dist-info/RECORD,,

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

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