From 11fb4d43aa718d7b308d61b1e823d1d9fd5fb888 Mon Sep 17 00:00:00 2001 From: WyattBlue Date: Sun, 5 Jan 2025 16:54:30 -0500 Subject: [PATCH] Print debug even if PyAV not installed --- auto_editor/__init__.py | 2 +- auto_editor/__main__.py | 18 +++++++++++------- auto_editor/utils/log.py | 5 +++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/auto_editor/__init__.py b/auto_editor/__init__.py index 67d00754f..a582c3046 100644 --- a/auto_editor/__init__.py +++ b/auto_editor/__init__.py @@ -1 +1 @@ -__version__ = "26.1.0" +__version__ = "26.1.1" diff --git a/auto_editor/__main__.py b/auto_editor/__main__.py index 721f3e730..5276647f9 100755 --- a/auto_editor/__main__.py +++ b/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 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 ( @@ -329,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 @@ -363,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: diff --git a/auto_editor/utils/log.py b/auto_editor/utils/log.py index 7afda480b..4b0dade5e 100644 --- a/auto_editor/utils/log.py +++ b/auto_editor/utils/log.py @@ -5,9 +5,10 @@ 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: