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

auto_editor/formats/fcp7.py

@@ -2,13 +2,12 @@ from __future__ import annotations
 
 import xml.etree.ElementTree as ET
 from fractions import Fraction
-from io import StringIO
 from math import ceil
 from typing import TYPE_CHECKING
 from xml.etree.ElementTree import Element
 
-from auto_editor.ffwrapper import FileInfo, initFileInfo
-from auto_editor.timeline import ASpace, TlAudio, TlVideo, VSpace, v3
+from auto_editor.ffwrapper import FileInfo
+from auto_editor.timeline import ASpace, Template, TlAudio, TlVideo, VSpace, v3
 
 from .utils import Validator, show
 
@@ -29,59 +28,20 @@ DEPTH = "16"
 
 
 def uri_to_path(uri: str) -> str:
-    def de_norm(s: str) -> str:
-        uri_escape = {
-            "3C": "<",
-            "3E": ">",
-            "23": "#",
-            "25": "%",
-            "2B": "+",
-            "7B": "{",
-            "7D": "}",
-            "7C": "|",
-            "5C": "\\",
-            "5E": "^",
-            "7E": "~",
-            "5B": "[",
-            "5D": "]",
-            "60": "`",
-            "3F": "?",
-            "3A": ":",
-            "40": "@",
-            "3D": "=",
-            "2A": "*",
-            "29": ")",
-            "28": "(",
-            "27": "'",
-            "26": "&",
-            "24": "$",
-            "22": '"',
-            "21": "!",
-            "20": " ",
-        }
-        buf = StringIO()
-        i = 0
-        while i < len(s):
-            if s[i] == "%" and len(s) > i + 3:
-                tag = s[i + 1 : i + 3]
-                if tag in uri_escape:
-                    buf.write(uri_escape[tag])
-                    i += 3
-                else:
-                    buf.write(s[i])
-                    i += 1
-            else:
-                buf.write(s[i])
-                i += 1
-        return buf.getvalue()
+    urllib = __import__("urllib.parse", fromlist=["parse"])
 
     if uri.startswith("file://localhost/"):
-        return de_norm(uri[16:])
-    if uri.startswith("file://"):
-        if uri[9] == ":":  # Handle Windows-style paths
-            return de_norm(uri[8:])
-        return de_norm(uri[7:])
-    return uri
+        uri = uri[16:]
+    elif uri.startswith("file://"):
+        # Windows-style paths
+        if len(uri) > 8 and uri[9] == ":":
+            uri = uri[8:]
+        else:
+            uri = uri[7:]
+    else:
+        return uri
+
+    return urllib.parse.unquote(uri)
 
     # /Users/wyattblue/projects/auto-editor/example.mp4
     # file:///Users/wyattblue/projects/auto-editor/example.mp4
@@ -282,7 +242,7 @@ def fcp7_read_xml(path: str, log: Log) -> v3:
                     fileobj = valid.parse(clipitem["file"], {"pathurl": str})
 
                     if "pathurl" in fileobj:
-                        sources[file_id] = initFileInfo(
+                        sources[file_id] = FileInfo.init(
                             uri_to_path(fileobj["pathurl"]),
                             log,
                         )
@@ -317,7 +277,7 @@ def fcp7_read_xml(path: str, log: Log) -> v3:
                 file_id = clipitem["file"].attrib["id"]
                 if file_id not in sources:
                     fileobj = valid.parse(clipitem["file"], {"pathurl": str})
-                    sources[file_id] = initFileInfo(
+                    sources[file_id] = FileInfo.init(
                         uri_to_path(fileobj["pathurl"]), log
                     )
 
@@ -336,10 +296,8 @@ def fcp7_read_xml(path: str, log: Log) -> v3:
                     )
                 )
 
-    primary_src = sources[next(iter(sources))]
-    assert type(primary_src) is FileInfo
-
-    return v3(primary_src, tb, sr, res, "#000", vobjs, aobjs, v1=None)
+    T = Template.init(sources[next(iter(sources))], sr, res=res)
+    return v3(tb, "#000", T, vobjs, aobjs, v1=None)
 
 
 def media_def(
@@ -424,13 +382,14 @@ def resolve_write_audio(audio: Element, make_filedef, tl: v3) -> None:
                 clipitem.append(speedup(aclip.speed * 100))
 
 
-def premiere_write_audio(audio: Element, make_filedef, src: FileInfo, tl: v3) -> None:
+def premiere_write_audio(audio: Element, make_filedef, tl: v3) -> None:
     ET.SubElement(audio, "numOutputChannels").text = "2"
     aformat = ET.SubElement(audio, "format")
     aschar = ET.SubElement(aformat, "samplecharacteristics")
     ET.SubElement(aschar, "depth").text = DEPTH
     ET.SubElement(aschar, "samplerate").text = f"{tl.sr}"
 
+    has_video = tl.v and tl.v[0]
     t = 0
     for aclips in tl.a:
         for channelcount in range(0, 2):  # Because "stereo" is hardcoded.
@@ -442,7 +401,7 @@ def premiere_write_audio(audio: Element, make_filedef, src: FileInfo, tl: v3) ->
                 premiereTrackType="Stereo",
             )
 
-            if src.videos:
+            if has_video:
                 ET.SubElement(track, "outputchannelindex").text = f"{channelcount + 1}"
 
             for j, aclip in enumerate(aclips):
@@ -453,7 +412,7 @@ def premiere_write_audio(audio: Element, make_filedef, src: FileInfo, tl: v3) ->
                 _in = f"{aclip.offset}"
                 _out = f"{aclip.offset + aclip.dur}"
 
-                if not src.videos:
+                if not has_video:
                     clip_item_num = j + 1
                 else:
                     clip_item_num = len(aclips) + 1 + j + (t * len(aclips))
@@ -579,7 +538,7 @@ def fcp7_write_xml(name: str, output: str, resolve: bool, tl: v3) -> None:
     if resolve:
         resolve_write_audio(audio, make_filedef, tl)
     else:
-        premiere_write_audio(audio, make_filedef, src, tl)
+        premiere_write_audio(audio, make_filedef, tl)
 
     tree = ET.ElementTree(xmeml)
     ET.indent(tree, space="  ", level=0)

auto_editor/formats/json.py

@@ -6,11 +6,12 @@ from difflib import get_close_matches
 from fractions import Fraction
 from typing import Any
 
-from auto_editor.ffwrapper import FileInfo, initFileInfo
+from auto_editor.ffwrapper import FileInfo
 from auto_editor.json import dump, load
 from auto_editor.lib.err import MyError
 from auto_editor.timeline import (
     ASpace,
+    Template,
     TlAudio,
     TlVideo,
     VSpace,
@@ -59,7 +60,7 @@ def read_v3(tl: Any, log: Log) -> v3:
     def make_src(v: str) -> FileInfo:
         if v in srcs:
             return srcs[v]
-        temp = initFileInfo(v, log)
+        temp = FileInfo.init(v, log)
         srcs[v] = temp
         return temp
 
@@ -151,11 +152,11 @@ def read_v3(tl: Any, log: Log) -> v3:
             a.append(a_out)
 
     try:
-        src = srcs[next(iter(srcs))]
+        T = Template.init(srcs[next(iter(srcs))])
     except StopIteration:
-        src = None
+        T = Template(sr, "stereo", res, [], [])
 
-    return v3(src, tb, sr, res, bg, v, a, v1=None)
+    return v3(tb, bg, T, v, a, v1=None)
 
 
 def read_v1(tl: Any, log: Log) -> v3:
@@ -168,7 +169,7 @@ def read_v1(tl: Any, log: Log) -> v3:
 
     check_file(path, log)
 
-    src = initFileInfo(path, log)
+    src = FileInfo.init(path, log)
 
     vtl: VSpace = []
     atl: ASpace = [[] for _ in range(len(src.audios))]
@@ -207,11 +208,9 @@ def read_v1(tl: Any, log: Log) -> v3:
             atl[a].append(TlAudio(c.start, c.dur, c.src, c.offset, c.speed, 1, a))
 
     return v3(
-        src,
         src.get_fps(),
-        src.get_sr(),
-        src.get_res(),
         "#000",
+        Template.init(src),
         vtl,
         atl,
         v1(src, chunks),

auto_editor/lang/stdenv.py

@@ -13,6 +13,7 @@ from .palet import Syntax, env, is_boolarr, is_iterable, my_eval, p_slice, raise
 if TYPE_CHECKING:
     from typing import Any, Literal
 
+    import numpy as np
     from numpy.typing import NDArray
 
     Number = int | float | complex | Fraction

auto_editor/make_layers.py

@@ -11,7 +11,7 @@ from auto_editor.ffwrapper import FileInfo
 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.timeline import ASpace, Template, TlAudio, TlVideo, VSpace, v1, v3
 from auto_editor.utils.func import mut_margin
 from auto_editor.utils.types import CoerceError, time
 
@@ -99,16 +99,17 @@ def parse_time(val: str, arr: NDArray, tb: Fraction) -> int:  # raises: `CoerceE
 
 
 def make_timeline(
-    sources: list[FileInfo],
-    args: Args,
-    sr: int,
-    bar: Bar,
-    log: Log,
+    sources: list[FileInfo], args: Args, sr: int, bar: Bar, log: Log
 ) -> v3:
     inp = None if not sources else sources[0]
 
     if inp is None:
-        tb, res = Fraction(30), (1920, 1080)
+        tb = (
+            Fraction(30)
+            if args.frame_rate is None
+            else make_sane_timebase(args.frame_rate)
+        )
+        res = (1920, 1080) if args.resolution is None else args.resolution
     else:
         tb = make_sane_timebase(
             inp.get_fps() if args.frame_rate is None else args.frame_rate
@@ -302,4 +303,13 @@ def make_timeline(
     else:
         v1_compatiable = None
 
-    return v3(inp, tb, sr, res, args.background, vtl, atl, v1_compatiable)
+    if len(vtl) == 0 and len(atl) == 0:
+        log.error("Timeline is empty, nothing to do.")
+
+    if inp is None:
+        layout = "stereo" if args.audio_layout is None else args.audio_layout
+        template = Template(sr, layout, res, [], [])
+    else:
+        template = Template.init(inp, sr, args.audio_layout, res)
+
+    return v3(tb, args.background, template, vtl, atl, v1_compatiable)