diff --git a/core/downloader.py b/core/downloader.py index bc4f168..76fde48 100644 --- a/core/downloader.py +++ b/core/downloader.py @@ -213,9 +213,9 @@ def download_file( if "civitai.com" in url else "URL" ) - print(f"\n[Model Resolver] Starting download: {filename}") - print(f"[Model Resolver] Source: {source}") - print(f"[Model Resolver] URL: {url}") + log_info(f"Starting download: {filename}") + log_info(f"Source: {source}") + log_info(f"URL: {url}") # Start download response = requests.get(url, headers=headers, stream=True, timeout=30) @@ -224,7 +224,7 @@ def download_file( # Get total size total_size = int(response.headers.get("content-length", 0)) total_size_str = format_bytes(total_size) if total_size > 0 else "unknown" - print(f"[Model Resolver] Size: {total_size_str}") + log_info(f"Size: {total_size_str}") with download_lock: download_progress[download_id]["total_size"] = total_size @@ -291,8 +291,8 @@ def download_file( format_bytes(total_size) if total_size > 0 else "?" ) speed_str = format_bytes(int(smoothed_speed)) + "/s" - print( - f"[Model Resolver] Progress: {downloaded_str} / {total_str} ({progress_pct}%) - {speed_str}" + log_info( + f"Progress: {downloaded_str} / {total_str} ({progress_pct}%) - {speed_str}" ) else: # Just update downloaded bytes without recalculating speed @@ -315,22 +315,18 @@ def download_file( try: if os.path.exists(dest_path): os.remove(dest_path) - print( - f"[Model Resolver] Cancelled: {filename} - incomplete file deleted" - ) + log_info(f"Cancelled: {filename} - incomplete file deleted") else: - print(f"[Model Resolver] Cancelled: {filename} - no file to delete") + log_info(f"Cancelled: {filename} - no file to delete") except Exception as e: - print( - f"[Model Resolver] Warning: Could not delete incomplete file {dest_path}: {e}" - ) + log_warn(f"Could not delete incomplete file {dest_path}: {e}") # Try harder on Windows - sometimes the file handle takes a moment to release try: time.sleep(0.5) # time is already imported at module level if os.path.exists(dest_path): os.remove(dest_path) - print( - f"[Model Resolver] Cancelled: {filename} - incomplete file deleted (delayed)" + log_info( + f"Cancelled: {filename} - incomplete file deleted (delayed)" ) except Exception: pass @@ -350,9 +346,9 @@ def download_file( # CLI completion log elapsed = time.time() - start_time avg_speed = downloaded / elapsed if elapsed > 0 else 0 - print(f"[Model Resolver] ✓ Download complete: {filename}") - print( - f"[Model Resolver] Size: {format_bytes(downloaded)}, Time: {elapsed:.1f}s, Avg speed: {format_bytes(int(avg_speed))}/s" + log_info(f"✓ Download complete: {filename}") + log_info( + f"Size: {format_bytes(downloaded)}, Time: {elapsed:.1f}s, Avg speed: {format_bytes(int(avg_speed))}/s" ) except requests.exceptions.RequestException as e: @@ -378,8 +374,8 @@ def download_file( result["error"] = error_msg # CLI error log - print(f"[Model Resolver] ✗ Download failed: {os.path.basename(dest_path)}") - print(f"[Model Resolver] Error: {error_msg}") + log_error(f"✗ Download failed: {os.path.basename(dest_path)}") + log_error(f"Error: {error_msg}") # Clean up partial file try: @@ -396,8 +392,8 @@ def download_file( result["error"] = error_msg # CLI error log - print(f"[Model Resolver] ✗ Download failed: {os.path.basename(dest_path)}") - print(f"[Model Resolver] Error: {error_msg}") + log_error(f"✗ Download failed: {os.path.basename(dest_path)}") + log_error(f"Error: {error_msg}") log_error(f"Download error: {e}", exc_info=True) return result