From 28767945e8ffd00c50633f005426ae16b5bde969 Mon Sep 17 00:00:00 2001 From: Lucas Media Date: Thu, 29 Oct 2026 08:58:10 +0100 Subject: [PATCH] refactor(serverlibrary): move suffixes to library move audio/video suffixes to serverlibrary remove from audiobooks_library, ffmpeg_handling --- audiobook_metadata/metadata_audiobooks_library.py | 7 +++---- audiobook_metadata/metadata_rank_from_list.py | 9 --------- media_editing/ffmpeg_handling.py | 3 --- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/audiobook_metadata/metadata_audiobooks_library.py b/audiobook_metadata/metadata_audiobooks_library.py index 11fd1dd..f03b7b9 100755 --- a/audiobook_metadata/metadata_audiobooks_library.py +++ b/audiobook_metadata/metadata_audiobooks_library.py @@ -17,7 +17,6 @@ logging.setLoggerClass(CustomLogger) logger: CustomLogger = logging.getLogger(__name__) # type: ignore[assignment] metadata_fields = ["artist", "album", "composer", "comment", "genre", "grouping", "album artist", "description"] -audio_extensions = {"*.m4b", "*.m4a", "*.mp3", "*.flac", "*.ogg", "*.opus"} def ffmpeg_escape(path: Path) -> str: return str(path.resolve()).replace("'", r"'\''") @@ -192,12 +191,12 @@ class Audiobook: def init_book(self) -> None: self.files = [ - file for pattern in audio_extensions for file in self.bookPath.glob(pattern) + file for pattern in AUDIO_SUFFIXES for file in self.bookPath.glob(pattern) ] self.firstFile = self.get_first_file() self.size = sum( file.stat().st_size - for pattern in audio_extensions + for pattern in AUDIO_SUFFIXES for file in self.bookPath.glob(pattern) ) self.fileConunt = len(self.files) @@ -815,7 +814,7 @@ class AudiobookLibrary: """ media_files = [] - for ext in audio_extensions: + for ext in AUDIO_SUFFIXES: media_files.extend(list(self.libraryPath.rglob(ext))) dirs = {file.parent for file in media_files} for directory in dirs: diff --git a/audiobook_metadata/metadata_rank_from_list.py b/audiobook_metadata/metadata_rank_from_list.py index 00c026e..da65775 100755 --- a/audiobook_metadata/metadata_rank_from_list.py +++ b/audiobook_metadata/metadata_rank_from_list.py @@ -6,15 +6,6 @@ import subprocess from pathlib import Path from difflib import SequenceMatcher -AUDIO_EXTENSIONS = { - ".mp3", - ".m4b", - ".m4a", -} - -RED = "\033[31m" -GREEN = "\033[32m" -RESET = "\033[0m" USE_KID3 = True def normalize(text: str) -> str: return re.sub(r"[^a-z0-9]", "", text.lower()) diff --git a/media_editing/ffmpeg_handling.py b/media_editing/ffmpeg_handling.py index 91f1495..cf38e69 100755 --- a/media_editing/ffmpeg_handling.py +++ b/media_editing/ffmpeg_handling.py @@ -23,9 +23,6 @@ from serverlibrary import * logging.setLoggerClass(CustomLogger) logger: CustomLogger = logging.getLogger(__name__) # type: ignore[assignment] -VIDEO_EXTS = {".mp4", ".mkv", ".avi", ".mov", ".webm"} -AUDIO_EXTS = {".mp3", ".m4a", ".m4b", ".opus"} - # ---------------------------- # OUTPUT ENFORCEMENT (clean + centralized) # ----------------------------