auto-editor 27.1.1__py3-none-any.whl → 28.0.0__py3-none-any.whl

auto_editor/{formats → imports}/json.py

@@ -1,32 +1,28 @@
 from __future__ import annotations
 
 import os
-import sys
 from difflib import get_close_matches
 from fractions import Fraction
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from auto_editor.ffwrapper import FileInfo
-from auto_editor.json import dump, load
+from auto_editor.json import load
 from auto_editor.lib.err import MyError
 from auto_editor.timeline import (
-    ASpace,
     Template,
     TlAudio,
     TlVideo,
-    VSpace,
     audio_builder,
     v1,
     v3,
     visual_objects,
 )
 from auto_editor.utils.cmdkw import ParserError, Required, pAttrs
-from auto_editor.utils.log import Log
 from auto_editor.utils.types import CoerceError
 
-"""
-Make a pre-edited file reference that can be inputted back into auto-editor.
-"""
+if TYPE_CHECKING:
+    from auto_editor.timeline import ASpace, VSpace
+    from auto_editor.utils.log import Log
 
 
 def check_attrs(data: object, log: Log, *attrs: str) -> None:
@@ -218,11 +214,13 @@ def read_v1(tl: Any, log: Log) -> v3:
 
 
 def read_json(path: str, log: Log) -> v3:
-    with open(path, encoding="utf-8", errors="ignore") as f:
-        try:
+    try:
+        with open(path, encoding="utf-8", errors="ignore") as f:
             tl = load(path, f)
-        except MyError as e:
-            log.error(e)
+    except FileNotFoundError:
+        log.error(f"File not found: {path}")
+    except MyError as e:
+        log.error(e)
 
     check_attrs(tl, log, "version")
 
@@ -235,27 +233,3 @@ def read_json(path: str, log: Log) -> v3:
     if type(ver) is not str:
         log.error("version needs to be a string")
     log.error(f"Importing version {ver} timelines is not supported.")
-
-
-def make_json_timeline(ver: int, out: str | int, tl: v3, log: Log) -> None:
-    if ver not in {3, 1}:
-        log.error(f"Version {ver} is not supported!")
-
-    if isinstance(out, str):
-        if not out.endswith(".json"):
-            log.error("Output extension must be .json")
-        outfile: Any = open(out, "w")
-    else:
-        outfile = sys.stdout
-
-    if ver == 3:
-        dump(tl.as_dict(), outfile, indent=2)
-    else:
-        if tl.v1 is None:
-            log.error("Timeline can't be converted to v1 format")
-        dump(tl.v1.as_dict(), outfile, indent=2)
-
-    if isinstance(out, str):
-        outfile.close()
-    else:
-        print("")  # Flush stdout

auto_editor/lang/palet.py

@@ -747,7 +747,7 @@ env.update({
 # fmt: on
 
 
-def interpret(env: Env, parser: Parser) -> list:
+def interpret(env: Env, parser: Parser) -> list[object]:
     result = []
 
     try:

auto_editor/lang/stdenv.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
 import bv
@@ -7,10 +8,12 @@ import bv
 from auto_editor.analyze import mut_remove_large, mut_remove_small
 from auto_editor.lib.contracts import *
 from auto_editor.lib.data_structs import *
+from auto_editor.lib.err import MyError
 
 from .palet import Syntax, env, is_boolarr, is_iterable, my_eval, p_slice, raise_, ref
 
 if TYPE_CHECKING:
+    from fractions import Fraction
     from typing import Any, Literal
 
     import numpy as np
@@ -928,7 +931,7 @@ def make_standard_env() -> dict[str, Any]:
         except Exception:
             raise MyError("hash-ref: invalid key")
 
-    def hash_set(h: dict, k: object, v: object) -> None:
+    def hash_set(h: dict[object, object], k: object, v: object) -> None:
         h[k] = v
 
     def hash_remove(h: dict, v: object) -> None:
@@ -953,7 +956,7 @@ def make_standard_env() -> dict[str, Any]:
         except Exception:
             return False
 
-    def change_file_ext(a, ext) -> str:
+    def change_file_ext(a: str, ext: str) -> str:
         import os.path
 
         base_name = os.path.splitext(a)[0]

auto_editor/lib/contracts.py

@@ -97,7 +97,7 @@ class Proc:
             self.kw_contracts = None
             self.contracts = c
 
-    def __call__(self, *args: Any, **kwargs: Any):
+    def __call__(self, *args: Any, **kwargs: Any) -> Any:
         lower, upper = self.arity
         amount = len(args)
         cont = self.contracts

auto_editor/preview.py

@@ -68,8 +68,7 @@ def preview(tl: v3, log: Log) -> None:
     for src in all_sources:
         in_len += initLevels(src, tb, bar, False, log).media_length
 
-    out_len = tl.out_len()
-
+    out_len = len(tl)
     diff = out_len - in_len
 
     fp = sys.stdout

auto_editor/render/audio.py

@@ -272,7 +272,7 @@ def mix_audio_files(sr: int, audio_paths: list[str], output_path: str) -> None:
     max_val = np.max(np.abs(mixed_audio))
     if max_val > 0:
         mixed_audio = mixed_audio * (32767 / max_val)
-    mixed_audio = mixed_audio.astype(np.int16)  # type: ignore
+    mixed_audio = mixed_audio.astype(np.int16)
 
     output_container = bv.open(output_path, mode="w")
     output_stream = output_container.add_stream("pcm_s16le", rate=sr)

auto_editor/timeline.py

@@ -12,7 +12,6 @@ if TYPE_CHECKING:
     from collections.abc import Iterator
     from fractions import Fraction
     from pathlib import Path
-    from typing import Any
 
     from auto_editor.ffwrapper import FileInfo
     from auto_editor.utils.chunks import Chunks
@@ -297,18 +296,14 @@ video\n"""
                 seen.add(source.path)
                 yield source
 
-    def _duration(self, layer: Any) -> int:
-        total_dur = 0
-        for clips in layer:
-            dur = 0
-            for clip in clips:
-                dur += clip.dur
-            total_dur = max(total_dur, dur)
-        return total_dur
-
-    def out_len(self) -> int:
-        # Calculates the duration of the timeline
-        return max(self._duration(self.v), self._duration(self.a))
+    def __len__(self) -> int:
+        result = 0
+        for clips in self.v + self.a:
+            if len(clips) > 0:
+                lastClip = clips[-1]
+                result = max(result, lastClip.start + lastClip.dur)
+
+        return result
 
     def as_dict(self) -> dict:
         v = []

{auto_editor-27.1.1.dist-info → auto_editor-28.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: auto-editor
-Version: 27.1.1
+Version: 28.0.0
 Summary: Auto-Editor: Effort free video editing!
 Author-email: WyattBlue <wyattblue@auto-editor.com>
 License-Expression: Unlicense
@@ -12,7 +12,7 @@ Requires-Python: <3.14,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy<3.0,>=2
-Requires-Dist: basswood-av<16,>=15.0.0
+Requires-Dist: basswood-av<16,>=15.2.1
 Dynamic: license-file
 
 <p align="center"><img src="https://auto-editor.com/img/auto-editor-banner.webp" title="Auto-Editor" width="700"></p>

{auto_editor-27.1.1.dist-info → auto_editor-28.0.0.dist-info}/RECORD

@@ -1,40 +1,42 @@
-auto_editor/__init__.py,sha256=0ioEHfOkA9Eoup9m_rzaYLCKq4b4PYoylPtUx3iCRPE,23
-auto_editor/__main__.py,sha256=WfNtjKwx5fDMPpfSNLarigXD3Jp0My98FpzQqSAxQZ8,15807
+auto_editor/__init__.py,sha256=DffemEfW53YOlYaNQ9gcZ_Hf1d--6ODBrbX9JaC4Y9Y,23
+auto_editor/__main__.py,sha256=t5Um7M9ess9xYRfmn6iDvJoBqj_KRQLhlkpFdfhx3MU,15478
 auto_editor/analyze.py,sha256=CeJG0LI9wXZk1R-QPrNGPS4za-_Avd8y7H-D437DqLg,12300
-auto_editor/edit.py,sha256=qeuStjcBbRVhLweap_pxxAfME3Jh6tHyxywOjrYJ_ts,19125
-auto_editor/ffwrapper.py,sha256=Wet6B5nohgnjpBX7o20Zq0rYr-H9mUuOqHrbQAPPj38,5128
-auto_editor/help.py,sha256=CzfDTsL4GuGu596ySHKj_wKnxGR9h8B0KUdkZpo33oE,8044
+auto_editor/edit.py,sha256=p_UOfReMkMmdhh7b5azXBWvX99AyMKO-ZpnZBso5cj0,19257
+auto_editor/ffwrapper.py,sha256=ueYdN7-cBAdJBJbv5yT05iuQP_BPFIrR5hFeMkk5c3U,5040
+auto_editor/help.py,sha256=8Kkos7Bpcn-3YN7ngv0fZp-8a8Qw6b70ZZKerL8SEQ4,7901
 auto_editor/json.py,sha256=8IVhZJSLx2IVqJsbR5YKDvbHOhgIOvdQmYNpMdMG_xA,9332
 auto_editor/make_layers.py,sha256=nSEeCHysMot2eze23q05g2HFDuskN_4Jk108xlk2Rw8,10102
-auto_editor/preview.py,sha256=cqQdozM2IB-5qXHNxeqiSrSdEIzlMfjD4SU-NX9sYZ0,3052
-auto_editor/timeline.py,sha256=wUduvIB7JRoV_kswSBWJar_aNJH6i-RO917xrON6lIM,9521
+auto_editor/preview.py,sha256=yYn5jJLQ3TiJiNC6JffaggLVPQfBU558zJeRQz7nCDY,3046
+auto_editor/timeline.py,sha256=9D-2lXIGXx2R82qQ7_4TfG77ikN4byM_fK_1QyLlPZ8,9346
 auto_editor/vanparse.py,sha256=Ug5A2QaRqGiw4l55Z_h9T2QU1x0WqRibR7yY5rQ0WTk,10002
 auto_editor/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 auto_editor/cmds/cache.py,sha256=bViYbtVXefTeEIUvSanDfA6cG35ep1N_Jvtz7ZjgIkY,1959
-auto_editor/cmds/desc.py,sha256=DSAWPKt8PS9soBTgzpsFIEWoTe4gPTWwjXpNL-p3WsI,866
-auto_editor/cmds/info.py,sha256=VA2WkTBbQPvrVHjDaJyqryoVMtiiN6cguiUMdWgBJfU,7002
+auto_editor/cmds/desc.py,sha256=kdRJfabdde5thuFOoTXlW3J3G8F0ZvbsJoOkUn7E3GA,805
+auto_editor/cmds/info.py,sha256=awiusgunhoiqrr3LX0AevrVwj4foNJrtRBJUbIebwyc,6589
 auto_editor/cmds/levels.py,sha256=2Hbvoy6wMbRRoHdZf25PMqq1uvhRKyPcITNPMpZFo7s,5632
 auto_editor/cmds/palet.py,sha256=ONzTqemaQq9YEfIOsDRNnwzfqnEMUMSXIQrETxyroRU,749
 auto_editor/cmds/repl.py,sha256=HSUTDaVykPb5Bd-v_jz_8R7HvFmKOcT_ZVmP-d0AbUY,3247
 auto_editor/cmds/subdump.py,sha256=kHg8nfUi6I6VeJjEgMxupPa666qsYUh7ZEUxint7Gqo,2443
-auto_editor/cmds/test.py,sha256=UNN1r6J69-woqA6QU7TeY0WlPxukQzwCRl5DGBTLK8g,28837
-auto_editor/formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_editor/formats/fcp11.py,sha256=uaJbLiwiVxqoVy5JCA14wZj-m1wqZIzWh7rS-BsnSQM,5219
-auto_editor/formats/fcp7.py,sha256=Q_raDxOBqo8QcnhaiXrIFPB-Un7wUvQ4SYt6KALOI1s,19212
-auto_editor/formats/json.py,sha256=UUBhFR_79vn4Lxu73B0cVBFgw4qytrmMP-TiCmDFMd0,7666
-auto_editor/formats/shotcut.py,sha256=-ES854LLFCMCBe100JRJedDmuk8zPev17aQMTrzPv-g,4923
-auto_editor/formats/utils.py,sha256=LYXDiqOk9WwUorLGw2D0M7In9BNDkoKikNawuks7hqE,1648
+auto_editor/cmds/test.py,sha256=VVU1sVDhv4jclJUw387ruWTSRFPh5m-1wfYEGW3mzBs,29624
+auto_editor/exports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+auto_editor/exports/fcp11.py,sha256=3HKkTv65J3NZohAyuc08tuHk4fqgEGN8RAMQNzrNFrY,5340
+auto_editor/exports/fcp7.py,sha256=6ZP9EtVc8nPZu-2zZn1IZP4I5gYedzZ6TJFRM36XDWc,13480
+auto_editor/exports/json.py,sha256=Z7RKtD5-OB3saOtWG9qfI9OrLtylhU9VyfpnVRNcuU8,768
+auto_editor/exports/shotcut.py,sha256=J2Myi9fu37fUVqr5mzlWcfHJ9LVKu3f4Pz3tEq2onCc,4811
+auto_editor/imports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+auto_editor/imports/fcp7.py,sha256=hWh78sDmMSsf7RhteDCbyz_aS8QYwY2fUg-BB-FchZg,8653
+auto_editor/imports/json.py,sha256=gsWtlLl26Y7BeOaIAngWH_I0innqp8bFmew0qzQWZB8,7024
 auto_editor/lang/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 auto_editor/lang/libintrospection.py,sha256=6H1rGp0wqaCud5IPaoEmzULGnYt6ec7_0h32ATcw2oY,261
 auto_editor/lang/libmath.py,sha256=z33A161Oe6vYYK7R6pgYjdZZe63dQkN38Qf36TL3prg,847
-auto_editor/lang/palet.py,sha256=RQjyIZMJSWnzDkHTu-5mt74o9_4zO4VrcH-wLojCF7A,24113
-auto_editor/lang/stdenv.py,sha256=o7kFu7EbaH71XPFGxJUXYGxSeZ8O3i1_C5Hmi9uya4Q,44150
+auto_editor/lang/palet.py,sha256=VS_G_-czy9epsBrqUa0dhEPKWJMGaj3Q5Q49l7mp2so,24121
+auto_editor/lang/stdenv.py,sha256=ndxkNTFl6QbcgGdgoQtvAfjZhRiqDn6z_-Ad427bcNo,44285
 auto_editor/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_editor/lib/contracts.py,sha256=lExGQymcQUmwG5lC1lO4qm4GY8W0q_yzK_miTaAoPA4,7586
+auto_editor/lib/contracts.py,sha256=VWLERPFmf6Lb_3yZoMeqF7pyBTWfAMChIVUVpzN9tz0,7593
 auto_editor/lib/data_structs.py,sha256=Hnzl5gWvo-geTU0g-lGejj6HQW3VvPv0NBEj2XoGskY,7089
 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=ejV_NIvrmxMJt6mf7nPNIzlPHOumNhcIO2J-irHO-k8,17427
+auto_editor/render/audio.py,sha256=OsvUXJD_qmv2xHivLD6skEmK8vdmPyLMhV7mBFdMLQM,17411
 auto_editor/render/subtitle.py,sha256=F27T8OsAojUIGTGBWqTdH36h0BnHXSExxIqzOtqyZoE,6129
 auto_editor/render/video.py,sha256=uIrYzF4bDZ3vwfX2F6TdR6F73GI4yruGssto9xEQ-AA,11999
 auto_editor/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -45,10 +47,10 @@ auto_editor/utils/container.py,sha256=CNHChHbhzIrjmDdWw6UzMqscrr9u7A-ZqKWejGjJwY
 auto_editor/utils/func.py,sha256=ODyjXnzSDatEu08w398K8_xBKYdXMY3IPHiJpGRZDyQ,3250
 auto_editor/utils/log.py,sha256=wPNf6AabV-0cnoS_bPLv1Lh7llQBtNqPKeh07einOuc,3701
 auto_editor/utils/types.py,sha256=j2hd4zMQ9EftDy41Ji2_PFru_7HEZObd9yKA0BJxFaY,7616
-auto_editor-27.1.1.dist-info/licenses/LICENSE,sha256=yiq99pWITHfqS0pbZMp7cy2dnbreTuvBwudsU-njvIM,1210
+auto_editor-28.0.0.dist-info/licenses/LICENSE,sha256=yiq99pWITHfqS0pbZMp7cy2dnbreTuvBwudsU-njvIM,1210
 docs/build.py,sha256=g1uc1H9T_naGaermUiVMMwUpbT0IWElRhjgT0fvCh8w,1914
-auto_editor-27.1.1.dist-info/METADATA,sha256=ri7aLym52FDEnnDR7czUR3xqZ025BLmepV0Em6GXjQc,6176
-auto_editor-27.1.1.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
-auto_editor-27.1.1.dist-info/entry_points.txt,sha256=UAsTc7qJQbnAzHd7KWg-ALo_X9Hj2yDs3M9I2DV3eyI,212
-auto_editor-27.1.1.dist-info/top_level.txt,sha256=jBV5zlbWRbKOa-xaWPvTD45QL7lGExx2BDzv-Ji4dTw,17
-auto_editor-27.1.1.dist-info/RECORD,,
+auto_editor-28.0.0.dist-info/METADATA,sha256=5hrS0TC7CGSbN5GyOatgqq8svTg9nWNiHw_9fSvHGms,6176
+auto_editor-28.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+auto_editor-28.0.0.dist-info/entry_points.txt,sha256=UAsTc7qJQbnAzHd7KWg-ALo_X9Hj2yDs3M9I2DV3eyI,212
+auto_editor-28.0.0.dist-info/top_level.txt,sha256=jBV5zlbWRbKOa-xaWPvTD45QL7lGExx2BDzv-Ji4dTw,17
+auto_editor-28.0.0.dist-info/RECORD,,

{auto_editor-27.1.1.dist-info → auto_editor-28.0.0.dist-info}/WHEEL

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

auto_editor/formats/utils.py

@@ -1,56 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-from xml.etree.ElementTree import Element
-
-if TYPE_CHECKING:
-    from auto_editor.utils.log import Log
-
-
-def show(ele: Element, limit: int, depth: int = 0) -> None:
-    print(
-        f"{' ' * (depth * 4)}<{ele.tag} {ele.attrib}> {ele.text.strip() if ele.text is not None else ''}"
-    )
-    for child in ele:
-        if isinstance(child, Element) and depth < limit:
-            show(child, limit, depth + 1)
-
-
-class Validator:
-    def __init__(self, log: Log):
-        self.log = log
-
-    def parse(self, ele: Element, schema: dict) -> dict:
-        new: dict = {}
-
-        for key, val in schema.items():
-            if isinstance(val, dict) and "__arr" in val:
-                new[key] = []
-
-        is_arr = False
-        for child in ele:
-            if child.tag not in schema:
-                continue
-
-            if schema[child.tag] is None:
-                new[child.tag] = child
-                continue
-
-            if isinstance(schema[child.tag], dict):
-                val = self.parse(child, schema[child.tag])
-                is_arr = "__arr" in schema[child.tag]
-            else:
-                val = schema[child.tag](child.text)
-
-            if child.tag in new:
-                if not is_arr:
-                    self.log.error(f"<{child.tag}> can only occur once")
-                new[child.tag].append(val)
-            else:
-                new[child.tag] = [val] if is_arr else val
-
-        return new
-
-    def check(self, ele: Element, tag: str) -> None:
-        if tag != ele.tag:
-            self.log.error(f"Expected '{tag}' tag, got '{ele.tag}'")