From 39c01ebf699ec820d780504c5cd7f55f7d27b557 Mon Sep 17 00:00:00 2001 From: vex1023 Date: Thu, 14 May 2026 17:46:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=20=5Fsanitize=5Ffor?= =?UTF-8?q?=5Fconsole=20=E5=87=BD=E6=95=B0=EF=BC=8C=E5=A4=84=E7=90=86=20Wi?= =?UTF-8?q?ndows=20GBK=20=E7=BB=88=E7=AB=AF=E4=B8=8B=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E7=BC=96=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/cli.py | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/scripts/cli.py b/scripts/cli.py index ecd48fa..03909ca 100644 --- a/scripts/cli.py +++ b/scripts/cli.py @@ -121,6 +121,40 @@ def _get_config_loader(): # Result formatting # --------------------------------------------------------------------------- +def _sanitize_for_console(text: str) -> str: + """Remove or replace characters that can't be encoded in Windows GBK console.""" + _REPLACE = { + "\u2022": "*", # bullet + "\u2023": ">", # triangular bullet + "\u25B6": ">", # black right-pointing triangle + "\u25C0": "<", # black left-pointing triangle + "\u2713": "v", # check mark + "\u2714": "v", # heavy check mark + "\u2192": "->", # rightwards arrow + "\u2190": "<-", # leftwards arrow + "\u2014": "--", # em dash + "\u2013": "-", # en dash + "\u2018": "'", # left single quote + "\u2019": "'", # right single quote + "\u201c": '"', # left double quote + "\u201d": '"', # right double quote + "\u2026": "...", # ellipsis + "\u00a0": " ", # non-breaking space + } + for old, new in _REPLACE.items(): + text = text.replace(old, new) + # Remove any remaining non-BMP characters or chars outside printable ASCII range + # that GBK cannot encode + result = [] + for ch in text: + try: + ch.encode("gbk") + result.append(ch) + except UnicodeEncodeError: + result.append("?") + return "".join(result) + + def _format_result(r, fmt: str = "text") -> str: """Format a single SearchResult.""" if fmt == "json": @@ -134,10 +168,10 @@ def _format_result(r, fmt: str = "text") -> str: "extra": dict(r.extra) if r.extra else {}, }, ensure_ascii=False, indent=2) - lines = [f"[{r.rank}] {r.title}"] + lines = [_sanitize_for_console(r.title)] lines.append(f" URL: {r.url}") if r.snippet: - lines.append(f" {r.snippet[:200]}") + lines.append(f" {_sanitize_for_console(r.snippet[:200])}") if r.extra: extra_parts = [] for k, v in r.extra.items(): @@ -150,7 +184,7 @@ def _format_result(r, fmt: str = "text") -> str: elif v and k not in ("parsed_date", "note", "feed_url"): extra_parts.append(f"{k}: {v}") if extra_parts: - lines.append(f" ({'; '.join(extra_parts)})") + lines.append(f" ({_sanitize_for_console('; '.join(extra_parts))})") return "\n".join(lines)