pymecli 0.6.4__tar.gz → 0.6.6__tar.gz

{pymecli-0.6.4 → pymecli-0.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pymecli
-Version: 0.6.4
+Version: 0.6.6
 Summary: My CLI
 Project-URL: Homepage, https://pypi.org/project/pymecli
 Project-URL: Repository, https://github.com/meme2046/pymecli
@@ -34,6 +34,7 @@ Requires-Dist: telethon>=1.44.0
 Requires-Dist: toml>=0.10.2
 Requires-Dist: typer>=0.20.1
 Requires-Dist: uvicorn>=0.40.0
+Requires-Dist: wcwidth==0.8.5
 Requires-Dist: webdriver-manager>=4.0.2
 Description-Content-Type: text/markdown
 

{pymecli-0.6.4 → pymecli-0.6.6}/cli/util.py

@@ -12,6 +12,8 @@ import pytz
 import typer
 from babel.dates import format_datetime
 from cowsay.__main__ import cli
+from tabulate import tabulate
+from wcwidth import ljust, wcswidth
 
 from utils.pyredis import get_redis_client_sync
 
@@ -65,24 +67,35 @@ def emoji():
     """
     打印自己常用的『emoji』符号
     """
-    emoji_list = [
-        "『",
-        "』",
-        "✓",
-        "✗",
-        "⤴︎",
-        "⤵︎",
-        "⇡",
-        "⇣",
-        "⤶",
-        "↩",
-        "↖",
-        "↙",
-        "↗",
-        "↘",
-        "╰›",
-    ]
-    print(emoji_list)
+    emoji_list = (
+        "『 』 ✓ ✗ ⇡ ⇣ ❎ ✅ 📢 🧪 🔎 🚀 🧮 💊 🐸 🐷 🐢"
+        " 🐶 🔖️ 📌 🐻 ☕ 🧸 📋 🍀 🍾 🥑 🍹"
+        " 🌞 🎉 🍼 🥇 🦊 🍉 🍈 🍑 🌐 🐠 🌱 🍭 💎 🎯 🌻"
+        " ⬇️ ⬆️ ↕️ 🍅 🍥 ☃️ 🐳 🤖 🪃 💰 🦣 🦄 🐼 ♂️ ♀️ 🐝"
+    ).split()
+
+    # tabulate 用 len() 算列宽，终端用 wcswidth() 算显示宽度，
+    # 需要把每个 emoji 补到 len=2 且 wcswidth=2 才能对齐
+    # - SMP emoji (len=1, wcsw=2): 加 VS(U+FE0F) 变 len=2
+    # - 窄符号 (wcsw=1): 用 wcwidth.ljust 补空格到 wcsw=2
+    VS = "\ufe0f"
+
+    def pad(e: str) -> str:
+        if len(e) == 1 and wcswidth(e) == 2:
+            e += VS
+        return ljust(e, 2)
+
+    padded = [pad(e) for e in emoji_list]
+
+    rows = []
+    for i in range(0, len(padded), 10):
+        row = padded[i : i + 10]
+        while len(row) < 10:
+            row.append("")
+        rows.append(row)
+
+    cols = [f"{i}" for i in range(1, 11)]
+    print(tabulate(rows, headers=cols, tablefmt="grid"))
 
 
 def strf_time(zone: str):

{pymecli-0.6.4 → pymecli-0.6.6}/pyproject.toml

@@ -32,13 +32,14 @@
     "ifaddr>=0.2.0",
     "telethon>=1.44.0",
     "protobuf<4",
-  ]
+    "wcwidth==0.8.5",
+]
   description = "My CLI"
   license = { text = "MIT" }
   name = "pymecli"
   readme = "README.md"
   requires-python = ">=3.10"
-  version = "0.6.4"
+  version = "0.6.6"
 
 [project.urls]
   Homepage = "https://pypi.org/project/pymecli"