TonieToolbox 0.5.0a1__py3-none-any.whl → 0.6.0a1__py3-none-any.whl

TonieToolbox/audio_conversion.py

@@ -7,29 +7,39 @@ import glob
 import subprocess
 import tempfile
 from .dependency_manager import get_ffmpeg_binary, get_opus_binary
+from .constants import SUPPORTED_EXTENSIONS
 from .logger import get_logger
 
 logger = get_logger('audio_conversion')
 
 
-def get_opus_tempfile(ffmpeg_binary=None, opus_binary=None, filename=None, bitrate=48, vbr=True, keep_temp=False, auto_download=False):
+def get_opus_tempfile(
+    ffmpeg_binary: str = None,
+    opus_binary: str = None,
+    filename: str = None,
+    bitrate: int = 48,
+    vbr: bool = True,
+    keep_temp: bool = False,
+    auto_download: bool = False,
+    no_mono_conversion: bool = False
+) -> tuple[tempfile.SpooledTemporaryFile | None, str | None]:
     """
     Convert an audio file to Opus format and return a temporary file handle.
     
     Args:
-        ffmpeg_binary: Path to the ffmpeg binary. If None, will be auto-detected or downloaded.
-        opus_binary: Path to the opusenc binary. If None, will be auto-detected or downloaded.
-        filename: Path to the input audio file
-        bitrate: Bitrate for the Opus encoding in kbps
-        vbr: Whether to use variable bitrate encoding
-        keep_temp: Whether to keep the temporary files for testing
-        auto_download: Whether to automatically download dependencies if not found
-        
+        ffmpeg_binary (str | None): Path to the ffmpeg binary. If None, will be auto-detected or downloaded.
+        opus_binary (str | None): Path to the opusenc binary. If None, will be auto-detected or downloaded.
+        filename (str | None): Path to the input audio file
+        bitrate (int): Bitrate for the Opus encoding in kbps
+        vbr (bool): Whether to use variable bitrate encoding
+        keep_temp (bool): Whether to keep the temporary files for testing
+        auto_download (bool): Whether to automatically download dependencies if not found
+        no_mono_conversion (bool): Whether to skip mono to stereo conversion
     Returns:
-        tuple: (file handle, temp_file_path) or (file handle, None) if keep_temp is False
+        tuple[tempfile.SpooledTemporaryFile | None, str | None]: (file handle, temp_file_path) or (file handle, None) if keep_temp is False
     """
-    logger.trace("Entering get_opus_tempfile(ffmpeg_binary=%s, opus_binary=%s, filename=%s, bitrate=%d, vbr=%s, keep_temp=%s, auto_download=%s)",
-                ffmpeg_binary, opus_binary, filename, bitrate, vbr, keep_temp, auto_download)
+    logger.trace("Entering get_opus_tempfile(ffmpeg_binary=%s, opus_binary=%s, filename=%s, bitrate=%d, vbr=%s, keep_temp=%s, auto_download=%s, no_mono_conversion=%s)",
+                ffmpeg_binary, opus_binary, filename, bitrate, vbr, keep_temp, auto_download, no_mono_conversion)
     
     logger.debug("Converting %s to Opus format (bitrate: %d kbps, vbr: %s)", filename, bitrate, vbr)
     
@@ -52,6 +62,38 @@ def get_opus_tempfile(ffmpeg_binary=None, opus_binary=None, filename=None, bitra
     vbr_parameter = "--vbr" if vbr else "--hard-cbr"
     logger.debug("Using encoding parameter: %s", vbr_parameter)
 
+    is_mono = False
+    ffprobe_path = None
+    ffmpeg_dir, ffmpeg_file = os.path.split(ffmpeg_binary)
+    ffprobe_candidates = [
+        os.path.join(ffmpeg_dir, 'ffprobe'),
+        os.path.join(ffmpeg_dir, 'ffprobe.exe'),
+        'ffprobe',
+        'ffprobe.exe',
+    ]
+    for candidate in ffprobe_candidates:
+        if os.path.exists(candidate):
+            ffprobe_path = candidate
+            break
+    if ffprobe_path:
+        try:
+            probe_cmd = [ffprobe_path, '-v', 'error', '-select_streams', 'a:0', '-show_entries', 'stream=channels', '-of', 'default=noprint_wrappers=1:nokey=1', filename]
+            logger.debug(f"Probing audio channels with: {' '.join(probe_cmd)}")
+            result = subprocess.run(probe_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+            if result.returncode == 0:
+                channels = result.stdout.strip()
+                logger.debug(f"Detected channels: {channels}")
+                if channels == '1':
+                    is_mono = True
+            else:
+                logger.warning(f"ffprobe failed to detect channels: {result.stderr}")
+        except Exception as e:
+            logger.warning(f"Mono detection failed: {e}")
+    else:
+        logger.warning("ffprobe not found, will always force stereo conversion for non-Opus input.")
+        is_mono = True  # Always force stereo if we can't check
+    logger.info(f"Mono detected: {is_mono}, no_mono_conversion: {no_mono_conversion}")
+
     temp_path = None
     if keep_temp:
         temp_dir = os.path.join(tempfile.gettempdir(), "tonie_toolbox_temp")
@@ -62,7 +104,12 @@ def get_opus_tempfile(ffmpeg_binary=None, opus_binary=None, filename=None, bitra
         
         logger.debug("Starting FFmpeg process")
         try:
-            ffmpeg_cmd = [ffmpeg_binary, "-hide_banner", "-loglevel", "warning", "-i", filename, "-f", "wav", "-ar", "48000", "-"]
+            if is_mono and not no_mono_conversion:
+                ffmpeg_cmd = [ffmpeg_binary, "-hide_banner", "-loglevel", "warning", "-i", filename, "-f", "wav", "-ar", "48000", "-ac", "2", "-"]
+                logger.info(f"Forcing stereo conversion for mono input: {' '.join(ffmpeg_cmd)}")
+            else:
+                ffmpeg_cmd = [ffmpeg_binary, "-hide_banner", "-loglevel", "warning", "-i", filename, "-f", "wav", "-ar", "48000", "-"]
+                logger.info(f"FFmpeg command: {' '.join(ffmpeg_cmd)}")
             logger.trace("FFmpeg command: %s", ffmpeg_cmd)
             ffmpeg_process = subprocess.Popen(ffmpeg_cmd, stdout=subprocess.PIPE)
         except FileNotFoundError:
@@ -106,7 +153,12 @@ def get_opus_tempfile(ffmpeg_binary=None, opus_binary=None, filename=None, bitra
         
         logger.debug("Starting FFmpeg process")
         try:
-            ffmpeg_cmd = [ffmpeg_binary, "-hide_banner", "-loglevel", "warning", "-i", filename, "-f", "wav", "-ar", "48000", "-"]
+            if is_mono and not no_mono_conversion:
+                ffmpeg_cmd = [ffmpeg_binary, "-hide_banner", "-loglevel", "warning", "-i", filename, "-f", "wav", "-ar", "48000", "-ac", "2", "-"]
+                logger.info(f"Forcing stereo conversion for mono input: {' '.join(ffmpeg_cmd)}")
+            else:
+                ffmpeg_cmd = [ffmpeg_binary, "-hide_banner", "-loglevel", "warning", "-i", filename, "-f", "wav", "-ar", "48000", "-"]
+                logger.info(f"FFmpeg command: {' '.join(ffmpeg_cmd)}")
             logger.trace("FFmpeg command: %s", ffmpeg_cmd)
             ffmpeg_process = subprocess.Popen(ffmpeg_cmd, stdout=subprocess.PIPE)
         except FileNotFoundError:
@@ -155,24 +207,20 @@ def get_opus_tempfile(ffmpeg_binary=None, opus_binary=None, filename=None, bitra
         return tmp_file, None
 
 
-def filter_directories(glob_list):
+def filter_directories(glob_list: list[str]) -> list[str]:
     """
     Filter a list of glob results to include only audio files that can be handled by ffmpeg.
     
     Args:
-        glob_list: List of path names from glob.glob()
-        
+        glob_list (list[str]): List of path names from glob.glob()
     Returns:
-        list: Filtered list containing only supported audio files
+        list[str]: Filtered list containing only supported audio files
     """
     logger.trace("Entering filter_directories() with %d items", len(glob_list))
     logger.debug("Filtering %d glob results for supported audio files", len(glob_list))
     
-    # Common audio file extensions supported by ffmpeg
-    supported_extensions = [
-        '.wav', '.mp3', '.aac', '.m4a', '.flac', '.ogg', '.opus',
-        '.ape', '.wma', '.aiff', '.mp2', '.mp4', '.webm', '.mka'
-    ]
+    supported_extensions = SUPPORTED_EXTENSIONS
+    logger.debug("Supported audio file extensions: %s", supported_extensions)
     
     filtered = []
     for name in glob_list:
@@ -189,17 +237,16 @@ def filter_directories(glob_list):
     return filtered
 
 
-def get_input_files(input_filename):
+def get_input_files(input_filename: str) -> list[str]:
     """
     Get a list of input files to process.
     
     Supports direct file paths, directory paths, glob patterns, and .lst files.
     
     Args:
-        input_filename: Input file pattern or list file path
-        
+        input_filename (str): Input file pattern or list file path
     Returns:
-        list: List of input file paths
+        list[str]: List of input file paths
     """
     logger.trace("Entering get_input_files(input_filename=%s)", input_filename)
     logger.debug("Getting input files for pattern: %s", input_filename)
@@ -244,22 +291,46 @@ def get_input_files(input_filename):
         
         logger.debug("Found %d files in list file", len(input_files))
     else:
-        logger.debug("Processing glob pattern: %s", input_filename)
+        logger.debug("Processing input path: %s", input_filename)
+        
+        # Try the exact pattern first
         input_files = sorted(filter_directories(glob.glob(input_filename)))
-        logger.debug("Found %d files matching pattern", len(input_files))
+        if input_files:
+            logger.debug("Found %d files matching exact pattern", len(input_files))
+        else:
+            # If no extension is provided, try appending a wildcard for extension
+            _, ext = os.path.splitext(input_filename)
+            if not ext:
+                wildcard_pattern = input_filename + ".*"
+                logger.debug("No extension in pattern, trying with wildcard: %s", wildcard_pattern)
+                input_files = sorted(filter_directories(glob.glob(wildcard_pattern)))
+                
+                # If still no files found, try treating it as a directory
+                if not input_files and os.path.exists(os.path.dirname(input_filename)):
+                    potential_dir = input_filename
+                    if os.path.isdir(potential_dir):
+                        logger.debug("Treating input as directory: %s", potential_dir)
+                        dir_glob = os.path.join(potential_dir, "*")
+                        input_files = sorted(filter_directories(glob.glob(dir_glob)))
+                        if input_files:
+                            logger.debug("Found %d audio files in directory", len(input_files))
+                
+                if input_files:
+                    logger.debug("Found %d files after trying alternatives", len(input_files))
+                else:
+                    logger.warning("No files found for pattern %s even after trying alternatives", input_filename)
     
     logger.trace("Exiting get_input_files() with %d files", len(input_files))
     return input_files
 
 
-def append_to_filename(output_filename, tag):
+def append_to_filename(output_filename: str, tag: str) -> str:
     """
     Append a tag to a filename, preserving the extension.
     
     Args:
-        output_filename: Original filename
-        tag: Tag to append (typically an 8-character hex value)
-        
+        output_filename (str): Original filename
+        tag (str): Tag to append (typically an 8-character hex value)
     Returns:
         str: Modified filename with tag
     """

TonieToolbox/config.py

@@ -0,0 +1 @@
+## TODO: Add config.py

TonieToolbox/constants.py

@@ -1,13 +1,13 @@
 """
 Constants used throughout the TonieToolbox package
 """
-SAMPLE_RATE_KHZ = 48
-ONLY_CONVERT_FRAMEPACKING = -1
-OTHER_PACKET_NEEDED = -2
-DO_NOTHING = -3
-TOO_MANY_SEGMENTS = -4
-TIMESTAMP_DEDUCT = 0x50000000
-OPUS_TAGS = [
+SAMPLE_RATE_KHZ: int = 48
+ONLY_CONVERT_FRAMEPACKING: int = -1
+OTHER_PACKET_NEEDED: int = -2
+DO_NOTHING: int = -3
+TOO_MANY_SEGMENTS: int = -4
+TIMESTAMP_DEDUCT: int = 0x50000000
+OPUS_TAGS: list[bytearray] = [
     bytearray(
         b"\x4F\x70\x75\x73\x54\x61\x67\x73\x0D\x00\x00\x00\x4C\x61\x76\x66\x35\x38\x2E\x32\x30\x2E\x31\x30\x30\x03\x00\x00\x00\x26\x00\x00\x00\x65\x6E\x63\x6F\x64\x65\x72\x3D\x6F\x70\x75\x73\x65\x6E\x63\x20\x66\x72\x6F\x6D\x20\x6F\x70\x75\x73\x2D\x74\x6F\x6F\x6C\x73\x20\x30\x2E\x31\x2E\x31\x30\x2A\x00\x00\x00\x65\x6E\x63\x6F\x64\x65\x72\x5F\x6F\x70\x74\x69\x6F\x6E\x73\x3D\x2D\x2D\x71\x75\x69\x65\x74\x20\x2D\x2D\x62\x69\x74\x72\x61\x74\x65\x20\x39\x36\x20\x2D\x2D\x76\x62\x72\x3B\x01\x00\x00\x70\x61\x64\x3D\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30"),
     bytearray(
@@ -15,7 +15,7 @@ OPUS_TAGS = [
 ]
 
 # Mapping of language tags to ISO codes
-LANGUAGE_MAPPING = {
+LANGUAGE_MAPPING: dict[str, str] = {
     # Common language names to ISO codes
     'deutsch': 'de-de',
     'german': 'de-de',
@@ -39,7 +39,7 @@ LANGUAGE_MAPPING = {
 }
 
 # Mapping of genre tags to tonie categories
-GENRE_MAPPING = {
+GENRE_MAPPING: dict[str, str] = {
     # Standard Tonie category names from tonies.json
     'hörspiel': 'Hörspiele & Hörbücher',
     'hörbuch': 'Hörspiele & Hörbücher',
@@ -87,4 +87,88 @@ GENRE_MAPPING = {
     
     # Default to standard format for custom
     'custom': 'Hörspiele & Hörbücher',
+}
+
+    # Supported file extensions for audio files
+SUPPORTED_EXTENSIONS = [
+        '.wav', '.mp3', '.aac', '.m4a', '.flac', '.ogg', '.opus',
+        '.ape', '.wma', '.aiff', '.mp2', '.mp4', '.webm', '.mka'
+    ]
+
+ARTWORK_NAMES = [
+        'cover', 'folder', 'album', 'front', 'artwork', 'image', 
+        'albumart', 'albumartwork', 'booklet'
+    ]
+ARTWORK_EXTENSIONS = ['.jpg', '.jpeg', '.png', '.bmp', '.gif']
+
+
+TAG_VALUE_REPLACEMENTS = {
+    "Die drei ???": "Die drei Fragezeichen",
+    "Die Drei ???": "Die drei Fragezeichen",
+    "DIE DREI ???": "Die drei Fragezeichen",
+    "Die drei !!!": "Die drei Ausrufezeichen",
+    "Die Drei !!!": "Die drei Ausrufezeichen",
+    "DIE DREI !!!": "Die drei Ausrufezeichen",
+    "TKKG™": "TKKG",
+    "Die drei ??? Kids": "Die drei Fragezeichen Kids",
+    "Die Drei ??? Kids": "Die drei Fragezeichen Kids",
+    "Bibi & Tina": "Bibi und Tina",
+    "Benjamin Blümchen™": "Benjamin Blümchen",
+    "???": "Fragezeichen",
+    "!!!": "Ausrufezeichen",
+}
+
+TAG_MAPPINGS = {
+    # ID3 (MP3) tags
+    'TIT2': 'title',
+    'TALB': 'album',
+    'TPE1': 'artist',
+    'TPE2': 'albumartist',
+    'TCOM': 'composer',
+    'TRCK': 'tracknumber',
+    'TPOS': 'discnumber',
+    'TDRC': 'date',
+    'TCON': 'genre',
+    'TPUB': 'publisher',
+    'TCOP': 'copyright',
+    'COMM': 'comment',
+    
+    # Vorbis tags (FLAC, OGG)
+    'title': 'title',
+    'album': 'album',
+    'artist': 'artist',
+    'albumartist': 'albumartist',
+    'composer': 'composer',
+    'tracknumber': 'tracknumber',
+    'discnumber': 'discnumber',
+    'date': 'date',
+    'genre': 'genre',
+    'publisher': 'publisher',
+    'copyright': 'copyright',
+    'comment': 'comment',
+    
+    # MP4 (M4A, AAC) tags
+    '©nam': 'title',
+    '©alb': 'album',
+    '©ART': 'artist',
+    'aART': 'albumartist',
+    '©wrt': 'composer',
+    'trkn': 'tracknumber',
+    'disk': 'discnumber',
+    '©day': 'date',
+    '©gen': 'genre',
+    '©pub': 'publisher',
+    'cprt': 'copyright',
+    '©cmt': 'comment',
+    
+    # Additional tags some files might have
+    'album_artist': 'albumartist',
+    'track': 'tracknumber',
+    'track_number': 'tracknumber',
+    'disc': 'discnumber',
+    'disc_number': 'discnumber',
+    'year': 'date',
+    'albuminterpret': 'albumartist',  # German tag name
+    'interpret': 'artist',            # German tag name
+
 }

TonieToolbox/filename_generator.py

@@ -15,10 +15,9 @@ def sanitize_filename(filename: str) -> str:
     Sanitize a filename by removing invalid characters and trimming.
     
     Args:
-        filename: The filename to sanitize
-        
+        filename (str): The filename to sanitize
     Returns:
-        A sanitized filename
+        str: A sanitized filename
     """
     # Remove invalid characters for filenames
     sanitized = re.sub(r'[<>:"/\\|?*]', '_', filename)
@@ -29,7 +28,7 @@ def sanitize_filename(filename: str) -> str:
         return "tonie"
     return sanitized
 
-def guess_output_filename(input_filename: str, input_files: List[str] = None) -> str:
+def guess_output_filename(input_filename: str, input_files: list[str] = None) -> str:
     """
     Generate a sensible output filename based on input file or directory.
     
@@ -40,11 +39,10 @@ def guess_output_filename(input_filename: str, input_files: List[str] = None) ->
     4. For multiple files: Use the common parent directory name
     
     Args:
-        input_filename: The input filename or pattern
-        input_files: List of resolved input files (optional)
-        
+        input_filename (str): The input filename or pattern
+        input_files (list[str] | None): List of resolved input files (optional)
     Returns:
-        Generated output filename without extension
+        str: Generated output filename without extension
     """
     logger.debug("Guessing output filename from input: %s", input_filename)
     

TonieToolbox/integration.py

@@ -0,0 +1,20 @@
+import platform
+
+def handle_integration(args):
+    import platform
+    if platform.system() == 'Windows':
+        from .integration_windows import WindowsClassicContextMenuIntegration as ContextMenuIntegration
+        if args.install_integration:
+            ContextMenuIntegration.install()
+        elif args.uninstall_integration:
+            ContextMenuIntegration.uninstall()
+    elif platform.system() == 'Darwin':
+        from .integration_macos import MacOSContextMenuIntegration as ContextMenuIntegration
+        if args.install_integration:
+            ContextMenuIntegration.install()
+        elif args.uninstall_integration:
+            ContextMenuIntegration.uninstall()
+    elif platform.system() == 'Linux':
+        raise NotImplementedError("Context menu integration is not supported on Linux YET. But Soon™")
+    else:
+        raise NotImplementedError(f"Context menu integration is not supported on this OS: {platform.system()}")