feat: update version and dependencies in setup.py; add privilege management and process handling modules
- Updated version from 2026.05.31 to 2026.06.11 in setup.py - Replaced 'textual' with 'rich' in install_requires - Added privilege.py for managing sudo privileges with a keep-alive mechanism - Introduced process.py for handling subprocesses with enhanced control and output streaming - Created ui.py for unified console interactions and user prompts
This commit is contained in:
Даниил Грабарь
+104
-210
@@ -4,110 +4,82 @@ import argparse
|
||||
import shutil
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
from typing import Callable
|
||||
|
||||
from textual.app import App
|
||||
|
||||
from cobot.tui import SCREEN_CSS, LogScreen, PickScreen
|
||||
from cobot import ui
|
||||
from cobot import privilege
|
||||
from cobot.ui import done
|
||||
from cobot.process import StepProgress
|
||||
|
||||
_PROJECT_DIR = Path(__file__).parent.parent.parent
|
||||
|
||||
Log = Callable[[str], None]
|
||||
|
||||
# Stop and remove all Docker containers whose name contains "lwc".
|
||||
# Останавливаем и удаляем все Docker-контейнеры, чьё имя содержит "lwc".
|
||||
def _stop_docker_containers(write) -> None:
|
||||
|
||||
def _stop_docker_containers(log: Log) -> None:
|
||||
"""Stop and force-remove all Docker containers whose name contains "lwc".
|
||||
Останавливает и принудительно удаляет все Docker-контейнеры с "lwc" в имени.
|
||||
"""
|
||||
write("[cyan][*][/cyan] Stopping Docker containers...")
|
||||
log("[cyan]▸[/cyan] Остановка Docker-контейнеров...")
|
||||
result = subprocess.run(
|
||||
["docker", "ps", "-a", "--filter", "name=lwc", "--format", "{{.Names}}"],
|
||||
capture_output=True, text=True,
|
||||
)
|
||||
containers = [c for c in result.stdout.strip().splitlines() if c]
|
||||
if not containers:
|
||||
write("[dim]No project containers found.[/dim]")
|
||||
log("[dim]Контейнеры проекта не найдены.[/dim]")
|
||||
return
|
||||
for name in containers:
|
||||
subprocess.run(["docker", "rm", "-f", name], capture_output=True)
|
||||
write(f"[green][ok][/green] Removed container: {name}")
|
||||
log(f"[green]✓[/green] Удалён контейнер: {name}")
|
||||
|
||||
|
||||
# Remove all Docker images whose repository or tag contains "lwc".
|
||||
# Удаляем все Docker-образы, репозиторий или тег которых содержит "lwc".
|
||||
def _remove_docker_images(write) -> None:
|
||||
def _remove_docker_images(log: Log) -> None:
|
||||
"""Force-remove all local Docker images whose name or tag contains "lwc".
|
||||
Принудительно удаляет все локальные Docker-образы с "lwc" в имени или теге.
|
||||
"""
|
||||
write("[cyan][*][/cyan] Removing Docker images...")
|
||||
log("[cyan]▸[/cyan] Удаление Docker-образов...")
|
||||
result = subprocess.run(
|
||||
["docker", "images", "--format", "{{.Repository}}:{{.Tag}}"],
|
||||
capture_output=True, text=True,
|
||||
)
|
||||
project_images = [
|
||||
img for img in result.stdout.strip().splitlines()
|
||||
if "lwc" in img.lower()
|
||||
]
|
||||
project_images = [img for img in result.stdout.strip().splitlines() if "lwc" in img.lower()]
|
||||
if not project_images:
|
||||
write("[dim]No project images found.[/dim]")
|
||||
log("[dim]Образы проекта не найдены.[/dim]")
|
||||
return
|
||||
for img in project_images:
|
||||
subprocess.run(["docker", "rmi", "-f", img], capture_output=True)
|
||||
write(f"[green][ok][/green] Removed image: {img}")
|
||||
log(f"[green]✓[/green] Удалён образ: {img}")
|
||||
|
||||
|
||||
# Remove the Docker volume that stores the Webots asset cache.
|
||||
# Удаляем Docker volume с кэшем ассетов Webots.
|
||||
def _remove_webots_volume(write) -> None:
|
||||
"""Remove the lwc-webots-cache Docker volume if it exists. Skips silently if absent.
|
||||
Удаляет Docker volume lwc-webots-cache если он существует. Молча пропускает если отсутствует.
|
||||
def _remove_webots_volume(log: Log) -> None:
|
||||
"""Remove the lwc-webots-cache Docker volume if it exists.
|
||||
Удаляет Docker volume lwc-webots-cache если он существует.
|
||||
"""
|
||||
result = subprocess.run(
|
||||
["docker", "volume", "inspect", "lwc-webots-cache"],
|
||||
capture_output=True,
|
||||
)
|
||||
result = subprocess.run(["docker", "volume", "inspect", "lwc-webots-cache"], capture_output=True)
|
||||
if result.returncode != 0:
|
||||
write("[dim]Webots cache volume not found, skipping.[/dim]")
|
||||
log("[dim]Volume кэша Webots не найден, пропускаем.[/dim]")
|
||||
return
|
||||
subprocess.run(["docker", "volume", "rm", "lwc-webots-cache"], capture_output=True)
|
||||
write("[green][ok][/green] Removed Docker volume: lwc-webots-cache")
|
||||
log("[green]✓[/green] Удалён Docker volume: lwc-webots-cache")
|
||||
|
||||
|
||||
# Remove ROS2 Jazzy packages via apt and clean up the source line from shell configs.
|
||||
# Uses the official removal commands to also unregister the ROS2 apt repository.
|
||||
# Удаляем пакеты ROS2 Jazzy через apt и очищаем строку source из конфигов оболочки.
|
||||
# Используем официальные команды удаления, которые также снимают регистрацию apt-репозитория ROS2.
|
||||
def _remove_ros2(write) -> None:
|
||||
"""Remove all ros-jazzy-* packages, the ros2-apt-source package, and the ROS2 source
|
||||
line from .bashrc / .zshrc. Does nothing if /opt/ros/jazzy is not present.
|
||||
Удаляет все пакеты ros-jazzy-*, пакет ros2-apt-source и строку source ROS2 из
|
||||
.bashrc / .zshrc. Ничего не делает если /opt/ros/jazzy отсутствует.
|
||||
def _remove_ros2(log: Log) -> None:
|
||||
"""Remove all ros-jazzy-* packages, the ros2-apt-source, and the ROS2 source line.
|
||||
Удаляет все пакеты ros-jazzy-*, ros2-apt-source и строку source ROS2 из конфигов.
|
||||
"""
|
||||
write("[cyan][*][/cyan] Removing ROS2 Jazzy packages...")
|
||||
log("[cyan]▸[/cyan] Удаление пакетов ROS2 Jazzy...")
|
||||
if not Path("/opt/ros/jazzy").exists():
|
||||
write("[dim]ROS2 Jazzy not found, skipping.[/dim]")
|
||||
log("[dim]ROS2 Jazzy не найден, пропускаем.[/dim]")
|
||||
else:
|
||||
# Remove all ros-jazzy-* packages matched by the apt regex pattern ~n<name>.
|
||||
# Удаляем все пакеты ros-jazzy-* по regex-паттерну apt ~n<имя>.
|
||||
subprocess.run(
|
||||
["sudo", "apt", "remove", "-y", "~nros-jazzy-*"],
|
||||
capture_output=True,
|
||||
)
|
||||
subprocess.run(["sudo", "apt", "autoremove", "-y"], capture_output=True)
|
||||
write("[green][ok][/green] ROS2 Jazzy packages removed")
|
||||
subprocess.run(privilege.sudo(["apt", "remove", "-y", "~nros-jazzy-*"]), capture_output=True)
|
||||
subprocess.run(privilege.sudo(["apt", "autoremove", "-y"]), capture_output=True)
|
||||
log("[green]✓[/green] Пакеты ROS2 Jazzy удалены")
|
||||
subprocess.run(privilege.sudo(["apt", "remove", "-y", "ros2-apt-source"]), capture_output=True)
|
||||
subprocess.run(privilege.sudo(["apt", "update", "-qq"]), capture_output=True)
|
||||
subprocess.run(privilege.sudo(["apt", "autoremove", "-y"]), capture_output=True)
|
||||
log("[green]✓[/green] apt-репозиторий ROS2 удалён")
|
||||
|
||||
# Remove the ROS2 apt source package that added the repository.
|
||||
# Удаляем пакет apt-источника ROS2, который добавил репозиторий.
|
||||
subprocess.run(
|
||||
["sudo", "apt", "remove", "-y", "ros2-apt-source"],
|
||||
capture_output=True,
|
||||
)
|
||||
subprocess.run(["sudo", "apt", "update", "-qq"], capture_output=True)
|
||||
subprocess.run(["sudo", "apt", "autoremove", "-y"], capture_output=True)
|
||||
write("[green][ok][/green] ROS2 apt repository removed")
|
||||
|
||||
# Clean up the source line that local-setup added to the shell config.
|
||||
# Очищаем строку source, добавленную local-setup в конфиг оболочки.
|
||||
source_line = "source /opt/ros/jazzy/setup.bash"
|
||||
for rc_name in [".bashrc", ".zshrc"]:
|
||||
rc = Path.home() / rc_name
|
||||
@@ -116,32 +88,24 @@ def _remove_ros2(write) -> None:
|
||||
content = rc.read_text()
|
||||
if source_line not in content:
|
||||
continue
|
||||
# Remove the whole block that was added by local-setup, not just the single line.
|
||||
# Удаляем весь блок добавленный local-setup, а не только одну строку.
|
||||
new_content = content.replace(f"\n# ROS2 Jazzy\n{source_line}\n", "\n")
|
||||
new_content = new_content.replace(source_line, "")
|
||||
rc.write_text(new_content)
|
||||
write(f"[green][ok][/green] Cleaned up ~/{rc_name}")
|
||||
log(f"[green]✓[/green] Очищен ~/{rc_name}")
|
||||
|
||||
|
||||
# Remove Webots from the system via apt.
|
||||
# Удаляем Webots из системы через apt.
|
||||
def _remove_webots(write) -> None:
|
||||
"""Remove the webots package via apt, run autoremove, and clean up WEBOTS_HOME
|
||||
from .bashrc / .zshrc. Skips if webots is not found on PATH.
|
||||
Удаляет пакет webots через apt, запускает autoremove и очищает WEBOTS_HOME из
|
||||
.bashrc / .zshrc. Пропускает если webots не найден в PATH.
|
||||
def _remove_webots(log: Log) -> None:
|
||||
"""Remove the webots package and clean WEBOTS_HOME from shell configs.
|
||||
Удаляет пакет webots и очищает WEBOTS_HOME из конфигов оболочки.
|
||||
"""
|
||||
write("[cyan][*][/cyan] Removing Webots...")
|
||||
log("[cyan]▸[/cyan] Удаление Webots...")
|
||||
if not shutil.which("webots"):
|
||||
write("[dim]Webots not found, skipping.[/dim]")
|
||||
log("[dim]Webots не найден, пропускаем.[/dim]")
|
||||
return
|
||||
subprocess.run(["sudo", "apt", "remove", "-y", "webots"], capture_output=True)
|
||||
subprocess.run(["sudo", "apt", "autoremove", "-y"], capture_output=True)
|
||||
write("[green][ok][/green] Webots removed")
|
||||
subprocess.run(privilege.sudo(["apt", "remove", "-y", "webots"]), capture_output=True)
|
||||
subprocess.run(privilege.sudo(["apt", "autoremove", "-y"]), capture_output=True)
|
||||
log("[green]✓[/green] Webots удалён")
|
||||
|
||||
# Remove the WEBOTS_HOME block that install_webots.sh added to shell configs.
|
||||
# Удаляем блок WEBOTS_HOME, добавленный install_webots.sh в конфиги оболочки.
|
||||
for rc_name in [".bashrc", ".zshrc"]:
|
||||
rc = Path.home() / rc_name
|
||||
if not rc.exists():
|
||||
@@ -154,154 +118,65 @@ def _remove_webots(write) -> None:
|
||||
new_content = new_content.replace("# Webots\n", "")
|
||||
if new_content != content:
|
||||
rc.write_text(new_content)
|
||||
write(f"[green][ok][/green] Cleaned WEBOTS_HOME from ~/{rc_name}")
|
||||
log(f"[green]✓[/green] Очищен WEBOTS_HOME из ~/{rc_name}")
|
||||
|
||||
|
||||
# Uninstall the cobot CLI from the uv tool store.
|
||||
# Удаляем cobot CLI из хранилища инструментов uv.
|
||||
def _uninstall_cobot(write) -> None:
|
||||
def _uninstall_cobot(log: Log) -> None:
|
||||
"""Uninstall the lightweight-cobot package from the uv tool store.
|
||||
Удаляет пакет lightweight-cobot из хранилища инструментов uv.
|
||||
"""
|
||||
write("[cyan][*][/cyan] Uninstalling cobot CLI...")
|
||||
result = subprocess.run(
|
||||
["uv", "tool", "uninstall", "lightweight-cobot"],
|
||||
capture_output=True, text=True,
|
||||
)
|
||||
log("[cyan]▸[/cyan] Удаление cobot CLI...")
|
||||
result = subprocess.run(["uv", "tool", "uninstall", "lightweight-cobot"],
|
||||
capture_output=True, text=True)
|
||||
if result.returncode == 0:
|
||||
write("[green][ok][/green] cobot uninstalled")
|
||||
log("[green]✓[/green] cobot удалён")
|
||||
else:
|
||||
write(f"[yellow]Warning:[/yellow] {result.stderr.strip() or 'could not uninstall cobot'}")
|
||||
log(f"[yellow]Предупреждение:[/yellow] {result.stderr.strip() or 'не удалось удалить cobot'}")
|
||||
|
||||
|
||||
# Delete the entire project directory from disk.
|
||||
# Удаляем всю директорию проекта с диска.
|
||||
def _remove_project_dir(write) -> None:
|
||||
"""Recursively delete the entire project directory (_PROJECT_DIR) from disk.
|
||||
Рекурсивно удаляет всю директорию проекта (_PROJECT_DIR) с диска.
|
||||
def _remove_project_dir(log: Log) -> None:
|
||||
"""Recursively delete the entire project directory from disk.
|
||||
Рекурсивно удаляет всю директорию проекта с диска.
|
||||
"""
|
||||
write(f"[cyan][*][/cyan] Removing project directory...")
|
||||
try:
|
||||
shutil.rmtree(_PROJECT_DIR)
|
||||
write(f"[green][ok][/green] Removed {_PROJECT_DIR}")
|
||||
except Exception as exc:
|
||||
write(f"[red]Failed:[/red] {exc}")
|
||||
raise
|
||||
log("[cyan]▸[/cyan] Удаление директории проекта...")
|
||||
shutil.rmtree(_PROJECT_DIR)
|
||||
log(f"[green]✓[/green] Удалено {_PROJECT_DIR}")
|
||||
|
||||
|
||||
# Run all deletion steps in order.
|
||||
# Progress ranges are split evenly across the active steps so the bar always reaches 100%.
|
||||
# Выполняем все шаги удаления по порядку.
|
||||
# Диапазоны прогресса делятся равномерно между активными шагами, чтобы бар всегда доходил до 100%.
|
||||
def _task_delete(screen: LogScreen, remove_ros: bool, remove_webots: bool) -> None:
|
||||
"""Worker function that runs inside LogScreen. Runs all deletion steps in order:
|
||||
containers -> images -> ROS2 (optional) -> Webots (optional) -> cobot CLI -> project dir.
|
||||
Рабочая функция внутри LogScreen. Выполняет все шаги удаления по порядку:
|
||||
контейнеры -> образы -> ROS2 (опционально) -> Webots (опционально) -> cobot CLI -> директория.
|
||||
def _delete(remove_ros: bool, remove_webots: bool) -> None:
|
||||
"""Run all deletion steps in order, with progress split across the active steps.
|
||||
Выполняет все шаги удаления по порядку, распределяя прогресс между активными шагами.
|
||||
"""
|
||||
try:
|
||||
screen.set_progress(0, "Stopping containers...")
|
||||
_stop_docker_containers(screen.write)
|
||||
_remove_webots_volume(screen.write)
|
||||
ok, fail_msg = True, ""
|
||||
with StepProgress("Удаление проекта") as p:
|
||||
try:
|
||||
p.set(0, "Остановка контейнеров...")
|
||||
_stop_docker_containers(p.raw)
|
||||
_remove_webots_volume(p.raw)
|
||||
|
||||
screen.set_progress(20, "Removing Docker images...")
|
||||
_remove_docker_images(screen.write)
|
||||
p.set(20, "Удаление Docker-образов...")
|
||||
_remove_docker_images(p.raw)
|
||||
|
||||
pct = 40
|
||||
if remove_ros:
|
||||
screen.set_progress(pct, "Removing ROS2 Jazzy...")
|
||||
_remove_ros2(screen.write)
|
||||
pct = 65
|
||||
pct = 40
|
||||
if remove_ros:
|
||||
p.set(pct, "Удаление ROS2 Jazzy...")
|
||||
_remove_ros2(p.raw)
|
||||
pct = 65
|
||||
if remove_webots:
|
||||
p.set(pct, "Удаление Webots...")
|
||||
_remove_webots(p.raw)
|
||||
pct = 75
|
||||
|
||||
if remove_webots:
|
||||
screen.set_progress(pct, "Removing Webots...")
|
||||
_remove_webots(screen.write)
|
||||
pct = 75
|
||||
p.set(pct, "Удаление cobot CLI...")
|
||||
_uninstall_cobot(p.raw)
|
||||
|
||||
screen.set_progress(pct, "Uninstalling cobot CLI...")
|
||||
_uninstall_cobot(screen.write)
|
||||
p.set(88, "Удаление директории проекта...")
|
||||
_remove_project_dir(p.raw)
|
||||
p.set(100, "Готово")
|
||||
except Exception as exc:
|
||||
ok, fail_msg = False, str(exc)
|
||||
|
||||
screen.set_progress(88, "Removing project directory...")
|
||||
_remove_project_dir(screen.write)
|
||||
|
||||
if not screen.is_stopped():
|
||||
screen.set_progress(100, "Done")
|
||||
screen.write("\n[green]Project fully removed.[/green]")
|
||||
screen.finish(True)
|
||||
|
||||
except Exception as exc:
|
||||
if not screen.is_stopped():
|
||||
screen.write(f"\n[red]Error:[/red] {exc}")
|
||||
screen.finish(False)
|
||||
|
||||
|
||||
# Multi-step confirmation wizard before anything is deleted.
|
||||
# Shows extra questions only when the relevant software is actually installed.
|
||||
# Многошаговый мастер подтверждения перед удалением.
|
||||
# Дополнительные вопросы показываются только если соответствующее ПО действительно установлено.
|
||||
class _DeleteApp(App[None]):
|
||||
"""Deletion wizard that asks for confirmation, then optionally asks about ROS2 and Webots,
|
||||
then launches LogScreen running _task_delete.
|
||||
Мастер удаления: просит подтверждение, затем опционально спрашивает про ROS2 и Webots,
|
||||
затем запускает LogScreen с _task_delete.
|
||||
"""
|
||||
CSS = SCREEN_CSS
|
||||
|
||||
def on_mount(self) -> None:
|
||||
self.push_screen(
|
||||
PickScreen(
|
||||
"Confirm deletion",
|
||||
"This will permanently delete the project, Docker images and containers. Are you sure?",
|
||||
["No, cancel", "Yes, delete everything"],
|
||||
"No, cancel",
|
||||
),
|
||||
self._on_confirm,
|
||||
)
|
||||
|
||||
def _on_confirm(self, choice: Optional[str]) -> None:
|
||||
if choice is None or choice.startswith("No"):
|
||||
self.exit()
|
||||
return
|
||||
self.push_screen(
|
||||
PickScreen(
|
||||
"ROS2 Jazzy",
|
||||
"Also remove ROS2 Jazzy from the system?",
|
||||
["No, keep ROS2", "Yes, remove ROS2 Jazzy"],
|
||||
"No, keep ROS2",
|
||||
),
|
||||
self._on_ros_choice,
|
||||
)
|
||||
|
||||
def _on_ros_choice(self, choice: Optional[str]) -> None:
|
||||
remove_ros = choice is not None and choice.startswith("Yes")
|
||||
# Only ask about Webots if it is actually installed on this machine.
|
||||
# Спрашиваем про Webots только если он действительно установлен на этой машине.
|
||||
if shutil.which("webots"):
|
||||
self.push_screen(
|
||||
PickScreen(
|
||||
"Webots",
|
||||
"Also remove Webots from the system?",
|
||||
["No, keep Webots", "Yes, remove Webots"],
|
||||
"No, keep Webots",
|
||||
),
|
||||
lambda c: self._on_webots_choice(c, remove_ros),
|
||||
)
|
||||
else:
|
||||
self._start_deletion(remove_ros, remove_webots=False)
|
||||
|
||||
def _on_webots_choice(self, choice: Optional[str], remove_ros: bool) -> None:
|
||||
remove_webots = choice is not None and choice.startswith("Yes")
|
||||
self._start_deletion(remove_ros, remove_webots)
|
||||
|
||||
def _start_deletion(self, remove_ros: bool, remove_webots: bool) -> None:
|
||||
self.push_screen(
|
||||
LogScreen(
|
||||
"Deleting project",
|
||||
lambda s: _task_delete(s, remove_ros, remove_webots),
|
||||
show_progress=True,
|
||||
),
|
||||
lambda _: self.exit(),
|
||||
)
|
||||
done(ok, "Проект полностью удалён" if ok else fail_msg)
|
||||
|
||||
|
||||
def register(subparsers: argparse._SubParsersAction) -> None:
|
||||
@@ -313,4 +188,23 @@ def register(subparsers: argparse._SubParsersAction) -> None:
|
||||
|
||||
|
||||
def run(args: argparse.Namespace) -> None:
|
||||
_DeleteApp().run()
|
||||
ui.header("Удаление проекта", "контейнеры, образы, опционально ROS2/Webots")
|
||||
|
||||
if not ui.confirm(
|
||||
"Это безвозвратно удалит проект, Docker-образы и контейнеры. Продолжить?",
|
||||
default=False,
|
||||
):
|
||||
return
|
||||
|
||||
remove_ros = ui.confirm("Также удалить ROS2 Jazzy из системы?", default=False)
|
||||
|
||||
remove_webots = False
|
||||
if shutil.which("webots"):
|
||||
remove_webots = ui.confirm("Также удалить Webots из системы?", default=False)
|
||||
|
||||
# apt removals need root — acquire sudo once before starting.
|
||||
# Удаление через apt требует root — получаем sudo один раз перед началом.
|
||||
if (remove_ros or remove_webots) and not privilege.ensure_sudo():
|
||||
return
|
||||
|
||||
_delete(remove_ros, remove_webots)
|
||||
|
||||
Reference in New Issue
Block a user