auto-editor 26.1.0__py3-none-any.whl → 26.1.1__py3-none-any.whl

auto_editor/__init__.py

@@ -1 +1 @@
-__version__ = "26.1.0"
+__version__ = "26.1.1"

auto_editor/__main__.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+import platform as plat
 import re
 import sys
 from os import environ
@@ -7,7 +8,6 @@ from os.path import exists, isdir, isfile, lexists, splitext
 from subprocess import run
 
 import auto_editor
-from auto_editor.edit import edit_media
 from auto_editor.utils.func import get_stdout
 from auto_editor.utils.log import Log
 from auto_editor.utils.types import (
@@ -286,7 +286,16 @@ def download_video(my_input: str, args: Args, log: Log) -> str:
 
 
 def main() -> None:
-    subcommands = ("test", "info", "levels", "subdump", "desc", "repl", "palet")
+    subcommands = (
+        "test",
+        "info",
+        "levels",
+        "subdump",
+        "desc",
+        "repl",
+        "palet",
+        "cache",
+    )
 
     if len(sys.argv) > 1 and sys.argv[1] in subcommands:
         obj = __import__(
@@ -320,15 +329,17 @@ def main() -> None:
         return
 
     if args.debug and not args.input:
-        import platform as plat
+        print(f"OS: {plat.system()} {plat.release()} {plat.machine().lower()}")
+        print(f"Python: {plat.python_version()}")
 
-        import av
+        try:
+            import av
 
-        license = av._core.library_meta["libavcodec"]["license"]
+            license = av._core.library_meta["libavcodec"]["license"]
+            print(f"PyAV: {av.__version__} ({license})")
+        except (ModuleNotFoundError, ImportError):
+            print("PyAV: error")
 
-        print(f"OS: {plat.system()} {plat.release()} {plat.machine().lower()}")
-        print(f"Python: {plat.python_version()}")
-        print(f"PyAV: {av.__version__} ({license})")
         print(f"Auto-Editor: {auto_editor.__version__}")
         return
 
@@ -354,6 +365,8 @@ def main() -> None:
                     log.error(f"Option/Input file doesn't exist: {my_input}")
             paths.append(my_input)
 
+    from auto_editor.edit import edit_media
+
     try:
         edit_media(paths, args, log)
     except KeyboardInterrupt:

auto_editor/analyze.py

@@ -4,6 +4,7 @@ import os
 import re
 from dataclasses import dataclass
 from fractions import Fraction
+from hashlib import sha1
 from math import ceil
 from tempfile import gettempdir
 from typing import TYPE_CHECKING
@@ -154,8 +155,10 @@ def iter_motion(
 
 def obj_tag(path: Path, kind: str, tb: Fraction, obj: Sequence[object]) -> str:
     mod_time = int(path.stat().st_mtime)
-    key = f"{path.name}:{mod_time:x}:{kind}:{tb}:"
-    return key + ",".join(f"{v}" for v in obj)
+    key = f"{path}:{mod_time:x}:{tb}:" + ",".join(f"{v}" for v in obj)
+    part1 = sha1(key.encode()).hexdigest()[:16]
+
+    return f"{part1}{kind}"
 
 
 @dataclass(slots=True)
@@ -206,31 +209,47 @@ class Levels:
         if self.no_cache:
             return None
 
-        workfile = os.path.join(gettempdir(), f"ae-{__version__}", "cache.npz")
+        key = obj_tag(self.src.path, kind, self.tb, obj)
+        cache_file = os.path.join(gettempdir(), f"ae-{__version__}", f"{key}.npz")
 
         try:
-            npzfile = np.load(workfile, allow_pickle=False)
+            with np.load(cache_file, allow_pickle=False) as npzfile:
+                return npzfile["data"]
         except Exception as e:
             self.log.debug(e)
             return None
 
-        key = obj_tag(self.src.path, kind, self.tb, obj)
-        if key not in npzfile.files:
-            return None
-
-        self.log.debug("Using cache")
-        return npzfile[key]
-
     def cache(self, arr: np.ndarray, kind: str, obj: Sequence[object]) -> np.ndarray:
         if self.no_cache:
             return arr
 
-        workdur = os.path.join(gettempdir(), f"ae-{__version__}")
-        if not os.path.exists(workdur):
-            os.mkdir(workdur)
+        workdir = os.path.join(gettempdir(), f"ae-{__version__}")
+        if not os.path.exists(workdir):
+            os.mkdir(workdir)
 
         key = obj_tag(self.src.path, kind, self.tb, obj)
-        np.savez(os.path.join(workdur, "cache.npz"), **{key: arr})
+        cache_file = os.path.join(workdir, f"{key}.npz")
+
+        try:
+            np.savez(cache_file, data=arr)
+        except Exception as e:
+            self.log.warning(f"Cache write failed: {e}")
+
+        cache_entries = []
+        with os.scandir(workdir) as entries:
+            for entry in entries:
+                if entry.name.endswith(".npz"):
+                    cache_entries.append((entry.path, entry.stat().st_mtime))
+
+        if len(cache_entries) > 10:
+            # Sort by modification time, oldest first
+            cache_entries.sort(key=lambda x: x[1])
+            # Remove oldest files until we're back to 10
+            for filepath, _ in cache_entries[:-10]:
+                try:
+                    os.remove(filepath)
+                except OSError:
+                    pass
 
         return arr
 
@@ -257,14 +276,15 @@ class Levels:
         bar = self.bar
         bar.start(inaccurate_dur, "Analyzing audio volume")
 
-        result = np.zeros((inaccurate_dur), dtype=np.float32)
+        result: NDArray[np.float32] = np.zeros(inaccurate_dur, dtype=np.float32)
         index = 0
 
         for value in iter_audio(audio, self.tb):
             if index > len(result) - 1:
                 result = np.concatenate(
-                    (result, np.zeros((len(result)), dtype=np.float32))
+                    (result, np.zeros(len(result), dtype=np.float32))
                 )
+
             result[index] = value
             bar.tick(index)
             index += 1
@@ -296,13 +316,13 @@ class Levels:
         bar = self.bar
         bar.start(inaccurate_dur, "Analyzing motion")
 
-        result = np.zeros((inaccurate_dur), dtype=np.float32)
+        result: NDArray[np.float32] = np.zeros(inaccurate_dur, dtype=np.float32)
         index = 0
 
         for value in iter_motion(video, self.tb, blur, width):
             if index > len(result) - 1:
                 result = np.concatenate(
-                    (result, np.zeros((len(result)), dtype=np.float32))
+                    (result, np.zeros(len(result), dtype=np.float32))
                 )
             result[index] = value
             bar.tick(index)

auto_editor/subcommands/cache.py

@@ -0,0 +1,69 @@
+import glob
+import os
+import sys
+from shutil import rmtree
+from tempfile import gettempdir
+
+import numpy as np
+
+from auto_editor import __version__
+
+
+def main(sys_args: list[str] = sys.argv[1:]) -> None:
+    cache_dir = os.path.join(gettempdir(), f"ae-{__version__}")
+
+    if sys_args and sys_args[0] in ("clean", "clear"):
+        rmtree(cache_dir, ignore_errors=True)
+        return
+
+    if not os.path.exists(cache_dir):
+        print("Empty cache")
+        return
+
+    cache_files = glob.glob(os.path.join(cache_dir, "*.npz"))
+    if not cache_files:
+        print("Empty cache")
+        return
+
+    def format_bytes(size: float) -> str:
+        for unit in ("B", "KiB", "MiB", "GiB", "TiB"):
+            if size < 1024:
+                return f"{size:.2f} {unit}"
+            size /= 1024
+        return f"{size:.2f} PiB"
+
+    GRAY = "\033[90m"
+    GREEN = "\033[32m"
+    BLUE = "\033[34m"
+    YELLOW = "\033[33m"
+    RESET = "\033[0m"
+
+    total_size = 0
+    for cache_file in cache_files:
+        try:
+            with np.load(cache_file, allow_pickle=False) as npzfile:
+                array = npzfile["data"]
+                key = os.path.basename(cache_file)[:-4]  # Remove .npz extension
+
+                hash_part = key[:16]
+                rest_part = key[16:]
+
+                size = array.nbytes
+                total_size += size
+                size_str = format_bytes(size)
+                size_num, size_unit = size_str.rsplit(" ", 1)
+
+                print(
+                    f"{YELLOW}entry: {GRAY}{hash_part}{RESET}{rest_part}  "
+                    f"{YELLOW}size: {GREEN}{size_num} {BLUE}{size_unit}{RESET}"
+                )
+        except Exception as e:
+            print(f"Error reading {cache_file}: {e}")
+
+    total_str = format_bytes(total_size)
+    total_num, total_unit = total_str.rsplit(" ", 1)
+    print(f"\n{YELLOW}total cache size: {GREEN}{total_num} {BLUE}{total_unit}{RESET}")
+
+
+if __name__ == "__main__":
+    main()

auto_editor/utils/log.py

@@ -5,9 +5,10 @@ from datetime import timedelta
 from shutil import get_terminal_size, rmtree
 from tempfile import mkdtemp
 from time import perf_counter, sleep
-from typing import NoReturn
+from typing import TYPE_CHECKING, NoReturn
 
-import av
+if TYPE_CHECKING:
+    import av
 
 
 class Log:

{auto_editor-26.1.0.dist-info → auto_editor-26.1.1.dist-info}/METADATA

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

{auto_editor-26.1.0.dist-info → auto_editor-26.1.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
-auto_editor/__init__.py,sha256=8MQdwPYn_Y7GCbtRLrmuh9XSy5S52w2pxd3bulKs9Ag,23
-auto_editor/__main__.py,sha256=eAsNa1BP4Y6Oyp4l838YmcxEwsM0LUdbaGeNFELe4h0,11124
-auto_editor/analyze.py,sha256=HyRdnty3VW9ZTwwPwjsZp3bLVRLvII_1Y6NlEItDKfw,11947
+auto_editor/__init__.py,sha256=2Ltcef2BVJgJx2W5ZkX7r21sdnzR3Zvtu1PYKRHEjLk,23
+auto_editor/__main__.py,sha256=tc0M1MIPYjU5wCEU3EqmleOzaUgksU60qVHO0vRuC10,11310
+auto_editor/analyze.py,sha256=Fv8NA99T1dZzrqlweJNlK7haKjgK13neR9CMw4t6rlY,12716
 auto_editor/edit.py,sha256=eEMRaQbn0jylfJ6D_egnUXjoMCbdQVsAu7MDrn-xlGo,15950
 auto_editor/ffwrapper.py,sha256=Tct_Q-uy5F51h8M7UFam50UzRFpgkBvUamJP1AoKVvc,4749
 auto_editor/help.py,sha256=CzfDTsL4GuGu596ySHKj_wKnxGR9h8B0KUdkZpo33oE,8044
@@ -31,6 +31,7 @@ auto_editor/render/audio.py,sha256=1iOQCeRXfRz28cqnHp2XeK-f3_UnPf80AKQAfifGvdE,1
 auto_editor/render/subtitle.py,sha256=lf2l1QWJgFiqlpQWWBwSlKJnSgW8Lkfi59WrJMbIDqM,6240
 auto_editor/render/video.py,sha256=dje0RNW2dKILfTzt0VAF0WR6REfGOsc6l17pP1Z4ooA,12215
 auto_editor/subcommands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+auto_editor/subcommands/cache.py,sha256=YW_5qH0q5TVzmfOLEO117uqcY7dF6DS619ltVTPIzHQ,1959
 auto_editor/subcommands/desc.py,sha256=GDrKJYiHMaeTrplZAceXl1JwoqD78XsV2_5lc0Xd7po,869
 auto_editor/subcommands/info.py,sha256=UDdoxd6_fqSoRPwthkWXqnpxHp7dJQ0Dn96lYX_ubWc,7010
 auto_editor/subcommands/levels.py,sha256=psSSIsGfzr9j0HGKp2yvK6nMlrkLwxkwsyI0uF2xb_c,4496
@@ -44,12 +45,12 @@ auto_editor/utils/chunks.py,sha256=J-eGKtEz68gFtRrj1kOSgH4Tj_Yz6prNQ7Xr-d9NQJw,5
 auto_editor/utils/cmdkw.py,sha256=aUGBvBel2Ko1o6Rwmr4rEL-BMc5hEnzYLbyZ1GeJdcY,5729
 auto_editor/utils/container.py,sha256=Wf1ZL0tvXWl6m1B9mK_SkgVl89ilV_LpwlQq0TVroCc,2704
 auto_editor/utils/func.py,sha256=kB-pNDn20M6YT7sljyd_auve5teK-E2G4TgwVOAIuJw,2754
-auto_editor/utils/log.py,sha256=C1b-vnszSsohMd5fyaRcCuf0OPobZVMkV77cP-_JNP4,3776
+auto_editor/utils/log.py,sha256=n5dlJ2CdK_54eiYE02SPgkBdBWABV7tE2p8ONj_F6TM,3813
 auto_editor/utils/types.py,sha256=7BF7R7DA5eKmtI6f5ia7bOYNL0u_2sviiPsE1VmP0lc,10724
-docs/build.py,sha256=CM-ZWgQk8wSNjivx_-6wGIaG7cstrNKsX2d4TzFVivE,1642
-auto_editor-26.1.0.dist-info/LICENSE,sha256=yiq99pWITHfqS0pbZMp7cy2dnbreTuvBwudsU-njvIM,1210
-auto_editor-26.1.0.dist-info/METADATA,sha256=QDfveFTnxTtnA2WqZTvgM4vNGQ1sTnziQ2MSAyqF5WQ,6109
-auto_editor-26.1.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-auto_editor-26.1.0.dist-info/entry_points.txt,sha256=-H7zdTw4MqnAcwrN5xTNkGIhzZtJMxS9r6lTMeR9-aA,240
-auto_editor-26.1.0.dist-info/top_level.txt,sha256=jBV5zlbWRbKOa-xaWPvTD45QL7lGExx2BDzv-Ji4dTw,17
-auto_editor-26.1.0.dist-info/RECORD,,
+docs/build.py,sha256=POy8X8QOBYe_8A8HI_yiVI_Qg9E5mLpn1z7AHQr0_vQ,1888
+auto_editor-26.1.1.dist-info/LICENSE,sha256=yiq99pWITHfqS0pbZMp7cy2dnbreTuvBwudsU-njvIM,1210
+auto_editor-26.1.1.dist-info/METADATA,sha256=Ovf6CjY_x-lyih-4c1xBZEkL_X0gvifVFthPcLSMOtk,6109
+auto_editor-26.1.1.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+auto_editor-26.1.1.dist-info/entry_points.txt,sha256=-H7zdTw4MqnAcwrN5xTNkGIhzZtJMxS9r6lTMeR9-aA,240
+auto_editor-26.1.1.dist-info/top_level.txt,sha256=jBV5zlbWRbKOa-xaWPvTD45QL7lGExx2BDzv-Ji4dTw,17
+auto_editor-26.1.1.dist-info/RECORD,,

{auto_editor-26.1.0.dist-info → auto_editor-26.1.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.7.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

docs/build.py

@@ -2,6 +2,7 @@
 
 import os
 import sys
+from html import escape
 
 # Put 'auto_editor' in Python path
 sys.path.append(os.path.dirname(os.path.dirname(__file__)))
@@ -19,7 +20,7 @@ def main():
 
     with open("src/ref/options.html", "w") as file:
         file.write(
-            '{{ header-desc "Options" "These are the options and flags that auto-editor uses." }}\n'
+            '{{ headerdesc "Options" "These are the options and flags that auto-editor uses." }}\n'
             "<body>\n"
             "{{ nav }}\n"
             '<section class="section">\n'
@@ -27,12 +28,18 @@ def main():
         )
         for op in parser.args:
             if isinstance(op, OptionText):
-                file.write(f"<h2>{op.text}</h2>\n")
+                file.write(f"<h2>{escape(op.text)}</h2>\n")
             else:
-                file.write(f"<h3><code>{op.names[0]}</code></h3>\n")
+                if op.metavar is None:
+                    file.write(f"<h3><code>{op.names[0]}</code></h3>\n")
+                else:
+                    file.write(
+                        f"<h3><code>{op.names[0]} {escape(op.metavar)}</code></h3>\n"
+                    )
+
                 if len(op.names) > 1:
                     file.write(
-                        "<h4><code>"
+                        "<h4>Aliases: <code>"
                         + "</code> <code>".join(op.names[1:])
                         + "</code></h4>\n"
                     )