bcmd 0.6.19__py3-none-any.whl → 0.6.21__py3-none-any.whl

bcmd/tasks/docs.py

@@ -47,7 +47,7 @@ async def build(
 
 
 async def init(path: Path):
-    global projectPath, docsPath, vitepressDistPath, distPath, deployPath, conf, zipFile
+    global projectPath, docsPath, vitepressDistPath, distPath, deployPath, zipFile
 
     # 初始化目录路径
     projectPath = path
@@ -62,10 +62,10 @@ async def init(path: Path):
     bpath.remove(vitepressDistPath)
 
     # 更新配置
-    infoTomlFile = deployPath / 'info.toml'
-    if not infoTomlFile.exists():
-        btask.abort('部署文件不存在', infoTomlFile)
-    conf.update(await bfile.readToml(infoTomlFile))
+    projectTomlFile = projectPath / 'project.toml'
+    if not projectTomlFile.exists():
+        btask.abort('部署文件不存在', projectTomlFile)
+    conf.update(await bfile.readToml(projectTomlFile))
 
     # 整理特殊的字段
     zipFile = distPath / f'{conf['domain']}_{now}.7z'
@@ -115,8 +115,7 @@ async def vitepressBuild(outputPath: Path):
 
 
 async def makeDeploy(outputPath: Path):
-    bpath.copy(projectPath / 'deploy', outputPath)
-    bpath.remove(outputPath / 'info.toml')
+    bpath.copy(deployPath, outputPath)
 
     # 删除配置里面加密和删除非字符串的配置，剩下的内容用于替换文件名和文件内容
     dataDict: dict[str, Any] = pickle.loads(pickle.dumps(conf))

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.19.dist-info → bcmd-0.6.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcmd
-Version: 0.6.19
+Version: 0.6.21
 Summary: Commands for Beni
 Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>

{bcmd-0.6.19.dist-info → bcmd-0.6.21.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=nmEZgb1KGSUCgnep2nCL7NgIsQYU5JoHvgIvggIGGtM,5912
+bcmd/tasks/docs.py,sha256=RDylKH1dSmXHZnW2g_zVqur6R3IqmT4hL90bj457C3c,5867
 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,7 +15,7 @@ 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
@@ -26,8 +26,8 @@ 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.19.dist-info/METADATA,sha256=vJz5ZMevCIpE4RER7CVUN0VL--qIn86UKAPPFsHMUsw,845
-bcmd-0.6.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bcmd-0.6.19.dist-info/entry_points.txt,sha256=mriCeYh3wksKcqq3-LtzyFkSCIdN1uZc1IJwom-SW1s,34
-bcmd-0.6.19.dist-info/top_level.txt,sha256=fYY6tRrJ_G7tn24RXAG0M5ZKbcuaQznodfX1toFPSKs,10
-bcmd-0.6.19.dist-info/RECORD,,
+bcmd-0.6.21.dist-info/METADATA,sha256=9ewmt7eSu-bdEXlaaBOeg3FeMoSaDh8FSzGN5FC4vWU,845
+bcmd-0.6.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bcmd-0.6.21.dist-info/entry_points.txt,sha256=mriCeYh3wksKcqq3-LtzyFkSCIdN1uZc1IJwom-SW1s,34
+bcmd-0.6.21.dist-info/top_level.txt,sha256=fYY6tRrJ_G7tn24RXAG0M5ZKbcuaQznodfX1toFPSKs,10
+bcmd-0.6.21.dist-info/RECORD,,