clash-controller 0.2.1__tar.gz → 0.2.2__tar.gz

{clash_controller-0.2.1 → clash_controller-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clash_controller
-Version: 0.2.1
+Version: 0.2.2
 Summary: A Textual TUI for managing Clash proxy instances
 Author-email: Moha-Master <hongkongreporter@outlook.com>
 License-Expression: MIT

{clash_controller-0.2.1 → clash_controller-0.2.2}/clash_controller/__init__.py

@@ -2,4 +2,4 @@
 Clash Controller - A Textual TUI for managing Clash proxy instances.
 """
 
-__version__ = "0.2.1"
+__version__ = "0.2.2"

{clash_controller-0.2.1 → clash_controller-0.2.2}/clash_controller/app.tcss

@@ -4,6 +4,23 @@ Screen {
     background: $surface;
 }
 
+/* ---------- 按钮：全局单行（替代 compact，无边框；三项目一致） ---------- */
+Button {
+    height: 1;
+    border: none;
+    min-width: 0;
+    padding: 0 1;
+}
+
+Button:focus {
+    border: none;
+    text-style: bold reverse;
+}
+
+Button:disabled {
+    text-opacity: 60%;
+}
+
 /* ---------- 模态三段式：标题栏 / 内容 / 按钮栏 ---------- */
 .modal-box {
     layout: vertical;
@@ -40,7 +57,7 @@ Screen {
 
 /* ---------- 页面公共 ---------- */
 .page-hint {
-    height: auto;
+    height: 1;
     padding: 0 1;
     color: $text-muted;
 }
@@ -104,7 +121,7 @@ Screen {
 }
 
 .tbl:focus {
-    border: tall $primary;
+    border: round $primary;
 }
 
 /* ---------- 信息面板 ---------- */
@@ -165,12 +182,17 @@ Screen {
 }
 
 #home-col {
-    width: 72;
+    width: auto;
     max-width: 90%;
     height: auto;
 }
 
-#home-banner,
+#home-banner {
+    width: 1fr;
+    text-align: left;
+    color: $primary;
+}
+
 #home-plain {
     width: 1fr;
     text-align: center;

{clash_controller-0.2.1 → clash_controller-0.2.2}/clash_controller/screens/config.py

@@ -4,7 +4,7 @@ import asyncio
 from rich.text import Text
 from textual import on, work
 from textual.binding import Binding
-from textual.containers import Horizontal
+from textual.containers import Horizontal, Vertical
 from textual.widgets import Button, DataTable, Static
 
 from ..config import load_config_providers, save_config_providers
@@ -32,14 +32,15 @@ class ConfigScreen(PageScreen):
         self._display: list = []
 
     def compose_page(self):
-        with Horizontal(classes="filter-row"):
-            yield Button("拉取并部署", id="deploy", variant="primary", compact=True)
-            yield Button("＋ 新增", id="add", compact=True)
-            yield Button("编辑", id="edit", compact=True)
-            yield Button("删除", id="delete", variant="error", compact=True)
-            yield Button("重载配置", id="reload-api", compact=True)
-            yield Static("", classes="fill")
-            yield Static("单击行 = 部署该提供方", classes="fl-label")
+        with Vertical(classes="panel"):
+            with Horizontal(classes="filter-row"):
+                yield Button("拉取并部署", id="deploy", variant="primary")
+                yield Button("＋ 新增", id="add")
+                yield Button("编辑", id="edit")
+                yield Button("删除", id="delete", variant="error")
+                yield Button("重载配置", id="reload-api")
+                yield Static("", classes="fill")
+                yield Static("单击行 = 部署该提供方", classes="fl-label")
         yield make_table("名称", "地址", id="cf-table")
 
     def on_mount(self) -> None:

{clash_controller-0.2.1 → clash_controller-0.2.2}/clash_controller/screens/home.py

@@ -7,19 +7,13 @@ from textual.screen import Screen
 from textual.widgets import OptionList, Static
 
 from .. import __version__
-from ..ui import LOGO_WIDTH, logo_text
-
-try:  # textual 各版本 Option 导出位置不同
-    from textual.widgets.option_list import Option
-except ImportError:  # pragma: no cover
-    from textual.widgets._option_list import Option
+from ..ui import LOGO_WIDTH, home_col_width, logo_text
+from ..widgets import HintBar, MenuMarquee
 
 
 class HomeScreen(Screen):
     """功能主菜单：概览 / 配置管理 / 设置 / 切换端点。"""
 
-    CSS_CLASSES = "logo-page"
-
     def __init__(self) -> None:
         super().__init__(classes="logo-page")
 
@@ -46,29 +40,29 @@ class HomeScreen(Screen):
                 name = (self.app.profile or {}).get("name", "")
                 yield Static(f"v{__version__}" + (f" · {name}" if name else ""), id="home-version")
                 yield OptionList(id="home-list")
-        yield Static("↑↓ 选择 · 回车 进入 · 1-4 直达 · Esc/Ctrl+C 退出", classes="page-hint")
+        yield HintBar("↑↓ 选择 · 回车 进入 · 1-4 直达 · Esc/Ctrl+C 退出", classes="page-hint")
 
     def on_mount(self) -> None:
         ol = self.query_one("#home-list", OptionList)
-        ol.add_options(self._options())
+        self._marquee = MenuMarquee(
+            self, "home-list", [(label, desc) for _, label, desc in self.ITEMS]
+        )
+        ol.add_options(self._marquee.placeholder_options())
         ol.highlighted = 0
         ol.focus()
         self._apply_breakpoint()
+        self.call_after_refresh(self._marquee.start)
 
     def on_resize(self, event) -> None:
         self._apply_breakpoint()
+        if getattr(self, "_marquee", None) is not None:
+            self._marquee.sync()
 
     def _apply_breakpoint(self) -> None:
-        """宽度不足以容纳艺术字时降级为普通标题文本。"""
-        self.set_class(self.size.width < LOGO_WIDTH + 6, "-sm")
-
-    def _options(self):
-        for i, (_, label, desc) in enumerate(self.ITEMS, start=1):
-            t = Text()
-            t.append(f" {i}  ", style="bold")
-            t.append(f"{label:<14}", style="bold")
-            t.append(desc, style="dim")
-            yield Option(t)
+        """宽度不足以容纳艺术字时降级为普通标题文本；列宽跟随 logo。"""
+        small = self.size.width < LOGO_WIDTH + 6
+        self.set_class(small, "-sm")
+        self.query_one("#home-col").styles.width = None if small else home_col_width()
 
     def _open(self, key: str) -> None:
         from .config import ConfigScreen

{clash_controller-0.2.1 → clash_controller-0.2.2}/clash_controller/screens/profiles.py

@@ -11,8 +11,8 @@ from textual.widgets import Button, OptionList, Static
 from .. import __version__
 from ..config import load_profiles, save_profiles
 from ..deploy import default_endpoint_type
-from ..ui import LOGO_WIDTH, logo_text
-from ..widgets import ConfirmModal, FormField, FormModal, shorten
+from ..ui import LOGO_WIDTH, home_col_width, logo_text
+from ..widgets import ConfirmModal, FormField, FormModal, HintBar, MenuMarquee
 
 try:  # textual 各版本 Option 导出位置不同
     from textual.widgets.option_list import Option
@@ -20,8 +20,6 @@ except ImportError:  # pragma: no cover
     from textual.widgets._option_list import Option
 
 REQUIRED_FIELDS = ["endpoint_type", "config_directory", "use_sudo"]
-NAME_MAX = 14
-URL_MAX = 30
 
 
 def validate_profile(profile: dict) -> str | None:
@@ -210,6 +208,7 @@ class ProfileListScreen(Screen):
         super().__init__(classes="logo-page")
         self._profiles: list = []
         self._display: list = []
+        self._marquee = None
 
     # ------------------------------------------------------------ 组合
 
@@ -221,15 +220,17 @@ class ProfileListScreen(Screen):
                 yield Static(f"v{__version__}", id="home-version")
                 yield OptionList(id="pf-list")
                 with Horizontal(id="pf-actions"):
-                    yield Button("＋ 新增端点", id="add", variant="primary", compact=True)
-                    yield Button("编辑", id="edit", compact=True)
-                    yield Button("删除", id="delete", variant="error", compact=True)
-        yield Static(self.HINT, classes="page-hint")
+                    yield Button("＋ 新增端点", id="add", variant="primary")
+                    yield Button("编辑", id="edit")
+                    yield Button("删除", id="delete", variant="error")
+        yield HintBar(self.HINT, classes="page-hint")
 
     def on_mount(self) -> None:
+        self._marquee = MenuMarquee(self, "pf-list", [])
         self._load()
         self.query_one("#pf-list", OptionList).focus()
         self._apply_breakpoint()
+        self.call_after_refresh(self._marquee.start)
 
     def on_resize(self, event) -> None:
         self._apply_breakpoint()
@@ -237,8 +238,10 @@ class ProfileListScreen(Screen):
             self._rebuild()
 
     def _apply_breakpoint(self) -> None:
-        """宽度不足以容纳艺术字时降级为普通标题文本（与首页一致）。"""
-        self.set_class(self.size.width < LOGO_WIDTH + 6, "-sm")
+        """宽度不足以容纳艺术字时降级为普通标题文本；列宽跟随 logo。"""
+        small = self.size.width < LOGO_WIDTH + 6
+        self.set_class(small, "-sm")
+        self.query_one("#home-col").styles.width = None if small else home_col_width()
 
     # ------------------------------------------------------------ 数据加载
 
@@ -252,31 +255,28 @@ class ProfileListScreen(Screen):
     def action_refresh_page(self) -> None:
         self._load()
 
-    def _options(self) -> list[Option]:
-        if not self._display:
-            return [Option(Text("（暂无端点，Ctrl+N 创建）", style="dim"), disabled=True)]
+    def _rows(self) -> list[tuple[str, str]]:
         labels = {"local": "本地", "remote": "远程"}
-        opts = []
-        w = self.size.width or 120
-        col_width = min(72, w)
-        url_cap = max(10, col_width - 29 - 4)
-        for i, p in enumerate(self._display, start=1):
-            t = Text()
-            t.append(f" {i}  ", style="bold")
-            t.append(f"{shorten(str(p.get('name', '?')), NAME_MAX):<{NAME_MAX}}", style="bold")
-            t.append(" · ", style="dim")
-            t.append(f"{shorten(str(p.get('url', '')), url_cap):<{url_cap}}", style="dim")
-            t.append(" · ", style="dim")
-            t.append(labels.get(p.get("endpoint_type", ""), p.get("endpoint_type", "?")))
-            opts.append(Option(t))
-        return opts
+        rows = []
+        for p in self._display:
+            kind = labels.get(p.get("endpoint_type", ""), p.get("endpoint_type", "?"))
+            name = str(p.get("name", "?") or "?")
+            rows.append((name, f"{p.get('url', '')} · {kind}"))
+        return rows
 
     def _rebuild(self) -> None:
+        if self._marquee is None:
+            return
         self._display = list(self._profiles)
         ol = self.query_one("#pf-list", OptionList)
         prev = ol.highlighted
         ol.clear_options()
-        ol.add_options(self._options())
+        if self._display:
+            self._marquee.rows = self._rows()
+            ol.add_options(self._marquee.placeholder_options())
+            self._marquee.set_rows(self._rows())
+        else:
+            ol.add_options([Option(Text("（暂无端点，Ctrl+N 创建）", style="dim"), disabled=True)])
         ol.highlighted = prev if prev is not None and 0 <= prev < len(self._display) else (0 if self._display else None)
         n = len(self._profiles)
         self.query_one("#home-version", Static).update(f"v{__version__} · {n} 个端点")

{clash_controller-0.2.1 → clash_controller-0.2.2}/clash_controller/screens/settings.py

@@ -29,15 +29,16 @@ class SettingsScreen(PageScreen):
             with Horizontal(classes="kv-row gap-top"):
                 yield Static("模式", classes="kv-label")
                 yield Select(MODES, value="rule", allow_blank=False, compact=True, id="st-mode", classes="kv-ctl")
-        with Horizontal(classes="filter-row gap-top"):
-            yield Static("核心操作", classes="fl-label")
-            yield Button("重载 GEO", id="reload-geo", compact=True)
-        with Horizontal(classes="filter-row gap-top"):
-            yield Static("重启升级", classes="fl-label")
-            yield Button("重启 Clash", id="restart", variant="error", compact=True)
-            yield Button("升级内核", id="up-kernel", compact=True)
-            yield Button("升级 UI", id="up-ui", compact=True)
-            yield Button("升级 GEO", id="up-geo", compact=True)
+        with Vertical(classes="panel"):
+            with Horizontal(classes="filter-row"):
+                yield Static("核心操作", classes="fl-label")
+                yield Button("重载 GEO", id="reload-geo")
+            with Horizontal(classes="filter-row gap-top"):
+                yield Static("重启升级", classes="fl-label")
+                yield Button("重启 Clash", id="restart", variant="error")
+                yield Button("升级内核", id="up-kernel")
+                yield Button("升级 UI", id="up-ui")
+                yield Button("升级 GEO", id="up-geo")
 
     def on_mount(self) -> None:
         self.set_subtitle((self.app.profile or {}).get("name", ""))

{clash_controller-0.2.1 → clash_controller-0.2.2}/clash_controller/ui.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 from collections.abc import Callable
 from typing import ClassVar
 
+from rich.cells import cell_len
 from rich.text import Text
 from textual import on
 from textual.binding import Binding
@@ -19,7 +20,7 @@ try:  # 不同 textual 版本 Option 导出位置不同
 except ImportError:  # pragma: no cover
     from textual.widgets._option_list import Option
 
-from .widgets import EDIT_HINT, STYLE_ERR
+from .widgets import EDIT_HINT, STYLE_ERR, HintBar
 
 # ---------------------------------------------------------------- 首页 logo
 
@@ -32,11 +33,16 @@ LOGO_LINES = [
     " ╚═════╝╚══════╝╚═╝  ╚═╝╚══════╝╚═╝  ╚═╝ ╚═════╝   ╚═╝   ╚══════╝",
 ]
 
-LOGO_WIDTH = max(len(line) for line in LOGO_LINES)
+LOGO_WIDTH = max(cell_len(line.rstrip()) for line in LOGO_LINES)  # 随 LOGO_LINES 自动计算，换 logo 无需改别处
 
 
 def logo_text() -> Text:
-    return Text("\n".join(LOGO_LINES))
+    return Text("\n".join(line.rstrip() for line in LOGO_LINES))
+
+
+def home_col_width() -> int:
+    """首页栏列宽：跟随 logo，菜单文字更宽时以 40 列兜底。"""
+    return max(LOGO_WIDTH, 40)
 
 
 # ---------------------------------------------------------------- 页面骨架
@@ -78,7 +84,8 @@ class PageScreen(Screen):
         background: $panel;
         layout: horizontal;
     }
-    PageScreen #topbar Button {
+    PageScreen #topbar #top-back,
+    PageScreen #topbar #top-menu {
         margin-right: 2;
     }
     PageScreen .tb-left {
@@ -112,7 +119,7 @@ class PageScreen(Screen):
         overflow-y: hidden;
     }
     PageScreen .page-hint {
-        height: auto;
+        height: 1;
         padding: 0 1;
         color: $text-muted;
         background: $surface;
@@ -145,17 +152,17 @@ class PageScreen(Screen):
 
     def compose(self):
         with Horizontal(id="topbar"):
-            yield Button("◀ 返回", id="top-back", compact=True)
+            yield Button("◀ 返回", id="top-back")
             with Horizontal(classes="tb-left"):
                 yield Static(Text(self.TITLE, style="bold"), classes="tb-title")
                 yield Static(self.subtitle, classes="tb-sub", id="tb-sub")
             with Horizontal(classes="tb-right"):
                 yield from self.compose_toolbar()
                 if self.menu:
-                    yield Button("菜单 ▾", id="top-menu", compact=True)
+                    yield Button("菜单 ▾", id="top-menu")
         with Vertical(id="page"):
             yield from self.compose_page()
-        yield Static(self.HINT, classes="page-hint", id="page-hint")
+        yield HintBar(self.HINT, classes="page-hint", id="page-hint")
         if self.menu:
             with Vertical(id="page-menu"):
                 yield OptionList(id="menu-list")
@@ -272,7 +279,7 @@ class PageScreen(Screen):
         if not self.is_mounted:
             return
         try:
-            hint = self.query_one("#page-hint", Static)
+            hint = self.query_one("#page-hint", HintBar)
         except Exception:  # noqa: BLE001 — 组合早期尚未挂载
             return
         hint.update(EDIT_HINT if self._editing() else self.HINT)

{clash_controller-0.2.1 → clash_controller-0.2.2}/clash_controller/widgets.py

@@ -11,10 +11,15 @@ from rich.cells import cell_len
 from rich.text import Text
 from textual import events
 from textual.binding import Binding
-from textual.containers import Horizontal, Vertical, VerticalScroll
+from textual.containers import Horizontal, ScrollableContainer, Vertical, VerticalScroll
 from textual.coordinate import Coordinate
 from textual.screen import ModalScreen
-from textual.widgets import Button, DataTable, Input, Label, Select, Static, Switch, TextArea
+from textual.widgets import Button, DataTable, Input, Label, OptionList, Select, Static, Switch, TextArea
+
+try:  # textual 各版本 Option 导出位置不同
+    from textual.widgets.option_list import Option
+except ImportError:  # pragma: no cover
+    from textual.widgets._option_list import Option
 
 # ---------------------------------------------------------------- 文案与配色
 
@@ -175,7 +180,7 @@ class InputModal(ModalScreen[str | None]):
                 if self.hint_text:
                     yield Static(self.hint_text, classes="im-hint")
                 yield Static("", classes="im-error", id="im-error")
-                yield Static("", classes="page-hint", id="im-hint")
+                yield HintBar("", classes="page-hint", id="im-hint")
             with Horizontal(classes="btn-row"):
                 yield Button("取消", id="im-cancel", variant="default")
                 yield Button("确定", id="im-ok", variant="primary")
@@ -194,7 +199,7 @@ class InputModal(ModalScreen[str | None]):
         if not self.is_mounted:
             return
         editing = isinstance(self.app.focused, (Input, TextArea))
-        self.query_one("#im-hint", Static).update(HINT_FORM_EDIT if editing else HINT_FORM)
+        self.query_one("#im-hint", HintBar).update(HINT_FORM_EDIT if editing else HINT_FORM)
 
     def _submit(self) -> None:
         val = self.query_one("#im-input", Input).value.strip()
@@ -280,7 +285,7 @@ class FormModal(ModalScreen["dict | None"]):
                                 yield Input(
                                     value=f.value if f.kind == "text" else "",
                                     password=(f.kind == "password"),
-                                    placeholder=(f.value if f.kind == "password" else f.placeholder),
+                                    placeholder=(mask_secret(f.value) if f.kind == "password" else f.placeholder),
                                     compact=True,
                                     id=f"in-{f.name}",
                                 )
@@ -302,7 +307,7 @@ class FormModal(ModalScreen["dict | None"]):
                             if f.hint:
                                 yield Static(f.hint, classes="frm-note")
             yield Static("", classes="frm-err", id="frm-error")
-            yield Static("", classes="page-hint", id="frm-hint")
+            yield HintBar("", classes="page-hint", id="frm-hint")
             with Horizontal(classes="btn-row"):
                 yield Button("取消", id="frm-cancel", variant="default")
                 yield Button(self.ok_label, id="frm-ok", variant="primary")
@@ -333,7 +338,7 @@ class FormModal(ModalScreen["dict | None"]):
             text = HINT_FORM_EDIT
         else:
             text = HINT_FORM
-        self.query_one("#frm-hint", Static).update(text)
+        self.query_one("#frm-hint", HintBar).update(text)
 
     def _collect(self) -> "dict | None":
         """收集表单值；校验失败时写入错误信息并返回 None。可在子类扩展。"""
@@ -425,6 +430,180 @@ class OutputModal(ModalScreen[None]):
 
 # ---------------------------------------------------------------- 表格辅助
 
+class HintBar(ScrollableContainer):
+    """单行操作提示栏：内容宽于容器时，像 LED 屏一样来回滚动（端点停留约 3s）。"""
+
+    DEFAULT_CSS = """
+    HintBar {
+        height: 1;
+        overflow-x: auto;
+        overflow-y: hidden;
+        scrollbar-size: 0 0;
+    }
+    HintBar .hint-text {
+        width: auto;
+        height: 1;
+    }
+    """
+
+    TICK = 0.25
+    HOLD = 12  # 到达端点后停留的拍数（12 x 0.25s = 3s）
+
+    def __init__(self, text: str = "", **kwargs) -> None:
+        super().__init__(**kwargs)
+        self._text = text
+        self._direction = 1
+        self._hold = 0
+
+    def compose(self):
+        yield Static(Text(self._text, no_wrap=True), classes="hint-text")
+
+    def on_mount(self) -> None:
+        self.set_interval(self.TICK, self._tick)
+
+    def update(self, text: str) -> None:
+        self._text = text
+        self._direction = 1
+        self._hold = 0
+        if self.is_mounted:
+            self.query_one(".hint-text", Static).update(Text(text, no_wrap=True))
+            self.scroll_x = 0
+
+    def _tick(self) -> None:
+        total = self.virtual_size.width
+        view = self.size.width
+        if total <= view:
+            if self.scroll_x:
+                self.scroll_x = 0
+            return
+        if self._hold > 0:
+            self._hold -= 1
+            return
+        end = total - view
+        x = int(self.scroll_x) + self._direction
+        if x >= end:
+            x = end
+            self._direction = -1
+            self._hold = self.HOLD
+        elif x <= 0:
+            x = 0
+            self._direction = 1
+            self._hold = self.HOLD
+        self.scroll_x = x
+
+
+def marquee_window(text: str, width: int, offset: int) -> str:
+    """在 width 单元格内取 text 的循环窗口，起点为第 offset 个字符（跑马灯用）。"""
+    if width <= 0 or not text:
+        return " " * max(0, width)
+    s = text + "   "
+    n = len(s)
+    used = 0
+    out: list[str] = []
+    i = offset % n
+    while used < width and len(out) <= n + width:
+        ch = s[i % n]
+        w = cell_len(ch) or 1
+        if used + w > width:
+            break
+        out.append(ch)
+        used += w
+        i += 1
+    return "".join(out) + " " * (width - used)
+
+
+class MenuMarquee:
+    """首页 OptionList 菜单行控制器：描述右对齐，超宽时来回跑马灯。
+
+    屏幕 on_mount 用法::
+
+        self._marquee = MenuMarquee(self, "home-list", [(label, desc), ...])
+        ol.add_options([Option("") for _ in self._marquee.rows])
+        self.call_after_refresh(self._marquee.start)
+    """
+
+    TICK = 0.25
+    HOLD = 12
+
+    def __init__(self, screen, list_id: str, rows, *, label_width: int = 14) -> None:
+        self.screen = screen
+        self.list = screen.query_one(f"#{list_id}", OptionList)
+        self.rows = list(rows)
+        self.label_width = label_width
+        self.offset = 0
+        self.direction = 1
+        self.hold = 0
+        self._timer = None
+
+    def placeholder_options(self):
+        """与 rows 等长的占位 Option（先 add_options，再由 sync 填充文本）。"""
+        return [Option("") for _ in self.rows]
+
+    def start(self) -> None:
+        self.sync()
+        if self._timer is None:
+            self._timer = self.screen.set_interval(self.TICK, self._tick)
+
+    def set_rows(self, rows) -> None:
+        self.rows = list(rows)
+        self.offset = 0
+        self.direction = 1
+        self.hold = 0
+        self.sync()
+
+    def sync(self) -> None:
+        node = self.list
+        if not node.is_mounted or node.option_count != len(self.rows):
+            return
+        for idx in range(len(self.rows)):
+            node.replace_option_prompt_at_index(idx, self._prompt(idx))
+
+    def _room(self) -> int:
+        node = self.list
+        width = node.content_size.width
+        if node.show_vertical_scrollbar:
+            width -= node.scrollbar_size_vertical
+        return max(6, width - self.label_width - 4)
+
+    def _prompt(self, idx: int) -> Text:
+        label, desc = self.rows[idx]
+        label = shorten(label, self.label_width)
+        pad = " " * max(0, self.label_width - cell_len(label))
+        prefix = f" {idx + 1:<2} {label}{pad}"
+        room = self._room()
+        if cell_len(desc) <= room:
+            window = " " * (room - cell_len(desc)) + desc
+        else:
+            window = marquee_window(desc, room, self.offset)
+        text = Text(no_wrap=True, overflow="crop")
+        text.append(prefix, style="bold")
+        text.append(window, style="dim")
+        return text
+
+    def _tick(self) -> None:
+        room = self._room()
+        longest = max((cell_len(d) for _, d in self.rows), default=0)
+        if longest <= room:
+            if self.offset:
+                self.offset = 0
+                self.sync()
+            return
+        if self.hold > 0:
+            self.hold -= 1
+            return
+        span = max(cell_len(d) + 3 for _, d in self.rows if cell_len(d) > room)
+        self.offset += self.direction
+        if self.offset >= span:
+            self.offset = span - 1
+            self.direction = -1
+            self.hold = self.HOLD
+        elif self.offset <= 0:
+            self.offset = 0
+            self.direction = 1
+            self.hold = self.HOLD
+        self.sync()
+
+
 class ClickTable(DataTable):
     """列表即操作的表格：单击数据单元格 = 移动光标并立即发 RowSelected。
 
@@ -477,6 +656,16 @@ def shorten(text: str, limit: int) -> str:
     return out + "…"
 
 
+def mask_secret(v: str | None, keep: int = 4) -> str:
+    """密钥/口令脱敏展示：首尾各 keep 位，过短则全圆点（placeholder 专用）。"""
+    s = (v or "").strip()
+    if not s:
+        return ""
+    if len(s) <= keep * 2 + 1:
+        return "•" * min(8, max(6, len(s)))
+    return f"{s[:keep]}…{s[-keep:]}"
+
+
 def rcell(text, content_width: int) -> Text:
     """右对齐单元格：文本在 content_width 内右对齐。"""
     pad = max(0, content_width - cell_len(str(text)))

{clash_controller-0.2.1 → clash_controller-0.2.2}/clash_controller.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clash_controller
-Version: 0.2.1
+Version: 0.2.2
 Summary: A Textual TUI for managing Clash proxy instances
 Author-email: Moha-Master <hongkongreporter@outlook.com>
 License-Expression: MIT

{clash_controller-0.2.1 → clash_controller-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "clash_controller"
-version = "0.2.1"
+version = "0.2.2"
 description = "A Textual TUI for managing Clash proxy instances"
 readme = "README.md"
 requires-python = ">=3.10"