bcmd 0.0.51__py3-none-any.whl → 0.0.56__py3-none-any.whl

bcmd/common/password.py

@@ -11,7 +11,7 @@ async def getPypi() -> tuple[str, str]:
         with tryRun():
             data = _getData(
                 '输入密码（pypi）',
-                'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6ImJlbmltYW5nIiwicGFzc3dvIjoxNjk2OTIxNDg3Ljg2NzY5MTN9.WvtsFXFB0fk7GTj01tfed1BF-gmDv-3U4bVmcN2wT9wcmQiOiJweXBpMDA5OTg4IiwiODVlYmMwMmQtZDg4MS00NWJiLWE3ZjktNTdkZDA1YjJiNjg2'
+                'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6Il9fdG9rZW5fXyIsInBhc3N3b3JkIjoicHlwaS1BZ0VJY0hsd2FTNXZjbWNDSkRrM05qWTFOMk5tTFRsaU9URXROR0ZsT1MwNVlUQTBMVFE0WVQ2NlTzlIbkx4RG9Ca3ciLCIzMGE0YTM1Ni0zNmYwLTQ4NTktODk3Zi0xZDFmZDRkMmVhMWQiOjE3MDA4NDU1ODQuNDg5MTY2fQ.YjsYWtUxfsDbHJRQiFSzfuNKDnccC3gxGbAk_bW-LBARCak5EUmlOR1ppWVFBQ0tsc3pMQ0ppT0RBMU16QmhaUzFrTURZekxUUTBZbVF0T0dJMU1pMHdNMlZqWVRSaFlUYzJZV1lpWFFBQUJpQWNvaWxLNlA2TVNZSklETnlvXzcwTXkybzVPWWR3'
             )
             return data['username'], data['password']
 

bcmd/tasks/lib.py

@@ -16,14 +16,14 @@ app: Final = btask.newSubApp('lib 工具')
 @syncCall
 async def tidy(
     workspace_path: Path = typer.Argument(None, help='workspace 路径'),
-    no_version: bool = typer.Option(False, '--no-version', help='是否带版本号'),
+    with_version: bool = typer.Option(False, '--with-version', help='是否带版本号')
 ):
     '整理 pyproject.toml 里面的 dependencies'
     if not workspace_path:
         workspace_path = Path.cwd()
     pyprojectTomlFile = workspace_path / 'pyproject.toml'
     btask.check(pyprojectTomlFile.is_file(), 'pyproject.toml 不存在', pyprojectTomlFile)
-    targetVenvFileName = 'venv.list' if no_version else 'venv.lock'
+    targetVenvFileName = 'venv.lock' if with_version else 'venv.list'
     targetVenvFile = bpath.get(workspace_path, f'./../{targetVenvFileName}')
     btask.check(targetVenvFile.is_file(), '文件不存在', targetVenvFile)
     ary = (await bfile.readText(targetVenvFile)).strip().replace('\r\n', '\n').split('\n')
@@ -45,13 +45,14 @@ async def tidy(
 async def version(
     workspace_path: Path = typer.Argument(None, help='workspace 路径'),
     disabled_commit: bool = typer.Option(False, '--disabled-commit', '-d', help='是否提交git'),
+    with_dependencies_version: bool = typer.Option(False, '--with_dependencies_version', help='第三方库是否带版本号')
 ):
-    '修改 pyproject.toml 版本号'
+    '修改 pyproject.toml 版本号（同时会更新依赖列表）'
     if not workspace_path:
         workspace_path = Path.cwd()
     file = workspace_path / 'pyproject.toml'
     btask.check(file.is_file(), '文件不存在', file)
-    isChangeDependencies = tidy(workspace_path)
+    isChangeDependencies = tidy(workspace_path, with_dependencies_version)
     data = await bfile.readToml(file)
     version = data['project']['version']
     versionList = [int(x) for x in version.split('.')]
@@ -65,7 +66,7 @@ async def version(
     else:
         raise Exception('版本号修改失败，先检查文件中定义的版本号格式是否正常')
     await bfile.writeText(file, content)
-    bcolor.printCyan(f'{version} => {newVersion}')
+    bcolor.printCyan(newVersion)
     if not disabled_commit:
         msg = ''.join([
             f'更新版本号 {newVersion}',

bcmd/tasks/pwd.py

@@ -1,6 +1,5 @@
 import getpass
 import json
-import time
 import uuid
 from typing import Final
 
@@ -13,10 +12,14 @@ from rich.console import Console
 app: Final = btask.newSubApp('lib 工具')
 
 
+_KEY_SALT = '_salt_@#%@#xafDGAz.nq'
+_KEY_TEXT = '_text_A!@$,FJ@#adsfkl'
+
+
 @app.command()
 @syncCall
-async def encode():
-    '生成密文（JSON内容需要先复制到剪贴板）'
+async def encode_json():
+    '生成JSON密文（使用剪贴板内容）'
     content = pyperclip.paste()
     try:
         data = json.loads(content)
@@ -28,7 +31,7 @@ async def encode():
         password = getpass.getpass('输入密码：')
     while password != getpass.getpass('再次密码：'):
         pass
-    data[str(uuid.uuid4())] = time.time()
+    data[_KEY_SALT] = str(uuid.uuid4())
     result = jwt.encode(data, password, algorithm='HS256')
     result = magicSequence(result)
     pyperclip.copy(result)
@@ -40,8 +43,8 @@ async def encode():
 
 @app.command()
 @syncCall
-async def decode():
-    '还原密文内容'
+async def decode_json():
+    '还原JSON密文内容（使用剪贴板内容）'
     content = pyperclip.paste()
     bcolor.printYellow(content)
     content = magicSequence(content)
@@ -50,6 +53,49 @@ async def decode():
         password = getpass.getpass('输入密码：')
     try:
         data = jwt.decode(content, password, algorithms=['HS256'])
+        if _KEY_SALT in data:
+            del data[_KEY_SALT]
         Console().print_json(data=data, indent=4, ensure_ascii=False, sort_keys=True)
     except:
         return btask.abort('无法解析密文')
+
+
+@app.command()
+@syncCall
+async def encode_text():
+    '生成文本密文（使用剪贴板内容）'
+    content = pyperclip.paste()
+    bcolor.printYellow(content)
+    data = {
+        _KEY_TEXT: content,
+        _KEY_SALT: str(uuid.uuid4()),
+    }
+    password = ''
+    while not password:
+        password = getpass.getpass('输入密码：')
+    while password != getpass.getpass('再次密码：'):
+        pass
+    result = jwt.encode(data, password, algorithm='HS256')
+    result = magicSequence(result)
+    pyperclip.copy(result)
+    print('密文已复制到剪贴板')
+    bcolor.printYellow(result)
+    bcolor.printGreen('OK')
+
+
+@app.command()
+@syncCall
+async def decode_text():
+    '还原文本密文内容（使用剪贴板内容）'
+    content = pyperclip.paste()
+    bcolor.printYellow(content)
+    content = magicSequence(content)
+    password = ''
+    while not password:
+        password = getpass.getpass('输入密码：')
+    try:
+        data = jwt.decode(content, password, algorithms=['HS256'])
+        content = data[_KEY_TEXT]
+        bcolor.printYellow(content)
+    except:
+        return btask.abort('无法解析密文')

bcmd/tasks/venv.py

@@ -5,6 +5,11 @@ from typing import Final
 import typer
 from beni import bexecute, bfile, bhttp, binput, bpath, btask
 from beni.bfunc import syncCall
+from beni.btype import Null
+
+from bcmd.common import password
+
+from . import bin
 
 app: Final = btask.app
 
@@ -18,6 +23,7 @@ async def venv(
     quiet: bool = typer.Option(False, '--quiet', '-q', help='是否安静模式'),
 ):
     'python 虚拟环境配置'
+    await password.getQiniu()
     packages = packages or []
     for i in range(len(packages)):
         package = packages[i]
@@ -51,6 +57,16 @@ async def venv(
             pip = bpath.get(venvPath, 'Scripts/pip.exe')
             await pipInstall(pip, targetFile)
             await bexecute.run(f'{pip} freeze > {venvLockFile}')
+
+            # 下载 bin 文件
+            binListFile = bpath.get(path, 'bin.list')
+            if binListFile.exists():
+                bin.download(
+                    names=Null,
+                    file=binListFile,
+                    output=path / 'bin',
+                )
+
         finally:
             if tempFile.is_file():
                 bpath.move(tempFile, pipIniFile, True)

bcmd-0.0.56.dist-info/METADATA

@@ -0,0 +1,12 @@
+Metadata-Version: 2.1
+Name: bcmd
+Version: 0.0.56
+Summary: Commands for Beni
+Author-email: Beni Mang <benimang@126.com>
+Maintainer-email: Beni Mang <benimang@126.com>
+Keywords: benimang,beni,bcmd
+Requires-Python: >=3.10
+Requires-Dist: benimang ==0.4.34
+Requires-Dist: pathspec
+Requires-Dist: pyjwt
+

{bcmd-0.0.51.dist-info → bcmd-0.0.56.dist-info}/RECORD

@@ -1,20 +1,20 @@
 bcmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bcmd/main.py,sha256=_ycMuR_Opl2muPSZAQYTLk9wGM20x_4I0o7eF_HV848,136
 bcmd/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bcmd/common/password.py,sha256=5IR-lIOUphCbUtfIDe2ISbQwlAr4Pbm7Irw5sQyEa_w,1336
+bcmd/common/password.py,sha256=O2TL7S7wLMtatII2N-z68dkX6Y3vF-NKccMffcb69sU,1562
 bcmd/tasks/__init__.py,sha256=JQomljtTMPQbpLv-y0vKSzwFm4_WZdtWzutCAoXq6Ok,205
 bcmd/tasks/bin.py,sha256=4O9Doak-ecOTGvyriZf6v31bhTI66s5IsIKV3wW_cu4,3082
 bcmd/tasks/json.py,sha256=WWOyvcZPYaqQgp-Tkm-uIJschNMBKPKtZN3yXz_SC5s,635
-bcmd/tasks/lib.py,sha256=A0TgyrpwF62qucBDtunsDedj_HkhyMzU31vb54U4XZU,4175
+bcmd/tasks/lib.py,sha256=l4v9JnsSFicnWfd6lOMa9TIKZn14ybYsIiPX1vCWaho,4350
 bcmd/tasks/math.py,sha256=jDLIEhy9Dbz7yHlZQIr7rps6C-rNamiVM7_9tVYdMJk,4302
 bcmd/tasks/mirror.py,sha256=PLRI5XPG9CV44rgQn1mB5U-GRJYnp5wl3Xwsd0_df_Y,1448
 bcmd/tasks/proxy.py,sha256=nAxF9yzk-2O6TeEczGRc3vS3dfe2ZZR1hcGOFU1DS3g,660
-bcmd/tasks/pwd.py,sha256=rMHsabEVmZpN9xz9Br-sSJSdS-2_jO0WCe7dQ7UnFvo,1579
+bcmd/tasks/pwd.py,sha256=-j6HcZcfKz7U2XhEDAsomY0FdXZwnwqE_yXD5RRZtX0,2885
 bcmd/tasks/task.py,sha256=7AelyK8mTVTfERaagkaUUggP8Md3XC9gurgoakMYf_I,4738
 bcmd/tasks/time.py,sha256=nSIVYov2LsGdxsZAtC91UKXcUtVAqR9o-JmzeuevFhA,2586
-bcmd/tasks/venv.py,sha256=uQNV9doN9h7ZkxKNKi4Thd6AnYPNmsAUCtCB9DQC0Jg,3620
-bcmd-0.0.51.dist-info/METADATA,sha256=-ztfWSTvi0sabuvlWQZrzPogNnnMWPP3TBTWTJevDwA,2142
-bcmd-0.0.51.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-bcmd-0.0.51.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
-bcmd-0.0.51.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
-bcmd-0.0.51.dist-info/RECORD,,
+bcmd/tasks/venv.py,sha256=VU34ZZlvqUc4EIlOHayOiJNW4L7v8wsz1Mc-FPfdGVI,4015
+bcmd-0.0.56.dist-info/METADATA,sha256=whlDDZ3rwGvlTZgKF35pjtH7bAjU76BCF67Vc5Fq0mQ,310
+bcmd-0.0.56.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+bcmd-0.0.56.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
+bcmd-0.0.56.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
+bcmd-0.0.56.dist-info/RECORD,,

{bcmd-0.0.51.dist-info → bcmd-0.0.56.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

bcmd-0.0.51.dist-info/METADATA

@@ -1,65 +0,0 @@
-Metadata-Version: 2.1
-Name: bcmd
-Version: 0.0.51
-Summary: Commands for Beni
-Author-email: Beni Mang <benimang@126.com>
-Maintainer-email: Beni Mang <benimang@126.com>
-Keywords: benimang,beni,bcmd
-Requires-Python: >=3.10
-Requires-Dist: aioconsole ==0.6.2
-Requires-Dist: aiofiles ==23.2.1
-Requires-Dist: aiohttp ==3.8.5
-Requires-Dist: aiosignal ==1.3.1
-Requires-Dist: async-timeout ==4.0.3
-Requires-Dist: attrs ==23.1.0
-Requires-Dist: autopep8 ==2.0.4
-Requires-Dist: benimang ==0.4.33
-Requires-Dist: bleach ==6.0.0
-Requires-Dist: build ==0.10.0
-Requires-Dist: certifi ==2023.7.22
-Requires-Dist: charset-normalizer ==3.2.0
-Requires-Dist: click ==8.1.7
-Requires-Dist: colorama ==0.4.6
-Requires-Dist: docutils ==0.20.1
-Requires-Dist: frozenlist ==1.4.0
-Requires-Dist: idna ==3.4
-Requires-Dist: importlib-metadata ==6.8.0
-Requires-Dist: jaraco.classes ==3.3.0
-Requires-Dist: keyring ==24.2.0
-Requires-Dist: markdown-it-py ==3.0.0
-Requires-Dist: mdurl ==0.1.2
-Requires-Dist: more-itertools ==10.1.0
-Requires-Dist: multidict ==6.0.4
-Requires-Dist: nest-asyncio ==1.5.7
-Requires-Dist: orjson ==3.9.5
-Requires-Dist: packaging ==23.1
-Requires-Dist: pathspec ==0.11.2
-Requires-Dist: pkginfo ==1.9.6
-Requires-Dist: portalocker ==2.7.0
-Requires-Dist: pretty-errors ==1.2.25
-Requires-Dist: prettytable ==3.8.0
-Requires-Dist: pycodestyle ==2.11.0
-Requires-Dist: Pygments ==2.16.1
-Requires-Dist: PyJWT ==2.8.0
-Requires-Dist: pyperclip ==1.8.2
-Requires-Dist: pyproject-hooks ==1.0.0
-Requires-Dist: pywin32 ==306
-Requires-Dist: pywin32-ctypes ==0.2.2
-Requires-Dist: PyYAML ==6.0.1
-Requires-Dist: qiniu ==7.11.1
-Requires-Dist: readme-renderer ==41.0
-Requires-Dist: requests ==2.31.0
-Requires-Dist: requests-toolbelt ==1.0.0
-Requires-Dist: rfc3986 ==2.0.0
-Requires-Dist: rich ==13.5.2
-Requires-Dist: six ==1.16.0
-Requires-Dist: twine ==4.0.2
-Requires-Dist: typer ==0.9.0
-Requires-Dist: typing-extensions ==4.7.1
-Requires-Dist: tzdata ==2023.3
-Requires-Dist: urllib3 ==2.0.4
-Requires-Dist: wcwidth ==0.2.6
-Requires-Dist: webencodings ==0.5.1
-Requires-Dist: yarl ==1.9.2
-Requires-Dist: zipp ==3.16.2
-