Remove filesetup object

Author: WyattBlue

auto_editor/analyze.py

@@ -28,15 +28,6 @@
     from auto_editor.utils.log import Log
 
 
-@dataclass(slots=True)
-class FileSetup:
-    src: FileInfo
-    strict: bool
-    tb: Fraction
-    bar: Bar
-    log: Log
-
-
 class LevelError(Exception):
     pass
 
@@ -177,6 +168,7 @@ class Levels:
     bar: Bar
     no_cache: bool
     log: Log
+    strict: bool
 
     @property
     def media_length(self) -> int:

auto_editor/lang/palet.py

@@ -1487,12 +1487,12 @@ def edit_audio(
     mincut: int = 6,
     minclip: int = 3,
 ) -> np.ndarray:
-    if "@levels" not in env or "@filesetup" not in env:
+    if "@levels" not in env:
         raise MyError("Can't use `audio` if there's no input media")
 
     levels = env["@levels"]
-    src = env["@filesetup"].src
-    strict = env["@filesetup"].strict
+    src = levels.src
+    strict = levels.strict
 
     stream_data: NDArray[np.bool_] | None = None
     if stream == Sym("all"):
@@ -1531,19 +1531,17 @@ def edit_motion(
         raise MyError("Can't use `motion` if there's no input media")
 
     levels = env["@levels"]
-    strict = env["@filesetup"].strict
     try:
         return levels.motion(stream, blur, width) >= threshold
     except LevelError as e:
-        return raise_(e) if strict else levels.all()
+        return raise_(e) if levels.strict else levels.all()
 
 
 def edit_subtitle(pattern, stream=0, **kwargs):
     if "@levels" not in env:
         raise MyError("Can't use `subtitle` if there's no input media")
 
     levels = env["@levels"]
-    strict = env["@filesetup"].strict
     if "ignore-case" not in kwargs:
         kwargs["ignore-case"] = False
     if "max-count" not in kwargs:
@@ -1553,7 +1551,7 @@ def edit_subtitle(pattern, stream=0, **kwargs):
     try:
         return levels.subtitle(pattern, stream, ignore_case, max_count)
     except LevelError as e:
-        return raise_(e) if strict else levels.all()
+        return raise_(e) if levels.strict else levels.all()
 
 
 def my_eval(env: Env, node: object) -> Any:

auto_editor/make_layers.py

@@ -6,7 +6,7 @@
 
 import numpy as np
 
-from auto_editor.analyze import FileSetup, Levels
+from auto_editor.analyze import Levels
 from auto_editor.ffwrapper import FileInfo
 from auto_editor.lang.palet import Lexer, Parser, env, interpret, is_boolarr
 from auto_editor.lib.data_structs import print_str
@@ -125,16 +125,13 @@ def make_timeline(
     concat = np.concatenate
 
     for i, src in enumerate(sources):
-        filesetup = FileSetup(src, len(sources) < 2, tb, bar, log)
-
         try:
             parser = Parser(Lexer("`--edit`", args.edit_based_on))
             if log.is_debug:
                 log.debug(f"edit: {parser}")
 
             env["timebase"] = tb
-            env["@levels"] = Levels(src, tb, bar, args.no_cache, log)
-            env["@filesetup"] = filesetup
+            env["@levels"] = Levels(src, tb, bar, args.no_cache, log, len(sources) < 2)
 
             results = interpret(env, parser)
 

auto_editor/preview.py

@@ -65,7 +65,7 @@ def preview(tl: v3, log: Log) -> None:
 
     in_len = 0
     for src in all_sources:
-        in_len += Levels(src, tb, Bar("none"), False, log).media_length
+        in_len += Levels(src, tb, Bar("none"), False, log, False).media_length
 
     out_len = tl.out_len()
 

auto_editor/subcommands/levels.py

@@ -127,7 +127,7 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
             except ParserError as e:
                 log.error(e)
 
-        levels = Levels(src, tb, bar, False, log)
+        levels = Levels(src, tb, bar, False, log, strict=True)
         try:
             if method == "audio":
                 print_arr_gen(iter_audio(src, tb, **obj))

auto_editor/subcommands/repl.py

@@ -5,7 +5,7 @@
 from fractions import Fraction
 
 import auto_editor
-from auto_editor.analyze import FileSetup, Levels
+from auto_editor.analyze import Levels
 from auto_editor.ffwrapper import initFileInfo
 from auto_editor.lang.palet import ClosingError, Lexer, Parser, env, interpret
 from auto_editor.lib.data_structs import print_str
@@ -65,8 +65,7 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
         tb = src.get_fps() if args.timebase is None else args.timebase
         bar = Bar("modern")
         env["timebase"] = tb
-        env["@levels"] = Levels(src, tb, bar, False, log)
-        env["@filesetup"] = FileSetup(src, strict, tb, bar, log)
+        env["@levels"] = Levels(src, tb, bar, False, log, strict)
 
     print(f"Auto-Editor {auto_editor.__version__}")
     text = None