Move json functions from timeline.py

Author: WyattBlue

auto_editor/exports/json.py

@@ -1,13 +1,44 @@
-from __future__ import annotations
-
 import sys
-from typing import TYPE_CHECKING
 
 from auto_editor.json import dump
-from auto_editor.timeline import v3
-
-if TYPE_CHECKING:
-    from auto_editor.utils.log import Log
+from auto_editor.timeline import Clip, v3
+from auto_editor.utils.log import Log
+
+
+def as_dict(self: v3) -> dict:
+    def aclip_to_dict(self: Clip) -> dict:
+        return {
+            "name": "audio",
+            "src": self.src,
+            "start": self.start,
+            "dur": self.dur,
+            "offset": self.offset,
+            "speed": self.speed,
+            "volume": self.volume,
+            "stream": self.stream,
+        }
+
+    v = []
+    a = []
+    for vlayer in self.v:
+        vb = [vobj.as_dict() for vobj in vlayer]
+        if vb:
+            v.append(vb)
+    for layer in self.a:
+        ab = [aclip_to_dict(clip) for clip in layer]
+        if ab:
+            a.append(ab)
+
+    return {
+        "version": "3",
+        "timebase": f"{self.tb.numerator}/{self.tb.denominator}",
+        "background": self.background,
+        "resolution": self.T.res,
+        "samplerate": self.T.sr,
+        "layout": self.T.layout,
+        "v": v,
+        "a": a,
+    }
 
 
 def make_json_timeline(ver: str, out: str, tl: v3, log: Log) -> None:
@@ -20,7 +51,7 @@ def make_json_timeline(ver: str, out: str, tl: v3, log: Log) -> None:
         outfile = open(out, "w")
 
     if ver == "v3":
-        dump(tl.as_dict(), outfile, indent=2)
+        dump(as_dict(tl), outfile, indent=2)
     else:
         if tl.v1 is None:
             log.error("Timeline can't be converted to v1 format")

auto_editor/timeline.py

@@ -282,41 +282,6 @@ def __len__(self) -> int:
 
         return result
 
-    def as_dict(self) -> dict:
-        def aclip_to_dict(self: Clip) -> dict:
-            return {
-                "name": "audio",
-                "src": self.src,
-                "start": self.start,
-                "dur": self.dur,
-                "offset": self.offset,
-                "speed": self.speed,
-                "volume": self.volume,
-                "stream": self.stream,
-            }
-
-        v = []
-        a = []
-        for vlayer in self.v:
-            vb = [vobj.as_dict() for vobj in vlayer]
-            if vb:
-                v.append(vb)
-        for layer in self.a:
-            ab = [aclip_to_dict(clip) for clip in layer]
-            if ab:
-                a.append(ab)
-
-        return {
-            "version": "3",
-            "timebase": f"{self.tb.numerator}/{self.tb.denominator}",
-            "background": self.background,
-            "resolution": self.T.res,
-            "samplerate": self.T.sr,
-            "layout": self.T.layout,
-            "v": v,
-            "a": a,
-        }
-
     @property
     def T(self) -> Template:
         return self.template