TonieToolbox 0.1.0__tar.gz → 0.1.3__tar.gz

{tonietoolbox-0.1.0/TonieToolbox.egg-info → tonietoolbox-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TonieToolbox
-Version: 0.1.0
+Version: 0.1.3
 Summary: Convert audio files to Tonie box compatible format
 Home-page: https://github.com/Quentendo64/TonieToolbox
 Author: Quentendo64
@@ -31,6 +31,8 @@ Happy Testing :-P
 
 A Python tool for converting audio files to Tonie box compatible format (TAF - Tonie Audio Format).
 
+# Beginners Guide
+- [HOWTO](HOWTO.md)
 
 ## Table of Contents
 

{tonietoolbox-0.1.0 → tonietoolbox-0.1.3}/README.md

@@ -4,6 +4,8 @@ Happy Testing :-P
 
 A Python tool for converting audio files to Tonie box compatible format (TAF - Tonie Audio Format).
 
+# Beginners Guide
+- [HOWTO](HOWTO.md)
 
 ## Table of Contents
 

{tonietoolbox-0.1.0 → tonietoolbox-0.1.3}/TonieToolbox/__init__.py

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

{tonietoolbox-0.1.0 → tonietoolbox-0.1.3}/TonieToolbox/__main__.py

@@ -71,17 +71,17 @@ def main():
 
     ffmpeg_binary = args.ffmpeg
     if ffmpeg_binary is None:
-        ffmpeg_binary = get_ffmpeg_binary()
+        ffmpeg_binary = get_ffmpeg_binary(args.auto_download)
         if ffmpeg_binary is None:
-            logger.error("Could not find FFmpeg. Please install FFmpeg or specify its location using --ffmpeg")
+            logger.error("Could not find FFmpeg. Please install FFmpeg or specify its location using --ffmpeg or use --auto-download")
             sys.exit(1)
         logger.debug("Using FFmpeg binary: %s", ffmpeg_binary)
 
     opus_binary = args.opusenc
     if opus_binary is None:
-        opus_binary = get_opus_binary() 
+        opus_binary = get_opus_binary(args.auto_download) 
         if opus_binary is None:
-            logger.error("Could not find opusenc. Please install opus-tools or specify its location using --opusenc")
+            logger.error("Could not find opusenc. Please install opus-tools or specify its location using --opusenc or use --auto-download")
             sys.exit(1)
         logger.debug("Using opusenc binary: %s", opus_binary)
 
@@ -123,7 +123,7 @@ def main():
         logger.debug("Using default output location: %s", out_filename)
 
     if args.append_tonie_tag:
-        # Validate that the value is an 8-character hex value
+        logger.debug("Appending Tonie tag to output filename")
         hex_tag = args.append_tonie_tag
         logger.debug("Validating tag: %s", hex_tag)
         if not all(c in '0123456789abcdefABCDEF' for c in hex_tag) or len(hex_tag) != 8:
@@ -137,7 +137,7 @@ 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.bitrate, not args.cbr, ffmpeg_binary, opus_binary, args.keep_temp, args.auto_download)
     logger.info("Successfully created Tonie file: %s", out_filename)
 
 

{tonietoolbox-0.1.0 → tonietoolbox-0.1.3}/TonieToolbox/audio_conversion.py

@@ -12,7 +12,7 @@ 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):
+def get_opus_tempfile(ffmpeg_binary=None, opus_binary=None, filename=None, bitrate=48, vbr=True, keep_temp=False, auto_download=False):
     """
     Convert an audio file to Opus format and return a temporary file handle.
     
@@ -23,6 +23,7 @@ def get_opus_tempfile(ffmpeg_binary=None, opus_binary=None, filename=None, bitra
         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
         
     Returns:
         tuple: (file handle, temp_file_path) or (file handle, None) if keep_temp is False
@@ -31,18 +32,18 @@ def get_opus_tempfile(ffmpeg_binary=None, opus_binary=None, filename=None, bitra
     
     if ffmpeg_binary is None:
         logger.debug("FFmpeg not specified, attempting to auto-detect")
-        ffmpeg_binary = get_ffmpeg_binary()
+        ffmpeg_binary = get_ffmpeg_binary(auto_download)
         if ffmpeg_binary is None:
-            logger.error("Could not find or download FFmpeg binary")
-            raise RuntimeError("Could not find or download FFmpeg binary")
+            logger.error("Could not find FFmpeg binary. Use --auto-download to enable automatic installation")
+            raise RuntimeError("Could not find FFmpeg binary. Use --auto-download to enable automatic installation")
         logger.debug("Found FFmpeg at: %s", ffmpeg_binary)
     
     if opus_binary is None:
         logger.debug("Opusenc not specified, attempting to auto-detect")
-        opus_binary = get_opus_binary()
+        opus_binary = get_opus_binary(auto_download)
         if opus_binary is None:
-            logger.error("Could not find or download Opus binary")
-            raise RuntimeError("Could not find or download Opus binary")
+            logger.error("Could not find Opus binary. Use --auto-download to enable automatic installation")
+            raise RuntimeError("Could not find Opus binary. Use --auto-download to enable automatic installation")
         logger.debug("Found opusenc at: %s", opus_binary)
     
     vbr_parameter = "--vbr" if vbr else "--hard-cbr"

{tonietoolbox-0.1.0 → tonietoolbox-0.1.3}/TonieToolbox/constants.py

@@ -6,6 +6,7 @@ ONLY_CONVERT_FRAMEPACKING = -1
 OTHER_PACKET_NEEDED = -2
 DO_NOTHING = -3
 TOO_MANY_SEGMENTS = -4
+TIMESTAMP_DEDUCT = 0x50000000
 OPUS_TAGS = [
     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\x30"),

{tonietoolbox-0.1.0 → tonietoolbox-0.1.3}/TonieToolbox/dependency_manager.py

@@ -21,12 +21,12 @@ logger = get_logger('dependency_manager')
 DEPENDENCIES = {
     'ffmpeg': {
         'windows': {
-            'url': 'https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-win64-gpl-shared.zip',
+            'url': 'https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-win64-gpl.zip',
             'bin_path': 'bin/ffmpeg.exe',
             'extract_dir': 'ffmpeg'
         },
         'linux': {
-            'url': 'https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linux64-gpl-shared.tar.xz',
+            'url': 'https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linux64-gpl.tar.xz',
             'bin_path': 'ffmpeg',
             'extract_dir': 'ffmpeg'
         },
@@ -280,12 +280,13 @@ def install_package(package_name):
         logger.error("Failed to install %s: %s", package_name, e)
         return False
 
-def ensure_dependency(dependency_name):
+def ensure_dependency(dependency_name, auto_download=False):
     """
     Ensure that a dependency is available, downloading it if necessary.
     
     Args:
         dependency_name (str): Name of the dependency ('ffmpeg' or 'opusenc')
+        auto_download (bool): Whether to automatically download or install the dependency if not found
         
     Returns:
         str: Path to the binary if available, None otherwise
@@ -308,6 +309,11 @@ def ensure_dependency(dependency_name):
         logger.info("Found %s in PATH: %s", dependency_name, path_binary)
         return path_binary
     
+    # If auto_download is not enabled, don't try to install or download
+    if not auto_download:
+        logger.warning("%s not found in PATH and auto-download is disabled. Use --auto-download to enable automatic installation.", dependency_name)
+        return None
+        
     # If not in PATH, check if we should install via package manager
     if 'package' in DEPENDENCIES[dependency_name].get(system, {}):
         package_name = DEPENDENCIES[dependency_name][system]['package']
@@ -359,20 +365,26 @@ def ensure_dependency(dependency_name):
     logger.error("Failed to set up %s", dependency_name)
     return None
 
-def get_ffmpeg_binary():
+def get_ffmpeg_binary(auto_download=False):
     """
     Get the path to the FFmpeg binary, downloading it if necessary.
     
+    Args:
+        auto_download (bool): Whether to automatically download or install if not found
+    
     Returns:
         str: Path to the FFmpeg binary if available, None otherwise
     """
-    return ensure_dependency('ffmpeg')
+    return ensure_dependency('ffmpeg', auto_download)
 
-def get_opus_binary():
+def get_opus_binary(auto_download=False):
     """
     Get the path to the opusenc binary, downloading it if necessary.
     
+    Args:
+        auto_download (bool): Whether to automatically download or install if not found
+    
     Returns:
         str: Path to the opusenc binary if available, None otherwise
     """
-    return ensure_dependency('opusenc')
+    return ensure_dependency('opusenc', auto_download)

{tonietoolbox-0.1.0 → tonietoolbox-0.1.3}/TonieToolbox/tonie_file.py

@@ -12,7 +12,7 @@ import os
 from  . import tonie_header_pb2
 from .opus_packet import OpusPacket
 from .ogg_page import OggPage
-from .constants import OPUS_TAGS, SAMPLE_RATE_KHZ
+from .constants import OPUS_TAGS, SAMPLE_RATE_KHZ, TIMESTAMP_DEDUCT
 from .logger import get_logger
 
 # Setup logging
@@ -277,7 +277,7 @@ 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):
+                     bitrate=96, vbr=True, ffmpeg_binary=None, opus_binary=None, keep_temp=False, auto_download=False):
     """
     Create a Tonie file from input files.
     
@@ -291,6 +291,7 @@ def create_tonie_file(output_file, input_files, no_tonie_header=False, user_time
         ffmpeg_binary: Path to ffmpeg binary
         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
     """
     from .audio_conversion import get_opus_tempfile
     
@@ -330,8 +331,8 @@ def create_tonie_file(output_file, input_files, no_tonie_header=False, user_time
                     timestamp = int(time.time())
                     logger.debug("Falling back to current timestamp: %d", timestamp)
         else:
-            timestamp = int(time.time())
-            logger.debug("Using current timestamp: %d", timestamp)
+            timestamp = int(time.time()-TIMESTAMP_DEDUCT)
+            logger.debug("Using current timestamp - 0x50000000: %d", timestamp)
 
         sha1 = hashlib.sha1()
 
@@ -360,7 +361,7 @@ def create_tonie_file(output_file, input_files, no_tonie_header=False, user_time
             else:
                 logger.debug("Converting %s to Opus format (bitrate: %d kbps, VBR: %s)", 
                             fname, bitrate, vbr)
-                handle, temp_file_path = get_opus_tempfile(ffmpeg_binary, opus_binary, fname, bitrate, vbr, keep_temp)
+                handle, temp_file_path = get_opus_tempfile(ffmpeg_binary, opus_binary, fname, bitrate, vbr, keep_temp, auto_download)
                 if temp_file_path:
                     temp_files.append(temp_file_path)
                     logger.debug("Temporary opus file saved to: %s", temp_file_path)

{tonietoolbox-0.1.0 → tonietoolbox-0.1.3/TonieToolbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TonieToolbox
-Version: 0.1.0
+Version: 0.1.3
 Summary: Convert audio files to Tonie box compatible format
 Home-page: https://github.com/Quentendo64/TonieToolbox
 Author: Quentendo64
@@ -31,6 +31,8 @@ Happy Testing :-P
 
 A Python tool for converting audio files to Tonie box compatible format (TAF - Tonie Audio Format).
 
+# Beginners Guide
+- [HOWTO](HOWTO.md)
 
 ## Table of Contents