auto-editor 28.0.0__py3-none-any.whl → 28.0.2__py3-none-any.whl

auto_editor/timeline.py

@@ -38,45 +38,24 @@ class v1:
 
 
 @dataclass(slots=True)
-class TlVideo:
+class Clip:
     start: int
     dur: int
     src: FileInfo
     offset: int
-    speed: float
     stream: int
 
-    def as_dict(self) -> dict:
-        return {
-            "name": "video",
-            "src": self.src,
-            "start": self.start,
-            "dur": self.dur,
-            "offset": self.offset,
-            "speed": self.speed,
-            "stream": self.stream,
-        }
-
-
-@dataclass(slots=True)
-class TlAudio:
-    start: int
-    dur: int
-    src: FileInfo
-    offset: int
-    speed: float
-    volume: float
-    stream: int
+    speed: float = 1.0
+    volume: float = 1.0
 
     def as_dict(self) -> dict:
         return {
-            "name": "audio",
+            "name": "video",
             "src": self.src,
             "start": self.start,
             "dur": self.dur,
             "offset": self.offset,
             "speed": self.speed,
-            "volume": self.volume,
             "stream": self.stream,
         }
 
@@ -176,14 +155,12 @@ rect_builder = pAttrs(
 visual_objects = {
     "rect": (TlRect, rect_builder),
     "image": (TlImage, img_builder),
-    "video": (TlVideo, video_builder),
+    "video": (Clip, video_builder),
 }
 
-VLayer = list[TlVideo | TlImage | TlRect]
+VLayer = list[Clip | TlImage | TlRect]
 VSpace = list[VLayer]
-
-ALayer = list[TlAudio]
-ASpace = list[ALayer]
+ASpace = list[list[Clip]]
 
 
 @dataclass(slots=True)
@@ -248,7 +225,7 @@ video\n"""
         for i, layer in enumerate(self.v):
             result += f" v{i} "
             for obj in layer:
-                if isinstance(obj, TlVideo):
+                if isinstance(obj, Clip):
                     result += (
                         f"[#:start {obj.start} #:dur {obj.dur} #:off {obj.offset}] "
                     )
@@ -283,7 +260,7 @@ video\n"""
     def sources(self) -> Iterator[FileInfo]:
         for vclips in self.v:
             for v in vclips:
-                if isinstance(v, TlVideo):
+                if isinstance(v, Clip):
                     yield v.src
         for aclips in self.a:
             for a in aclips:
@@ -305,30 +282,6 @@ video\n"""
 
         return result
 
-    def as_dict(self) -> dict:
-        v = []
-        for i, vlayer in enumerate(self.v):
-            vb = [vobj.as_dict() for vobj in vlayer]
-            if vb:
-                v.append(vb)
-
-        a = []
-        for i, alayer in enumerate(self.a):
-            ab = [aobj.as_dict() for aobj in alayer]
-            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
@@ -342,7 +295,7 @@ video\n"""
         return self.T.sr
 
 
-def make_tracks_dir(tracks_dir: Path, path: Path) -> None:
+def make_tracks_dir(tracks_dir: Path) -> None:
     from os import mkdir
     from shutil import rmtree
 
@@ -353,7 +306,7 @@ def make_tracks_dir(tracks_dir: Path, path: Path) -> None:
         mkdir(tracks_dir)
 
 
-def set_stream_to_0(src: FileInfo, tl: v3, log: Log) -> None:
+def set_stream_to_0(tl: v3, log: Log) -> None:
     dir_exists = False
     cache: dict[Path, FileInfo] = {}
 
@@ -362,7 +315,7 @@ def set_stream_to_0(src: FileInfo, tl: v3, log: Log) -> None:
 
         fold = path.parent / f"{path.stem}_tracks"
         if not dir_exists:
-            make_tracks_dir(fold, path)
+            make_tracks_dir(fold)
             dir_exists = True
 
         newtrack = fold / f"{path.stem}_{i}.wav"

{auto_editor-28.0.0.dist-info → auto_editor-28.0.2.dist-info}/METADATA

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

auto_editor-28.0.2.dist-info/RECORD

@@ -0,0 +1,56 @@
+auto_editor/__init__.py,sha256=6apXf8Vs7EJRS3EJg55T29rrBLN_XnKO63TMnymWMvI,23
+auto_editor/__main__.py,sha256=t5Um7M9ess9xYRfmn6iDvJoBqj_KRQLhlkpFdfhx3MU,15478
+auto_editor/analyze.py,sha256=CeJG0LI9wXZk1R-QPrNGPS4za-_Avd8y7H-D437DqLg,12300
+auto_editor/edit.py,sha256=sNvS2A7Aknzx-kDGDkdiIenCeIVCIxqj5NXnnhfeWpQ,19311
+auto_editor/ffwrapper.py,sha256=dSrONV1QyPzPhK0g6lOM5pPDITz7qblyjLpRV_VRH_Y,5474
+auto_editor/help.py,sha256=8Kkos7Bpcn-3YN7ngv0fZp-8a8Qw6b70ZZKerL8SEQ4,7901
+auto_editor/json.py,sha256=g6ZsrSOXtjQj-8Otea3TIY2G-HZ6g-IXUblwukgTO1g,9332
+auto_editor/make_layers.py,sha256=Udxn7Vw0Jz9HOarLeswQ-WwTu87PWcsyduBdtFwSOyc,10079
+auto_editor/preview.py,sha256=pBCw21wTORG0-Zs4Zf2anCecTNlnfiCq50tINeOcFmg,2815
+auto_editor/timeline.py,sha256=84k-sSK3c2kTZ28atPoIaWgSecZvO-fOGfsXFlmifP4,8165
+auto_editor/vanparse.py,sha256=Ug5A2QaRqGiw4l55Z_h9T2QU1x0WqRibR7yY5rQ0WTk,10002
+auto_editor/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+auto_editor/cmds/cache.py,sha256=rK06dX3Z1pDAK0t5rqR7S2cMEpnT_Tv17t3Q5qPQKLI,1959
+auto_editor/cmds/desc.py,sha256=kdRJfabdde5thuFOoTXlW3J3G8F0ZvbsJoOkUn7E3GA,805
+auto_editor/cmds/info.py,sha256=NwzZu6l6IIdK0ajZdn8WX_iiJwlsMrGIZ2vffDRu3gc,6535
+auto_editor/cmds/levels.py,sha256=zR9Sd7wDO36rEI-Tu_pdsAwNiwQxg62CQ04RG5mZeC0,5853
+auto_editor/cmds/palet.py,sha256=t2O_xM82PXUjnSgcHxyt9OG24gwQS4ksR2sKiQ1SvUA,743
+auto_editor/cmds/repl.py,sha256=HSUTDaVykPb5Bd-v_jz_8R7HvFmKOcT_ZVmP-d0AbUY,3247
+auto_editor/cmds/subdump.py,sha256=Zxs9X0gEaQYA5F1EqccJmVUYfI1o3J7ltyc9bvy1tA4,2393
+auto_editor/cmds/test.py,sha256=p7z2cojsiyWnRN_UVeT4iYakkGlsQTjt_dRZ4cSvIQg,29835
+auto_editor/exports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+auto_editor/exports/fcp11.py,sha256=uOonQPBoSQSfUpdi58vqDgpZdmN6Jevm2YNPo9m9nI0,6195
+auto_editor/exports/fcp7.py,sha256=shZtn5i66hqGVrpR1PP1hiwKiZirr1cRUxATzbW-BOo,12069
+auto_editor/exports/json.py,sha256=Q176-MtctEyPVenxbjuhMx_j8oVx-_G4Zwa-PJ3f7oQ,1579
+auto_editor/exports/shotcut.py,sha256=miIOvzM73tUJcHFCe7fUu66YZxEvlDSkV1PHxv8ED8k,4699
+auto_editor/imports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+auto_editor/imports/fcp7.py,sha256=Vep1syViRZOrtZBlF6Ek_eRy0rLINpTso5nrh3uY3zk,8563
+auto_editor/imports/json.py,sha256=5c_vKoS8FzxAWagCetrwATHdnZ2beWQ77g8JYKVM0i8,6993
+auto_editor/lang/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+auto_editor/lang/libintrospection.py,sha256=6H1rGp0wqaCud5IPaoEmzULGnYt6ec7_0h32ATcw2oY,261
+auto_editor/lang/libmath.py,sha256=z33A161Oe6vYYK7R6pgYjdZZe63dQkN38Qf36TL3prg,847
+auto_editor/lang/palet.py,sha256=bsuEWNEefTb0-69Dc4lq4aotqu7aarH1okETK8ab-Gw,22794
+auto_editor/lang/stdenv.py,sha256=munuKA5rkg_5krQ_km92JhoNY6Vio9wo5E79YWlD2eg,43654
+auto_editor/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+auto_editor/lib/contracts.py,sha256=bADXnFXyq_-Tku59saxwDOlvexfS3wMAMdrKNL-Ql2w,7494
+auto_editor/lib/data_structs.py,sha256=2SxsOXKiY0H95wRIFOrQBjv1ykJUQar0Vr5dK9zZOiQ,6971
+auto_editor/lib/err.py,sha256=UlszQJdzMZwkbT8x3sY4GkCV_5x9yrd6uVVUzvA8iiI,35
+auto_editor/render/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+auto_editor/render/audio.py,sha256=08Leg9R66ROz8meZyY03e7yfUd5otxdd6DdNO9vX5ys,17518
+auto_editor/render/subtitle.py,sha256=F27T8OsAojUIGTGBWqTdH36h0BnHXSExxIqzOtqyZoE,6129
+auto_editor/render/video.py,sha256=8somlAxtbGMSRREab8psTdIlaETZQ2s2gY20PWY9sww,12072
+auto_editor/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+auto_editor/utils/bar.py,sha256=Ky9JRf37JTgLyvNuIXDfucaUE8H1vBbCqKLjttmsmmo,4156
+auto_editor/utils/chunks.py,sha256=J-eGKtEz68gFtRrj1kOSgH4Tj_Yz6prNQ7Xr-d9NQJw,52
+auto_editor/utils/cmdkw.py,sha256=aUGBvBel2Ko1o6Rwmr4rEL-BMc5hEnzYLbyZ1GeJdcY,5729
+auto_editor/utils/container.py,sha256=CNHChHbhzIrjmDdWw6UzMqscrr9u7A-ZqKWejGjJwYE,2628
+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-28.0.2.dist-info/licenses/LICENSE,sha256=yiq99pWITHfqS0pbZMp7cy2dnbreTuvBwudsU-njvIM,1210
+docs/build.py,sha256=g1uc1H9T_naGaermUiVMMwUpbT0IWElRhjgT0fvCh8w,1914
+auto_editor-28.0.2.dist-info/METADATA,sha256=E8DfZMV3tmFRZCJ9vjb-MMe8nHHPRssbhWyzWFm5XZA,6176
+auto_editor-28.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+auto_editor-28.0.2.dist-info/entry_points.txt,sha256=UAsTc7qJQbnAzHd7KWg-ALo_X9Hj2yDs3M9I2DV3eyI,212
+auto_editor-28.0.2.dist-info/top_level.txt,sha256=jBV5zlbWRbKOa-xaWPvTD45QL7lGExx2BDzv-Ji4dTw,17
+auto_editor-28.0.2.dist-info/RECORD,,

auto_editor-28.0.0.dist-info/RECORD

@@ -1,56 +0,0 @@
-auto_editor/__init__.py,sha256=DffemEfW53YOlYaNQ9gcZ_Hf1d--6ODBrbX9JaC4Y9Y,23
-auto_editor/__main__.py,sha256=t5Um7M9ess9xYRfmn6iDvJoBqj_KRQLhlkpFdfhx3MU,15478
-auto_editor/analyze.py,sha256=CeJG0LI9wXZk1R-QPrNGPS4za-_Avd8y7H-D437DqLg,12300
-auto_editor/edit.py,sha256=p_UOfReMkMmdhh7b5azXBWvX99AyMKO-ZpnZBso5cj0,19257
-auto_editor/ffwrapper.py,sha256=ueYdN7-cBAdJBJbv5yT05iuQP_BPFIrR5hFeMkk5c3U,5040
-auto_editor/help.py,sha256=8Kkos7Bpcn-3YN7ngv0fZp-8a8Qw6b70ZZKerL8SEQ4,7901
-auto_editor/json.py,sha256=8IVhZJSLx2IVqJsbR5YKDvbHOhgIOvdQmYNpMdMG_xA,9332
-auto_editor/make_layers.py,sha256=nSEeCHysMot2eze23q05g2HFDuskN_4Jk108xlk2Rw8,10102
-auto_editor/preview.py,sha256=yYn5jJLQ3TiJiNC6JffaggLVPQfBU558zJeRQz7nCDY,3046
-auto_editor/timeline.py,sha256=9D-2lXIGXx2R82qQ7_4TfG77ikN4byM_fK_1QyLlPZ8,9346
-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
-auto_editor/cmds/desc.py,sha256=kdRJfabdde5thuFOoTXlW3J3G8F0ZvbsJoOkUn7E3GA,805
-auto_editor/cmds/info.py,sha256=awiusgunhoiqrr3LX0AevrVwj4foNJrtRBJUbIebwyc,6589
-auto_editor/cmds/levels.py,sha256=2Hbvoy6wMbRRoHdZf25PMqq1uvhRKyPcITNPMpZFo7s,5632
-auto_editor/cmds/palet.py,sha256=ONzTqemaQq9YEfIOsDRNnwzfqnEMUMSXIQrETxyroRU,749
-auto_editor/cmds/repl.py,sha256=HSUTDaVykPb5Bd-v_jz_8R7HvFmKOcT_ZVmP-d0AbUY,3247
-auto_editor/cmds/subdump.py,sha256=kHg8nfUi6I6VeJjEgMxupPa666qsYUh7ZEUxint7Gqo,2443
-auto_editor/cmds/test.py,sha256=VVU1sVDhv4jclJUw387ruWTSRFPh5m-1wfYEGW3mzBs,29624
-auto_editor/exports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_editor/exports/fcp11.py,sha256=3HKkTv65J3NZohAyuc08tuHk4fqgEGN8RAMQNzrNFrY,5340
-auto_editor/exports/fcp7.py,sha256=6ZP9EtVc8nPZu-2zZn1IZP4I5gYedzZ6TJFRM36XDWc,13480
-auto_editor/exports/json.py,sha256=Z7RKtD5-OB3saOtWG9qfI9OrLtylhU9VyfpnVRNcuU8,768
-auto_editor/exports/shotcut.py,sha256=J2Myi9fu37fUVqr5mzlWcfHJ9LVKu3f4Pz3tEq2onCc,4811
-auto_editor/imports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_editor/imports/fcp7.py,sha256=hWh78sDmMSsf7RhteDCbyz_aS8QYwY2fUg-BB-FchZg,8653
-auto_editor/imports/json.py,sha256=gsWtlLl26Y7BeOaIAngWH_I0innqp8bFmew0qzQWZB8,7024
-auto_editor/lang/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_editor/lang/libintrospection.py,sha256=6H1rGp0wqaCud5IPaoEmzULGnYt6ec7_0h32ATcw2oY,261
-auto_editor/lang/libmath.py,sha256=z33A161Oe6vYYK7R6pgYjdZZe63dQkN38Qf36TL3prg,847
-auto_editor/lang/palet.py,sha256=VS_G_-czy9epsBrqUa0dhEPKWJMGaj3Q5Q49l7mp2so,24121
-auto_editor/lang/stdenv.py,sha256=ndxkNTFl6QbcgGdgoQtvAfjZhRiqDn6z_-Ad427bcNo,44285
-auto_editor/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_editor/lib/contracts.py,sha256=VWLERPFmf6Lb_3yZoMeqF7pyBTWfAMChIVUVpzN9tz0,7593
-auto_editor/lib/data_structs.py,sha256=Hnzl5gWvo-geTU0g-lGejj6HQW3VvPv0NBEj2XoGskY,7089
-auto_editor/lib/err.py,sha256=UlszQJdzMZwkbT8x3sY4GkCV_5x9yrd6uVVUzvA8iiI,35
-auto_editor/render/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_editor/render/audio.py,sha256=OsvUXJD_qmv2xHivLD6skEmK8vdmPyLMhV7mBFdMLQM,17411
-auto_editor/render/subtitle.py,sha256=F27T8OsAojUIGTGBWqTdH36h0BnHXSExxIqzOtqyZoE,6129
-auto_editor/render/video.py,sha256=uIrYzF4bDZ3vwfX2F6TdR6F73GI4yruGssto9xEQ-AA,11999
-auto_editor/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_editor/utils/bar.py,sha256=Ky9JRf37JTgLyvNuIXDfucaUE8H1vBbCqKLjttmsmmo,4156
-auto_editor/utils/chunks.py,sha256=J-eGKtEz68gFtRrj1kOSgH4Tj_Yz6prNQ7Xr-d9NQJw,52
-auto_editor/utils/cmdkw.py,sha256=aUGBvBel2Ko1o6Rwmr4rEL-BMc5hEnzYLbyZ1GeJdcY,5729
-auto_editor/utils/container.py,sha256=CNHChHbhzIrjmDdWw6UzMqscrr9u7A-ZqKWejGjJwYE,2628
-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-28.0.0.dist-info/licenses/LICENSE,sha256=yiq99pWITHfqS0pbZMp7cy2dnbreTuvBwudsU-njvIM,1210
-docs/build.py,sha256=g1uc1H9T_naGaermUiVMMwUpbT0IWElRhjgT0fvCh8w,1914
-auto_editor-28.0.0.dist-info/METADATA,sha256=5hrS0TC7CGSbN5GyOatgqq8svTg9nWNiHw_9fSvHGms,6176
-auto_editor-28.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-auto_editor-28.0.0.dist-info/entry_points.txt,sha256=UAsTc7qJQbnAzHd7KWg-ALo_X9Hj2yDs3M9I2DV3eyI,212
-auto_editor-28.0.0.dist-info/top_level.txt,sha256=jBV5zlbWRbKOa-xaWPvTD45QL7lGExx2BDzv-Ji4dTw,17
-auto_editor-28.0.0.dist-info/RECORD,,