bcmd 0.6.3__py3-none-any.whl → 0.6.5__py3-none-any.whl

{bcmd-0.6.3.dist-info → bcmd-0.6.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcmd
-Version: 0.6.3
+Version: 0.6.5
 Summary: Commands for Beni
 Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>
@@ -8,7 +8,7 @@ Keywords: benimang,beni,bcmd
 Requires-Python: >=3.10
 Requires-Dist: aioconsole==0.8.1
 Requires-Dist: async-lru==2.0.5
-Requires-Dist: benimang==0.8.0
+Requires-Dist: benimang==0.8.1
 Requires-Dist: cryptography==45.0.4
 Requires-Dist: nest-asyncio==1.6.0
 Requires-Dist: pillow==11.2.1

bcmd-0.6.5.dist-info/RECORD

@@ -0,0 +1,29 @@
+bcmdx/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bcmdx/main.py,sha256=GP_60-6vImXqdMfC5vc4xlscWajx4OYmnlNXASWn19w,147
+bcmdx/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bcmdx/common/func.py,sha256=MB_ChA4aRzEjhMhyFmZ-h8aOZePzk0poYcTYRJUQxmI,509
+bcmdx/common/password.py,sha256=2oxHvsCL05lNBpDJ8hbx4LPadDsZQKds4f0rJBYTNHA,1368
+bcmdx/resources/project/main.py,sha256=xdskz_sf05fYA1SRMFCIxDjx8SnegxTbCmHpW86ItLs,11
+bcmdx/tasks/__init__.py,sha256=lcVrTgdEph3tKBwwCPVyEOHp-1A3zdFA_6OWLrOo19M,314
+bcmdx/tasks/bin.py,sha256=B_e-HYOc2Cohk-1PbKHyKn3RhI8TAUfI2EBRoFEHiTM,2961
+bcmdx/tasks/code.py,sha256=IUs_ClZuSsBk2gavlitC8mkRrQQX9rvNDgR8cFxduBA,3992
+bcmdx/tasks/crypto.py,sha256=LKvgsMPLvsi1wlt66TinYiN-oV2IPAfaN9y7hWaVpHs,2951
+bcmdx/tasks/debian.py,sha256=B9aMIIct3vNqMJr5hTr1GegXVf20H49C27FMvRRGIzI,3004
+bcmdx/tasks/download.py,sha256=XdZYKi8zQTNYWEgUxeTNDqPgP7IGYJkMmlDDC9u93Vk,2315
+bcmdx/tasks/image.py,sha256=Q8ujT6tq2tt0qS0DIY87PNG2RJ1wSArt2dHVTtCuccA,12161
+bcmdx/tasks/json.py,sha256=WWOyvcZPYaqQgp-Tkm-uIJschNMBKPKtZN3yXz_SC5s,635
+bcmdx/tasks/lib.py,sha256=4Ge0DQe4J7hyg2S-kJQ22MDbvO-E7BoyM00etNsxowc,2751
+bcmdx/tasks/math.py,sha256=xbl5UdaDMyAjiLodDPleP4Cutrk2S3NOAgurzAgOEAE,2862
+bcmdx/tasks/mirror.py,sha256=nAe8NYftMKzht16MFBj7RqXwvVhR6Jh2uuAyJLh87og,1098
+bcmdx/tasks/pdf.py,sha256=fkHRgxqzrRxdb4_-9pL9wp2roqAHJPS_dVqAGJvRUsM,1504
+bcmdx/tasks/proxy.py,sha256=xvxN5PClUnc5LQpmq2Wug7_LUVpJboMWLXBvL9lX7EM,1552
+bcmdx/tasks/time.py,sha256=ZiqA1jdgl-TBtFSOxxP51nwv4g9iZItmkFKpf9MKelk,2453
+bcmdx/tasks/upgrade.py,sha256=z9Ein8U_Co7fsijPxyDFM8tXBFCp4bWATImwwwvC5ho,536
+bcmdx/tasks/wasabi.py,sha256=xWFAxprSIlBqDDMGaNXZFb-SahnW1d_R9XxSKRYIhnM,3110
+bcmdx/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bcmdx/utils/tkUtil.py,sha256=Juj0be7i3wCBIZBFic4ye76ZfsVLkFiw50J266e5-0U,4685
+bcmd-0.6.5.dist-info/METADATA,sha256=O89LvsZh4ht3n6a15QOaAqzN6_eJd5PKZ1QnS3FOjNU,812
+bcmd-0.6.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bcmd-0.6.5.dist-info/entry_points.txt,sha256=p7bvtyio57ADkhcYAQeVus3iwXlSlcUwmuLtyR2qslQ,40
+bcmd-0.6.5.dist-info/top_level.txt,sha256=rFHAQCIe-D-4iY7llhCS6cRDYfRIhHh9knGydcCiQjQ,6
+bcmd-0.6.5.dist-info/RECORD,,

bcmd-0.6.5.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+beni = bcmdx.main:run

bcmd-0.6.5.dist-info/top_level.txt

@@ -0,0 +1 @@
+bcmdx

{bcmd → bcmdx}/common/func.py

@@ -15,5 +15,5 @@ def checkPathOrNotExists(folder: Path):
 
 @contextmanager
 def useResources(name: str):
-    with importlib.resources.path('bcmd.resources', name) as target:
+    with importlib.resources.path('bcmdx.resources', name) as target:
         yield target

bcmdx/tasks/lib.py

@@ -0,0 +1,93 @@
+import os
+from pathlib import Path
+from typing import Final
+
+import typer
+from beni import bcolor, bfile, bpath, brun, btask
+from beni.bfunc import syncCall
+
+from bcmdx.utils.tkUtil import TkForm
+
+from ..common import password
+
+app: Final = btask.newSubApp('lib 工具')
+
+
+@app.command()
+@syncCall
+async def update_version(
+    path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
+    isNotCommit: bool = typer.Option(False, '--no-commit', '-d', help='是否提交git'),
+):
+    '修改 pyproject.toml 版本号'
+    file = path / 'pyproject.toml'
+    btask.assertTrue(file.is_file(), '文件不存在', file)
+    data = await bfile.readToml(file)
+    latestVersion = data['project']['version']
+    vAry = [int(x) for x in latestVersion.split('.')]
+    versionList = [
+        f'{vAry[0] + 1}.0.0',
+        f'{vAry[0]}.{vAry[1] + 1}.0',
+        f'{vAry[0]}.{vAry[1]}.{vAry[2] + 1}',
+    ]
+
+    def showGui():
+        app = TkForm()
+        app.title('bcmd 版本更新')
+        app.addLabel('当前版本号', latestVersion)
+        version_var = app.addRadioBtn(
+            '请选择新版本',
+            versionList,
+            selectedIndex=-1,
+        )
+        result: str = ''
+
+        def onBtn():
+            nonlocal result
+            result = version_var.get()
+            app.destroy()
+
+        app.addBtn('确定', onBtn, focus=True)
+        app.run()
+        return result
+
+    newVersion = showGui()
+    if not newVersion:
+        btask.abort('用户取消操作')
+    content = await bfile.readText(file)
+    if f"version = '{latestVersion}'" in content:
+        content = content.replace(f"version = '{latestVersion}'", f"version = '{newVersion}'")
+    elif f'version = "{latestVersion}"' in content:
+        content = content.replace(f'version = "{latestVersion}"', f'version = "{newVersion}"')
+    else:
+        raise Exception('版本号修改失败，先检查文件中定义的版本号格式是否正常')
+    await bfile.writeText(file, content)
+
+    # 执行一遍 uv.lock
+    with bpath.changePath(path):
+        await brun.run('uv lock')
+
+    bcolor.printCyan(newVersion)
+    if not isNotCommit:
+        msg = f'更新版本号 {newVersion}'
+        os.system(
+            rf'TortoiseGitProc.exe /command:commit /path:{path} /logmsg:"{msg}"'
+        )
+    bcolor.printGreen('OK')
+
+
+@app.command()
+@syncCall
+async def build(
+    path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
+):
+    '发布项目'
+    user, pwd = await password.getPypi()
+    bpath.remove(path / 'dist')
+    bpath.remove(
+        *list(path.glob('*.egg-info'))
+    )
+    with bpath.changePath(path):
+        await brun.run(f'uv build')
+        await brun.run(f'uv publish -u {user} -p {pwd}')
+    bcolor.printGreen('OK')

{bcmd → bcmdx}/tasks/upgrade.py

@@ -11,7 +11,7 @@ app: Final = btask.app
 @app.command()
 @syncCall
 async def upgrade(
-    name: str = typer.Argument('bcmd', help='要更新的包名'),
+    name: str = typer.Argument('bcmdx', help='要更新的包名'),
 ):
     '使用 pipx 官方源更新指定包到最新版本'
 

bcmdx/utils/tkUtil.py

@@ -0,0 +1,130 @@
+import tkinter as tk
+from tkinter.scrolledtext import ScrolledText
+from typing import Callable
+from uuid import uuid4
+
+# version 2026-0621
+
+
+class TkForm(tk.Tk):
+
+    _row = -1
+    _initFocusItem: tk.Widget | None = None
+
+    RADIO_NOTHING = uuid4().hex
+
+    def __init__(self):
+        super().__init__()
+        self.resizable(False, False)
+        self.bind("<Map>", self._onMap)
+
+    def _onMap(self, event: tk.Event):
+        if self._initFocusItem:
+            self._initFocusItem.focus_set()
+            self._initFocusItem = None
+
+    def add(self, desc: str, widget: tk.Widget):
+        self._row += 1
+        tk.Label(text=desc).grid(row=self._row, column=0, padx=10, pady=5, sticky='n')
+        widget.grid(row=self._row, column=1, padx=10, pady=5, sticky='w')
+
+    def addFrame(self, frame: tk.Frame):
+        self._row += 1
+        frame.grid(row=self._row, column=0, columnspan=2, padx=10, pady=5)
+
+    def run(self):
+        self.center()
+        self.mainloop()
+
+    def center(self):
+        self.withdraw()  # 先隐藏窗口，避免闪动
+        self.update_idletasks()  # 确保获取正确的窗口尺寸
+        width = self.winfo_width()  # 获取窗口宽度
+        height = self.winfo_height()  # 获取窗口高度
+        screen_width = self.winfo_screenwidth()  # 屏幕宽度
+        screen_height = self.winfo_screenheight()  # 屏幕高度
+        x = (screen_width - width) // 2  # 水平居中
+        y = (screen_height - height) // 2  # 垂直居中
+        self.geometry(f"+{x}+{y}")  # 设置窗口位置
+        self.deiconify()  # 恢复显示窗口
+
+    def addLabel(self, desc: str, text: str):
+        self.add(desc, tk.Label(text=text))
+
+    def addBtn(self, label: str, command: Callable[..., None], *, width: int = 20, focus: bool = False):
+        frame = tk.Frame(self)
+        self.addFrame(frame)
+        btn = tk.Button(frame, text=label, width=width, command=command)
+        btn.pack(side="left", expand=True, padx=15)
+        if focus:
+            self._initFocusItem = btn
+
+    def addRadioBtn(self, desc: str, selectionList: list[str], *, selectedIndex: int | None = None, focusIndex: int | None = None):
+        frame = tk.Frame()
+        self.add(desc, frame)
+        var = tk.StringVar(value=selectionList[selectedIndex] if selectedIndex is not None else self.RADIO_NOTHING)
+        radioBtnList: list[tk.Radiobutton] = []
+        for version in selectionList:
+            radioBtn = tk.Radiobutton(frame, text=version, variable=var, value=version)
+            radioBtn.pack(side="left", padx=(0, 15))
+            radioBtnList.append(radioBtn)
+        if focusIndex is not None:
+            self._initFocusItem = radioBtnList[focusIndex]
+        return var
+
+    def addEntry(self, desc: str, text: str = '', *, width: int = 60, focus: bool = False):
+        entry = tk.Entry(self, width=30)
+        entry.insert(0, text)
+        self.add(desc, entry)
+        if focus:
+            self._initFocusItem = entry
+        return entry
+
+    def addScrolledText(self, desc: str, text: str = '', *, width: int = 60, height: int = 20, focus: bool = False):
+        scrolledText = ScrolledText(self, width=width, height=height)
+        scrolledText.insert("1.0", text)
+        self.add(desc, scrolledText)
+        if focus:
+            self._initFocusItem = scrolledText
+        return scrolledText
+
+    def addCheckBox(self, text: str, value: bool = False):
+        remember_var = tk.BooleanVar(value=value)
+        check_btn = tk.Checkbutton(text=text, variable=remember_var)
+        self.add("", check_btn)
+        return remember_var
+
+    def addPasswordInput(self, desc: str, *, width: int = 60, command: Callable[..., None] | None = None):
+        password_entry = tk.Entry(self, show="*", width=width)  # 使用 show="*" 隐藏输入内容
+        if command:
+            password_entry.bind('<Return>', lambda event: command())
+        self.add(desc, password_entry)
+        return password_entry
+
+
+''' 例子
+app = TkForm()
+app.title('更新版本信息')
+app.addLabel('当前版本号', '3.11.8')
+app.addLabel('上次更新时间', '2025-06-16 16:00:00')
+version_var = app.addRadioBtn(
+    '请选择新版本',
+    ['3.11.8', '3.11.9', '3.11.10'],
+    2,
+)
+log_text = app.addScrolledText('更新日志', '123\n23454asd这个')
+vara = app.addCheckBox('记住密码', False)
+varb = app.addCheckBox('阿萨德法师大润发', True)
+passwordInput = app.addPasswordInput('密码', command=lambda: onBtn())
+
+
+def onBtn():
+    print(version_var.get())
+    print(log_text.get('1.0', "end-1c").split('\n'))
+    app.destroy()
+
+
+app.addBtn('确定', onBtn)
+app.bind("<Visibility>", lambda e: passwordInput.focus_set())
+app.run()
+'''

bcmd/resources/project/.gitignore

@@ -1,3 +0,0 @@
-__pycache__
-*~$*
-venv/

bcmd/resources/project/.vscode/launch.json

@@ -1,15 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Python: main.py",
-            "type": "debugpy",
-            "request": "launch",
-            // "console": "internalConsole",
-            "program": "${workspaceFolder}/main.py"
-        }
-    ]
-}

bcmd/resources/project/.vscode/settings.json

@@ -1,11 +0,0 @@
-{
-    "files.exclude": {
-        ".pytest_cache": true,
-        "**/__pycache__": true,
-        ".gitignore": true,
-        ".venv": true,
-        ".venv-lock": true,
-        "venv": true,
-    },
-    "python.defaultInterpreterPath": "${workspaceFolder}/venv/Scripts/python.exe",
-}

bcmd/resources/project/.vscode/tasks.json

@@ -1,68 +0,0 @@
-{
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "git commit",
-            "problemMatcher": [],
-            "command": "TortoiseGitProc.exe",
-            "args": [
-                "/command:commit",
-                "/path:${workspaceFolder}/",
-            ],
-        },
-        {
-            "label": "git commit file",
-            "problemMatcher": [],
-            "command": "TortoiseGitProc.exe",
-            "args": [
-                "/command:commit",
-                "/path:${file}",
-            ],
-        },
-        {
-            "label": "git revert",
-            "problemMatcher": [],
-            "command": "TortoiseGitProc.exe",
-            "args": [
-                "/command:revert",
-                "/path:${workspaceFolder}/",
-            ],
-        },
-        {
-            "label": "git revert file",
-            "problemMatcher": [],
-            "command": "TortoiseGitProc.exe",
-            "args": [
-                "/command:revert",
-                "/path:${file}",
-            ],
-        },
-        {
-            "label": "git sync",
-            "problemMatcher": [],
-            "command": "TortoiseGitProc.exe",
-            "args": [
-                "/command:sync",
-                "/path:${workspaceFolder}/",
-            ],
-        },
-        {
-            "label": "git log",
-            "problemMatcher": [],
-            "command": "TortoiseGitProc.exe",
-            "args": [
-                "/command:log",
-                "/path:${workspaceFolder}/",
-            ],
-        },
-        {
-            "label": "git log file",
-            "problemMatcher": [],
-            "command": "TortoiseGitProc.exe",
-            "args": [
-                "/command:log",
-                "/path:${file}",
-            ],
-        },
-    ],
-}

bcmd/tasks/lib.py

@@ -1,58 +0,0 @@
-import os
-from pathlib import Path
-from typing import Final
-
-import typer
-from beni import bcolor, bfile, bpath, brun, btask
-from beni.bfunc import syncCall
-
-from ..common import password
-
-app: Final = btask.newSubApp('lib 工具')
-
-
-@app.command()
-@syncCall
-async def update_version(
-    path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
-    isNotCommit: bool = typer.Option(False, '--no-commit', '-d', help='是否提交git'),
-):
-    '修改 pyproject.toml 版本号'
-    file = path / 'pyproject.toml'
-    btask.assertTrue(file.is_file(), '文件不存在', file)
-    data = await bfile.readToml(file)
-    version = data['project']['version']
-    versionList = [int(x) for x in version.split('.')]
-    versionList[-1] += 1
-    newVersion = '.'.join([str(x) for x in versionList])
-    content = await bfile.readText(file)
-    if f"version = '{version}'" in content:
-        content = content.replace(f"version = '{version}'", f"version = '{newVersion}'")
-    elif f'version = "{version}"' in content:
-        content = content.replace(f'version = "{version}"', f'version = "{newVersion}"')
-    else:
-        raise Exception('版本号修改失败，先检查文件中定义的版本号格式是否正常')
-    await bfile.writeText(file, content)
-    bcolor.printCyan(newVersion)
-    if not isNotCommit:
-        msg = f'更新版本号 {newVersion}'
-        os.system(
-            rf'TortoiseGitProc.exe /command:commit /path:{file} /logmsg:"{msg}"'
-        )
-    bcolor.printGreen('OK')
-
-
-@app.command()
-@syncCall
-async def build(
-    path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
-):
-    '发布项目'
-    user, pwd = await password.getPypi()
-    bpath.remove(path / 'dist')
-    bpath.remove(
-        *list(path.glob('*.egg-info'))
-    )
-    with bpath.changePath(path):
-        await brun.run(f'uv build', isPrint=True)
-        await brun.run(f'uv publish -u {user} -p {pwd}', isPrint=True)

bcmd-0.6.3.dist-info/RECORD

@@ -1,31 +0,0 @@
-bcmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bcmd/main.py,sha256=GP_60-6vImXqdMfC5vc4xlscWajx4OYmnlNXASWn19w,147
-bcmd/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bcmd/common/func.py,sha256=MehbfuWFHTOsihhYxVFj0_U6-hjMTfLh3n-oMrpyyKo,508
-bcmd/common/password.py,sha256=2oxHvsCL05lNBpDJ8hbx4LPadDsZQKds4f0rJBYTNHA,1368
-bcmd/resources/project/.gitignore,sha256=EygWFLwtooQl0GWXSeaLszLT-yQioKM7YMNAidcAHGw,23
-bcmd/resources/project/main.py,sha256=xdskz_sf05fYA1SRMFCIxDjx8SnegxTbCmHpW86ItLs,11
-bcmd/resources/project/.vscode/launch.json,sha256=Wpghb9lW9Y1wtrjqlTbyjeejDuU8BQJmBjwsLyPRh1g,478
-bcmd/resources/project/.vscode/settings.json,sha256=G4rCroWxEHcQfsqIJ6CXRHI6VGr3WYQI3KPPjH_JANs,280
-bcmd/resources/project/.vscode/tasks.json,sha256=gouhpkrqiPz7v65Jw1Rz-BCYU3sSdmphzXIYCzVnoe0,1783
-bcmd/tasks/__init__.py,sha256=lcVrTgdEph3tKBwwCPVyEOHp-1A3zdFA_6OWLrOo19M,314
-bcmd/tasks/bin.py,sha256=B_e-HYOc2Cohk-1PbKHyKn3RhI8TAUfI2EBRoFEHiTM,2961
-bcmd/tasks/code.py,sha256=IUs_ClZuSsBk2gavlitC8mkRrQQX9rvNDgR8cFxduBA,3992
-bcmd/tasks/crypto.py,sha256=LKvgsMPLvsi1wlt66TinYiN-oV2IPAfaN9y7hWaVpHs,2951
-bcmd/tasks/debian.py,sha256=B9aMIIct3vNqMJr5hTr1GegXVf20H49C27FMvRRGIzI,3004
-bcmd/tasks/download.py,sha256=XdZYKi8zQTNYWEgUxeTNDqPgP7IGYJkMmlDDC9u93Vk,2315
-bcmd/tasks/image.py,sha256=Q8ujT6tq2tt0qS0DIY87PNG2RJ1wSArt2dHVTtCuccA,12161
-bcmd/tasks/json.py,sha256=WWOyvcZPYaqQgp-Tkm-uIJschNMBKPKtZN3yXz_SC5s,635
-bcmd/tasks/lib.py,sha256=dzb1VaVkVMtI586pqIoqp5jEhY0KcZkIbz5BIZJh7vY,1932
-bcmd/tasks/math.py,sha256=xbl5UdaDMyAjiLodDPleP4Cutrk2S3NOAgurzAgOEAE,2862
-bcmd/tasks/mirror.py,sha256=nAe8NYftMKzht16MFBj7RqXwvVhR6Jh2uuAyJLh87og,1098
-bcmd/tasks/pdf.py,sha256=fkHRgxqzrRxdb4_-9pL9wp2roqAHJPS_dVqAGJvRUsM,1504
-bcmd/tasks/proxy.py,sha256=xvxN5PClUnc5LQpmq2Wug7_LUVpJboMWLXBvL9lX7EM,1552
-bcmd/tasks/time.py,sha256=ZiqA1jdgl-TBtFSOxxP51nwv4g9iZItmkFKpf9MKelk,2453
-bcmd/tasks/upgrade.py,sha256=2Wu_aFn-UcToNPDzjRG78VSChirEiD2KnAf6fJUgYak,535
-bcmd/tasks/wasabi.py,sha256=xWFAxprSIlBqDDMGaNXZFb-SahnW1d_R9XxSKRYIhnM,3110
-bcmd-0.6.3.dist-info/METADATA,sha256=DNPenlEJcwpllXjMXn9Oi4RPJWpX28dPKieUiEamwjE,812
-bcmd-0.6.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bcmd-0.6.3.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
-bcmd-0.6.3.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
-bcmd-0.6.3.dist-info/RECORD,,

bcmd-0.6.3.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-beni = bcmd.main:run

bcmd-0.6.3.dist-info/top_level.txt

@@ -1 +0,0 @@
-bcmd