klnote 0.1.0__tar.gz → 0.2.0__tar.gz

{klnote-0.1.0 → klnote-0.2.0}/PKG-INFO

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: klnote
-Version: 0.1.0
+Version: 0.2.0
 Summary: Stock note management tool
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: click>=8.0.0
+Requires-Dist: prettytable>=3.0.0
 Provides-Extra: dev
 Requires-Dist: pytest>=8.0.0; extra == "dev"
 
@@ -62,12 +63,18 @@ klnote --help
 ### 股票操作 (stk)
 
 ```
-klnote stk ls                       # 列出所有股票
+klnote stk ls                       # 列出所有股票（表格对齐）
 klnote stk add <code> [-n name] [-d desc]   # 添加股票
 klnote stk get <identifier>         # 查看股票详情
 klnote stk delete <identifier>      # 删除股票
 ```
 
+**输出示例：**
+```
+ id                                code    name      description  note_num  created_at                   updated_at 
+ 38578199c19644ebab18ce7b5c16d699  688102  斯瑞新财   None         1         2026-06-04T15:52:20.853674Z  None 
+```
+
 ### 笔记操作 (note)
 
 ```

{klnote-0.1.0 → klnote-0.2.0}/README.md

@@ -52,12 +52,18 @@ klnote --help
 ### 股票操作 (stk)
 
 ```
-klnote stk ls                       # 列出所有股票
+klnote stk ls                       # 列出所有股票（表格对齐）
 klnote stk add <code> [-n name] [-d desc]   # 添加股票
 klnote stk get <identifier>         # 查看股票详情
 klnote stk delete <identifier>      # 删除股票
 ```
 
+**输出示例：**
+```
+ id                                code    name      description  note_num  created_at                   updated_at 
+ 38578199c19644ebab18ce7b5c16d699  688102  斯瑞新财   None         1         2026-06-04T15:52:20.853674Z  None 
+```
+
 ### 笔记操作 (note)
 
 ```

klnote-0.2.0/klnote/__init__.py

@@ -0,0 +1,3 @@
+__version__ = "0.2.0"
+__author__ = "zimvir"
+__email__ = "zimvir@qq.com"

{klnote-0.1.0 → klnote-0.2.0}/klnote/cli.py

@@ -1,5 +1,9 @@
 import click
-from klnote.core.service import Service
+
+from prettytable import PrettyTable
+
+from klnote.core import Service
+
 
 service = Service()
 
@@ -10,29 +14,6 @@ def cli():
     pass
 
 
-def search_by_identifier(identifier: str):
-    """
-    股票标识符解析，返回 stock id 列表
-
-    解析逻辑:
-      1. UUID格式(32位十六进制) → search(id=)
-      2. 纯数字               → search(code=)
-      3. 其他(字母/中文混合)   → search(code=) 优先，search(name=) 兜底
-    """
-    import re
-    # UUID → id
-    if re.fullmatch(r'[0-9a-f]{32}', identifier):
-        return service.search(id=identifier)
-
-    # 纯数字 → code
-    if identifier.isdigit():
-        return service.search(code=identifier)
-
-    # 其他（字母混合）→ 先试 code，再试 name
-    ids = service.search(code=identifier)
-    if not ids:
-        ids = service.search(name=identifier)
-    return ids
 
 
 # ============= stock 组 =============
@@ -49,8 +30,26 @@ def ls():
     if not stocks:
         click.echo("暂无股票")
         return
+    headers = ['id', 'code', 'name', 'description', 'note_num', 'created_at', 'updated_at']
+    pt = PrettyTable(headers)
+    pt.align = "l"
+    pt.horizontal_char = '-'
+    pt.border = False
     for s in stocks:
-        click.echo(f"{s['id']}: {s['code']} {s.get('name', '')}")
+
+        rows = [
+            [
+            s.get("id") or "None",
+            s.get("code") or "None",
+            s.get("name") or "None",
+            s.get("description") or "None",
+            str(len(s.get("notes") or [])),
+            s.get("created_at") or "None",
+            s.get("updated_at") or "None"
+            ] for s in stocks
+        ]
+        pt.add_rows(rows)
+    click.echo(pt)
 
 
 @stk.command()
@@ -67,7 +66,7 @@ def add(code, name, description):
 @click.argument('identifier')
 def get(identifier):
     """查看股票详情（支持 id/code/name）"""
-    stock_ids = search_by_identifier(identifier)
+    stock_ids = service.match_by_identifier(identifier)
     if not stock_ids:
         click.echo("未找到")
         return
@@ -86,7 +85,7 @@ def get(identifier):
 @click.argument('identifier')
 def delete(identifier):
     """删除股票（支持 id/code/name）"""
-    stock_ids = search_by_identifier(identifier)
+    stock_ids = service.match_by_identifier(identifier)
     if not stock_ids:
         click.echo("未找到")
         return
@@ -108,7 +107,7 @@ def note():
 @click.option('-c', '--content', default='', help='笔记内容')
 def add(stock_identifier, summary, content):
     """添加笔记（支持 id/code/name）"""
-    stock_ids = search_by_identifier(stock_identifier)
+    stock_ids = service.match_by_identifier(stock_identifier)
     if not stock_ids:
         click.echo("未找到股票")
         return
@@ -121,7 +120,7 @@ def add(stock_identifier, summary, content):
 @click.argument('stock_identifier')
 def ls(stock_identifier):
     """列出股票的所有笔记（支持 id/code/name）"""
-    stock_ids = search_by_identifier(stock_identifier)
+    stock_ids = service.match_by_identifier(stock_identifier)
     if not stock_ids:
         click.echo("未找到股票")
         return
@@ -131,10 +130,12 @@ def ls(stock_identifier):
             click.echo(f"[{stock_id}] 暂无笔记")
             continue
         for i, n in enumerate(notes):
-            click.echo(f"[{i}] {n.get('summary', '')}")
-            click.echo(f"    {n.get('content', '')}")
-            click.echo(f"    created: {n.get('created_at', '')}")
-        click.echo("-"*50)
+            click.echo(f"索引： {i}")
+            click.echo(f"创建时间: {n.get('created_at', '')}")
+            click.echo(f"摘要: {n.get('summary', '')}")
+            if n.get('content'):
+                click.echo(f"内容： \n    {n.get('content', '')}")
+            click.echo("-"*50)
 
 
 @note.command()
@@ -142,7 +143,7 @@ def ls(stock_identifier):
 @click.argument('index', type=int)
 def delete(stock_identifier, index):
     """删除笔记（支持 id/code/name）"""
-    stock_ids = search_by_identifier(stock_identifier)
+    stock_ids = service.match_by_identifier(stock_identifier)
     if not stock_ids:
         click.echo("未找到股票")
         return

klnote-0.2.0/klnote/core/__init__.py

@@ -0,0 +1,3 @@
+from .service import Service
+
+

{klnote-0.1.0 → klnote-0.2.0}/klnote/core/service.py

@@ -1,5 +1,5 @@
 import json
-
+import re
 from .database import Database
 from .constants import DB_PATH
 from .utils import get_iso_timestamp
@@ -10,7 +10,8 @@ class Service:
         self.db = db or Database(DB_PATH)
 
 
-    def search(self,id:str=None, code:str=None, name:str=None):
+
+    def match_by_id_code_name(self,id:str=None, code:str=None, name:str=None):
         """
          id code name 三选一 查询,若多填， 优先 找 id 其次 code 最后 name
 
@@ -26,6 +27,30 @@ class Service:
 
         return ids
 
+    def match_by_identifier(self,identifier: str):
+        """
+        股票标识符解析，返回 stock id 列表
+
+        解析逻辑:
+          1. UUID格式(32位十六进制) → search(id=)
+          2. 纯数字               → search(code=)
+          3. 其他(字母/中文混合)   → search(code=) 优先，search(name=) 兜底
+        """
+
+        # UUID → id
+        if re.fullmatch(r'[0-9a-f]{32}', identifier):
+            return self.match_by_id_code_name(id=identifier)
+
+        # 纯数字 → code
+        if identifier.isdigit():
+            return self.match_by_id_code_name(code=identifier)
+
+        # 其他（字母混合）→ 先试 code，再试 name
+        ids = self.match_by_id_code_name(code=identifier)
+        if not ids:
+            ids = self.match_by_id_code_name(name=identifier)
+        return ids
+
     # stock
     def stock_add(self, code: str, id: str = None, name: str = None, description: str = None):
         """新建股票条目"""

{klnote-0.1.0 → klnote-0.2.0}/klnote.egg-info/PKG-INFO

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: klnote
-Version: 0.1.0
+Version: 0.2.0
 Summary: Stock note management tool
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: click>=8.0.0
+Requires-Dist: prettytable>=3.0.0
 Provides-Extra: dev
 Requires-Dist: pytest>=8.0.0; extra == "dev"
 
@@ -62,12 +63,18 @@ klnote --help
 ### 股票操作 (stk)
 
 ```
-klnote stk ls                       # 列出所有股票
+klnote stk ls                       # 列出所有股票（表格对齐）
 klnote stk add <code> [-n name] [-d desc]   # 添加股票
 klnote stk get <identifier>         # 查看股票详情
 klnote stk delete <identifier>      # 删除股票
 ```
 
+**输出示例：**
+```
+ id                                code    name      description  note_num  created_at                   updated_at 
+ 38578199c19644ebab18ce7b5c16d699  688102  斯瑞新财   None         1         2026-06-04T15:52:20.853674Z  None 
+```
+
 ### 笔记操作 (note)
 
 ```

{klnote-0.1.0 → klnote-0.2.0}/klnote.egg-info/requires.txt

@@ -1,4 +1,5 @@
 click>=8.0.0
+prettytable>=3.0.0
 
 [dev]
 pytest>=8.0.0

{klnote-0.1.0 → klnote-0.2.0}/pyproject.toml

@@ -4,11 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "klnote"
-version = "0.1.0"
+version = "0.2.0"
 description = "Stock note management tool"
 requires-python = ">=3.10"
 dependencies = [
     "click>=8.0.0",
+    "prettytable>=3.0.0",
 ]
 readme = "README.md"