bcmd 0.6.18__tar.gz → 0.6.20__tar.gz

{bcmd-0.6.18 → bcmd-0.6.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcmd
-Version: 0.6.18
+Version: 0.6.20
 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.6
+Requires-Dist: benimang==0.8.9
 Requires-Dist: cryptography==45.0.4
 Requires-Dist: nest-asyncio==1.6.0
 Requires-Dist: paramiko==3.5.1

{bcmd-0.6.18 → bcmd-0.6.20}/bcmd/tasks/docs.py

@@ -1,5 +1,5 @@
-import asyncio
 import datetime
+import json
 import pickle
 import tkinter as tk
 from contextlib import asynccontextmanager
@@ -14,8 +14,6 @@ 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
@@ -90,7 +88,7 @@ async def userInput():
         def onBtn(self):
             password = self.varPassword.get()
             try:
-                conf['server_info'] = bcrypto.decryptJson(conf['server_info'], password)
+                bcrypto.decryptJson(conf['server_info'], password)
                 self.destroy()
             except:
                 messagebox.showerror('密码错误', '密码错误，请重新输入')
@@ -103,12 +101,10 @@ async def userInput():
         btask.abort('用户取消操作')
     isUpload, password = result
 
-    # 配置里面每个字段都尝试解密（实际效率较低但不影响使用）
+    # 将里面加密的内容解密
     for k, v in conf.items():
-        try:
+        if str(v).startswith(bcrypto.FLAG):
             conf[k] = bcrypto.decryptText(v, password)
-        except:
-            pass
 
 
 async def vitepressBuild(outputPath: Path):
@@ -131,7 +127,6 @@ async def makeDeploy(outputPath: Path):
 
     # 文件名以及内容调整
     fileList = bpath.listFile(outputPath, True)
-    await asyncio.gather(*[decryptFileIgnoreError(x, password) for x in fileList])
     for file in fileList:
 
         # 替换文件名
@@ -145,10 +140,8 @@ async def makeDeploy(outputPath: Path):
         # 替换文件内容
         content = await bfile.readText(file)
         oldContent = content
-        try:
+        if content.startswith(bcrypto.FLAG):
             content = bcrypto.decryptText(content, password)
-        except:
-            pass
         for k, v in dataDict.items():
             content = content.replace(f'{{{k}}}', str(v))
         if oldContent != content:
@@ -168,7 +161,7 @@ async def sshClient():
     with bpath.useTempFile() as tempFile:
         await bfile.writeText(tempFile, conf['server_key'])
         client.connect(
-            **conf['server_info'],
+            **json.loads(conf['server_info']),
             key_filename=str(tempFile),
         )
         yield client

bcmd-0.6.20/bcmd/tasks/project.py

@@ -0,0 +1,71 @@
+import getpass
+import os
+from pathlib import Path
+from typing import Final
+
+from beni import bcolor, bcrypto, bexecute, bfile, bpath, btask
+from beni.bfunc import syncCall
+from typer import Argument, Option
+
+app: Final = btask.newSubApp('项目相关')
+
+
+@app.command()
+@syncCall
+async def init(
+    path: Path = Argument(Path.cwd(), help='workspace 路径'),
+    deep: int = Option(3, '--deep', '-d', help='探索深度'),
+):
+    '找出项目执行初始化 pnpm install 和 uv sync --all-extras'
+
+    initSubFolder(path, deep)
+
+
+@app.command()
+@syncCall
+async def https_cert(
+    path: Path = Argument(Path.cwd(), help='https证书路径'),
+    no_commit: bool = Option(False, '--no-commit', help='不执行提交操作'),
+):
+    '更新 https 证书，将证书文件加密并且改名为 {domain}.key 或 {domain}.pem，将下载下来的文件直接放到目录后执行'
+    fileList = list(path.glob('**/*.key')) + list(path.glob('**/*.pem'))
+    fileList = list(filter(lambda x: x.stem != '{domain}', fileList))
+    btask.assertTrue(fileList, '没有找到需要处理的证书文件')
+
+    # 处理密码输入
+    while True:
+        password = getpass.getpass('请输入密码：')
+        if not password:
+            continue
+        repassword = getpass.getpass('请重复输入密码：')
+        if password == repassword:
+            break
+        else:
+            bcolor.printRed('两次密码输入不一样')
+
+    # 文件加密处理
+    for file in fileList:
+        content = await bfile.readText(file)
+        content = bcrypto.encryptText(content, password)
+        toFile = file.parent / f'{{domain}}{file.suffix}'
+        bcolor.printGreen('更新文件', toFile)
+        await bfile.writeText(toFile, content)
+        bcolor.printYellow('删除文件', file)
+        bpath.remove(file)
+
+    if not no_commit:
+        await bexecute.run(f'TortoiseGitProc.exe /command:commit /path:{path}/ /logmsg:"更新https证书文件"')
+
+
+def initSubFolder(path: Path, deep: int):
+    uvLockFile = path / 'uv.lock'
+    pnpmLockFile = path / 'pnpm-lock.yaml'
+    if uvLockFile.exists():
+        with bpath.changePath(path):
+            os.system('uv sync --all-extras')
+    elif pnpmLockFile.exists():
+        with bpath.changePath(path):
+            os.system('pnpm install')
+    elif deep > 1:
+        for subPath in bpath.listDir(path):
+            initSubFolder(subPath, deep - 1)

{bcmd-0.6.18 → bcmd-0.6.20}/bcmd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcmd
-Version: 0.6.18
+Version: 0.6.20
 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.6
+Requires-Dist: benimang==0.8.9
 Requires-Dist: cryptography==45.0.4
 Requires-Dist: nest-asyncio==1.6.0
 Requires-Dist: paramiko==3.5.1

{bcmd-0.6.18 → bcmd-0.6.20}/bcmd.egg-info/SOURCES.txt

@@ -24,7 +24,6 @@ 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
@@ -58,5 +57,4 @@ bcmd/tasks/proxy.py
 bcmd/tasks/time.py
 bcmd/tasks/upgrade.py
 bcmd/tasks/wasabi.py
-bcmd/utils/__init__.py
-bcmd/utils/utils.py
+bcmd/utils/__init__.py

{bcmd-0.6.18 → bcmd-0.6.20}/bcmd.egg-info/requires.txt

@@ -1,6 +1,6 @@
 aioconsole==0.8.1
 async-lru==2.0.5
-benimang==0.8.6
+benimang==0.8.9
 cryptography==45.0.4
 nest-asyncio==1.6.0
 paramiko==3.5.1

{bcmd-0.6.18 → bcmd-0.6.20}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = 'bcmd'
-version = '0.6.18'
+version = '0.6.20'
 description = 'Commands for Beni'
 requires-python = '>=3.10'
 keywords = ['benimang', 'beni', 'bcmd']
@@ -13,7 +13,7 @@ maintainers = [{ name = 'Beni Mang', email = 'benimang@126.com' }]
 dependencies = [
     "aioconsole==0.8.1",
     "async-lru==2.0.5",
-    "benimang==0.8.6",
+    "benimang==0.8.9",
     "cryptography==45.0.4",
     "nest-asyncio==1.6.0",
     "paramiko==3.5.1",

bcmd-0.6.18/bcmd/tasks/project.py

@@ -1,34 +0,0 @@
-import os
-from pathlib import Path
-from typing import Final
-
-from beni import btask, bpath
-from beni.bfunc import syncCall
-from typer import Argument, Option
-
-app: Final = btask.newSubApp('项目相关')
-
-
-@app.command()
-@syncCall
-async def init(
-    path: Path = Argument(Path.cwd(), help='workspace 路径'),
-    deep: int = Option(3, '--deep', '-d', help='探索深度'),
-):
-    '找出项目执行初始化 pnpm install 和 uv sync --all-extras'
-
-    initSubFolder(path, deep)
-
-
-def initSubFolder(path: Path, deep: int):
-    uvLockFile = path / 'uv.lock'
-    pnpmLockFile = path / 'pnpm-lock.yaml'
-    if uvLockFile.exists():
-        with bpath.changePath(path):
-            os.system('uv sync --all-extras')
-    elif pnpmLockFile.exists():
-        with bpath.changePath(path):
-            os.system('pnpm install')
-    elif deep > 1:
-        for subPath in bpath.listDir(path):
-            initSubFolder(subPath, deep - 1)

bcmd-0.6.18/bcmd/utils/utils.py

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