TonieToolbox 0.1.6__tar.gz → 0.1.7__tar.gz

{tonietoolbox-0.1.6/TonieToolbox.egg-info → tonietoolbox-0.1.7}/PKG-INFO

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

{tonietoolbox-0.1.6 → tonietoolbox-0.1.7}/TonieToolbox/__init__.py

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

{tonietoolbox-0.1.6 → tonietoolbox-0.1.7}/TonieToolbox/__main__.py

@@ -89,10 +89,13 @@ def main():
     # Check for updates
     if not args.skip_update_check:
         logger.debug("Checking for updates (force_refresh=%s)", args.force_refresh_cache)
-        check_for_updates(
+        is_latest, latest_version, message, update_confirmed = check_for_updates(
             quiet=args.silent or args.quiet,
             force_refresh=args.force_refresh_cache
         )
+        
+        if not is_latest and not update_confirmed and not (args.silent or args.quiet):
+            logger.info("Update available but user chose to continue without updating.")
 
     ffmpeg_binary = args.ffmpeg
     if ffmpeg_binary is None:

{tonietoolbox-0.1.6 → tonietoolbox-0.1.7}/TonieToolbox/dependency_manager.py

@@ -309,14 +309,65 @@ def ensure_dependency(dependency_name, auto_download=False):
         logger.info("Found %s in PATH: %s", dependency_name, path_binary)
         return path_binary
     
+    # Set up paths to check for previously downloaded versions
+    user_data_dir = get_user_data_dir()
+    dependency_info = DEPENDENCIES[dependency_name].get(system, {})
+    extract_dir_name = dependency_info.get('extract_dir', dependency_name)
+    binary_path = dependency_info.get('bin_path', bin_name)
+    extract_dir = os.path.join(user_data_dir, extract_dir_name)
+    
+    # Check if we already downloaded and extracted it previously
+    logger.debug("Checking for previously downloaded %s in %s", dependency_name, extract_dir)
+    if os.path.exists(extract_dir):
+        existing_binary = find_binary_in_extracted_dir(extract_dir, binary_path)
+        if existing_binary and os.path.exists(existing_binary):
+            # Verify that the binary works
+            logger.info("Found previously downloaded %s: %s", dependency_name, existing_binary)
+            try:
+                if os.access(existing_binary, os.X_OK) or system == 'windows':
+                    if system in ['linux', 'darwin']:
+                        logger.debug("Ensuring executable permissions on %s", existing_binary)
+                        os.chmod(existing_binary, 0o755)
+                    
+                    # Quick check to verify binary works
+                    if dependency_name == 'opusenc':
+                        cmd = [existing_binary, '--version']
+                        try:
+                            result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=5)
+                            if result.returncode == 0:
+                                logger.info("Using previously downloaded %s: %s", dependency_name, existing_binary)
+                                return existing_binary
+                        except:
+                            # If --version fails, try without arguments
+                            try:
+                                result = subprocess.run([existing_binary], stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=5)
+                                if result.returncode == 0:
+                                    logger.info("Using previously downloaded %s: %s", dependency_name, existing_binary)
+                                    return existing_binary
+                            except:
+                                pass
+                    else:
+                        cmd = [existing_binary, '-version']
+                        try:
+                            result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=5)
+                            if result.returncode == 0:
+                                logger.info("Using previously downloaded %s: %s", dependency_name, existing_binary)
+                                return existing_binary
+                        except:
+                            pass
+                            
+                    logger.warning("Previously downloaded %s exists but failed verification", dependency_name)
+            except Exception as e:
+                logger.warning("Error verifying downloaded binary: %s", e)
+    
     # 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']
+    if 'package' in dependency_info:
+        package_name = dependency_info['package']
         logger.info("%s not found. Attempting to install %s package...", dependency_name, package_name)
         if install_package(package_name):
             path_binary = check_binary_in_path(bin_name)
@@ -325,27 +376,14 @@ def ensure_dependency(dependency_name, auto_download=False):
                 return path_binary
     
     # If not installable via package manager or installation failed, try downloading
-    if 'url' not in DEPENDENCIES[dependency_name].get(system, {}):
+    if 'url' not in dependency_info:
         logger.error("Cannot download %s for %s", dependency_name, system)
         return None
     
-    # Set up paths
-    user_data_dir = get_user_data_dir()
-    dependency_info = DEPENDENCIES[dependency_name][system]
+    # Set up download paths
     download_url = dependency_info['url']
-    extract_dir_name = dependency_info['extract_dir']
-    binary_path = dependency_info['bin_path']
-    
-    extract_dir = os.path.join(user_data_dir, extract_dir_name)
-    logger.debug("Using extract directory: %s", extract_dir)
     os.makedirs(extract_dir, exist_ok=True)
     
-    # Check if we already downloaded and extracted it
-    existing_binary = find_binary_in_extracted_dir(extract_dir, binary_path)
-    if existing_binary and os.path.exists(existing_binary):
-        logger.info("Using existing %s: %s", dependency_name, existing_binary)
-        return existing_binary
-    
     # Download and extract
     archive_ext = '.zip' if download_url.endswith('zip') else '.tar.xz'
     archive_path = os.path.join(user_data_dir, f"{dependency_name}{archive_ext}")

{tonietoolbox-0.1.6 → tonietoolbox-0.1.7}/TonieToolbox/version_handler.py

@@ -134,24 +134,27 @@ def check_for_updates(quiet=False, force_refresh=False):
     Check if the current version of TonieToolbox is the latest.
     
     Args:
-        quiet: If True, will not log any information messages
+        quiet: If True, will not log any information messages and skip user confirmation
         force_refresh: If True, bypass cache and check PyPI directly
         
     Returns:
-        tuple: (is_latest, latest_version, message)
+        tuple: (is_latest, latest_version, message, update_confirmed)
             is_latest: boolean indicating if the current version is the latest
             latest_version: string with the latest version
             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
     
-    logger.debug("Starting update check (quiet=%s, force_refresh=%s)", quiet, force_refresh)
+    logger.debug("Starting update check (quiet=%s, force_refresh=%s)", 
+                quiet, force_refresh)
     latest_version, error = get_pypi_version(force_refresh)
     
     if error:
         logger.debug("Error occurred during update check: %s", error)
-        return True, current_version, error
+        return True, current_version, error, update_confirmed
         
     compare_result = compare_versions(current_version, latest_version)
     is_latest = compare_result >= 0  # current >= latest
@@ -166,9 +169,69 @@ def check_for_updates(quiet=False, force_refresh=False):
         message = f"Update available! Current version: {current_version}, Latest version: {latest_version}"
         if not quiet:
             logger.info(message)
-            logger.info("Consider upgrading with: pip install --upgrade TonieToolbox")
+            
+            # Show confirmation prompt if not in quiet mode
+            try:
+                response = input(f"Do you want to upgrade to TonieToolbox {latest_version}? [y/N]: ").lower().strip()
+                update_confirmed = response == 'y' or response == 'yes'
+                
+                if update_confirmed:
+                    logger.info("Update confirmed. Attempting to install update...")
+                    if install_update():
+                        logger.info(f"Successfully updated to TonieToolbox {latest_version}")
+                        import sys
+                        logger.info("Exiting program. Please restart TonieToolbox to use the new version.")
+                        sys.exit(0)
+                    else:
+                        logger.error("Failed to install update automatically")
+                        logger.error("Please update manually using: pip install --upgrade TonieToolbox")
+                        import sys
+                        sys.exit(1)
+                else:
+                    logger.info("Update skipped by user.")
+            except (EOFError, KeyboardInterrupt):
+                logger.debug("User input interrupted")
+                update_confirmed = False
+    
+    return is_latest, latest_version, message, update_confirmed
+
+
+def install_update():
+    """
+    Try to install the update using pip, pip3, or pipx.
+    
+    Returns:
+        bool: True if the update was successfully installed, False otherwise
+    """
+    logger = get_logger("version_handler")
+    import subprocess
+    import sys
+    
+    package_name = "TonieToolbox"
+    commands = [
+        [sys.executable, "-m", "pip", "install", "--upgrade", package_name],
+        ["pip", "install", "--upgrade", package_name],
+        ["pip3", "install", "--upgrade", package_name],
+        ["pipx", "upgrade", package_name]
+    ]
+    
+    for cmd in commands:
+        try:
+            logger.info(f"Attempting to install update using: {' '.join(cmd)}")
+            result = subprocess.run(cmd, capture_output=True, text=True, check=False)
+            
+            if result.returncode == 0:
+                logger.debug("Update command succeeded")
+                logger.debug(f"Output: {result.stdout}")
+                return True
+            else:
+                logger.debug(f"Command failed with returncode {result.returncode}")
+                logger.debug(f"stdout: {result.stdout}")
+                logger.debug(f"stderr: {result.stderr}")
+        except Exception as e:
+            logger.debug(f"Exception while running {cmd[0]}: {str(e)}")
     
-    return is_latest, latest_version, message
+    return False
 
 
 def clear_version_cache():

{tonietoolbox-0.1.6 → tonietoolbox-0.1.7/TonieToolbox.egg-info}/PKG-INFO

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