bcmd 0.6.20__tar.gz → 0.6.22__tar.gz

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

@@ -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 → bcmd-0.6.22}/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 → bcmd-0.6.22}/bcmd.egg-info/PKG-INFO

@@ -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 → bcmd-0.6.22}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = 'bcmd'
-version = '0.6.20'
+version = '0.6.22'
 description = 'Commands for Beni'
 requires-python = '>=3.10'
 keywords = ['benimang', 'beni', 'bcmd']