feat(ffmpeg_handling): move tag function and SUFFIX array to serverlibrary

This commit is contained in:
Lucas Vivo authored and Lucas Media committed 2026-10-30 10:27:41 +01:00
1 parent 95dc00b070
commit 3b70209bc2
3 files changed
+42 -24

No files matched your search

+4 -9
View File
@@ -1160,11 +1160,6 @@ def cmd_test(args):
test_dir = Path(tempfile.mkdtemp(prefix="ffmpeg_test_"))
logger.info(f"Using test dir: {test_dir}")
def red_tag(tag: str) -> str:
return f"{red}[{tag}]{reset}"
def green_tag(tag: str) -> str:
return f"{green}[{tag}]{reset}"
def run_and_probe(name, cmd_func, args_probe, _test_dict=None):
if _test_dict is None:
@@ -2215,7 +2210,7 @@ def main():
(
p
for p in input_path.rglob("*")
if p.is_file() and p.suffix.lower() in VIDEO_EXTS
if p.is_file() and p.suffix.lower() in VIDEO_SUFFIXES
),
key=natural_sort_key,
)
@@ -2224,14 +2219,14 @@ def main():
(
p
for p in input_path.iterdir()
if p.is_file() and p.suffix.lower() in VIDEO_EXTS
if p.is_file() and p.suffix.lower() in VIDEO_SUFFIXES
),
key=natural_sort_key,
)
for file in sorted_files:
if (
file.suffix.lower() not in VIDEO_EXTS
and file.suffix.lower() not in AUDIO_EXTS
file.suffix.lower() not in VIDEO_SUFFIXES
and file.suffix.lower() not in AUDIO_SUFFIXES
):
continue
logger.trace(f"Processing File: {file}")
+12 -8
View File
@@ -3,12 +3,14 @@ from .core import (
TRACE,
CustomLogger,
AUDIO_SUFFIXES,
blue,
AUDIO_RE_SUFFIXES,
blue_tag,
yellow_tag,
combined_score,
get_audio_tracks,
get_subtitle_tracks,
green,
red,
green_tag,
red_tag,
reset,
safe_delete,
safe_rename,
@@ -19,9 +21,9 @@ from .core import (
tmdb_get,
tvdb_get,
VIDEO_SUFFIXES,
VIDEO_RE_SUFFIXES,
word_similarity,
words,
yellow,
)
__all__ = [
@@ -29,12 +31,13 @@ __all__ = [
"TRACE",
"CustomLogger",
"AUDIO_SUFFIXES",
"blue",
"AUDIO_RE_SUFFIXES",
"blue_tag",
"combined_score",
"get_audio_tracks",
"get_subtitle_tracks",
"green",
"red",
"green_tag",
"red_tag",
"reset",
"safe_delete",
"safe_rename",
@@ -45,7 +48,8 @@ __all__ = [
"tmdb_get",
"tvdb_get",
"VIDEO_SUFFIXES",
"VIDEO_RE_SUFFIXES",
"word_similarity",
"words",
"yellow",
"yellow_tag",
]
+26 -7
View File
@@ -12,9 +12,8 @@ import logging
import colorlog
# -----------------------------
# Logger
# Global Variables
# -----------------------------
TRACE = 5
red = "\033[91m"
green = "\033[92m"
@@ -22,6 +21,16 @@ yellow = "\033[93m"
blue = "\033[94m"
reset = "\033[0m"
AUDIO_SUFFIXES = {".m4b", ".m4a", ".mp3", ".flac", ".ogg", ".opus", ".wma"}
VIDEO_SUFFIXES = {".mp4", ".mkv", ".avi", ".mov", ".webm"}
AUDIO_RE_SUFFIXES = {f"*{suffix}" for suffix in AUDIO_SUFFIXES}
VIDEO_RE_SUFFIXES = {f"*{suffix}" for suffix in VIDEO_SUFFIXES}
# -----------------------------
# Logger
# -----------------------------
TRACE = 5
class CustomLogger(logging.Logger):
def trace(self, msg: str, *args, **kwargs) -> None:
@@ -29,7 +38,6 @@ class CustomLogger(logging.Logger):
kwargs.setdefault("stacklevel", 2)
self._log(TRACE, msg, args, **kwargs)
LOG_LEVELS = {
"TRACE": TRACE,
"DEBUG": logging.DEBUG,
@@ -39,7 +47,6 @@ LOG_LEVELS = {
"CRITICAL": logging.CRITICAL,
}
def setup_logging(log_level: str = "INFO", logfile: str | None = None, no_date: bool=True) -> None:
logging.addLevelName(TRACE, "TRACE")
@@ -82,14 +89,26 @@ def setup_logging(log_level: str = "INFO", logfile: str | None = None, no_date:
root_logger.addHandler(stdout_handler)
root_logger.info(f"Set logger to {log_level}, Logfile: {logfile_data}")
# -----------------------------
# Media Files
# -----------------------------
# -----------------------------
# Little Helpers
# -----------------------------
AUDIO_SUFFIXES = {"*.m4b", "*.m4a", "*.mp3", "*.flac", "*.ogg", "*.opus"}
VIDEO_SUFFIXES = {".mp4", ".mkv", ".avi", ".mov", ".webm"}
def tag(msg: str):
return msg.upper()
def red_tag(msg: str) -> str:
return f"{red}[{tag(msg)}]{reset}"
def green_tag(msg: str) -> str:
return f"{green}[{tag(msg)}]{reset}"
def yellow_tag(msg: str) -> str:
return f"{yellow}[{tag(msg)}]{reset}"
def blue_tag(msg: str) -> str:
return f"{blue}[{tag(msg)}]{reset}"
# -----------------------------
# Helpers