auto-editor 27.1.0__tar.gz → 27.1.1__tar.gz

{auto_editor-27.1.0 → auto_editor-27.1.1}/PKG-INFO

@@ -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.1/auto_editor/__init__.py

@@ -0,0 +1 @@
+__version__ = "27.1.1"

{auto_editor-27.1.0 → auto_editor-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-27.1.0 → auto_editor-27.1.1}/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-27.1.0 → auto_editor-27.1.1}/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 → auto_editor-27.1.1}/auto_editor.egg-info/PKG-INFO

@@ -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/auto_editor/__init__.py

@@ -1 +0,0 @@
-__version__ = "27.1.0"