aliyun-controller 0.2.2__tar.gz → 0.2.3__tar.gz

{aliyun_controller-0.2.2 → aliyun_controller-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aliyun_controller
-Version: 0.2.2
+Version: 0.2.3
 Summary: A Textual TUI for managing Alibaba Cloud services including billing queries and DNS management
 Author-email: Moha-Master <hongkongreporter@outlook.com>
 License-Expression: MIT

{aliyun_controller-0.2.2 → aliyun_controller-0.2.3}/aliyun_controller/__init__.py

@@ -1,4 +1,4 @@
 """
 Aliyun Controller
 """
-__version__ = "0.2.2"
+__version__ = "0.2.3"

{aliyun_controller-0.2.2 → aliyun_controller-0.2.3}/aliyun_controller/app.py

@@ -1,18 +1,65 @@
 """Textual 应用入口：全局配置、服务客户端、状态栏与首启配置向导。"""
 from pathlib import Path
 
+from rich.spinner import SPINNERS
+from rich.text import Text
 from textual import work
 from textual.app import App, ComposeResult
 from textual.binding import Binding
+from textual.widget import Widget
 from textual.widgets import Static
 
 from .billing import AliCloudBssQuerier
 from .config import config_exists, load_config
 from .dns import AliCloudDnsQuerier
+from .widgets import ProgressCover
+
+_DOTS = SPINNERS["dots"]
 
 
 class StatusBar(Static):
-    """底部状态栏：展示最近一次操作结果 / 进行中提示。"""
+    """底部状态栏：展示最近一次操作结果 / 进行中提示；spinner=True 时显示点阵转圈。"""
+
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+        self._text = ""
+        self._busy = False
+        self._frame = 0
+        self._timer = None
+
+    def render(self) -> Text:
+        if self._busy:
+            glyph = _DOTS["frames"][self._frame % len(_DOTS["frames"])]
+            return Text.assemble((glyph, "bold"), " ", self._text)
+        return Text(self._text)
+
+    def set_status(self, text: str) -> None:
+        self._busy = False
+        self._text = text
+        self._stop_timer()
+        self.refresh()
+
+    def set_spinner(self, text: str) -> None:
+        self._busy = True
+        self._text = text
+        self._ensure_timer()
+        self.refresh()
+
+    def _ensure_timer(self) -> None:
+        if self._timer is None and self.is_mounted:
+            self._timer = self.set_interval(_DOTS["interval"] / 1000, self._tick)
+
+    def _stop_timer(self) -> None:
+        if self._timer is not None:
+            self._timer.stop()
+            self._timer = None
+
+    def _tick(self) -> None:
+        self._frame += 1
+        self.refresh()
+
+    def on_mount(self) -> None:
+        self._ensure_timer()
 
 
 class AliyunControllerApp(App):
@@ -58,13 +105,29 @@ class AliyunControllerApp(App):
     def compose(self) -> ComposeResult:
         yield StatusBar("", id="status")
 
+    def get_loading_widget(self) -> Widget:
+        """全局默认：任意控件 .loading=True 时用 indeterminate 进度条覆盖其区域。"""
+        return ProgressCover()
+
     def status(self, message: str, kind: str = "") -> None:
         try:
             bar = self.query_one("#status", StatusBar)
-        except Exception:
+        except Exception:  # noqa: BLE001
             return
         bar.update_classes({"ok": kind == "ok", "warn": kind == "warn", "err": kind == "err"})
-        bar.update(message)
+        bar.set_status(message)
+
+    def spinner(self, on: bool, message: str = "加载中…") -> None:
+        """状态栏点阵 spinner（无遮罩、不阻断输入）：适合轻量、即时的后台动作。"""
+        try:
+            bar = self.query_one("#status", StatusBar)
+        except Exception:  # noqa: BLE001
+            return
+        bar.update_classes({})
+        if on:
+            bar.set_spinner(message)
+        else:
+            bar.set_status("")
 
     def notify_ok(self, message: str) -> None:
         self.status(message, "ok")

{aliyun_controller-0.2.2 → aliyun_controller-0.2.3}/aliyun_controller/screens/billing.py

@@ -45,6 +45,9 @@ class _BillingScreen(PageScreen):
     @work(exclusive=True)
     async def _reload(self) -> None:
         self.app.status(f"正在查询 {self.billing_cycle} 的账单明细…")
+        tables = list(self.query(DataTable))
+        for t in tables:
+            t.loading = True
         querier = self.app.get_billing()
         try:
             payload = await asyncio.to_thread(self.fetch, self.billing_cycle, querier)
@@ -56,6 +59,11 @@ class _BillingScreen(PageScreen):
             self.app.notify_err(f"查询失败: {type(e).__name__}: {e}")
             self._show_error()
             return
+        finally:
+            for t in tables:
+                t.loading = False
+            if tables:
+                tables[0].focus()
         self.set_subtitle(self.billing_cycle)
         self._show_result(payload)
 

{aliyun_controller-0.2.2 → aliyun_controller-0.2.3}/aliyun_controller/screens/dns.py

@@ -25,6 +25,7 @@ from ..widgets import (
     ConfirmModal,
     FormField,
     FormModal,
+    busy,
     filter_fuzzy,
     fit_table_columns,
     load_rows,
@@ -77,6 +78,8 @@ class DomainListScreen(PageScreen):
     @work(exclusive=True)
     async def _load(self) -> None:
         self.app.status("正在获取域名列表…")
+        table = self.query_one(DataTable)
+        table.loading = True
         try:
             domains = await asyncio.to_thread(self.app.get_dns().get_domains)
         except AliyunApiError as e:
@@ -89,6 +92,9 @@ class DomainListScreen(PageScreen):
             self._domains = []
             self._rebuild()
             return
+        finally:
+            table.loading = False
+            table.focus()
         self._domains = domains
         self._rebuild()
 
@@ -252,6 +258,8 @@ class RecordListScreen(PageScreen):
     @work(exclusive=True)
     async def _load(self) -> None:
         self.app.status(f"正在获取 {self.domain_name} 的解析记录…")
+        table = self._table()
+        table.loading = True
         try:
             records = await asyncio.to_thread(self.app.get_dns().get_domain_records, self.domain_name)
         except AliyunApiError as e:
@@ -264,6 +272,9 @@ class RecordListScreen(PageScreen):
             self._records = []
             self._rebuild()
             return
+        finally:
+            table.loading = False
+            table.focus()
         self._records = records
         self._rebuild()
 
@@ -350,14 +361,14 @@ class RecordListScreen(PageScreen):
         elif isinstance(result, dict):
             self._save_record(record, is_new, result)
 
-    def _save_record(self, record: dict | None, is_new: bool, data: dict) -> None:
+    @work(exclusive=True)
+    async def _save_record(self, record: dict | None, is_new: bool, data: dict) -> None:
         dns = self.app.get_dns()
         enabled = bool(data.get("status", True))
-        try:
+
+        def _apply() -> None:
             if is_new:
-                rid = dns.add_domain_record(
-                    self.domain_name, data["rr"], data["type"], data["value"], data["ttl"]
-                )
+                rid = dns.add_domain_record(self.domain_name, data["rr"], data["type"], data["value"], data["ttl"])
                 if rid and not enabled:
                     dns.set_domain_record_status(rid, "Disable")
             else:
@@ -368,6 +379,10 @@ class RecordListScreen(PageScreen):
                     dns.set_domain_record_status(
                         record.get("RecordId"), "Enable" if enabled else "Disable"
                     )
+
+        try:
+            async with busy(self.app, "正在保存解析记录…", mode="bar"):
+                await asyncio.to_thread(_apply)
         except AliyunApiError as e:
             self.app.notify_err(str(e))
             return
@@ -380,13 +395,7 @@ class RecordListScreen(PageScreen):
         def confirm(ok: bool) -> None:
             if not ok:
                 return
-            try:
-                self.app.get_dns().delete_domain_record(record.get("RecordId"))
-            except AliyunApiError as e:
-                self.app.notify_err(str(e))
-                return
-            self.app.notify_ok(f"已删除解析记录 {name}")
-            self._load()
+            self._do_delete(record, name)
 
         self.app.push_screen(
             ConfirmModal(
@@ -398,6 +407,17 @@ class RecordListScreen(PageScreen):
             confirm,
         )
 
+    @work(exclusive=True)
+    async def _do_delete(self, record: dict, name: str) -> None:
+        try:
+            async with busy(self.app, f"正在删除 {name}…", mode="bar"):
+                await asyncio.to_thread(self.app.get_dns().delete_domain_record, record.get("RecordId"))
+        except AliyunApiError as e:
+            self.app.notify_err(str(e))
+            return
+        self.app.notify_ok(f"已删除解析记录 {name}")
+        self._load()
+
     # ------------------------------------------------------------ 事件
 
     @on(Input.Changed, "#rc-search")

{aliyun_controller-0.2.2 → aliyun_controller-0.2.3}/aliyun_controller/widgets.py

@@ -3,18 +3,37 @@
 所有模态均为 ModalScreen 泛型返回值，配合 push_screen_wait / 回调消费；
 数据展示统一使用 DataTable，不构造字符串伪表格。
 """
+from __future__ import annotations
+
+import contextlib
 from collections.abc import Callable
 from dataclasses import dataclass, field
 from typing import Any
 
 from rich.cells import cell_len
+from rich.style import Style
 from rich.text import Text
 from textual import events
 from textual.binding import Binding
+from textual.clock import Clock
 from textual.containers import Horizontal, ScrollableContainer, Vertical, VerticalScroll
 from textual.coordinate import Coordinate
+from textual.css.query import NoMatches
 from textual.screen import ModalScreen
-from textual.widgets import Button, DataTable, Input, Label, OptionList, Select, Static, Switch, TextArea
+from textual.widget import Widget
+from textual.widgets import (
+    Button,
+    DataTable,
+    Input,
+    Label,
+    LoadingIndicator,
+    OptionList,
+    ProgressBar,
+    Select,
+    Static,
+    Switch,
+    TextArea,
+)
 
 try:  # textual 各版本 Option 导出位置不同
     from textual.widgets.option_list import Option
@@ -331,7 +350,7 @@ class FormModal(ModalScreen["dict | None"]):
             text = HINT_FORM
         self.query_one("#frm-hint", HintBar).update(text)
 
-    def _collect(self) -> "dict | None":
+    def _collect(self) -> dict | None:
         """收集表单值；校验失败时写入错误信息并返回 None。可在子类扩展。"""
         err_box = self.query_one("#frm-error", Static)
         err_box.update(Text(""))
@@ -688,10 +707,191 @@ def fit_table_columns(table: DataTable, weights: list[float], rows: int | None =
     return visible
 
 
+# ---------------------------------------------------------------- 加载指示器
+
+class _IndeterminateBar:
+    """自渲染不定进度条：按**绘制时**的区域宽度取景并居中。
+
+    不依赖 ``Widget.size``：覆盖层是交给合成器临时绘制的，首帧 ``_size`` 可能
+    尚未由 ``_size_updated`` 写入，若在 ``render()`` 里读 ``self.size`` 会拿到 0
+    而画出一格宽的「隐形条」。改用 Rich 渲染协议，``options.max_width`` 即为本次
+    真正要绘制的区域宽度，保证任何一帧都居中可见。
+    """
+
+    def __init__(
+        self, clock: Clock, animation_level: str, highlight: Style, track: Style, cap: int
+    ) -> None:
+        self._clock = clock
+        self._animation_level = animation_level
+        self._highlight = highlight
+        self._track = track
+        self._cap = cap
+
+    def __rich_console__(self, console, options):  # noqa: ANN001, ANN201
+        total = max(1, options.max_width)
+        width = min(total, self._cap)
+        bar = max(2, int(width * 0.25))
+        span = width + bar
+        if self._animation_level == "none":
+            start = 0
+        else:
+            speed = 30  # cells/s，与 Textual ProgressBar 的 indeterminate 一致
+            pos = int((speed * self._clock.time) % (2 * span))
+            if pos > span:
+                pos = 2 * span - pos
+            start = pos - bar
+        text = Text()
+        for i in range(width):
+            text.append("━", style=self._highlight if start <= i < start + bar else self._track)
+        yield text
+
+
+class ProgressCover(Widget):
+    """控件 loading=True 时覆盖其区域的不定进度条（方框 + 居中往复高亮条）。
+
+    必须是**单个自渲染 widget**：Textual 的 ``Widget._cover()`` 只把它交给合成器
+    替换原控件区域，并不挂进 DOM 参与布局；若用容器 + 子件，子件 region 恒为 0
+    而完全不可见（``ProgressBar`` 自身 compose 出 ``Bar`` 子件，因此同样不可用）。
+    """
+
+    COMPONENT_CLASSES = {"pc--bar", "pc--highlight"}
+
+    DEFAULT_CSS = """
+    ProgressCover {
+        width: 100%;
+        height: 100%;
+        background: $surface;
+        border: round $secondary;
+        margin: 1 1 0 1;
+        content-align: center middle;
+        &> .pc--bar { color: $panel-lighten-1; background: $surface; }
+        &> .pc--highlight { color: $primary; background: $surface; }
+    }
+    """
+
+    BAR_WIDTH = 40
+    """进度条固定宽（与全屏 BusyOverlay `.busy-box` 的内容宽一致），由 content-align 居中。"""
+
+    def __init__(self) -> None:
+        super().__init__()
+        self._clock = Clock()
+
+    def on_mount(self) -> None:
+        self._clock.reset()
+        self.auto_refresh = 1 / 15
+
+    def render(self) -> _IndeterminateBar:
+        highlight = Style.from_color(self.get_component_rich_style("pc--highlight").color)
+        track = Style.from_color(self.get_component_rich_style("pc--bar").color)
+        return _IndeterminateBar(
+            self._clock, self.app.animation_level, highlight, track, self.BAR_WIDTH
+        )
+
+
+class BusyOverlay(ModalScreen[None]):
+    """全屏忙碌遮罩：阻断一切输入直到被 pop。
+
+    使用固定宽度（46）与分行结构防止文案变化引起容器抖动或 Emoji 换行。
+    """
+
+    DEFAULT_CSS = """
+    BusyOverlay {
+        align: center middle;
+        background: $boost;
+    }
+    BusyOverlay .busy-box {
+        width: 46;
+        height: auto;
+        min-height: 5;
+        padding: 1 2;
+        border: round $primary;
+        background: $surface;
+        align: center middle;
+    }
+    BusyOverlay #busy-title {
+        width: 100%;
+        content-align: center middle;
+        text-style: bold;
+        text-wrap: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        margin-bottom: 1;
+    }
+    BusyOverlay LoadingIndicator { width: 100%; height: 1; }
+    BusyOverlay ProgressBar { width: 100%; }
+    BusyOverlay #busy-counter {
+        width: 100%;
+        content-align: center middle;
+        color: $text-muted;
+        margin-top: 1;
+    }
+    """
+
+    def __init__(self, message: str = "正在处理…", *, mode: str = "dots", total: float | None = None) -> None:
+        super().__init__()
+        self._message = message
+        self._mode = mode
+        self._total = total
+        self._done = 0.0
+
+    def compose(self):
+        with Vertical(classes="busy-box"):
+            yield Static(self._message, id="busy-title")
+            if self._mode == "bar":
+                yield ProgressBar(total=None, show_bar=True, show_percentage=False, show_eta=False)
+            elif self._mode == "percent":
+                yield ProgressBar(total=self._total, show_percentage=True, show_eta=False)
+                yield Static(f"0/{int(self._total or 0)} (0%)", id="busy-counter")
+            else:
+                yield LoadingIndicator()
+
+    def set_message(self, message: str) -> None:
+        self._message = message
+        if self.is_mounted:
+            with contextlib.suppress(NoMatches):
+                self.query_one("#busy-title", Static).update(message)
+
+    def advance(self, amount: float = 1) -> None:
+        """percent 模式：推进进度条并刷新计数文案。"""
+        self._done += amount
+        if self.is_mounted:
+            with contextlib.suppress(NoMatches):
+                bar = self.query_one(ProgressBar)
+                bar.progress += amount
+                if self._mode == "percent":
+                    pct = int(round((self._done / (self._total or 1)) * 100))
+                    self.query_one("#busy-counter", Static).update(
+                        f"{int(self._done)}/{int(self._total or 0)} ({pct}%)"
+                    )
+
+
+@contextlib.asynccontextmanager
+async def busy(app, message: str = "正在处理…", *, mode: str = "dots", total: float | None = None):
+    """异步 worker 内包裹耗时操作，全程显示全屏忙碌遮罩（异常/取消亦收起）。
+
+    用法：async with busy(self.app, "正在保存…", mode="bar"): await asyncio.to_thread(...)
+    需要进度回调时接住返回的遮罩对象：async with busy(app, "拉取中", mode="percent", total=n) as ov: ...
+    """
+    overlay = BusyOverlay(message, mode=mode, total=total)
+    app.push_screen(overlay)
+    try:
+        yield overlay
+    finally:
+        # 确保遮罩被收起：可能仍是栈顶，也可能已被其它层覆盖
+        for _ in range(len(app.screen_stack)):
+            if isinstance(app.screen, BusyOverlay) or app.screen is overlay:
+                app.pop_screen()
+            else:
+                break
+        if overlay.is_mounted:
+            overlay.remove()
+
+
 __all__ = [
     "ConfirmModal", "InputModal", "FormField", "FormModal", "OutputModal",
     "ClickTable", "make_table", "load_rows", "filter_fuzzy", "fuzzy_score",
     "shorten", "rcell", "fit_table_columns",
+    "ProgressCover", "BusyOverlay", "busy",
     "tint", "colored_text",
     "STYLE_OK", "STYLE_ERR", "STYLE_WARN", "STYLE_INFO", "STYLE_DIM",
     "HINT_PICK", "HINT_MENU", "HINT_FORM", "EDIT_HINT", "HINT_FORM_EDIT", "HINT_FORM_TA",

{aliyun_controller-0.2.2 → aliyun_controller-0.2.3}/aliyun_controller.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aliyun_controller
-Version: 0.2.2
+Version: 0.2.3
 Summary: A Textual TUI for managing Alibaba Cloud services including billing queries and DNS management
 Author-email: Moha-Master <hongkongreporter@outlook.com>
 License-Expression: MIT

{aliyun_controller-0.2.2 → aliyun_controller-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aliyun_controller"
-version = "0.2.2"
+version = "0.2.3"
 description = "A Textual TUI for managing Alibaba Cloud services including billing queries and DNS management"
 readme = "README.md"
 authors = [