bcmd 0.6.9__tar.gz → 0.6.11__tar.gz

{bcmd-0.6.9 → bcmd-0.6.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcmd
-Version: 0.6.9
+Version: 0.6.11
 Summary: Commands for Beni
 Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>
@@ -11,6 +11,7 @@ Requires-Dist: async-lru==2.0.5
 Requires-Dist: benimang==0.8.6
 Requires-Dist: cryptography==45.0.4
 Requires-Dist: nest-asyncio==1.6.0
+Requires-Dist: paramiko==3.5.1
 Requires-Dist: pillow==11.2.1
 Requires-Dist: prettytable==3.16.0
 Requires-Dist: psutil==7.0.0

{bcmd-0.6.9 → bcmd-0.6.11}/bcmd/common/func.py

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

{bcmd-0.6.9 → bcmd-0.6.11}/bcmd/tasks/__init__.py

@@ -3,6 +3,7 @@ from . import bin
 from . import code
 from . import crypto
 from . import debian
+from . import docs
 from . import download
 from . import image
 from . import json

bcmd-0.6.11/bcmd/tasks/docs.py

@@ -0,0 +1,185 @@
+import asyncio
+import datetime
+import pickle
+import tkinter as tk
+from contextlib import asynccontextmanager
+from pathlib import Path
+from tkinter import messagebox
+from typing import Any, Final
+from uuid import uuid4
+
+import paramiko
+from beni import bcolor, bcrypto, bfile, bpath, brun, btask, bzip
+from beni.bform import BForm
+from beni.bfunc import syncCall
+from typer import Argument
+
+from bcmd.utils.utils import decryptFileIgnoreError
+
+app: Final = btask.newSubApp('Vitepress 网站相关')
+conf: dict[str, Any] = {}
+isUpload: bool = False
+password: str = ''
+now = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
+
+projectPath = bpath.get('')
+docsPath = bpath.get('')
+vitepressDistPath = bpath.get('')
+distPath = bpath.get('')
+deployPath = bpath.get('')
+zipFile = bpath.get('')
+
+
+@app.command()
+@syncCall
+async def build(
+    path: Path = Argument(Path.cwd(), help='workspace 路径'),
+):
+    '发布'
+    with bpath.useTempPath(True) as tempPath:
+        await init(path)
+        await userInput()
+        await vitepressBuild(tempPath / 'site')
+        await makeDeploy(tempPath / 'deploy')
+        for file in bpath.listPath(tempPath):
+            await bzip.sevenZip(zipFile, file)
+        if isUpload:
+            await upload()
+    bcolor.printGreen('OK')
+
+
+async def init(path: Path):
+    global projectPath, docsPath, vitepressDistPath, distPath, deployPath, conf, zipFile
+
+    # 初始化目录路径
+    projectPath = path
+    docsPath = projectPath / 'docs'
+    vitepressDistPath = docsPath / '.vitepress/dist'
+    distPath = projectPath / 'dist'
+    deployPath = projectPath / 'deploy'
+
+    # 清空打包用到的目录
+    bpath.remove(distPath)
+    bpath.make(distPath)
+    bpath.remove(vitepressDistPath)
+
+    # 更新配置
+    infoTomlFile = deployPath / 'info.toml'
+    if not infoTomlFile.exists():
+        btask.abort('部署文件不存在', infoTomlFile)
+    conf.update(await bfile.readToml(infoTomlFile))
+
+    # 整理特殊的字段
+    zipFile = distPath / f'{conf['domain']}_{now}.7z'
+    conf['upload_file_name'] = zipFile.name
+    conf['temp_path'] += f'/{uuid4()}'
+
+
+async def userInput():
+    global isUpload, password
+
+    class BuildForm(BForm):
+        def __init__(self):
+            super().__init__(title='发布网站')
+            self.varIsUpload = tk.BooleanVar(value=True)
+            self.varPassword = tk.StringVar(value='')
+            self.addLabel('网站', conf['domain'])
+            self.addCheckBox('上传服务器', '', self.varIsUpload)
+            self.addEntry('请输入密码', self.varPassword, width=20, command=self.onBtn, password=True, focus=True)
+
+        def onBtn(self):
+            password = self.varPassword.get()
+            try:
+                conf['server_info'] = bcrypto.decryptJson(conf['server_info'], password)
+                self.destroy()
+            except:
+                messagebox.showerror('密码错误', '密码错误，请重新输入')
+
+        def getResult(self):
+            return self.varIsUpload.get(), self.varPassword.get()
+
+    isUpload, password = BuildForm().run()
+
+    # 配置里面每个字段都尝试解密（实际效率较低但不影响使用）
+    for k, v in conf.items():
+        try:
+            conf[k] = bcrypto.decryptText(v, password)
+        except:
+            pass
+
+
+async def vitepressBuild(outputPath: Path):
+    with bpath.changePath(projectPath):
+        await brun.run('pnpm install')
+        await brun.run('pnpm docs:build')
+        bpath.copy(vitepressDistPath, outputPath)
+
+
+async def makeDeploy(outputPath: Path):
+    bpath.copy(projectPath / 'deploy', outputPath)
+    bpath.remove(outputPath / 'info.toml')
+
+    # 删除配置里面加密和删除非字符串的配置，剩下的内容用于替换文件名和文件内容
+    dataDict: dict[str, Any] = pickle.loads(pickle.dumps(conf))
+    for k in list(dataDict.keys()):
+        v = dataDict[k]
+        if not isinstance(v, str):
+            del dataDict[k]
+
+    # 文件名以及内容调整
+    fileList = bpath.listFile(outputPath, True)
+    await asyncio.gather(*[decryptFileIgnoreError(x, password) for x in fileList])
+    for file in fileList:
+
+        # 替换文件名
+        toFile = str(file)
+        for k, v in dataDict.items():
+            toFile = toFile.replace(f'{{{k}}}', str(v))
+        if toFile != str(file):
+            file.rename(toFile)
+            file = bpath.get(toFile)
+
+        # 替换文件内容
+        content = await bfile.readText(file)
+        oldContent = content
+        for k, v in dataDict.items():
+            content = content.replace(f'{{{k}}}', str(v))
+        if oldContent != content:
+            await bfile.writeText(file, content)
+
+    # 将 Scrips 里面的文件都抽离到 dist 目录
+    scriptsPath = outputPath / 'Scripts'
+    for file in bpath.listFile(scriptsPath):
+        bpath.move(file, distPath / f'{conf['domain']}_{now}_{file.stem}{file.suffix}')
+    bpath.remove(scriptsPath)
+
+
+@asynccontextmanager
+async def sshClient():
+    client = paramiko.SSHClient()
+    client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+    with bpath.useTempFile() as tempFile:
+        await bfile.writeText(tempFile, conf['server_key'])
+        client.connect(
+            **conf['server_info'],
+            key_filename=str(tempFile),
+        )
+        yield client
+        client.close()
+
+
+async def upload():
+    async with sshClient() as client:
+
+        def executeCmd(cmd: str):
+            _, stdout, _ = client.exec_command(f"bash -lc '{cmd}'")
+            print(stdout.read().decode())
+
+        sftp = client.open_sftp()
+        for file in bpath.listFile(distPath):
+            executeCmd(f'mkdir -p {conf['temp_path']}')
+            sftp.put(str(file), f'{conf['temp_path']}/{file.name}')
+        shFile = list(distPath.glob('*.sh'))[0]
+        executeCmd(f'sh {conf['temp_path']}/{shFile.name}')
+        executeCmd(f'rm -rf {conf['temp_path']}')
+        sftp.close()

{bcmd-0.6.9 → bcmd-0.6.11}/bcmd/tasks/lib.py

@@ -86,6 +86,8 @@ async def build(
         *list(path.glob('*.egg-info'))
     )
     with bpath.changePath(path):
-        await brun.run(f'uv build')
-        await brun.run(f'uv publish -u {data['username']} -p {data['password']}')
+        _, code = await brun.run(f'uv build')
+        btask.assertTrue(not code, '构建失败')
+        _, code = await brun.run(f'uv publish -u {data['username']} -p {data['password']}')
+        btask.assertTrue(not code, '发布失败')
     bcolor.printGreen('OK')

{bcmd-0.6.9 → bcmd-0.6.11}/bcmd/tasks/upgrade.py

@@ -11,11 +11,10 @@ app: Final = btask.app
 @app.command()
 @syncCall
 async def upgrade(
-    name: str = typer.Argument('bcmdx', help='要更新的包名'),
+    name: str = typer.Argument('bcmd', help='要更新的包名'),
 ):
-    '使用 pipx 官方源更新指定包到最新版本'
-
-    cmd = f'pipx upgrade {name} -i https://pypi.org/simple'
+    '使用 uv 官方源更新指定包到最新版本'
+    cmd = f'uv tool install -U --index https://pypi.org/simple {name}'
     pyperclip.copy(cmd + '\n')
     bcolor.printGreen(cmd)
     bcolor.printGreen('已复制到剪贴板（需要手动执行）')

bcmd-0.6.11/bcmd/utils/utils.py

@@ -0,0 +1,9 @@
+from beni import bcrypto
+from beni.btype import XPath
+
+
+async def decryptFileIgnoreError(file: XPath, password: str):
+    try:
+        await bcrypto.decryptFile(file, password)
+    except:
+        pass

{bcmd-0.6.9 → bcmd-0.6.11}/bcmd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcmd
-Version: 0.6.9
+Version: 0.6.11
 Summary: Commands for Beni
 Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>
@@ -11,6 +11,7 @@ Requires-Dist: async-lru==2.0.5
 Requires-Dist: benimang==0.8.6
 Requires-Dist: cryptography==45.0.4
 Requires-Dist: nest-asyncio==1.6.0
+Requires-Dist: paramiko==3.5.1
 Requires-Dist: pillow==11.2.1
 Requires-Dist: prettytable==3.16.0
 Requires-Dist: psutil==7.0.0

{bcmd-0.6.9 → bcmd-0.6.11}/bcmd.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ pyproject.toml
 ./bcmd/tasks/code.py
 ./bcmd/tasks/crypto.py
 ./bcmd/tasks/debian.py
+./bcmd/tasks/docs.py
 ./bcmd/tasks/download.py
 ./bcmd/tasks/image.py
 ./bcmd/tasks/json.py
@@ -23,6 +24,7 @@ pyproject.toml
 ./bcmd/tasks/upgrade.py
 ./bcmd/tasks/wasabi.py
 ./bcmd/utils/__init__.py
+./bcmd/utils/utils.py
 ./test/__init__.py
 ./test/conftest.py
 ./test/test_pdf.py
@@ -44,6 +46,7 @@ bcmd/tasks/bin.py
 bcmd/tasks/code.py
 bcmd/tasks/crypto.py
 bcmd/tasks/debian.py
+bcmd/tasks/docs.py
 bcmd/tasks/download.py
 bcmd/tasks/image.py
 bcmd/tasks/json.py
@@ -55,4 +58,5 @@ bcmd/tasks/proxy.py
 bcmd/tasks/time.py
 bcmd/tasks/upgrade.py
 bcmd/tasks/wasabi.py
-bcmd/utils/__init__.py
+bcmd/utils/__init__.py
+bcmd/utils/utils.py

{bcmd-0.6.9 → bcmd-0.6.11}/bcmd.egg-info/requires.txt

@@ -3,6 +3,7 @@ async-lru==2.0.5
 benimang==0.8.6
 cryptography==45.0.4
 nest-asyncio==1.6.0
+paramiko==3.5.1
 pillow==11.2.1
 prettytable==3.16.0
 psutil==7.0.0

{bcmd-0.6.9 → bcmd-0.6.11}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = 'bcmd'
-version = '0.6.9'
+version = '0.6.11'
 description = 'Commands for Beni'
 requires-python = '>=3.10'
 keywords = ['benimang', 'beni', 'bcmd']
@@ -16,6 +16,7 @@ dependencies = [
     "benimang==0.8.6",
     "cryptography==45.0.4",
     "nest-asyncio==1.6.0",
+    "paramiko==3.5.1",
     "pillow==11.2.1",
     "prettytable==3.16.0",
     "psutil==7.0.0",