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

auto_editor/__init__.py

@@ -1 +1 @@
-__version__ = "27.1.0"
+__version__ = "27.1.1"

auto_editor/edit.py

@@ -5,6 +5,7 @@ import sys
 from fractions import Fraction
 from heapq import heappop, heappush
 from os.path import splitext
+from pathlib import Path
 from subprocess import run
 from typing import TYPE_CHECKING, Any
 
@@ -28,14 +29,18 @@ if TYPE_CHECKING:
 
 
 def set_output(
-    out: str | None, _export: str | None, src: FileInfo | None, log: Log
+    out: str | None, _export: str | None, path: Path | None, log: Log
 ) -> tuple[str, dict[str, Any]]:
-    if src is None:
-        root, ext = "out", ".mp4"
+    if out is None:
+        if path is None:
+            log.error("`--output` must be set.")  # When a timeline file is the input.
+        root, ext = splitext(path)
     else:
-        root, ext = splitext(src.path if out is None else out)
-        if ext == "":
-            ext = src.path.suffix
+        root, ext = splitext(out)
+
+    if ext == "":
+        # Use `mp4` as the default, because it is most compatible.
+        ext = ".mp4" if path is None else path.suffix
 
     if _export is None:
         if ext == ".xml":
@@ -158,8 +163,7 @@ def parse_export(export: str, log: Log) -> dict[str, Any]:
 
 def edit_media(paths: list[str], args: Args, log: Log) -> None:
     bar = initBar(args.progress)
-    tl = None
-    src = None
+    tl = src = use_path = None
 
     if args.keep_tracks_separate:
         log.deprecated("--keep-tracks-separate is deprecated.")
@@ -181,9 +185,10 @@ def edit_media(paths: list[str], args: Args, log: Log) -> None:
             tl = read_json(paths[0], log)
         else:
             sources = [FileInfo.init(path, log) for path in paths]
-            src = None if not sources else sources[0]
+            src = sources[0]
+            use_path = src.path
 
-    output, export_ops = set_output(args.output, args.export, src, log)
+    output, export_ops = set_output(args.output, args.export, use_path, log)
     assert "export" in export_ops
     export = export_ops["export"]
 

auto_editor/formats/fcp7.py

@@ -2,7 +2,6 @@ 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
@@ -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

auto_editor/timeline.py

@@ -347,26 +347,29 @@ video\n"""
         return self.T.sr
 
 
-def make_tracks_dir(path: Path) -> Path:
+def make_tracks_dir(tracks_dir: Path, path: Path) -> None:
     from os import mkdir
     from shutil import rmtree
 
-    tracks_dir = path.parent / f"{path.stem}_tracks"
-
     try:
         mkdir(tracks_dir)
     except OSError:
         rmtree(tracks_dir)
         mkdir(tracks_dir)
 
-    return tracks_dir
-
 
 def set_stream_to_0(src: FileInfo, tl: v3, log: Log) -> None:
-    fold = make_tracks_dir(src.path)
+    dir_exists = False
     cache: dict[Path, FileInfo] = {}
 
     def make_track(i: int, path: Path) -> FileInfo:
+        nonlocal dir_exists
+
+        fold = path.parent / f"{path.stem}_tracks"
+        if not dir_exists:
+            make_tracks_dir(fold, path)
+            dir_exists = True
+
         newtrack = fold / f"{path.stem}_{i}.wav"
         if newtrack not in cache:
             mux(path, output=newtrack, stream=i)

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

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

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

@@ -1,13 +1,13 @@
-auto_editor/__init__.py,sha256=GyXI0pHyyPF89C9QtYg4zFjEDtSMUJMNUdrc74jh27A,23
+auto_editor/__init__.py,sha256=0ioEHfOkA9Eoup9m_rzaYLCKq4b4PYoylPtUx3iCRPE,23
 auto_editor/__main__.py,sha256=WfNtjKwx5fDMPpfSNLarigXD3Jp0My98FpzQqSAxQZ8,15807
 auto_editor/analyze.py,sha256=CeJG0LI9wXZk1R-QPrNGPS4za-_Avd8y7H-D437DqLg,12300
-auto_editor/edit.py,sha256=UbKG5jhl5K3kCx9wIB_-Con6PF-4H0-Du0yVln3B5Qc,18921
+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/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=Ku6BdDDzdboO0DisO_KLDjAyxJLQVDybWVgFbGCcsmY,9416
+auto_editor/timeline.py,sha256=wUduvIB7JRoV_kswSBWJar_aNJH6i-RO917xrON6lIM,9521
 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
@@ -20,7 +20,7 @@ auto_editor/cmds/subdump.py,sha256=kHg8nfUi6I6VeJjEgMxupPa666qsYUh7ZEUxint7Gqo,2
 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=rHjXXjpJ5YQQvCxor7FpUaqaAreqjCas4uLpiTdFclc,20255
+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
@@ -45,10 +45,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.0.dist-info/licenses/LICENSE,sha256=yiq99pWITHfqS0pbZMp7cy2dnbreTuvBwudsU-njvIM,1210
+auto_editor-27.1.1.dist-info/licenses/LICENSE,sha256=yiq99pWITHfqS0pbZMp7cy2dnbreTuvBwudsU-njvIM,1210
 docs/build.py,sha256=g1uc1H9T_naGaermUiVMMwUpbT0IWElRhjgT0fvCh8w,1914
-auto_editor-27.1.0.dist-info/METADATA,sha256=JU6SgcQLr3thOG27aQRkt2r3INzU0q306BeK79qkwGs,6176
-auto_editor-27.1.0.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-auto_editor-27.1.0.dist-info/entry_points.txt,sha256=UAsTc7qJQbnAzHd7KWg-ALo_X9Hj2yDs3M9I2DV3eyI,212
-auto_editor-27.1.0.dist-info/top_level.txt,sha256=jBV5zlbWRbKOa-xaWPvTD45QL7lGExx2BDzv-Ji4dTw,17
-auto_editor-27.1.0.dist-info/RECORD,,
+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-27.1.0.dist-info → auto_editor-27.1.1.dist-info}/WHEEL

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