Make temp directory on demand

Author: WyattBlue

auto_editor/__main__.py

@@ -6,7 +6,6 @@
 import auto_editor
 from auto_editor.edit import edit_media
 from auto_editor.ffwrapper import FFmpeg
-from auto_editor.utils.func import setup_tempdir
 from auto_editor.utils.log import Log
 from auto_editor.utils.types import (
     Args,
@@ -315,9 +314,8 @@ def main() -> None:
     if not args.input:
         log.error("You need to give auto-editor an input file.")
 
-    temp = setup_tempdir(args.temp_dir, log)
-    log = Log(args.debug, args.quiet, temp, args.progress == "machine", no_color)
-    log.debug(f"Temp Directory: {temp}")
+    is_machine = args.progress == "machine"
+    log = Log(args.debug, args.quiet, args.temp_dir, is_machine, no_color)
 
     ffmpeg = FFmpeg(
         args.ffmpeg_location,
@@ -328,7 +326,7 @@ def main() -> None:
     paths = valid_input(args.input, ffmpeg, args, log)
 
     try:
-        edit_media(paths, ffmpeg, args, temp, log)
+        edit_media(paths, ffmpeg, args, log)
     except KeyboardInterrupt:
         log.error("Keyboard Interrupt")
     log.cleanup()

auto_editor/analyze.py

@@ -5,6 +5,7 @@
 from dataclasses import dataclass
 from fractions import Fraction
 from math import ceil
+from tempfile import gettempdir
 from typing import TYPE_CHECKING
 
 import av
@@ -33,7 +34,6 @@ class FileSetup:
     strict: bool
     tb: Fraction
     bar: Bar
-    temp: str
     log: Log
 
 
@@ -176,7 +176,6 @@ class Levels:
     tb: Fraction
     bar: Bar
     no_cache: bool
-    temp: str
     log: Log
 
     @property
@@ -214,9 +213,7 @@ def read_cache(self, tag: str, obj: dict[str, Any]) -> None | np.ndarray:
         if self.no_cache:
             return None
 
-        workfile = os.path.join(
-            os.path.dirname(self.temp), f"ae-{__version__}", "cache.npz"
-        )
+        workfile = os.path.join(gettempdir(), f"ae-{__version__}", "cache.npz")
 
         try:
             npzfile = np.load(workfile, allow_pickle=False)
@@ -235,7 +232,7 @@ def cache(self, arr: np.ndarray, tag: str, obj: dict[str, Any]) -> np.ndarray:
         if self.no_cache:
             return arr
 
-        workdur = os.path.join(os.path.dirname(self.temp), f"ae-{__version__}")
+        workdur = os.path.join(gettempdir(), f"ae-{__version__}")
         if not os.path.exists(workdur):
             os.mkdir(workdur)
 

auto_editor/edit.py

@@ -142,9 +142,7 @@ def parse_export(export: str, log: Log) -> dict[str, Any]:
     log.error(f"'{name}': Export must be [{', '.join([s for s in parsing.keys()])}]")
 
 
-def edit_media(
-    paths: list[str], ffmpeg: FFmpeg, args: Args, temp: str, log: Log
-) -> None:
+def edit_media(paths: list[str], ffmpeg: FFmpeg, args: Args, log: Log) -> None:
     bar = Bar(args.progress)
     tl = None
 
@@ -203,7 +201,7 @@ def edit_media(
         samplerate = args.sample_rate
 
     if tl is None:
-        tl = make_timeline(sources, args, samplerate, bar, temp, log)
+        tl = make_timeline(sources, args, samplerate, bar, log)
 
     if export["export"] == "timeline":
         from auto_editor.formats.json import make_json_timeline
@@ -214,7 +212,7 @@ def edit_media(
     if args.preview:
         from auto_editor.preview import preview
 
-        preview(tl, temp, log)
+        preview(tl, log)
         return
 
     if export["export"] == "json":
@@ -263,22 +261,22 @@ def make_media(tl: v3, output: str) -> None:
         sub_output = []
         apply_later = False
 
-        ensure = Ensure(ffmpeg, bar, samplerate, temp, log)
+        ensure = Ensure(ffmpeg, bar, samplerate, log)
 
         if ctr.default_sub != "none" and not args.sn:
-            sub_output = make_new_subtitles(tl, ensure, temp)
+            sub_output = make_new_subtitles(tl, ensure, log.temp)
 
         if ctr.default_aud != "none":
-            audio_output = make_new_audio(tl, ensure, args, ffmpeg, bar, temp, log)
+            audio_output = make_new_audio(tl, ensure, args, ffmpeg, bar, log)
 
         if ctr.default_vid != "none":
             if tl.v:
-                out_path, apply_later = render_av(ffmpeg, tl, args, bar, ctr, temp, log)
+                out_path, apply_later = render_av(ffmpeg, tl, args, bar, ctr, log)
                 visual_output.append((True, out_path))
 
             for v, vid in enumerate(src.videos, start=1):
                 if ctr.allow_image and vid.codec in ("png", "mjpeg", "webp"):
-                    out_path = os.path.join(temp, f"{v}.{vid.codec}")
+                    out_path = os.path.join(log.temp, f"{v}.{vid.codec}")
                     # fmt: off
                     ffmpeg.run(["-i", f"{src.path}", "-map", "0:v", "-map", "-0:V",
                         "-c", "copy", out_path])
@@ -297,7 +295,6 @@ def make_media(tl: v3, output: str) -> None:
             tl.tb,
             args,
             src,
-            temp,
             log,
         )
 

auto_editor/make_layers.py

@@ -102,7 +102,6 @@ def make_timeline(
     args: Args,
     sr: int,
     bar: Bar,
-    temp: str,
     log: Log,
 ) -> v3:
     inp = None if not sources else sources[0]
@@ -126,15 +125,15 @@ def make_timeline(
     concat = np.concatenate
 
     for i, src in enumerate(sources):
-        filesetup = FileSetup(src, len(sources) < 2, tb, bar, temp, log)
+        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, temp, log)
+            env["@levels"] = Levels(src, tb, bar, args.no_cache, log)
             env["@filesetup"] = filesetup
 
             results = interpret(env, parser)

auto_editor/output.py

@@ -19,7 +19,6 @@ class Ensure:
     _ffmpeg: FFmpeg
     _bar: Bar
     _sr: int
-    temp: str
     log: Log
     _audios: list[tuple[FileInfo, int]] = field(default_factory=list)
     _subtitles: list[tuple[FileInfo, int, str]] = field(default_factory=list)
@@ -33,7 +32,7 @@ def audio(self, src: FileInfo, stream: int) -> str:
             label = len(self._audios) - 1
             first_time = True
 
-        out_path = os.path.join(self.temp, f"{label:x}.wav")
+        out_path = os.path.join(self.log.temp, f"{label:x}.wav")
 
         if first_time:
             sample_rate = self._sr
@@ -83,7 +82,7 @@ def subtitle(self, src: FileInfo, stream: int, ext: str) -> str:
             self._subtitles.append((src, stream, ext))
             first_time = True
 
-        out_path = os.path.join(self.temp, f"{stream}s.{ext}")
+        out_path = os.path.join(self.log.temp, f"{stream}s.{ext}")
 
         if first_time:
             self.log.debug(f"Making external subtitle: {out_path}")
@@ -119,7 +118,6 @@ def mux_quality_media(
     tb: Fraction,
     args: Args,
     src: FileInfo,
-    temp: str,
     log: Log,
 ) -> None:
     v_tracks = len(visual_output)
@@ -142,7 +140,7 @@ def mux_quality_media(
                 cmd.extend(["-i", path])
         else:
             # Merge all the audio a_tracks into one.
-            new_a_file = os.path.join(temp, "new_audio.wav")
+            new_a_file = os.path.join(log.temp, "new_audio.wav")
             if a_tracks > 1:
                 new_cmd = []
                 for path in audio_output:

auto_editor/preview.py

@@ -48,7 +48,7 @@ def all_cuts(tl: v3, in_len: int) -> list[int]:
     return cut_lens
 
 
-def preview(tl: v3, temp: str, log: Log) -> None:
+def preview(tl: v3, log: Log) -> None:
     log.conwrite("")
     tb = tl.tb
 
@@ -65,7 +65,7 @@ def preview(tl: v3, temp: str, log: Log) -> None:
 
     in_len = 0
     for src in all_sources:
-        in_len += Levels(src, tb, Bar("none"), False, temp, log).media_length
+        in_len += Levels(src, tb, Bar("none"), False, log).media_length
 
     out_len = tl.out_len()
 

auto_editor/render/audio.py

@@ -166,7 +166,7 @@ def apply_audio_normalization(
 
 
 def make_new_audio(
-    tl: v3, ensure: Ensure, args: Args, ffmpeg: FFmpeg, bar: Bar, temp: str, log: Log
+    tl: v3, ensure: Ensure, args: Args, ffmpeg: FFmpeg, bar: Bar, log: Log
 ) -> list[str]:
     sr = tl.sr
     tb = tl.tb
@@ -176,6 +176,7 @@ def make_new_audio(
     norm = parse_norm(args.audio_normalize, log)
 
     af_tick = 0
+    temp = log.temp
 
     if not tl.a or not tl.a[0]:
         log.error("Trying to render empty audio timeline")

auto_editor/render/video.py

@@ -105,13 +105,7 @@ def make_image_cache(tl: v3) -> dict[tuple[FileInfo, int], np.ndarray]:
 
 
 def render_av(
-    ffmpeg: FFmpeg,
-    tl: v3,
-    args: Args,
-    bar: Bar,
-    ctr: Container,
-    temp: str,
-    log: Log,
+    ffmpeg: FFmpeg, tl: v3, args: Args, bar: Bar, ctr: Container, log: Log
 ) -> tuple[str, bool]:
     src = tl.src
     cns: dict[FileInfo, av.container.InputContainer] = {}
@@ -121,6 +115,7 @@ def render_av(
 
     target_pix_fmt = "yuv420p"  # Reasonable default
     img_cache = make_image_cache(tl)
+    temp = log.temp
 
     first_src: FileInfo | None = None
     for src in tl.sources:

auto_editor/subcommands/levels.py

@@ -19,7 +19,6 @@
     pAttr,
     pAttrs,
 )
-from auto_editor.utils.func import setup_tempdir
 from auto_editor.utils.log import Log
 from auto_editor.utils.types import frame_rate
 from auto_editor.vanparse import ArgumentParser
@@ -85,8 +84,7 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
     args = parser.parse_args(LevelArgs, sys_args)
 
     bar = Bar("none")
-    temp = setup_tempdir(None, Log())
-    log = Log(quiet=True, temp=temp)
+    log = Log(quiet=True)
 
     sources = [initFileInfo(path, log) for path in args.input]
     if len(sources) < 1:
@@ -129,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, temp, log)
+        levels = Levels(src, tb, bar, False, log)
         try:
             if method == "audio":
                 print_arr_gen(iter_audio(src, tb, **obj))

auto_editor/subcommands/repl.py

@@ -11,7 +11,6 @@
 from auto_editor.lib.data_structs import print_str
 from auto_editor.lib.err import MyError
 from auto_editor.utils.bar import Bar
-from auto_editor.utils.func import setup_tempdir
 from auto_editor.utils.log import Log
 from auto_editor.utils.types import frame_rate
 from auto_editor.vanparse import ArgumentParser
@@ -59,16 +58,15 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
     args = repl_options(ArgumentParser(None)).parse_args(REPL_Args, sys_args)
 
     if args.input:
-        temp = setup_tempdir(args.temp_dir, Log())
-        log = Log(quiet=True, temp=temp)
+        log = Log(quiet=True, temp_dir=args.temp_dir)
         strict = len(args.input) < 2
         sources = [initFileInfo(path, log) for path in args.input]
         src = sources[0]
         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, temp, log)
-        env["@filesetup"] = FileSetup(src, strict, tb, bar, temp, log)
+        env["@levels"] = Levels(src, tb, bar, False, log)
+        env["@filesetup"] = FileSetup(src, strict, tb, bar, log)
 
     print(f"Auto-Editor {auto_editor.__version__}")
     text = None