TonieToolbox 0.6.0a4__py3-none-any.whl → 0.6.0a5__py3-none-any.whl

TonieToolbox/__init__.py

@@ -1,5 +1,6 @@
+#!/usr/bin/python3
 """
 TonieToolbox - Convert audio files to Tonie box compatible format
 """
 
-__version__ = '0.6.0a4'
+__version__ = '0.6.0a5'

TonieToolbox/__main__.py

@@ -13,7 +13,7 @@ from .tonie_file import create_tonie_file
 from .tonie_analysis import check_tonie_file, check_tonie_file_cli, split_to_opus_files, compare_taf_files
 from .dependency_manager import get_ffmpeg_binary, get_opus_binary, ensure_dependency
 from .logger import TRACE, setup_logging, get_logger
-from .filename_generator import guess_output_filename
+from .filename_generator import guess_output_filename, apply_template_to_path,ensure_directory_exists
 from .version_handler import check_for_updates, clear_version_cache
 from .recursive_processor import process_recursive_folders
 from .media_tags import is_available as is_media_tags_available, ensure_mutagen, extract_album_info, format_metadata_filename, get_file_tags
@@ -41,7 +41,7 @@ def main():
     teddycloud_group.add_argument('--special-folder', action='store', metavar='FOLDER',
                        help='Special folder to upload to (currently only "library" is supported)', default='library')
     teddycloud_group.add_argument('--path', action='store', metavar='PATH',
-                       help='Path where to write the file on TeddyCloud server')
+                       help='Path where to write the file on TeddyCloud server (supports templates like "/{albumartist}/{album}")')
     teddycloud_group.add_argument('--connection-timeout', type=int, metavar='SECONDS', default=10,
                        help='Connection timeout in seconds (default: 10)')
     teddycloud_group.add_argument('--read-timeout', type=int, metavar='SECONDS', default=300,
@@ -112,7 +112,9 @@ def main():
     media_tag_group.add_argument('-m', '--use-media-tags', action='store_true',
                        help='Use media tags from audio files for naming')
     media_tag_group.add_argument('--name-template', metavar='TEMPLATE', action='store',
-                       help='Template for naming files using media tags. Example: "{album} - {artist}"')
+                       help='Template for naming files using media tags. Example: "{albumartist} - {album}"')
+    media_tag_group.add_argument('--output-to-template', metavar='PATH_TEMPLATE', action='store',
+                       help='Template for output path using media tags. Example: "C:\\Music\\{albumartist}\\{album}"')
     media_tag_group.add_argument('--show-tags', action='store_true',
                        help='Show available media tags from input files')
     # ------------- Parser - Version handling -------------
@@ -150,7 +152,7 @@ def main():
     else:
         log_level = logging.INFO 
     setup_logging(log_level, log_to_file=args.log_file)
-    logger = get_logger('main')
+    logger = get_logger(__name__)
     logger.debug("Starting TonieToolbox v%s with log level: %s", __version__, logging.getLevelName(log_level))
     logger.debug("Command-line arguments: %s", vars(args))
 
@@ -279,8 +281,33 @@ def main():
                       file_path, file_size, file_ext)
             logger.info("Uploading %s to TeddyCloud %s", file_path, teddycloud_url)
             logger.trace("Starting upload process for %s", file_path)
+            
+            upload_path = args.path
+            if upload_path and '{' in upload_path and args.use_media_tags:
+                metadata = get_file_tags(file_path)
+                if metadata:
+                    formatted_path = apply_template_to_path(upload_path, metadata)
+                    if formatted_path:
+                        logger.info("Using dynamic upload path from template: %s", formatted_path)
+                        upload_path = formatted_path
+                    else:
+                        logger.warning("Could not apply all tags to path template '%s'. Using as-is.", upload_path)
+            
+            # Create directories recursively if path is provided
+            if upload_path:
+                logger.debug("Creating directory structure on server: %s", upload_path)
+                try:
+                    client.create_directories_recursive(
+                        path=upload_path, 
+                        special=args.special_folder
+                    )
+                    logger.debug("Successfully created directory structure on server")
+                except Exception as e:
+                    logger.warning("Failed to create directory structure on server: %s", str(e))
+                    logger.debug("Continuing with upload anyway, in case the directory already exists")
+            
             response = client.upload_file(
-                destination_path=args.path, 
+                destination_path=upload_path, 
                 file_path=file_path,                   
                 special=args.special_folder,
             )
@@ -483,25 +510,25 @@ def main():
     
     guessed_name = None
     if args.use_media_tags:
+        logger.debug("Using media tags for naming")
         if len(files) > 1 and os.path.dirname(files[0]) == os.path.dirname(files[-1]):
+            logger.debug("Multiple files in the same folder, trying to extract album info")
             folder_path = os.path.dirname(files[0])            
             logger.debug("Extracting album info from folder: %s", folder_path)            
             album_info = extract_album_info(folder_path)
             if album_info:
-                template = args.name_template or "{album} - {artist}"
-                new_name = format_metadata_filename(album_info, template)
-                
+                template = args.name_template or "{artist} - {album}"
+                new_name = format_metadata_filename(album_info, template)                
                 if new_name:
                     logger.info("Using album metadata for output filename: %s", new_name)
                     guessed_name = new_name
                 else:
                     logger.debug("Could not format filename from album metadata")
         elif len(files) == 1:
-
-            
             tags = get_file_tags(files[0])
             if tags:
-                template = args.name_template or "{title} - {artist}"
+                logger.debug("")
+                template = args.name_template or "{artist} - {title}"
                 new_name = format_metadata_filename(tags, template)
                 
                 if new_name:
@@ -538,20 +565,71 @@ def main():
                 else:
                     logger.debug("Could not format filename from common metadata")
 
-    if args.output_filename:
+    if args.output_filename:        
         out_filename = args.output_filename
+        logger.debug("Output filename specified: %s", out_filename)
+    elif args.output_to_template and args.use_media_tags:
+        # Get metadata from files
+        if len(files) > 1 and os.path.dirname(files[0]) == os.path.dirname(files[-1]):
+            metadata = extract_album_info(os.path.dirname(files[0]))
+        elif len(files) == 1:
+            metadata = get_file_tags(files[0])
+        else:
+            # Try to get common tags for multiple files
+            metadata = {}
+            for file_path in files:
+                tags = get_file_tags(file_path)
+                if tags:
+                    for key, value in tags.items():
+                        if key not in metadata:
+                            metadata[key] = value
+                        elif metadata[key] != value:
+                            metadata[key] = None
+            metadata = {k: v for k, v in metadata.items() if v is not None}
+        
+        if metadata:
+            formatted_path = apply_template_to_path(args.output_to_template, metadata)
+            logger.debug("Formatted path from template: %s", formatted_path)
+            if formatted_path:
+                ensure_directory_exists(formatted_path)
+                if guessed_name:
+                    logger.debug("Using guessed name for output: %s", guessed_name)
+                    out_filename = os.path.join(formatted_path, guessed_name)
+                else:
+                    logger.debug("Using template path for output: %s", formatted_path)
+                    out_filename = formatted_path
+                logger.info("Using template path for output: %s", out_filename)
+            else:
+                logger.warning("Could not apply template to path. Using default output location.")
+                # Fall back to default output handling
+                if guessed_name:
+                    logger.debug("Using guessed name for output: %s", guessed_name)
+                    if args.output_to_source:
+                        source_dir = os.path.dirname(files[0]) if files else '.'
+                        out_filename = os.path.join(source_dir, guessed_name)
+                        logger.debug("Using source location for output: %s", out_filename)
+                    else:
+                        output_dir = './output'
+                        if not os.path.exists(output_dir):
+                            os.makedirs(output_dir, exist_ok=True)
+                        out_filename = os.path.join(output_dir, guessed_name)
+                        logger.debug("Using default output location: %s", out_filename)
+        else:
+            logger.warning("No metadata available to apply to template path. Using default output location.")
+            # Fall back to default output handling
     elif guessed_name:
+        logger.debug("Using guessed name for output: %s", guessed_name)
         if args.output_to_source:
             source_dir = os.path.dirname(files[0]) if files else '.'
             out_filename = os.path.join(source_dir, guessed_name)
-            logger.debug("Using source location for output with media tags: %s", out_filename)
+            logger.debug("Using source location for output: %s", out_filename)
         else:
             output_dir = './output'
             if not os.path.exists(output_dir):
                 logger.debug("Creating default output directory: %s", output_dir)
                 os.makedirs(output_dir, exist_ok=True)
             out_filename = os.path.join(output_dir, guessed_name)
-            logger.debug("Using default output location with media tags: %s", out_filename)
+            logger.debug("Using default output location: %s", out_filename)
     else:
         guessed_name = guess_output_filename(args.input_filename, files)    
         if args.output_to_source:
@@ -581,6 +659,7 @@ def main():
     
     if not out_filename.lower().endswith('.taf'):
         out_filename += '.taf'
+    ensure_directory_exists(out_filename)
         
     logger.info("Creating Tonie file: %s with %d input file(s)", out_filename, len(files))
     create_tonie_file(out_filename, files, args.no_tonie_header, args.user_timestamp,
@@ -591,10 +670,48 @@ def main():
     
     # ------------- Single File Upload -------------  
     artwork_url = None
-    if args.upload:                
+    if args.upload:
+        upload_path = args.path
+        if upload_path and '{' in upload_path and args.use_media_tags:
+            metadata = {}
+            if len(files) > 1 and os.path.dirname(files[0]) == os.path.dirname(files[-1]):
+                metadata = extract_album_info(os.path.dirname(files[0]))
+            elif len(files) == 1:
+                metadata = get_file_tags(files[0])
+            else:
+                for file_path in files:
+                    tags = get_file_tags(file_path)
+                    if tags:
+                        for key, value in tags.items():
+                            if key not in metadata:
+                                metadata[key] = value
+                            elif metadata[key] != value:
+                                metadata[key] = None
+                metadata = {k: v for k, v in metadata.items() if v is not None}
+            if metadata:
+                formatted_path = apply_template_to_path(upload_path, metadata)
+                if formatted_path:
+                    logger.info("Using dynamic upload path from template: %s", formatted_path)
+                    upload_path = formatted_path
+                else:
+                    logger.warning("Could not apply all tags to path template '%s'. Using as-is.", upload_path)
+        
+        # Create directories recursively if path is provided
+        if upload_path:
+            logger.debug("Creating directory structure on server: %s", upload_path)
+            try:
+                client.create_directories_recursive(
+                    path=upload_path, 
+                    special=args.special_folder
+                )
+                logger.debug("Successfully created directory structure on server")
+            except Exception as e:
+                logger.warning("Failed to create directory structure on server: %s", str(e))
+                logger.debug("Continuing with upload anyway, in case the directory already exists")
+        
         response = client.upload_file(
             file_path=out_filename,
-            destination_path=args.path,                    
+            destination_path=upload_path,                    
             special=args.special_folder,
         )
         upload_success = response.get('success', False)

TonieToolbox/artwork.py

@@ -13,6 +13,7 @@ from .logger import get_logger
 from .teddycloud import TeddyCloudClient
 from .media_tags import extract_artwork, find_cover_image
 
+logger = get_logger(__name__)
 
 def upload_artwork(
     client: TeddyCloudClient,
@@ -30,8 +31,7 @@ def upload_artwork(
         audio_files (list[str]): List of audio files to extract artwork from if needed
     Returns:
         tuple[bool, Optional[str]]: (success, artwork_url) where success is a boolean and artwork_url is the URL of the uploaded artwork
-    """
-    logger = get_logger('artwork')
+    """    
     logger.info("Looking for artwork for Tonie file: %s", taf_filename)
     taf_basename = os.path.basename(taf_filename)
     taf_name = os.path.splitext(taf_basename)[0]

TonieToolbox/audio_conversion.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python3
 """
 Audio conversion functionality for the TonieToolbox package
 """
@@ -10,7 +11,7 @@ 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')
+logger = get_logger(__name__)
 
 
 def get_opus_tempfile(

TonieToolbox/constants.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python3
 """
 Constants used throughout the TonieToolbox package
 """

TonieToolbox/dependency_manager.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python3
 """
 Dependency management for the TonieToolbox package.
 
@@ -22,7 +23,7 @@ import concurrent.futures
 from tqdm.auto import tqdm
 
 from .logger import get_logger
-logger = get_logger('dependency_manager')
+logger = get_logger(__name__)
 
 CACHE_DIR = os.path.join(os.path.expanduser("~"), ".tonietoolbox")
 LIBS_DIR = os.path.join(CACHE_DIR, "libs")

TonieToolbox/filename_generator.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python3
 """
 Module for generating intelligent output filenames for TonieToolbox.
 """
@@ -8,7 +9,7 @@ from pathlib import Path
 from typing import List, Optional
 from .logger import get_logger
 
-logger = get_logger('filename_generator')
+logger = get_logger(__name__)
 
 def sanitize_filename(filename: str) -> str:
     """
@@ -89,4 +90,52 @@ def guess_output_filename(input_filename: str, input_files: list[str] = None) ->
     except ValueError:
         # Files might be on different drives
         logger.debug("Could not determine common path, using generic name")
-        return "tonie_collection"
+        return "tonie_collection"
+
+def apply_template_to_path(template, metadata):
+    """
+    Apply metadata to a path template and ensure the path is valid.
+    
+    Args:
+        template: String template with {tag} placeholders
+        metadata: Dictionary of tag values
+        
+    Returns:
+        Formatted path with placeholders replaced by actual values
+    """
+    if not template or not metadata:
+        return None
+        
+    try:
+        # Replace any tags in the path with their values
+        formatted_path = template
+        for tag, value in metadata.items():
+            if value:
+                # Sanitize value for use in path
+                safe_value = re.sub(r'[<>:"|?*]', '_', str(value))
+                # Replace forward slashes with appropriate character, but NOT hyphens
+                safe_value = safe_value.replace('/', ' - ')
+                # Remove leading/trailing whitespace and dots
+                safe_value = safe_value.strip('. \t')
+                if not safe_value:
+                    safe_value = "unknown"
+
+                placeholder = '{' + tag + '}'
+                formatted_path = formatted_path.replace(placeholder, safe_value)
+        
+        # Check if there are any remaining placeholders
+        if re.search(r'{[^}]+}', formatted_path):
+            return None  # Some placeholders couldn't be filled
+            
+        # Normalize path separators for the OS
+        formatted_path = os.path.normpath(formatted_path)
+        return formatted_path
+    except Exception as e:
+        logger.error(f"Error applying template to path: {e}")
+        return None
+
+def ensure_directory_exists(file_path):
+    """Create the directory structure for a given file path if it doesn't exist."""
+    directory = os.path.dirname(file_path)
+    if directory:
+        os.makedirs(directory, exist_ok=True)

TonieToolbox/integration.py

@@ -1,10 +1,12 @@
+#!/usr/bin/python3
 import platform
+import os
+import subprocess
 from .logger import get_logger
 
 logger = get_logger(__name__)
 
 def handle_integration(args):
-    import platform
     if platform.system() == 'Windows':
         from .integration_windows import WindowsClassicContextMenuIntegration as ContextMenuIntegration
         if args.install_integration:
@@ -48,11 +50,6 @@ def handle_integration(args):
     
 def handle_config():
     """Opens the configuration file in the default text editor."""
-    import os
-    import platform
-    import subprocess
-
-   
     config_path = os.path.join(os.path.expanduser("~"), ".tonietoolbox", "config.json")
     if not os.path.exists(config_path):
         logger.info(f"Configuration file not found at {config_path}.")

TonieToolbox/integration_macos.py

@@ -1,3 +1,8 @@
+#!/usr/bin/python3
+"""
+Integration for MacOS Quick Actions (Services) for TonieToolbox.
+This module provides functionality to create and manage Quick Actions.
+"""
 import os
 import sys
 import json
@@ -8,7 +13,7 @@ from .constants import SUPPORTED_EXTENSIONS, CONFIG_TEMPLATE,UTI_MAPPINGS,ICON_B
 from .artwork import base64_to_ico
 from .logger import get_logger
 
-logger = get_logger('integration_macos')
+logger = get_logger(__name__)
 
 class MacOSContextMenuIntegration:
     """

TonieToolbox/integration_ubuntu.py

@@ -1 +1,2 @@
+#!/usr/bin/python3
 # TODO: Add integration_ubuntu.py

TonieToolbox/integration_windows.py

@@ -1,4 +1,8 @@
-# filepath: d:\Repository\TonieToolbox\TonieToolbox\integration_windows.py
+#!/usr/bin/python3
+"""
+Integration for Windows "classic" context menu.
+This module generates Windows registry entries to add a 'TonieToolbox' cascade menu.
+"""
 import os
 import sys
 import json
@@ -6,7 +10,7 @@ from .constants import SUPPORTED_EXTENSIONS, CONFIG_TEMPLATE, ICON_BASE64
 from .artwork import base64_to_ico
 from .logger import get_logger
 
-logger = get_logger('integration_windows')
+logger = get_logger(__name__)
 
 class WindowsClassicContextMenuIntegration:
     """

TonieToolbox/logger.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python3
 """
 Logging configuration for the TonieToolbox package.
 """

TonieToolbox/media_tags.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python3
 """
 Media tag processing functionality for the TonieToolbox package
 
@@ -14,6 +15,7 @@ from mutagen.flac import Picture
 from .logger import get_logger
 from .dependency_manager import is_mutagen_available, ensure_mutagen
 from .constants import ARTWORK_NAMES, ARTWORK_EXTENSIONS, TAG_VALUE_REPLACEMENTS, TAG_MAPPINGS
+logger = get_logger(__name__)
 
 MUTAGEN_AVAILABLE = False
 mutagen = None
@@ -56,9 +58,6 @@ def _import_mutagen():
 if is_mutagen_available():
     _import_mutagen()
 
-logger = get_logger('media_tags')
-
-
 def normalize_tag_value(value: str) -> str:
     """
     Normalize tag values by replacing special characters or known patterns

TonieToolbox/ogg_page.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python3
 """
 Classes and functions for handling OGG container pages
 """
@@ -14,8 +15,7 @@ from .constants import (
 )
 from .logger import get_logger
 
-# Setup logging
-logger = get_logger('ogg_page')
+logger = get_logger(__name__)
 
 
 def create_crc_table() -> list[int]:

TonieToolbox/opus_packet.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python3
 """
 Classes and functions for handling Opus audio packets
 """
@@ -6,8 +7,7 @@ import struct
 from .constants import SAMPLE_RATE_KHZ
 from .logger import get_logger
 
-# Setup logging
-logger = get_logger('opus_packet')
+logger = get_logger(__name__)
 
 
 class OpusPacket:

TonieToolbox/recursive_processor.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python3
 """
 Recursive folder processing functionality for the TonieToolbox package
 """
@@ -11,7 +12,7 @@ import re
 from .audio_conversion import filter_directories
 from .logger import get_logger
 
-logger = get_logger('recursive_processor')
+logger = get_logger(__name__)
 
 
 def find_audio_folders(root_path: str) -> list[dict[str, any]]:

TonieToolbox/tags.py

@@ -8,7 +8,7 @@ from .teddycloud import TeddyCloudClient
 import json
 from typing import Optional, Union
 
-logger = get_logger('tags')
+logger = get_logger(__name__)
 
 def get_tags(client: 'TeddyCloudClient') -> bool:
     """

TonieToolbox/teddycloud.py

@@ -9,8 +9,9 @@ import base64
 import ssl
 import socket
 import requests
+import json
 from .logger import get_logger
-logger = get_logger('teddycloud')
+logger = get_logger(__name__)
 DEFAULT_CONNECTION_TIMEOUT = 10
 DEFAULT_READ_TIMEOUT = 15  # seconds
 DEFAULT_MAX_RETRIES = 3
@@ -334,3 +335,115 @@ class TeddyCloudClient:
             }
     
     # ------------- Custom API Methods -------------
+
+    def _get_paths_cache_file(self) -> str:
+        """
+        Get the path to the paths cache file.
+        
+        Returns:
+            str: Path to the paths cache file
+        """
+        cache_dir = os.path.join(os.path.expanduser("~"), ".tonietoolbox")
+        os.makedirs(cache_dir, exist_ok=True)
+        return os.path.join(cache_dir, "paths.json")
+    
+    def _load_paths_cache(self) -> set:
+        """
+        Load the paths cache from the cache file.
+        
+        Returns:
+            set: Set of existing directory paths
+        """
+        cache_file = self._get_paths_cache_file()
+        try:
+            if os.path.exists(cache_file):
+                with open(cache_file, 'r', encoding='utf-8') as f:
+                    paths_data = json.load(f)
+                    # Convert to set for faster lookups
+                    return set(paths_data.get('paths', []))
+            return set()
+        except Exception as e:
+            logger.warning(f"Failed to load paths cache: {e}")
+            return set()
+    
+    def _save_paths_cache(self, paths: set) -> None:
+        """
+        Save the paths cache to the cache file.
+        
+        Args:
+            paths (set): Set of directory paths to save
+        """
+        cache_file = self._get_paths_cache_file()
+        try:
+            paths_data = {'paths': list(paths)}
+            with open(cache_file, 'w', encoding='utf-8') as f:
+                json.dump(paths_data, f, indent=2)
+            logger.debug(f"Saved {len(paths)} paths to cache file")
+        except Exception as e:
+            logger.warning(f"Failed to save paths cache: {e}")
+    
+    def create_directories_recursive(self, path: str, overlay: str = None, special: str = "library") -> str:
+        """
+        Create directories recursively on the TeddyCloud server.
+
+        This function handles both cases:
+        - Directories that already exist (prevents 500 errors)
+        - Parent directories that don't exist yet (creates them first)
+        
+        This optimized version uses a local paths cache instead of querying the file index,
+        since the file index might not represent the correct folders.
+
+        Args:
+            path (str): Directory path to create (can contain multiple levels)
+            overlay (str | None): Settings overlay ID (optional)
+            special (str | None): Special folder source, only 'library' supported yet (optional)
+
+        Returns:
+            str: Response message from server
+        """
+        path = path.replace('\\', '/').strip('/')
+        if not path:
+            return "Path is empty"
+        existing_dirs = self._load_paths_cache()
+        logger.debug(f"Loaded {len(existing_dirs)} existing paths from cache")
+        path_components = path.split('/')
+        current_path = ""
+        result = "OK"
+        paths_updated = False
+        for component in path_components:
+            if current_path:
+                current_path += f"/{component}"
+            else:
+                current_path = component
+            if current_path in existing_dirs:
+                logger.debug(f"Directory '{current_path}' exists in paths cache, skipping creation")
+                continue
+
+            try:
+                result = self.create_directory(current_path, overlay, special)
+                logger.debug(f"Created directory: {current_path}")
+                # Add the newly created directory to our cache
+                existing_dirs.add(current_path)
+                paths_updated = True
+            except requests.exceptions.HTTPError as e:
+                # If it's a 500 error, likely the directory already exists
+                if e.response.status_code == 500:
+                    if "already exists" in e.response.text.lower():
+                        logger.debug(f"Directory '{current_path}' already exists, continuing")
+                        # Add to our cache for future operations
+                        existing_dirs.add(current_path)
+                        paths_updated = True
+                    else:
+                        # Log the actual error message but continue anyway
+                        # This allows us to continue even if the error is something else
+                        logger.warning(f"Warning while creating '{current_path}': {str(e)}")
+                else:
+                    # Re-raise for other HTTP errors
+                    logger.error(f"Failed to create directory '{current_path}': {str(e)}")
+                    raise
+        
+        # Save updated paths cache if any changes were made
+        if paths_updated:
+            self._save_paths_cache(existing_dirs)
+                
+        return result

TonieToolbox/tonie_analysis.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python3
 """
 Functions for analyzing Tonie files
 """
@@ -10,7 +11,7 @@ from  . import tonie_header_pb2
 from .ogg_page import OggPage
 from .logger import get_logger
 
-logger = get_logger('tonie_analysis')
+logger = get_logger(__name__)
 
 def format_time(ts: float) -> str:
     """

TonieToolbox/tonie_file.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python3
 """
 Tonie file operations module
 """
@@ -15,7 +16,7 @@ from .ogg_page import OggPage
 from .constants import OPUS_TAGS, SAMPLE_RATE_KHZ, TIMESTAMP_DEDUCT
 from .logger import get_logger
 
-logger = get_logger('tonie_file')
+logger = get_logger(__name__)
 
 
 def toniefile_comment_add(buffer: bytearray, length: int, comment_str: str) -> int:

TonieToolbox/tonies_json.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python3
 """
 TonieToolbox module for handling the tonies.custom.json operations.
 
@@ -19,7 +20,7 @@ from .media_tags import get_file_tags, extract_album_info
 from .constants import LANGUAGE_MAPPING, GENRE_MAPPING
 from .teddycloud import TeddyCloudClient
 
-logger = get_logger('tonies_json')
+logger = get_logger(__name__)
 
 class ToniesJsonHandlerv1:
     """Handler for tonies.custom.json operations using v1 format."""

TonieToolbox/version_handler.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python3
 """
 Version handler to check if the latest version of TonieToolbox is being used.
 """
@@ -17,6 +18,7 @@ CACHE_DIR = os.path.join(os.path.expanduser("~"), ".tonietoolbox")
 CACHE_FILE = os.path.join(CACHE_DIR, "version_cache.json")
 CACHE_EXPIRY = 86400  # 24 hours in seconds
 
+logger = get_logger(__name__)
 
 def get_pypi_version(force_refresh: bool = False) -> tuple[str, str | None]:
     """
@@ -27,7 +29,6 @@ def get_pypi_version(force_refresh: bool = False) -> tuple[str, str | None]:
     Returns:
         tuple[str, str | None]: (latest_version, None) on success, (current_version, error_message) on failure
     """
-    logger = get_logger("version_handler")
     logger.debug("Checking for latest version (force_refresh=%s)", force_refresh)
     logger.debug("Current version: %s", __version__)
     
@@ -97,7 +98,6 @@ def compare_versions(v1: str, v2: str) -> int:
     Returns:
         int: -1 if v1 < v2, 0 if v1 == v2, 1 if v1 > v2
     """
-    logger = get_logger("version_handler")
     logger.debug("Comparing versions: '%s' vs '%s'", v1, v2)
     
     try:   
@@ -145,7 +145,6 @@ def check_for_updates(quiet: bool = False, force_refresh: bool = False) -> tuple
             message: string message about the update status or error
             update_confirmed: boolean indicating if the user confirmed the update
     """
-    logger = get_logger("version_handler")
     current_version = __version__
     update_confirmed = False
     
@@ -204,7 +203,6 @@ def install_update() -> bool:
     Returns:
         bool: True if the update was successfully installed, False otherwise
     """
-    logger = get_logger("version_handler")
     import subprocess
     import sys
     
@@ -242,7 +240,6 @@ def clear_version_cache() -> bool:
     Returns:
         bool: True if cache was cleared, False otherwise
     """
-    logger = get_logger("version_handler")
     
     try:
         if os.path.exists(CACHE_FILE):

{tonietoolbox-0.6.0a4.dist-info → tonietoolbox-0.6.0a5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TonieToolbox
-Version: 0.6.0a4
+Version: 0.6.0a5
 Summary: Convert audio files to Toniebox compatible format (.TAF) and interact with TeddyCloud.
 Home-page: https://github.com/Quentendo64/TonieToolbox
 Author: Quentendo64

tonietoolbox-0.6.0a5.dist-info/RECORD

@@ -0,0 +1,30 @@
+TonieToolbox/__init__.py,sha256=0gNvQWCJmnGv7_OCrSTA7qyNe3zUQ546m7TL9_SFtwY,117
+TonieToolbox/__main__.py,sha256=KSDasW-QaTzStXSKtemMKxoFV8IWvCmq1Oig5yo8BQs,41573
+TonieToolbox/artwork.py,sha256=BhAjLWqzui8zUOU9z9P4H3zbCCTOB94aT0MPlqEvZoY,5605
+TonieToolbox/audio_conversion.py,sha256=xXXsRGPS_yQ_mqtFJiqupLbeXN8__Q2Hg05C94EPC_8,17199
+TonieToolbox/constants.py,sha256=nTKDBy55PTv6Tazda3rsZZcckcm3AZOyWXa1LDuTuEk,33989
+TonieToolbox/dependency_manager.py,sha256=sQv0vNE7Gp_RqdR9GOwF8jJgu8GTw0Krppg5MjG5qJU,49432
+TonieToolbox/filename_generator.py,sha256=NJrRxv0sm_9G5ZDp1QG39mktgJnz5yGC8HUs7NhLYFg,5293
+TonieToolbox/integration.py,sha256=qWRZfowNBIQJPPnGUJ52Xw0SqyfScuzoONPVtZI8yjA,3063
+TonieToolbox/integration_macos.py,sha256=YxK7gIqiy1QTp7EM1M1OPC-mgb3gaIoI6Xfu3eUAyX0,27311
+TonieToolbox/integration_ubuntu.py,sha256=_Da2s7CmuP7kts0W-yyt4odZA8jr14d8iisVF_ipLDA,52
+TonieToolbox/integration_windows.py,sha256=WBclD1bW5X8cJ-x3j3-YPnSkpWOQmzxQXjj2-gemPN0,24011
+TonieToolbox/logger.py,sha256=ppAnOJAKNwwbt5q3NdF2WHgHemZjP0QWRaUx8UrkQK8,3139
+TonieToolbox/media_tags.py,sha256=pOLcqnY4sUudI-gBre0A7le3nA7ZDkhUNkozUdRVHiE,20843
+TonieToolbox/ogg_page.py,sha256=CpL3mHoRsfHBBrT2r4x5p3LBPgHfYQxb_WQsCZq6SI0,22341
+TonieToolbox/opus_packet.py,sha256=skKzr5sVpL7L77JisqqGL4Kz86acOGDzwbFRqRL2oSM,8017
+TonieToolbox/recursive_processor.py,sha256=IcTmQY6OF01KUfqjYE7F0CFl1SeWcSLzkB_Du6R8deI,13910
+TonieToolbox/tags.py,sha256=usNcZxMEAMP7vEfeNOtg70YBJpHiWuHb_XKCyEafsYc,2702
+TonieToolbox/teddycloud.py,sha256=1fpRzhJrOiUXTBhX9JNL9rlO5obIl32WMoYz5RWz0zA,18486
+TonieToolbox/tonie_analysis.py,sha256=KkaZ6vt4sntMTfutyQApI8gvCirMjTW8aeIBSbhtllA,30798
+TonieToolbox/tonie_file.py,sha256=z7yRmK0ujZ6SjF78-xJImGmQ2bS-Q7b-6d2ryYJnmwA,21769
+TonieToolbox/tonie_header.proto,sha256=WaWfwO4VrwGtscK2ujfDRKtpeBpaVPoZhI8iMmR-C0U,202
+TonieToolbox/tonie_header_pb2.py,sha256=s5bp4ULTEekgq6T61z9fDkRavyPM-3eREs20f_Pxxe8,3665
+TonieToolbox/tonies_json.py,sha256=Icu5ClFbRK0gFuefJkHQNRjeOW79tQV-GZ3hoIATo3M,60768
+TonieToolbox/version_handler.py,sha256=Q-i5_0r5lX3dlwDLI2lMAx4X10UZGN2rvMcntmyuiT4,9862
+tonietoolbox-0.6.0a5.dist-info/licenses/LICENSE.md,sha256=rGoga9ZAgNco9fBapVFpWf6ri7HOBp1KRnt1uIruXMk,35190
+tonietoolbox-0.6.0a5.dist-info/METADATA,sha256=Hzna0YOJdh0olBqOV921ZCfa62g8b_iL555_WeFsYdo,27009
+tonietoolbox-0.6.0a5.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+tonietoolbox-0.6.0a5.dist-info/entry_points.txt,sha256=oqpeyBxel7aScg35Xr4gZKnf486S5KW9okqeBwyJxxc,60
+tonietoolbox-0.6.0a5.dist-info/top_level.txt,sha256=Wkkm-2p7I3ENfS7ZbYtYUB2g-xwHrXVlERHfonsOPuE,13
+tonietoolbox-0.6.0a5.dist-info/RECORD,,

{tonietoolbox-0.6.0a4.dist-info → tonietoolbox-0.6.0a5.dist-info}/WHEEL

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

tonietoolbox-0.6.0a4.dist-info/RECORD

@@ -1,30 +0,0 @@
-TonieToolbox/__init__.py,sha256=P-i-pmjFHddy0r76UYtLh4dFA2jppC0wc_BqhDAzfqw,98
-TonieToolbox/__main__.py,sha256=F_FHZC7rLejBdEQ4plOg6dcyV4lgFKZDvJtQHpCthKs,34934
-TonieToolbox/artwork.py,sha256=VRDa9Ydeq7AsXhRKYyEqpfFNH64AA1Xek7yo60bn8OI,5606
-TonieToolbox/audio_conversion.py,sha256=0GpC6mSRYikIjf_A1w26LAnYtCP2gpHLEKozOISapnM,17190
-TonieToolbox/constants.py,sha256=DabAgzKeG8trpV9I6tie1FA6mt3BhTRf_gF5UwtMpE4,33970
-TonieToolbox/dependency_manager.py,sha256=7HCyUhVLZ6l0W1HPdYr3AgLc935S43qdTLpf1PipPkQ,49425
-TonieToolbox/filename_generator.py,sha256=ATCG4w8uN1vyAqvmdhOtpJLlb9QFKCnYIdBViYqpHjw,3464
-TonieToolbox/integration.py,sha256=TXCkXxmeMGtw8G8M-jUVuKa7i_hI0JvVoVlIvYFvEnc,3097
-TonieToolbox/integration_macos.py,sha256=HWHBcMU5BRe50ak2nqB9kIFJS83sJ8t2_B_0FMhat2U,27159
-TonieToolbox/integration_ubuntu.py,sha256=MU6W0xRCdoHBxrIiOIHePqYTF5Wvn4JxBnDQUPf6fgg,33
-TonieToolbox/integration_windows.py,sha256=7F_8Dh7fWHuvCfcigM5TB-bF5CupzM6iQ-YqOvvNVFQ,23939
-TonieToolbox/logger.py,sha256=Q_cXbCWfzNmt5q6fvVzeM8IugkD24CSZAVjuf16n6b4,3120
-TonieToolbox/media_tags.py,sha256=oDlLe0AyvmIdQlqPzH74AUCqwbZZ-49AQKAJdrW26XE,20830
-TonieToolbox/ogg_page.py,sha256=IHdP0er0TYjyLfON8zes11FdQtRab3QNxeK6sxnAX08,22340
-TonieToolbox/opus_packet.py,sha256=yz5jvViGZ-nGZjEaQ1gCKd-j1jPW402szYirbEl4izA,8019
-TonieToolbox/recursive_processor.py,sha256=6JD4b5sGnCe45GkJqWua9u9ZHv-RC77BRV58qQ8pA3Q,13904
-TonieToolbox/tags.py,sha256=7BowNWmbJDymvJ0hPVAAXwJRAfPklLokQQuV8FVldSI,2700
-TonieToolbox/teddycloud.py,sha256=5PSV5Qp0VRfDG78kGPbKQ7bXxxB1sfmGNHYhvIumVF8,13794
-TonieToolbox/tonie_analysis.py,sha256=KYDfWi9EmA5EvVyq_h_gcxrZ5Eaa5etYsF152GRgyqI,30787
-TonieToolbox/tonie_file.py,sha256=YntpgpmtWTe64WWqJmWWo2sXyMUnZ57pp3sKGoY-Yik,21754
-TonieToolbox/tonie_header.proto,sha256=WaWfwO4VrwGtscK2ujfDRKtpeBpaVPoZhI8iMmR-C0U,202
-TonieToolbox/tonie_header_pb2.py,sha256=s5bp4ULTEekgq6T61z9fDkRavyPM-3eREs20f_Pxxe8,3665
-TonieToolbox/tonies_json.py,sha256=YGS2wtaDudxxSy7QuRLWaE5n4bf_AyoSvVLH1Vdh8SE,60754
-TonieToolbox/version_handler.py,sha256=MLpJ9mSEHkcSoyePnACpfINHTSB1q1_4iEgcT1tGqNU,10028
-tonietoolbox-0.6.0a4.dist-info/licenses/LICENSE.md,sha256=rGoga9ZAgNco9fBapVFpWf6ri7HOBp1KRnt1uIruXMk,35190
-tonietoolbox-0.6.0a4.dist-info/METADATA,sha256=1ygRy4_HXQsn3C_TcLydyvkdpTppmYECp4OH7eQ2NTE,27009
-tonietoolbox-0.6.0a4.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-tonietoolbox-0.6.0a4.dist-info/entry_points.txt,sha256=oqpeyBxel7aScg35Xr4gZKnf486S5KW9okqeBwyJxxc,60
-tonietoolbox-0.6.0a4.dist-info/top_level.txt,sha256=Wkkm-2p7I3ENfS7ZbYtYUB2g-xwHrXVlERHfonsOPuE,13
-tonietoolbox-0.6.0a4.dist-info/RECORD,,