bcmd 0.6.18__py3-none-any.whl → 0.6.20__py3-none-any.whl

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/tasks/project.py

@@ -1,8 +1,9 @@
+import getpass
 import os
 from pathlib import Path
 from typing import Final
 
-from beni import btask, bpath
+from beni import bcolor, bcrypto, bexecute, bfile, bpath, btask
 from beni.bfunc import syncCall
 from typer import Argument, Option
 
@@ -20,6 +21,42 @@ async def init(
     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'

{bcmd-0.6.18.dist-info → bcmd-0.6.20.dist-info}/METADATA

@@ -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.dist-info → bcmd-0.6.20.dist-info}/RECORD

@@ -7,7 +7,7 @@ bcmd/tasks/__init__.py,sha256=shEJe1E9NlJhVWF0GpRLNDqdCVyJ91WYVKTGc1hrgkw,334
 bcmd/tasks/bin.py,sha256=DufZGRX7b2zclSaZM-zUPGwOiycN9RsV8KxF8tfSyqs,3240
 bcmd/tasks/code.py,sha256=IUs_ClZuSsBk2gavlitC8mkRrQQX9rvNDgR8cFxduBA,3992
 bcmd/tasks/crypto.py,sha256=LKvgsMPLvsi1wlt66TinYiN-oV2IPAfaN9y7hWaVpHs,2951
-bcmd/tasks/docs.py,sha256=LzCS41B82xILXTHbVvdb4ViFz0qPWDv3J8SG06Jaltc,6115
+bcmd/tasks/docs.py,sha256=nmEZgb1KGSUCgnep2nCL7NgIsQYU5JoHvgIvggIGGtM,5912
 bcmd/tasks/download.py,sha256=XdZYKi8zQTNYWEgUxeTNDqPgP7IGYJkMmlDDC9u93Vk,2315
 bcmd/tasks/image.py,sha256=_ck-WVfUlyQ2fZTpVPcpcurWSud7AkANKUuFjMW7MwA,14283
 bcmd/tasks/json.py,sha256=WWOyvcZPYaqQgp-Tkm-uIJschNMBKPKtZN3yXz_SC5s,635
@@ -15,20 +15,19 @@ bcmd/tasks/lib.py,sha256=AjB_Qx_eZakJQNpo_OQ796RKVNyUAR0m3S-fF9DXF-k,3070
 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/project.py,sha256=q3bK8depPwZoEGqe9fX2ol-DGsLNZgUxrwhVp4PEF68,928
+bcmd/tasks/project.py,sha256=Hg9zz2LXqzPKYRiIp3ZkibZJKL-NGD_XORw3F62ghNs,2401
 bcmd/tasks/proxy.py,sha256=B85ebW_XPo_21j0YKf3oOK-8Crr85ezaPeZZnbnvO4E,1896
 bcmd/tasks/time.py,sha256=ZiqA1jdgl-TBtFSOxxP51nwv4g9iZItmkFKpf9MKelk,2453
 bcmd/tasks/upgrade.py,sha256=nyhcl5oGAUnOOR8JJZW2jfepcVJ6O9gufK8VgxUeil0,543
 bcmd/tasks/wasabi.py,sha256=xWFAxprSIlBqDDMGaNXZFb-SahnW1d_R9XxSKRYIhnM,3110
 bcmd/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bcmd/utils/utils.py,sha256=Oyf5ubxaCD_T2GOz3zJkR4AJzfVcfBqtmL8Gk8_gOJs,202
 test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 test/conftest.py,sha256=grlPunlsvrkt_8QPckmF4POiKUPVxIxm2TPAh_ZB-zs,405
 test/test_pdf.py,sha256=7yYlfydyhy2dmVYdTA5Vir2AI8TUdzEi55fL-AqJmio,1533
 test/test_proxy.py,sha256=UMF2hFFGUEbJR1jT2mO_wdo-7Rfp0NDqIdTRnOmwtjY,164
 test/test_wasabi.py,sha256=qqXG1Kb9hKH6t624R173j6LagkgmejN0CFYt7kL0nNs,1066
-bcmd-0.6.18.dist-info/METADATA,sha256=fvKAuVIOdn77O6R1oPtoimzdcQARuiz2uan0SXfITFk,845
-bcmd-0.6.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bcmd-0.6.18.dist-info/entry_points.txt,sha256=mriCeYh3wksKcqq3-LtzyFkSCIdN1uZc1IJwom-SW1s,34
-bcmd-0.6.18.dist-info/top_level.txt,sha256=fYY6tRrJ_G7tn24RXAG0M5ZKbcuaQznodfX1toFPSKs,10
-bcmd-0.6.18.dist-info/RECORD,,
+bcmd-0.6.20.dist-info/METADATA,sha256=bQIJyAQSjUcpdsVezAjdlF2q3kSmofTdaReQ6uv4CuU,845
+bcmd-0.6.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bcmd-0.6.20.dist-info/entry_points.txt,sha256=mriCeYh3wksKcqq3-LtzyFkSCIdN1uZc1IJwom-SW1s,34
+bcmd-0.6.20.dist-info/top_level.txt,sha256=fYY6tRrJ_G7tn24RXAG0M5ZKbcuaQznodfX1toFPSKs,10
+bcmd-0.6.20.dist-info/RECORD,,

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