TonieToolbox 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

TonieToolbox/__init__.py

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

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/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/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/tonie_file.py

@@ -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
     
@@ -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.dist-info → tonietoolbox-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TonieToolbox
-Version: 0.1.0
+Version: 0.1.2
 Summary: Convert audio files to Tonie box compatible format
 Home-page: https://github.com/Quentendo64/TonieToolbox
 Author: Quentendo64

{tonietoolbox-0.1.0.dist-info → tonietoolbox-0.1.2.dist-info}/RECORD

@@ -1,19 +1,19 @@
-TonieToolbox/__init__.py,sha256=4GrSzQXn-JcheFR01mD-meQl4SSYK9OajTU8wImEFKQ,96
-TonieToolbox/__main__.py,sha256=88bs0yCm9Sue7AXIHC37vCDF19fUZGroL_6635P-_Io,7011
-TonieToolbox/audio_conversion.py,sha256=Vw6hFbYZYdt1A9zPlRfQNX7sI1iI-bo0xJM7EEnjDP4,7700
+TonieToolbox/__init__.py,sha256=xSV74aYOPiJ2fmGLawFvZ4AXq9TmJg4XV_ttHul3Rcw,96
+TonieToolbox/__main__.py,sha256=qOWIB6JQyEBXyFBEIYbqNtXgFFRrUoHQVnBWiX-pEfw,7114
+TonieToolbox/audio_conversion.py,sha256=10PayO1VQDGee2bcO6JD8zRSFoJRJhO2pBeba5k15vk,7998
 TonieToolbox/constants.py,sha256=vjSJTX9TDWV9W7rXERd6W0HO5UyiVFYYlCKAf0nwxJM,1991
-TonieToolbox/dependency_manager.py,sha256=ZHUhXWnOrRjFq0sI1RKfrg7tMIL3BCsHNmERuZ5ZZqM,14368
+TonieToolbox/dependency_manager.py,sha256=sr7PMBsqQ26bYszM-7Ay-UbKPuBJGyeJV3y1BPAOiBQ,15028
 TonieToolbox/filename_generator.py,sha256=RqQHyGTKakuWR01yMSnFVMU_HfLw3rqFxKhXNIHdTlg,3441
 TonieToolbox/logger.py,sha256=Up9fBVkOZwkY61_645bX4tienCpyVSkap-FeTV0v730,1441
 TonieToolbox/ogg_page.py,sha256=-ViaIRBgh5ayfwmyplL8QmmRr5P36X8W0DdHkSFUYUU,21948
 TonieToolbox/opus_packet.py,sha256=OcHXEe3I_K4mWPUD55prpG42sZxJsEeAxqSbFxBmb0c,7895
 TonieToolbox/tonie_analysis.py,sha256=4eOzxHL_g0TJFhuexNHcZXivxZ7eb5xfb9-efUZ02W0,20344
-TonieToolbox/tonie_file.py,sha256=dbtNGFNGxu_sfJl2due3Kz5VNJqnUqDC2A6r_WCxxJI,15127
+TonieToolbox/tonie_file.py,sha256=Zy95SJi5xwpOTWC5fyaGv1Xfuq1mKC5U89m7wvNsfEk,15246
 TonieToolbox/tonie_header.proto,sha256=WaWfwO4VrwGtscK2ujfDRKtpeBpaVPoZhI8iMmR-C0U,202
 TonieToolbox/tonie_header_pb2.py,sha256=s5bp4ULTEekgq6T61z9fDkRavyPM-3eREs20f_Pxxe8,3665
-tonietoolbox-0.1.0.dist-info/licenses/LICENSE.md,sha256=rGoga9ZAgNco9fBapVFpWf6ri7HOBp1KRnt1uIruXMk,35190
-tonietoolbox-0.1.0.dist-info/METADATA,sha256=I797RNgbCkKAM2iYK4ty3GP4Mmsl-Pic4AKw3NMCAtQ,8933
-tonietoolbox-0.1.0.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-tonietoolbox-0.1.0.dist-info/entry_points.txt,sha256=oqpeyBxel7aScg35Xr4gZKnf486S5KW9okqeBwyJxxc,60
-tonietoolbox-0.1.0.dist-info/top_level.txt,sha256=Wkkm-2p7I3ENfS7ZbYtYUB2g-xwHrXVlERHfonsOPuE,13
-tonietoolbox-0.1.0.dist-info/RECORD,,
+tonietoolbox-0.1.2.dist-info/licenses/LICENSE.md,sha256=rGoga9ZAgNco9fBapVFpWf6ri7HOBp1KRnt1uIruXMk,35190
+tonietoolbox-0.1.2.dist-info/METADATA,sha256=IEvOyo9te58KL5Pxkp9iNTjf3jItjKj6YDbFDh7A0kk,8933
+tonietoolbox-0.1.2.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+tonietoolbox-0.1.2.dist-info/entry_points.txt,sha256=oqpeyBxel7aScg35Xr4gZKnf486S5KW9okqeBwyJxxc,60
+tonietoolbox-0.1.2.dist-info/top_level.txt,sha256=Wkkm-2p7I3ENfS7ZbYtYUB2g-xwHrXVlERHfonsOPuE,13
+tonietoolbox-0.1.2.dist-info/RECORD,,