bcmd 0.6.11__py3-none-any.whl → 0.6.13__py3-none-any.whl

bcmd/common/secret.py

@@ -1,9 +1,10 @@
-import getpass
-from typing import Any, TypedDict, cast
+import tkinter as tk
+from tkinter import messagebox
+from typing import Any, TypedDict
 
 from async_lru import alru_cache
 from beni import bcrypto, btask
-from beni.bcolor import printRed
+from beni.bform import BForm
 
 
 class PypiSecret(TypedDict):
@@ -13,9 +14,9 @@ class PypiSecret(TypedDict):
 
 @alru_cache
 async def getPypi(value: str = '') -> PypiSecret:
-    return cast(
-        Any,
-        _getData(value or 'QbuF2mV/lqovtF5dskZGD7qHknYbNuF2QseWRtWxLZTPrC/jL1tcxV8JEKaRjLsu46PxJZ7zepJwggnUTIWnEAoV5VtgP2/hbuzxxHha8817kR5c65H9fXm8eOal7DYXsUoGPQMnm59UWNXUKjmIaP4sn9nySFlRYqa8sEZSbYQ4N0NL35Dpj1e3wyQxJ+7h2jwKAz50Hh8G4yAM3/js9+NUe4ymts+UXcwsP3ADIBMkzjnFc0lEYg2d+fw0A74XWCvoZPoGqHZR/THUOVNAYxoGgDzP4SPIk1XsmtpxvfO/DpJd/Cg/0fB3MYagGKI1+m6Bxqhvd1I/lf0YbM5y4E4='),
+    return _getData(
+        '请输入 PYPI 密钥信息',
+        value or 'QbuF2mV/lqovtF5dskZGD7qHknYbNuF2QseWRtWxLZTPrC/jL1tcxV8JEKaRjLsu46PxJZ7zepJwggnUTIWnEAoV5VtgP2/hbuzxxHha8817kR5c65H9fXm8eOal7DYXsUoGPQMnm59UWNXUKjmIaP4sn9nySFlRYqa8sEZSbYQ4N0NL35Dpj1e3wyQxJ+7h2jwKAz50Hh8G4yAM3/js9+NUe4ymts+UXcwsP3ADIBMkzjnFc0lEYg2d+fw0A74XWCvoZPoGqHZR/THUOVNAYxoGgDzP4SPIk1XsmtpxvfO/DpJd/Cg/0fB3MYagGKI1+m6Bxqhvd1I/lf0YbM5y4E4=',
     )
 
 
@@ -28,24 +29,41 @@ class QiniuSecret(TypedDict):
 
 @alru_cache
 async def getQiniu(value: str = '') -> QiniuSecret:
-    return cast(
-        Any,
-        _getData(value or 'vNroFKeKklrdcJ89suFm+iyuJsq/cyUB5+QWoeeiMc/J0oSLF9cg5rqbK1IRxF0cCQ8KmkQQhdVa+PI6kuTBhoSH6IviVTylzAOrJywEccz9jWkJkW28Y9Vo4ePZmfWf/j7wdxNB144z234KD8IxJn4lR2A0L9JN5kk1o1/hpcydXL74FNtt03lYL/E3WVcvpUfw37mri2HMYOfUw81dRwW35/hMuQjtq1BBrKrIsSKTHH44tROMcgyvt+Qy292AtDBcsYiZxBKhQtBFPMq/vUs='),
+    return _getData(
+        '请输入 七牛云 密钥信息',
+        value or 'vNroFKeKklrdcJ89suFm+iyuJsq/cyUB5+QWoeeiMc/J0oSLF9cg5rqbK1IRxF0cCQ8KmkQQhdVa+PI6kuTBhoSH6IviVTylzAOrJywEccz9jWkJkW28Y9Vo4ePZmfWf/j7wdxNB144z234KD8IxJn4lR2A0L9JN5kk1o1/hpcydXL74FNtt03lYL/E3WVcvpUfw37mri2HMYOfUw81dRwW35/hMuQjtq1BBrKrIsSKTHH44tROMcgyvt+Qy292AtDBcsYiZxBKhQtBFPMq/vUs=',
     )
 
 
-def _getData(content: str) -> dict[str, Any]:
-    index = content.find(' ')
-    if index > -1:
-        tips = f'请输入密码（{content[:index]}）：'
+def _getData(title: str, content: str) -> Any:
+
+    class PasswordForm(BForm):
+        result: dict[str, Any] = {}
+
+        def __init__(self):
+            super().__init__(title=title)
+            self.passwordVar = tk.StringVar(value='')
+            ary = content.split(' ')
+            if len(ary) > 1:
+                self.addLabel('提示', ary[0])
+            self.addEntry('密码', self.passwordVar, width=30, password=True, focus=True, command=self.onBtn)
+            self.addBtn('确定', self.onBtn)
+
+        def onBtn(self):
+            try:
+                self.result.update(
+                    bcrypto.decryptJson(content, self.passwordVar.get())
+                )
+                self.destroy()
+            except:
+                messagebox.showerror('密码错误', '密码错误，请重新输入')
+
+        def getResult(self):
+            return self.result
+
+    result = PasswordForm().run()
+
+    if result is None:
+        btask.abort('用户取消操作')
     else:
-        tips = '请输入密码：'
-    while True:
-        try:
-            pwd = getpass.getpass(tips)
-            return bcrypto.decryptJson(content, pwd)
-        except KeyboardInterrupt:
-            print('')
-            btask.abort('用户操作取消')
-        except BaseException:
-            printRed('密码错误')
+        return result

bcmd/tasks/docs.py

@@ -98,7 +98,10 @@ async def userInput():
         def getResult(self):
             return self.varIsUpload.get(), self.varPassword.get()
 
-    isUpload, password = BuildForm().run()
+    result = BuildForm().run()
+    if not result:
+        btask.abort('用户取消操作')
+    isUpload, password = result
 
     # 配置里面每个字段都尝试解密（实际效率较低但不影响使用）
     for k, v in conf.items():
@@ -142,6 +145,10 @@ async def makeDeploy(outputPath: Path):
         # 替换文件内容
         content = await bfile.readText(file)
         oldContent = content
+        try:
+            content = bcrypto.decryptText(content, password)
+        except:
+            pass
         for k, v in dataDict.items():
             content = content.replace(f'{{{k}}}', str(v))
         if oldContent != content:

{bcmd-0.6.11.dist-info → bcmd-0.6.13.dist-info}/METADATA

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

{bcmd-0.6.11.dist-info → bcmd-0.6.13.dist-info}/RECORD

@@ -1,14 +1,14 @@
 bcmd/__init__.py,sha256=GP_60-6vImXqdMfC5vc4xlscWajx4OYmnlNXASWn19w,147
 bcmd/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bcmd/common/func.py,sha256=MehbfuWFHTOsihhYxVFj0_U6-hjMTfLh3n-oMrpyyKo,508
-bcmd/common/secret.py,sha256=clemEVTCl3shhRBgjKZfrtTdyODz5U-wOyHfUXPegG4,1692
+bcmd/common/secret.py,sha256=oHZCNnpAjrS3ztuTUy24IwSGeA_3Z8KfgnNP48ZVjrQ,2285
 bcmd/resources/project/main.py,sha256=xdskz_sf05fYA1SRMFCIxDjx8SnegxTbCmHpW86ItLs,11
 bcmd/tasks/__init__.py,sha256=_G8hO9P0UEKJRreXv8114XeTR8uFG8gRSjvA1WMv8f8,333
 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/debian.py,sha256=B9aMIIct3vNqMJr5hTr1GegXVf20H49C27FMvRRGIzI,3004
-bcmd/tasks/docs.py,sha256=pVs9iy9fjo4DrWX-YfrxjnxLOO4VAW7w5NUqIZHxnVQ,5927
+bcmd/tasks/docs.py,sha256=LzCS41B82xILXTHbVvdb4ViFz0qPWDv3J8SG06Jaltc,6115
 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
@@ -27,8 +27,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.11.dist-info/METADATA,sha256=pvtRYCEzgRt8cvDZmOuxq6ZRO8HGrn2uHlekDuuGhz8,845
-bcmd-0.6.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bcmd-0.6.11.dist-info/entry_points.txt,sha256=mriCeYh3wksKcqq3-LtzyFkSCIdN1uZc1IJwom-SW1s,34
-bcmd-0.6.11.dist-info/top_level.txt,sha256=fYY6tRrJ_G7tn24RXAG0M5ZKbcuaQznodfX1toFPSKs,10
-bcmd-0.6.11.dist-info/RECORD,,
+bcmd-0.6.13.dist-info/METADATA,sha256=gPg2qkNuXzNWfU4DdgIr17XU5QUkaaPEkkhxew1o6cs,845
+bcmd-0.6.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bcmd-0.6.13.dist-info/entry_points.txt,sha256=mriCeYh3wksKcqq3-LtzyFkSCIdN1uZc1IJwom-SW1s,34
+bcmd-0.6.13.dist-info/top_level.txt,sha256=fYY6tRrJ_G7tn24RXAG0M5ZKbcuaQznodfX1toFPSKs,10
+bcmd-0.6.13.dist-info/RECORD,,