bcmd 0.6.20__py3-none-any.whl → 0.6.22__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'
@@ -84,6 +84,7 @@ async def userInput():
             self.addLabel('网站', conf['domain'])
             self.addCheckBox('上传服务器', '', self.varIsUpload)
             self.addEntry('请输入密码', self.varPassword, width=20, command=self.onBtn, password=True, focus=True)
+            self.addBtn('确定', self.onBtn)
 
         def onBtn(self):
             password = self.varPassword.get()
@@ -115,8 +116,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-0.6.20.dist-info → bcmd-0.6.22.dist-info}/METADATA

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

{bcmd-0.6.20.dist-info → bcmd-0.6.22.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=GELGIzTXY32_p_zaructhmozA5F0js6w-lKpYTaz8Ck,5913
 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
@@ -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.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-0.6.22.dist-info/METADATA,sha256=ugMwihGyP9oHQoQldwqQIc1FmXp5lN9Cl8w21N0LaTI,845
+bcmd-0.6.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bcmd-0.6.22.dist-info/entry_points.txt,sha256=mriCeYh3wksKcqq3-LtzyFkSCIdN1uZc1IJwom-SW1s,34
+bcmd-0.6.22.dist-info/top_level.txt,sha256=fYY6tRrJ_G7tn24RXAG0M5ZKbcuaQznodfX1toFPSKs,10
+bcmd-0.6.22.dist-info/RECORD,,