79ebb0b0bd
- Removed invalid 'pip-requirements' line from requirements.txt that was causing pip errors - Added config validation before bot restart to prevent startup failures - Check for essential environment variables (API_ID, API_HASH, SESSION) in .env or config.py - Prevent restart attempts when configuration is incomplete - Enhanced error logging with specific config issues - Update script now validates environment before attempting restart
259 lines
9.4 KiB
Python
259 lines
9.4 KiB
Python
#!/usr/bin/env python3
|
|
"""
|
|
Ultroid Update Script - Improved Version
|
|
This script handles updating the bot while it's not running using a robust approach.
|
|
"""
|
|
|
|
import os
|
|
import sys
|
|
import subprocess
|
|
import time
|
|
from pathlib import Path
|
|
|
|
def run_command(cmd, shell=True):
|
|
"""Run a command and return success status."""
|
|
try:
|
|
result = subprocess.run(cmd, shell=shell, capture_output=True, text=True)
|
|
print(f"Command: {cmd}")
|
|
if result.stdout.strip():
|
|
print(f"Output: {result.stdout}")
|
|
if result.stderr.strip():
|
|
print(f"Error: {result.stderr}")
|
|
return result.returncode == 0
|
|
except Exception as e:
|
|
print(f"Error running command '{cmd}': {e}")
|
|
return False
|
|
|
|
def backup_important_files():
|
|
"""Backup important configuration files."""
|
|
important_files = [
|
|
"config.py",
|
|
".env",
|
|
"resources/session/ultroid.session",
|
|
"resources/session/ultroid.session-journal"
|
|
]
|
|
|
|
backed_up = []
|
|
for file in important_files:
|
|
if os.path.exists(file):
|
|
backup_name = f"{file}.backup"
|
|
if run_command(f'cp "{file}" "{backup_name}"'):
|
|
backed_up.append((file, backup_name))
|
|
print(f"✅ Backed up {file}")
|
|
|
|
return backed_up
|
|
|
|
def restore_important_files(backed_up):
|
|
"""Restore important configuration files."""
|
|
for original, backup in backed_up:
|
|
if os.path.exists(backup):
|
|
if run_command(f'cp "{backup}" "{original}"'):
|
|
print(f"✅ Restored {original}")
|
|
run_command(f'rm "{backup}"')
|
|
|
|
def clean_repository():
|
|
"""Clean the repository of cache files and reset to clean state."""
|
|
print("🧹 Cleaning repository...")
|
|
|
|
# Remove Python cache files (Linux/Ubuntu commands)
|
|
run_command('find . -name "*.pyc" -delete')
|
|
run_command('find . -name "__pycache__" -type d -exec rm -rf {} + 2>/dev/null || true')
|
|
|
|
# Reset all tracked files to their HEAD state
|
|
run_command("git reset --hard HEAD")
|
|
|
|
# Clean untracked files (but preserve update script and important files)
|
|
run_command("git clean -fd -e update_script*.py -e config.py -e .env -e resources/session/")
|
|
|
|
def main():
|
|
"""Main update function."""
|
|
print("🔄 Starting Ultroid update process...")
|
|
|
|
# Get script directory
|
|
script_dir = Path(__file__).parent.absolute()
|
|
os.chdir(script_dir)
|
|
|
|
print(f"📁 Working directory: {script_dir}")
|
|
|
|
# Check if we're in a git repository
|
|
if not (script_dir / ".git").exists():
|
|
print("❌ Not a git repository. Cannot update.")
|
|
return False
|
|
|
|
# Get the repository URL from command line args or default to user's fork
|
|
repo_url = sys.argv[1] if len(sys.argv) > 1 else "https://github.com/overspend1/Ultroid-fork.git"
|
|
|
|
print(f"🔗 Using repository: {repo_url}")
|
|
|
|
# Backup important files
|
|
backed_up_files = backup_important_files()
|
|
|
|
# Set up remote
|
|
if not run_command("git remote get-url origin"):
|
|
run_command(f"git remote add origin {repo_url}")
|
|
else:
|
|
run_command(f"git remote set-url origin {repo_url}")
|
|
|
|
# Fetch latest changes
|
|
print("📥 Fetching updates from repository...")
|
|
if not run_command("git fetch origin"):
|
|
print("❌ Failed to fetch updates")
|
|
return False
|
|
|
|
# Get current branch
|
|
result = subprocess.run("git branch --show-current", shell=True, capture_output=True, text=True)
|
|
current_branch = result.stdout.strip() or "main"
|
|
|
|
print(f"🌿 Current branch: {current_branch}")
|
|
|
|
# Clean repository
|
|
clean_repository()
|
|
|
|
# Force pull updates (this will overwrite any local changes)
|
|
print("⬇️ Force pulling updates...")
|
|
if not run_command(f"git pull origin {current_branch}"):
|
|
# If pull fails, try reset to remote
|
|
print("🔄 Trying hard reset to remote...")
|
|
if not run_command(f"git reset --hard origin/{current_branch}"):
|
|
print("❌ Failed to update repository")
|
|
return False
|
|
|
|
# Restore important files
|
|
restore_important_files(backed_up_files)
|
|
|
|
# Update dependencies
|
|
print("📦 Installing/updating dependencies...")
|
|
if not run_command("pip3 install -r requirements.txt --upgrade"):
|
|
print("⚠️ Warning: Failed to update some dependencies")
|
|
|
|
# Try alternative pip command for systems that need it
|
|
run_command("pip3 install -r requirements.txt --break-system-packages --upgrade")
|
|
|
|
print("✅ Update completed successfully!")
|
|
return True
|
|
|
|
def validate_config():
|
|
"""Check if essential config is available before restart."""
|
|
config_issues = []
|
|
|
|
# Check for essential environment variables
|
|
essential_vars = ['API_ID', 'API_HASH', 'SESSION']
|
|
|
|
# Check .env file
|
|
if os.path.exists('.env'):
|
|
with open('.env', 'r') as f:
|
|
env_content = f.read()
|
|
for var in essential_vars:
|
|
if f"{var}=" not in env_content or f"{var}=" in env_content and env_content.split(f"{var}=")[1].split('\n')[0].strip() == "":
|
|
config_issues.append(f"{var} not set or empty in .env")
|
|
else:
|
|
# Check config.py
|
|
if os.path.exists('config.py'):
|
|
with open('config.py', 'r') as f:
|
|
config_content = f.read()
|
|
for var in essential_vars:
|
|
if var not in config_content:
|
|
config_issues.append(f"{var} not found in config.py")
|
|
else:
|
|
config_issues.append("No .env or config.py file found")
|
|
|
|
return config_issues
|
|
|
|
def restart_bot():
|
|
"""Restart the bot after update."""
|
|
print("🔄 Restarting Ultroid...")
|
|
|
|
# Validate configuration first
|
|
config_issues = validate_config()
|
|
if config_issues:
|
|
print("⚠️ Configuration issues detected:")
|
|
for issue in config_issues:
|
|
print(f" - {issue}")
|
|
print("❌ Cannot restart bot without proper configuration")
|
|
with open("update_restart.log", "w") as f:
|
|
f.write(f"Restart failed due to config issues at {time.strftime('%Y-%m-%d %H:%M:%S')}\n")
|
|
for issue in config_issues:
|
|
f.write(f"Config issue: {issue}\n")
|
|
f.write("Please set up your bot configuration before restart\n")
|
|
return
|
|
|
|
# Check if we have a virtual environment
|
|
venv_python = None
|
|
if os.path.exists("venv/bin/python"):
|
|
venv_python = "venv/bin/python"
|
|
elif os.path.exists("venv/Scripts/python.exe"):
|
|
venv_python = "venv/Scripts/python.exe"
|
|
|
|
# Create a restart log
|
|
with open("update_restart.log", "w") as f:
|
|
f.write(f"Update completed at {time.strftime('%Y-%m-%d %H:%M:%S')}\n")
|
|
f.write(f"Attempting restart...\n")
|
|
|
|
# Determine how to start the bot
|
|
try:
|
|
if len(sys.argv) > 1 and sys.argv[-1] == "main.py":
|
|
# Started with main.py
|
|
if venv_python:
|
|
print(f"🚀 Restarting with: {venv_python} main.py")
|
|
os.execv(venv_python, [venv_python, "main.py"])
|
|
else:
|
|
print(f"🚀 Restarting with: {sys.executable} main.py")
|
|
os.execv(sys.executable, [sys.executable, "main.py"])
|
|
else:
|
|
# Started as module
|
|
if venv_python:
|
|
print(f"🚀 Restarting with: {venv_python} -m pyUltroid")
|
|
os.execv(venv_python, [venv_python, "-m", "pyUltroid"])
|
|
else:
|
|
print(f"🚀 Restarting with: {sys.executable} -m pyUltroid")
|
|
os.execv(sys.executable, [sys.executable, "-m", "pyUltroid"])
|
|
except Exception as e:
|
|
print(f"❌ Failed to restart bot: {e}")
|
|
with open("update_restart.log", "a") as f:
|
|
f.write(f"Restart failed: {e}\n")
|
|
|
|
# Try alternative restart methods
|
|
print("🔄 Trying alternative restart method...")
|
|
try:
|
|
if venv_python:
|
|
subprocess.Popen([venv_python, "-m", "pyUltroid"])
|
|
else:
|
|
subprocess.Popen([sys.executable, "-m", "pyUltroid"])
|
|
print("✅ Bot restart initiated with subprocess")
|
|
except Exception as e2:
|
|
print(f"❌ Alternative restart also failed: {e2}")
|
|
with open("update_restart.log", "a") as f:
|
|
f.write(f"Alternative restart failed: {e2}\n")
|
|
f.write("Please manually restart the bot\n")
|
|
|
|
if __name__ == "__main__":
|
|
print("🚀 Ultroid Update Script - Ubuntu/Linux Version")
|
|
print("=" * 50)
|
|
|
|
# Create update log
|
|
log_file = "update_process.log"
|
|
with open(log_file, "w") as f:
|
|
f.write(f"Update started at {time.strftime('%Y-%m-%d %H:%M:%S')}\n")
|
|
|
|
# Wait a moment for the bot to fully shutdown
|
|
print("⏳ Waiting for bot shutdown...")
|
|
time.sleep(3)
|
|
|
|
# Perform update
|
|
try:
|
|
if main():
|
|
print("=" * 50)
|
|
with open(log_file, "a") as f:
|
|
f.write(f"Update successful at {time.strftime('%Y-%m-%d %H:%M:%S')}\n")
|
|
restart_bot()
|
|
else:
|
|
print("❌ Update failed. Please check the errors above.")
|
|
with open(log_file, "a") as f:
|
|
f.write(f"Update failed at {time.strftime('%Y-%m-%d %H:%M:%S')}\n")
|
|
sys.exit(1)
|
|
except Exception as e:
|
|
print(f"❌ Critical error during update: {e}")
|
|
with open(log_file, "a") as f:
|
|
f.write(f"Critical error: {e}\n")
|
|
sys.exit(1)
|