Allow deleting stopped sessions with stale tabs
This commit is contained in:
+23
-4
@@ -1235,16 +1235,35 @@ def command_choose(arguments: argparse.Namespace) -> int:
|
||||
if hub.apply_alias(endpoint_key, alias) is None:
|
||||
raise HubError("the selected Session is no longer open")
|
||||
|
||||
def delete_session(target: str, session: str) -> DeleteSessionOutcome:
|
||||
def delete_session(
|
||||
target: str,
|
||||
session: str,
|
||||
window_id: str | None,
|
||||
) -> DeleteSessionOutcome:
|
||||
delete_remote_session(ssh_bin, RemoteEntry(target), session)
|
||||
endpoint_key = Endpoint.remote(target, session).key
|
||||
warning: str | None = None
|
||||
warnings: list[str] = []
|
||||
tab_closed = False
|
||||
if window_id is not None:
|
||||
try:
|
||||
hub.dismiss_window(window_id)
|
||||
tab_closed = True
|
||||
except HubError as error:
|
||||
warnings.append(f"Tab 未关闭:{error}")
|
||||
try:
|
||||
alias_registry.set(endpoint_key, "")
|
||||
except AliasRegistryError as error:
|
||||
warning = f"Session 已删除,但显示名称清理失败:{error}"
|
||||
warnings.append(f"显示名称清理失败:{error}")
|
||||
hub.aliases.pop(endpoint_key, None)
|
||||
return DeleteSessionOutcome(warning)
|
||||
try:
|
||||
hub.restore_endpoint(endpoint_key)
|
||||
except HubError as error:
|
||||
warnings.append(f"隐藏记录清理失败:{error}")
|
||||
return DeleteSessionOutcome(
|
||||
warning=";".join(warnings) or None,
|
||||
windows=tuple(catalog_windows(hub.managed_windows())),
|
||||
tab_closed=tab_closed,
|
||||
)
|
||||
|
||||
def stop_session(
|
||||
window_id: str,
|
||||
|
||||
Reference in New Issue
Block a user