TonieToolbox 0.2.0__tar.gz → 0.2.2__tar.gz

{tonietoolbox-0.2.0/TonieToolbox.egg-info → tonietoolbox-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TonieToolbox
-Version: 0.2.0
+Version: 0.2.2
 Summary: Convert audio files to Tonie box compatible format
 Home-page: https://github.com/Quentendo64/TonieToolbox
 Author: Quentendo64
@@ -159,15 +159,14 @@ tonietoolbox --recursive --output-to-source "Music/Albums"
 Run the following command to see all available options:
 
 ```
-tonietoolbox --help
+tonietoolbox -h
 ```
 
 Output:
 ```
-usage: TonieToolbox.py [-h] [--ts TIMESTAMP] [--ffmpeg FFMPEG] [--opusenc OPUSENC] 
-                    [--bitrate BITRATE] [--cbr] [--append-tonie-tag TAG] 
-                    [--no-tonie-header] [--info] [--split] [--recursive] [--output-to-source]
-                    [--compare FILE2] [--detailed-compare] [--debug] [--trace] [--quiet] [--silent]
+usage: TonieToolbox.py [-h] [-v] [-t TIMESTAMP] [-f FFMPEG] [-o OPUSENC] 
+                    [-b BITRATE] [-c] [-a TAG] [-n] [-i] [-s] [-r] [-O]
+                    [-A] [-k] [-C FILE2] [-D] [-d] [-T] [-q] [-Q]
                     SOURCE [TARGET]
 
 Create Tonie compatible file from Ogg opus file(s).
@@ -178,25 +177,40 @@ positional arguments:
 
 optional arguments:
   -h, --help            show this help message and exit
-  --ts TIMESTAMP        set custom timestamp / bitstream serial / reference .taf file
-  --ffmpeg FFMPEG       specify location of ffmpeg
-  --opusenc OPUSENC     specify location of opusenc
-  --bitrate BITRATE     set encoding bitrate in kbps (default: 96)
-  --cbr                 encode in cbr mode
-  --append-tonie-tag TAG append [TAG] to filename (must be an 8-character hex value)
-  --no-tonie-header     do not write Tonie header
-  --info                Check and display info about Tonie file
-  --split               Split Tonie file into opus tracks
-  --recursive           Process folders recursively
-  --output-to-source    Save output files in the source directory instead of output directory
-  --compare FILE2       Compare input file with another .taf file for debugging
-  --detailed-compare    Show detailed OGG page differences when comparing files
+  -v, --version         show program version and exit
+  -t, --timestamp TIMESTAMP
+                        set custom timestamp / bitstream serial / reference .taf file
+  -f, --ffmpeg FFMPEG   specify location of ffmpeg
+  -o, --opusenc OPUSENC specify location of opusenc
+  -b, --bitrate BITRATE set encoding bitrate in kbps (default: 96)
+  -c, --cbr             encode in cbr mode
+  -a, --append-tonie-tag TAG
+                        append [TAG] to filename (must be an 8-character hex value)
+  -n, --no-tonie-header do not write Tonie header
+  -i, --info            Check and display info about Tonie file
+  -s, --split           Split Tonie file into opus tracks
+  -r, --recursive       Process folders recursively
+  -O, --output-to-source
+                        Save output files in the source directory instead of output directory
+  -A, --auto-download   Automatically download FFmpeg and opusenc if needed
+  -k, --keep-temp       Keep temporary opus files in a temp folder for testing
+  -C, --compare FILE2   Compare input file with another .taf file for debugging
+  -D, --detailed-compare
+                        Show detailed OGG page differences when comparing files
+
+Version Check Options:
+  -S, --skip-update-check
+                        Skip checking for updates
+  -F, --force-refresh-cache
+                        Force refresh of update information from PyPI
+  -X, --clear-version-cache
+                        Clear cached version information
 
 Logging Options:
-  --debug               Enable debug logging
-  --trace               Enable trace logging (very verbose)
-  --quiet               Show only warnings and errors
-  --silent              Show only errors
+  -d, --debug           Enable debug logging
+  -T, --trace           Enable trace logging (very verbose)
+  -q, --quiet           Show only warnings and errors
+  -Q, --silent          Show only errors
 ```
 
 ### Common Usage Examples
@@ -230,9 +244,9 @@ tonietoolbox file1.taf --compare file2.taf --detailed-compare
 #### Custom timestamp options:
 
 ```
-tonietoolbox input.mp3 --ts 1745078762  # UNIX Timestamp
-tonietoolbox input.mp3 --ts 0x6803C9EA  # Bitstream time
-tonietoolbox input.mp3 --ts ./reference.taf  # Reference TAF for extraction
+tonietoolbox input.mp3 --timestamp 1745078762  # UNIX Timestamp
+tonietoolbox input.mp3 --timestamp 0x6803C9EA  # Bitstream time
+tonietoolbox input.mp3 --timestamp ./reference.taf  # Reference TAF for extraction
 ```
 
 #### Set custom bitrate:

{tonietoolbox-0.2.0 → tonietoolbox-0.2.2}/README.md

@@ -132,15 +132,14 @@ tonietoolbox --recursive --output-to-source "Music/Albums"
 Run the following command to see all available options:
 
 ```
-tonietoolbox --help
+tonietoolbox -h
 ```
 
 Output:
 ```
-usage: TonieToolbox.py [-h] [--ts TIMESTAMP] [--ffmpeg FFMPEG] [--opusenc OPUSENC] 
-                    [--bitrate BITRATE] [--cbr] [--append-tonie-tag TAG] 
-                    [--no-tonie-header] [--info] [--split] [--recursive] [--output-to-source]
-                    [--compare FILE2] [--detailed-compare] [--debug] [--trace] [--quiet] [--silent]
+usage: TonieToolbox.py [-h] [-v] [-t TIMESTAMP] [-f FFMPEG] [-o OPUSENC] 
+                    [-b BITRATE] [-c] [-a TAG] [-n] [-i] [-s] [-r] [-O]
+                    [-A] [-k] [-C FILE2] [-D] [-d] [-T] [-q] [-Q]
                     SOURCE [TARGET]
 
 Create Tonie compatible file from Ogg opus file(s).
@@ -151,25 +150,40 @@ positional arguments:
 
 optional arguments:
   -h, --help            show this help message and exit
-  --ts TIMESTAMP        set custom timestamp / bitstream serial / reference .taf file
-  --ffmpeg FFMPEG       specify location of ffmpeg
-  --opusenc OPUSENC     specify location of opusenc
-  --bitrate BITRATE     set encoding bitrate in kbps (default: 96)
-  --cbr                 encode in cbr mode
-  --append-tonie-tag TAG append [TAG] to filename (must be an 8-character hex value)
-  --no-tonie-header     do not write Tonie header
-  --info                Check and display info about Tonie file
-  --split               Split Tonie file into opus tracks
-  --recursive           Process folders recursively
-  --output-to-source    Save output files in the source directory instead of output directory
-  --compare FILE2       Compare input file with another .taf file for debugging
-  --detailed-compare    Show detailed OGG page differences when comparing files
+  -v, --version         show program version and exit
+  -t, --timestamp TIMESTAMP
+                        set custom timestamp / bitstream serial / reference .taf file
+  -f, --ffmpeg FFMPEG   specify location of ffmpeg
+  -o, --opusenc OPUSENC specify location of opusenc
+  -b, --bitrate BITRATE set encoding bitrate in kbps (default: 96)
+  -c, --cbr             encode in cbr mode
+  -a, --append-tonie-tag TAG
+                        append [TAG] to filename (must be an 8-character hex value)
+  -n, --no-tonie-header do not write Tonie header
+  -i, --info            Check and display info about Tonie file
+  -s, --split           Split Tonie file into opus tracks
+  -r, --recursive       Process folders recursively
+  -O, --output-to-source
+                        Save output files in the source directory instead of output directory
+  -A, --auto-download   Automatically download FFmpeg and opusenc if needed
+  -k, --keep-temp       Keep temporary opus files in a temp folder for testing
+  -C, --compare FILE2   Compare input file with another .taf file for debugging
+  -D, --detailed-compare
+                        Show detailed OGG page differences when comparing files
+
+Version Check Options:
+  -S, --skip-update-check
+                        Skip checking for updates
+  -F, --force-refresh-cache
+                        Force refresh of update information from PyPI
+  -X, --clear-version-cache
+                        Clear cached version information
 
 Logging Options:
-  --debug               Enable debug logging
-  --trace               Enable trace logging (very verbose)
-  --quiet               Show only warnings and errors
-  --silent              Show only errors
+  -d, --debug           Enable debug logging
+  -T, --trace           Enable trace logging (very verbose)
+  -q, --quiet           Show only warnings and errors
+  -Q, --silent          Show only errors
 ```
 
 ### Common Usage Examples
@@ -203,9 +217,9 @@ tonietoolbox file1.taf --compare file2.taf --detailed-compare
 #### Custom timestamp options:
 
 ```
-tonietoolbox input.mp3 --ts 1745078762  # UNIX Timestamp
-tonietoolbox input.mp3 --ts 0x6803C9EA  # Bitstream time
-tonietoolbox input.mp3 --ts ./reference.taf  # Reference TAF for extraction
+tonietoolbox input.mp3 --timestamp 1745078762  # UNIX Timestamp
+tonietoolbox input.mp3 --timestamp 0x6803C9EA  # Bitstream time
+tonietoolbox input.mp3 --timestamp ./reference.taf  # Reference TAF for extraction
 ```
 
 #### Set custom bitrate:

{tonietoolbox-0.2.0 → tonietoolbox-0.2.2}/TonieToolbox/__init__.py

@@ -2,4 +2,4 @@
 TonieToolbox - Convert audio files to Tonie box compatible format
 """
 
-__version__ = '0.2.0'
+__version__ = '0.2.2'

{tonietoolbox-0.2.0 → tonietoolbox-0.2.2}/TonieToolbox/__main__.py

@@ -21,50 +21,52 @@ from .recursive_processor import process_recursive_folders
 def main():
     """Entry point for the TonieToolbox application."""
     parser = argparse.ArgumentParser(description='Create Tonie compatible file from Ogg opus file(s).')
-    parser.add_argument('--version', action='version', version=f'TonieToolbox {__version__}',
+    parser.add_argument('-v', '--version', action='version', version=f'TonieToolbox {__version__}',
                         help='show program version and exit')
     parser.add_argument('input_filename', metavar='SOURCE', type=str, 
                         help='input file or directory or a file list (.lst)')
     parser.add_argument('output_filename', metavar='TARGET', nargs='?', type=str,
                         help='the output file name (default: ---ID---)')
-    parser.add_argument('--ts', dest='user_timestamp', metavar='TIMESTAMP', action='store',
+    parser.add_argument('-t', '--timestamp', dest='user_timestamp', metavar='TIMESTAMP', action='store',
                         help='set custom timestamp / bitstream serial')
 
-    parser.add_argument('--ffmpeg', help='specify location of ffmpeg', default=None)
-    parser.add_argument('--opusenc', help='specify location of opusenc', default=None)
-    parser.add_argument('--bitrate', type=int, help='set encoding bitrate in kbps (default: 96)', default=96)
-    parser.add_argument('--cbr', action='store_true', help='encode in cbr mode')
-    parser.add_argument('--append-tonie-tag', metavar='TAG', action='store',
+    parser.add_argument('-f', '--ffmpeg', help='specify location of ffmpeg', default=None)
+    parser.add_argument('-o', '--opusenc', help='specify location of opusenc', default=None)
+    parser.add_argument('-b', '--bitrate', type=int, help='set encoding bitrate in kbps (default: 96)', default=96)
+    parser.add_argument('-c', '--cbr', action='store_true', help='encode in cbr mode')
+    parser.add_argument('-a', '--append-tonie-tag', metavar='TAG', action='store',
                         help='append [TAG] to filename (must be an 8-character hex value)')
-    parser.add_argument('--no-tonie-header', action='store_true', help='do not write Tonie header')
-    parser.add_argument('--info', action='store_true', help='Check and display info about Tonie file')
-    parser.add_argument('--split', action='store_true', help='Split Tonie file into opus tracks')
-    parser.add_argument('--recursive', action='store_true', help='Process folders recursively')
-    parser.add_argument('--output-to-source', action='store_true', 
+    parser.add_argument('-n', '--no-tonie-header', action='store_true', help='do not write Tonie header')
+    parser.add_argument('-i', '--info', action='store_true', help='Check and display info about Tonie file')
+    parser.add_argument('-s', '--split', action='store_true', help='Split Tonie file into opus tracks')
+    parser.add_argument('-r', '--recursive', action='store_true', help='Process folders recursively')
+    parser.add_argument('-O', '--output-to-source', action='store_true', 
                         help='Save output files in the source directory instead of output directory')
-    parser.add_argument('--auto-download', action='store_true', help='Automatically download FFmpeg and opusenc if needed')
-    parser.add_argument('--keep-temp', action='store_true', 
+    parser.add_argument('-A', '--auto-download', action='store_true', help='Automatically download FFmpeg and opusenc if needed')
+    parser.add_argument('-k', '--keep-temp', action='store_true', 
                        help='Keep temporary opus files in a temp folder for testing')
-    parser.add_argument('--compare', action='store', metavar='FILE2', 
+    parser.add_argument('-u', '--use-legacy-tags', action='store_true',
+                       help='Use legacy hardcoded tags instead of dynamic TonieToolbox tags')
+    parser.add_argument('-C', '--compare', action='store', metavar='FILE2', 
                        help='Compare input file with another .taf file for debugging')
-    parser.add_argument('--detailed-compare', action='store_true',
+    parser.add_argument('-D', '--detailed-compare', action='store_true',
                        help='Show detailed OGG page differences when comparing files')
     
     # Version check options
     version_group = parser.add_argument_group('Version Check Options')
-    version_group.add_argument('--skip-update-check', action='store_true',
+    version_group.add_argument('-S', '--skip-update-check', action='store_true',
                        help='Skip checking for updates')
-    version_group.add_argument('--force-refresh-cache', action='store_true',
+    version_group.add_argument('-F', '--force-refresh-cache', action='store_true',
                        help='Force refresh of update information from PyPI')
-    version_group.add_argument('--clear-version-cache', action='store_true',
+    version_group.add_argument('-X', '--clear-version-cache', action='store_true',
                        help='Clear cached version information')
     
     log_group = parser.add_argument_group('Logging Options')
     log_level_group = log_group.add_mutually_exclusive_group()
-    log_level_group.add_argument('--debug', action='store_true', help='Enable debug logging')
-    log_level_group.add_argument('--trace', action='store_true', help='Enable trace logging (very verbose)')
-    log_level_group.add_argument('--quiet', action='store_true', help='Show only warnings and errors')
-    log_level_group.add_argument('--silent', action='store_true', help='Show only errors')
+    log_level_group.add_argument('-d', '--debug', action='store_true', help='Enable debug logging')
+    log_level_group.add_argument('-T', '--trace', action='store_true', help='Enable trace logging (very verbose)')
+    log_level_group.add_argument('-q', '--quiet', action='store_true', help='Show only warnings and errors')
+    log_level_group.add_argument('-Q', '--silent', action='store_true', help='Show only errors')
 
     args = parser.parse_args()
     if args.trace:
@@ -143,7 +145,7 @@ def main():
             
             create_tonie_file(task_out_filename, audio_files, args.no_tonie_header, args.user_timestamp,
                            args.bitrate, not args.cbr, ffmpeg_binary, opus_binary, args.keep_temp, 
-                           args.auto_download)
+                           args.auto_download, not args.use_legacy_tags)
             logger.info("Successfully created Tonie file: %s", task_out_filename)
             
         logger.info("Recursive processing completed. Created %d Tonie files.", len(process_tasks))
@@ -207,7 +209,8 @@ def main():
     
     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,
-                     args.bitrate, not args.cbr, ffmpeg_binary, opus_binary, args.keep_temp, args.auto_download)
+                     args.bitrate, not args.cbr, ffmpeg_binary, opus_binary, args.keep_temp, 
+                     args.auto_download, not args.use_legacy_tags)
     logger.info("Successfully created Tonie file: %s", out_filename)
 
 

{tonietoolbox-0.2.0 → tonietoolbox-0.2.2}/TonieToolbox/dependency_manager.py

@@ -532,4 +532,49 @@ def get_opus_binary(auto_download=False):
     Returns:
         str: Path to the opusenc binary if available, None otherwise
     """
-    return ensure_dependency('opusenc', auto_download)
+    return ensure_dependency('opusenc', auto_download)
+
+def get_opus_version(opus_binary=None):
+    """
+    Get the version of opusenc.
+    
+    Args:
+        opus_binary: Path to the opusenc binary
+        
+    Returns:
+        str: The version string of opusenc, or a fallback string if the version cannot be determined
+    """
+    import subprocess
+    import re
+    
+    logger = get_logger('dependency_manager')
+    
+    if opus_binary is None:
+        opus_binary = get_opus_binary()
+    
+    if opus_binary is None:
+        logger.debug("opusenc binary not found, using fallback version string")
+        return "opusenc from opus-tools XXX"  # Fallback
+    
+    try:
+        # Run opusenc --version and capture output
+        result = subprocess.run([opus_binary, "--version"], 
+                                capture_output=True, text=True, check=False)
+        
+        # Extract version information from output
+        version_output = result.stdout.strip() or result.stderr.strip()
+        
+        if version_output:
+            # Try to extract just the version information using regex
+            match = re.search(r"(opusenc.*)", version_output)
+            if match:
+                return match.group(1)
+            else:
+                return version_output.splitlines()[0]  # Use first line
+        else:
+            logger.debug("Could not determine opusenc version, using fallback")
+            return "opusenc from opus-tools XXX"  # Fallback
+    
+    except Exception as e:
+        logger.debug(f"Error getting opusenc version: {str(e)}")
+        return "opusenc from opus-tools XXX"  # Fallback

{tonietoolbox-0.2.0 → tonietoolbox-0.2.2}/TonieToolbox/tonie_analysis.py

@@ -72,7 +72,8 @@ def get_header_info(in_file):
         
     Returns:
         tuple: Header size, Tonie header object, file size, audio size, SHA1 sum,
-               Opus header found flag, Opus version, channel count, sample rate, bitstream serial number
+               Opus header found flag, Opus version, channel count, sample rate, bitstream serial number,
+               Opus comments dictionary
                
     Raises:
         RuntimeError: If OGG pages cannot be found
@@ -112,17 +113,64 @@ def get_header_info(in_file):
     logger.debug("Opus header found: %s, Version: %d, Channels: %d, Sample rate: %d Hz, Serial: %d", 
                 opus_head_found, opus_version, channel_count, sample_rate, bitstream_serial_no)
 
+    # Read and parse Opus comments from the second page
+    opus_comments = {}
     found = OggPage.seek_to_page_header(in_file)
     if not found:
         logger.error("Second OGG page not found")
         raise RuntimeError("Second ogg page not found")
     
-    OggPage(in_file)
+    second_page = OggPage(in_file)
     logger.debug("Read second OGG page")
+    
+    try:
+        # Combine all segments data for the second page
+        comment_data = bytearray()
+        for segment in second_page.segments:
+            comment_data.extend(segment.data)
+        
+        if comment_data.startswith(b"OpusTags"):
+            pos = 8  # Skip "OpusTags"
+            # Extract vendor string
+            if pos + 4 <= len(comment_data):
+                vendor_length = struct.unpack("<I", comment_data[pos:pos+4])[0]
+                pos += 4
+                if pos + vendor_length <= len(comment_data):
+                    vendor = comment_data[pos:pos+vendor_length].decode('utf-8', errors='replace')
+                    opus_comments["vendor"] = vendor
+                    pos += vendor_length
+                    
+                    # Extract comments count
+                    if pos + 4 <= len(comment_data):
+                        comments_count = struct.unpack("<I", comment_data[pos:pos+4])[0]
+                        pos += 4
+                        
+                        # Extract individual comments
+                        for i in range(comments_count):
+                            if pos + 4 <= len(comment_data):
+                                comment_length = struct.unpack("<I", comment_data[pos:pos+4])[0]
+                                pos += 4
+                                if pos + comment_length <= len(comment_data):
+                                    comment = comment_data[pos:pos+comment_length].decode('utf-8', errors='replace')
+                                    pos += comment_length
+                                    
+                                    # Split comment into key/value if possible
+                                    if "=" in comment:
+                                        key, value = comment.split("=", 1)
+                                        opus_comments[key] = value
+                                    else:
+                                        opus_comments[f"comment_{i}"] = comment
+                                else:
+                                    break
+                            else:
+                                break
+    except Exception as e:
+        logger.error("Failed to parse Opus comments: %s", str(e))
 
     return (
         header_size, tonie_header, file_size, audio_size, sha1sum,
-        opus_head_found, opus_version, channel_count, sample_rate, bitstream_serial_no
+        opus_head_found, opus_version, channel_count, sample_rate, bitstream_serial_no,
+        opus_comments
     )
 
 
@@ -204,7 +252,7 @@ def check_tonie_file(filename):
     
     with open(filename, "rb") as in_file:
         header_size, tonie_header, file_size, audio_size, sha1, opus_head_found, \
-        opus_version, channel_count, sample_rate, bitstream_serial_no = get_header_info(in_file)
+        opus_version, channel_count, sample_rate, bitstream_serial_no, opus_comments = get_header_info(in_file)
 
         page_count, alignment_okay, page_size_okay, total_time, \
         chapters = get_audio_info(in_file, sample_rate, tonie_header, header_size)
@@ -254,6 +302,20 @@ def check_tonie_file(filename):
     print("")
     print("[{}] File is {}valid".format("OK" if all_ok else "NOT OK", "" if all_ok else "NOT "))
     print("")
+    
+    # Display Opus comments if available
+    if opus_comments:
+        print("[ii] Opus Comments:")
+        if "vendor" in opus_comments:
+            print("  Vendor: {}".format(opus_comments["vendor"]))
+            # Remove vendor from dict to avoid showing it twice
+            vendor = opus_comments.pop("vendor")
+            
+        # Sort remaining comments for consistent display
+        for key in sorted(opus_comments.keys()):
+            print("  {}: {}".format(key, opus_comments[key]))
+        print("")
+        
     print("[ii] Total runtime: {}".format(granule_to_time_string(total_time)))
     print("[ii] {} Tracks:".format(len(chapters)))
     for i in range(0, len(chapters)):

{tonietoolbox-0.2.0 → tonietoolbox-0.2.2}/TonieToolbox/tonie_file.py

@@ -19,6 +19,33 @@ from .logger import get_logger
 logger = get_logger('tonie_file')
 
 
+def toniefile_comment_add(buffer, length, comment_str):
+    """
+    Add a comment string to an Opus comment packet buffer.
+    
+    Args:
+        buffer: Bytearray buffer to add comment to
+        length: Current position in the buffer
+        comment_str: Comment string to add
+        
+    Returns:
+        int: New position in the buffer after adding comment
+    """
+    logger.debug("Adding comment: %s", comment_str)
+    
+    # Add 4-byte length prefix
+    str_length = len(comment_str)
+    buffer[length:length+4] = struct.pack("<I", str_length)
+    length += 4
+    
+    # Add the actual string
+    buffer[length:length+str_length] = comment_str.encode('utf-8')
+    length += str_length
+    
+    logger.trace("Added comment of length %d, new buffer position: %d", str_length, length)
+    return length
+
+
 def check_identification_header(page):
     """
     Check if a page contains a valid Opus identification header.
@@ -52,37 +79,103 @@ def check_identification_header(page):
     logger.debug("Opus identification header is valid")
 
 
-def prepare_opus_tags(page):
+def prepare_opus_tags(page, custom_tags=False, bitrate=64, vbr=True, opus_binary=None):
     """
     Prepare standard Opus tags for a Tonie file.
     
     Args:
         page: OggPage to modify
+        custom_tags: Whether to use custom TonieToolbox tags instead of default ones
+        bitrate: Actual bitrate used for encoding
+        vbr: Whether variable bitrate was used
+        opus_binary: Path to opusenc binary for version detection
         
     Returns:
         OggPage: Modified page with Tonie-compatible Opus tags
     """
     logger.debug("Preparing Opus tags for Tonie compatibility")
     page.segments.clear()
-    segment = OpusPacket(None)
-    segment.size = len(OPUS_TAGS[0])
-    segment.data = bytearray(OPUS_TAGS[0])
-    segment.spanning_packet = True
-    segment.first_packet = True
-    page.segments.append(segment)
-
-    segment = OpusPacket(None)
-    segment.size = len(OPUS_TAGS[1])
-    segment.data = bytearray(OPUS_TAGS[1])
-    segment.spanning_packet = False
-    segment.first_packet = False
-    page.segments.append(segment)
+    
+    if not custom_tags:
+        # Use the default hardcoded tags for backward compatibility
+        segment = OpusPacket(None)
+        segment.size = len(OPUS_TAGS[0])
+        segment.data = bytearray(OPUS_TAGS[0])
+        segment.spanning_packet = True
+        segment.first_packet = True
+        page.segments.append(segment)
+
+        segment = OpusPacket(None)
+        segment.size = len(OPUS_TAGS[1])
+        segment.data = bytearray(OPUS_TAGS[1])
+        segment.spanning_packet = False
+        segment.first_packet = False
+        page.segments.append(segment)
+    else:
+        # Use custom tags for TonieToolbox
+        # Create buffer for opus tags (similar to teddyCloud implementation)
+        logger.debug("Creating custom Opus tags")
+        comment_data = bytearray(0x1B4)  # Same size as in teddyCloud
+        
+        # OpusTags signature
+        comment_data_pos = 0
+        comment_data[comment_data_pos:comment_data_pos+8] = b"OpusTags"
+        comment_data_pos += 8
+        
+        # Vendor string
+        comment_data_pos = toniefile_comment_add(comment_data, comment_data_pos, "TonieToolbox")
+        
+        # Number of comments (3 comments: version, encoder info, and encoder options)
+        comments_count = 3
+        comment_data[comment_data_pos:comment_data_pos+4] = struct.pack("<I", comments_count)
+        comment_data_pos += 4
+        
+        # Add version information
+        from . import __version__
+        version_str = f"version={__version__}"
+        comment_data_pos = toniefile_comment_add(comment_data, comment_data_pos, version_str)
+        
+        # Get actual opusenc version
+        from .dependency_manager import get_opus_version
+        encoder_info = get_opus_version(opus_binary)
+        comment_data_pos = toniefile_comment_add(comment_data, comment_data_pos, f"encoder={encoder_info}")
+        
+        # Create encoder options string with actual settings
+        vbr_opt = "--vbr" if vbr else "--cbr"
+        encoder_options = f"encoder_options=--bitrate {bitrate} {vbr_opt}"
+        comment_data_pos = toniefile_comment_add(comment_data, comment_data_pos, encoder_options)
+        
+        # Add padding
+        remain = len(comment_data) - comment_data_pos - 4
+        comment_data[comment_data_pos:comment_data_pos+4] = struct.pack("<I", remain)
+        comment_data_pos += 4
+        comment_data[comment_data_pos:comment_data_pos+4] = b"pad="
+        
+        # Create segments - handle data in chunks of 255 bytes maximum
+        comment_data = comment_data[:comment_data_pos + remain]  # Trim to actual used size
+        
+        # Split large data into smaller segments (each <= 255 bytes)
+        remaining_data = comment_data
+        first_segment = True
+        
+        while remaining_data:
+            chunk_size = min(255, len(remaining_data))
+            segment = OpusPacket(None)
+            segment.size = chunk_size
+            segment.data = remaining_data[:chunk_size]
+            segment.spanning_packet = len(remaining_data) > chunk_size  # More data follows
+            segment.first_packet = first_segment
+            page.segments.append(segment)
+            
+            remaining_data = remaining_data[chunk_size:]
+            first_segment = False
+        
     page.correct_values(0)
     logger.trace("Opus tags prepared with %d segments", len(page.segments))
     return page
 
 
-def copy_first_and_second_page(in_file, out_file, timestamp, sha):
+def copy_first_and_second_page(in_file, out_file, timestamp, sha, use_custom_tags=True, bitrate=64, vbr=True, opus_binary=None):
     """
     Copy and modify the first two pages of an Opus file for a Tonie file.
     
@@ -91,9 +184,10 @@ def copy_first_and_second_page(in_file, out_file, timestamp, sha):
         out_file: Output file handle
         timestamp: Timestamp to use for the Tonie file
         sha: SHA1 hash object to update with written data
-        
-    Raises:
-        RuntimeError: If OGG pages cannot be found
+        use_custom_tags: Whether to use custom TonieToolbox tags
+        bitrate: Actual bitrate used for encoding
+        vbr: Whether VBR was used
+        opus_binary: Path to opusenc binary
     """
     logger.debug("Copying first and second pages with timestamp %d", timestamp)
     found = OggPage.seek_to_page_header(in_file)
@@ -116,7 +210,7 @@ def copy_first_and_second_page(in_file, out_file, timestamp, sha):
     page = OggPage(in_file)
     page.serial_no = timestamp
     page.checksum = page.calc_checksum()
-    page = prepare_opus_tags(page)
+    page = prepare_opus_tags(page, use_custom_tags, bitrate, vbr, opus_binary)
     page.write_page(out_file, sha)
     logger.debug("Second page written successfully")
 
@@ -277,7 +371,8 @@ def fix_tonie_header(out_file, chapters, timestamp, sha):
 
 
 def create_tonie_file(output_file, input_files, no_tonie_header=False, user_timestamp=None,
-                     bitrate=96, vbr=True, ffmpeg_binary=None, opus_binary=None, keep_temp=False, auto_download=False):
+                     bitrate=96, vbr=True, ffmpeg_binary=None, opus_binary=None, keep_temp=False, auto_download=False, 
+                     use_custom_tags=True):
     """
     Create a Tonie file from input files.
     
@@ -292,6 +387,7 @@ def create_tonie_file(output_file, input_files, no_tonie_header=False, user_time
         opus_binary: Path to opusenc binary
         keep_temp: Whether to keep temporary opus files for testing
         auto_download: Whether to automatically download dependencies if not found
+        use_custom_tags: Whether to use dynamic comment tags generated with toniefile_comment_add
     """
     from .audio_conversion import get_opus_tempfile
     
@@ -369,7 +465,7 @@ def create_tonie_file(output_file, input_files, no_tonie_header=False, user_time
             try:
                 if next_page_no == 2:
                     logger.debug("Processing first file: copying first and second page")
-                    copy_first_and_second_page(handle, out_file, timestamp, sha1)
+                    copy_first_and_second_page(handle, out_file, timestamp, sha1, use_custom_tags, bitrate, vbr, opus_binary)
                 else:
                     logger.debug("Processing subsequent file: skipping first and second page")
                     other_size = max_size

{tonietoolbox-0.2.0 → tonietoolbox-0.2.2/TonieToolbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TonieToolbox
-Version: 0.2.0
+Version: 0.2.2
 Summary: Convert audio files to Tonie box compatible format
 Home-page: https://github.com/Quentendo64/TonieToolbox
 Author: Quentendo64
@@ -159,15 +159,14 @@ tonietoolbox --recursive --output-to-source "Music/Albums"
 Run the following command to see all available options:
 
 ```
-tonietoolbox --help
+tonietoolbox -h
 ```
 
 Output:
 ```
-usage: TonieToolbox.py [-h] [--ts TIMESTAMP] [--ffmpeg FFMPEG] [--opusenc OPUSENC] 
-                    [--bitrate BITRATE] [--cbr] [--append-tonie-tag TAG] 
-                    [--no-tonie-header] [--info] [--split] [--recursive] [--output-to-source]
-                    [--compare FILE2] [--detailed-compare] [--debug] [--trace] [--quiet] [--silent]
+usage: TonieToolbox.py [-h] [-v] [-t TIMESTAMP] [-f FFMPEG] [-o OPUSENC] 
+                    [-b BITRATE] [-c] [-a TAG] [-n] [-i] [-s] [-r] [-O]
+                    [-A] [-k] [-C FILE2] [-D] [-d] [-T] [-q] [-Q]
                     SOURCE [TARGET]
 
 Create Tonie compatible file from Ogg opus file(s).
@@ -178,25 +177,40 @@ positional arguments:
 
 optional arguments:
   -h, --help            show this help message and exit
-  --ts TIMESTAMP        set custom timestamp / bitstream serial / reference .taf file
-  --ffmpeg FFMPEG       specify location of ffmpeg
-  --opusenc OPUSENC     specify location of opusenc
-  --bitrate BITRATE     set encoding bitrate in kbps (default: 96)
-  --cbr                 encode in cbr mode
-  --append-tonie-tag TAG append [TAG] to filename (must be an 8-character hex value)
-  --no-tonie-header     do not write Tonie header
-  --info                Check and display info about Tonie file
-  --split               Split Tonie file into opus tracks
-  --recursive           Process folders recursively
-  --output-to-source    Save output files in the source directory instead of output directory
-  --compare FILE2       Compare input file with another .taf file for debugging
-  --detailed-compare    Show detailed OGG page differences when comparing files
+  -v, --version         show program version and exit
+  -t, --timestamp TIMESTAMP
+                        set custom timestamp / bitstream serial / reference .taf file
+  -f, --ffmpeg FFMPEG   specify location of ffmpeg
+  -o, --opusenc OPUSENC specify location of opusenc
+  -b, --bitrate BITRATE set encoding bitrate in kbps (default: 96)
+  -c, --cbr             encode in cbr mode
+  -a, --append-tonie-tag TAG
+                        append [TAG] to filename (must be an 8-character hex value)
+  -n, --no-tonie-header do not write Tonie header
+  -i, --info            Check and display info about Tonie file
+  -s, --split           Split Tonie file into opus tracks
+  -r, --recursive       Process folders recursively
+  -O, --output-to-source
+                        Save output files in the source directory instead of output directory
+  -A, --auto-download   Automatically download FFmpeg and opusenc if needed
+  -k, --keep-temp       Keep temporary opus files in a temp folder for testing
+  -C, --compare FILE2   Compare input file with another .taf file for debugging
+  -D, --detailed-compare
+                        Show detailed OGG page differences when comparing files
+
+Version Check Options:
+  -S, --skip-update-check
+                        Skip checking for updates
+  -F, --force-refresh-cache
+                        Force refresh of update information from PyPI
+  -X, --clear-version-cache
+                        Clear cached version information
 
 Logging Options:
-  --debug               Enable debug logging
-  --trace               Enable trace logging (very verbose)
-  --quiet               Show only warnings and errors
-  --silent              Show only errors
+  -d, --debug           Enable debug logging
+  -T, --trace           Enable trace logging (very verbose)
+  -q, --quiet           Show only warnings and errors
+  -Q, --silent          Show only errors
 ```
 
 ### Common Usage Examples
@@ -230,9 +244,9 @@ tonietoolbox file1.taf --compare file2.taf --detailed-compare
 #### Custom timestamp options:
 
 ```
-tonietoolbox input.mp3 --ts 1745078762  # UNIX Timestamp
-tonietoolbox input.mp3 --ts 0x6803C9EA  # Bitstream time
-tonietoolbox input.mp3 --ts ./reference.taf  # Reference TAF for extraction
+tonietoolbox input.mp3 --timestamp 1745078762  # UNIX Timestamp
+tonietoolbox input.mp3 --timestamp 0x6803C9EA  # Bitstream time
+tonietoolbox input.mp3 --timestamp ./reference.taf  # Reference TAF for extraction
 ```
 
 #### Set custom bitrate: