Move function

crftbt · Nov 25, 2023 · 12461cb · 12461cb
1 parent d3f9f71
commit 12461cb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/auto_editor/formats/json.py b/auto_editor/formats/json.py
@@ -18,7 +18,6 @@
     color,
     natural,
     number,
-    src,
     threshold,
 )
 
@@ -35,11 +34,21 @@ def __init__(self, name: str, *attrs: tuple[str, Any, Any]):
         self.attrs = attrs
 
 
+def make_src(val: str) -> int | str:
+    try:
+        if int(val) > 0:
+            return int(val)
+    except ValueError:
+        pass
+
+    return val
+
+
 video_builder = cAttrs(
     "video",
     ("start", natural, Required),
     ("dur", natural, Required),
-    ("src", src, Required),
+    ("src", make_src, Required),
     ("offset", natural, 0),
     ("speed", number, 1),
     ("stream", natural, 0),
@@ -48,7 +57,7 @@ def __init__(self, name: str, *attrs: tuple[str, Any, Any]):
     "audio",
     ("start", natural, Required),
     ("dur", natural, Required),
-    ("src", src, Required),
+    ("src", make_src, Required),
     ("offset", natural, 0),
     ("speed", number, 1),
     ("volume", threshold, 1),
@@ -58,7 +67,7 @@ def __init__(self, name: str, *attrs: tuple[str, Any, Any]):
     "image",
     ("start", natural, Required),
     ("dur", natural, Required),
-    ("src", src, Required),
+    ("src", make_src, Required),
     ("x", int, "50%"),
     ("y", int, "50%"),
     ("opacity", threshold, 1),

diff --git a/auto_editor/render/audio.py b/auto_editor/render/audio.py
@@ -192,6 +192,9 @@ def make_new_audio(
 
         for c, clip in enumerate(layer):
             if f"{clip.src}-{clip.stream}" not in samples:
+                if clip.src not in tl.sources:
+                    log.error(f"Unknown source: {clip.src}")
+
                 audio_path = ensure.audio(
                     f"{tl.sources[clip.src].path.resolve()}",
                     clip.src,

diff --git a/auto_editor/utils/types.py b/auto_editor/utils/types.py
@@ -84,16 +84,6 @@ def speed(val: str) -> float:
     return _s
 
 
-def src(val: str) -> int | str:
-    try:
-        if int(val) > 0:
-            return int(val)
-    except ValueError:
-        pass
-
-    return val
-
-
 def threshold(val: str | float) -> float:
     num = number(val)
     if num > 1 or num < 0: