zhaarey/unshackle
1
0
Fork 0
mirror of https://github.com/unshackle-dl/unshackle.git synced 2025-10-23 15:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat: Implement terminal cleanup on exit and signal handling in ComfyConsole"

Browse Source 
This reverts commit 091d7335a3.
This commit is contained in:
Andy
2025-08-03 15:26:30 +00:00
parent e3571b9518
commit 1aaea23669
2 changed files with 2 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
unshackle/commands/dl.py
View File

@@ -765,8 +765,7 @@ class dl:
DOWNLOAD_LICENCE_ONLY.set() DOWNLOAD_LICENCE_ONLY.set()
try: try:
# Use transient mode to prevent display remnants with Live(Padding(download_table, (1, 5)), console=console, refresh_per_second=5):
with Live(Padding(download_table, (1, 5)), console=console, refresh_per_second=5, transient=True):
with ThreadPoolExecutor(downloads) as pool: with ThreadPoolExecutor(downloads) as pool:
for download in futures.as_completed( for download in futures.as_completed(
( (
@@ -1035,7 +1034,7 @@ class dl:
multiplex_tasks.append((task_id, task_tracks)) multiplex_tasks.append((task_id, task_tracks))
with Live(Padding(progress, (0, 5, 1, 5)), console=console, transient=True): with Live(Padding(progress, (0, 5, 1, 5)), console=console):
for task_id, task_tracks in multiplex_tasks: for task_id, task_tracks in multiplex_tasks:
progress.start_task(task_id) # TODO: Needed? progress.start_task(task_id) # TODO: Needed?
muxed_path, return_code, errors = task_tracks.mux( muxed_path, return_code, errors = task_tracks.mux(

40
unshackle/core/console.py
View File

@@ -1,7 +1,4 @@
import atexit
import logging import logging
import signal
import sys
from datetime import datetime from datetime import datetime
from types import ModuleType from types import ModuleType
from typing import IO, Callable, Iterable, List, Literal, Mapping, Optional, Union from typing import IO, Callable, Iterable, List, Literal, Mapping, Optional, Union
@@ -170,8 +167,6 @@ class ComfyConsole(Console):
time.monotonic. time.monotonic.
""" """
_cleanup_registered = False
def __init__( def __init__(
self, self,
*, *,
@@ -238,9 +233,6 @@ class ComfyConsole(Console):
if log_renderer: if log_renderer:
self._log_render = log_renderer self._log_render = log_renderer
# Register terminal cleanup handlers
self._register_cleanup()
def status( def status(
self, self,
status: RenderableType, status: RenderableType,
@@ -291,38 +283,6 @@ class ComfyConsole(Console):
return status_renderable return status_renderable
def _register_cleanup(self):
"""Register terminal cleanup handlers."""
if not ComfyConsole._cleanup_registered:
ComfyConsole._cleanup_registered = True
# Register cleanup on normal exit
atexit.register(self._cleanup_terminal)
# Register cleanup on signals
signal.signal(signal.SIGINT, self._signal_handler)
signal.signal(signal.SIGTERM, self._signal_handler)
def _cleanup_terminal(self):
"""Restore terminal to a clean state."""
try:
# Show cursor using ANSI escape codes
sys.stdout.write("\x1b[?25h") # Show cursor
sys.stdout.write("\x1b[0m") # Reset attributes
sys.stdout.flush()
# Also use Rich's method
self.show_cursor(True)
except Exception:
# Silently fail if cleanup fails
pass
def _signal_handler(self, signum, frame):
"""Handle signals with cleanup."""
self._cleanup_terminal()
# Exit after cleanup
sys.exit(1)
catppuccin_mocha = { catppuccin_mocha = {
# Colors based on "CatppuccinMocha" from Gogh themes # Colors based on "CatppuccinMocha" from Gogh themes