bcmd 0.5.9__tar.gz → 0.5.11__tar.gz

{bcmd-0.5.9 → bcmd-0.5.11}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.2
 Name: bcmd
-Version: 0.5.9
+Version: 0.5.11
 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.7.12
+Requires-Dist: benimang==0.7.13
 Requires-Dist: build
 Requires-Dist: cryptography
 Requires-Dist: pathspec

{bcmd-0.5.9 → bcmd-0.5.11}/bcmd/tasks/__init__.py

@@ -15,3 +15,4 @@ from . import proxy
 from . import time
 from . import upgrade
 from . import venv
+from . import wasabi

{bcmd-0.5.9 → bcmd-0.5.11}/bcmd/tasks/crypto.py

@@ -7,6 +7,7 @@ import pyperclip
 import typer
 from beni import bcolor, bcrypto, btask
 from beni.bfunc import syncCall
+from beni.binput import genPassword
 from rich.console import Console
 
 app: Final = btask.newSubApp('加密（v2）')
@@ -19,7 +20,7 @@ async def encrypt_text():
     content = pyperclip.paste()
     assert content, '剪贴板内容不能为空'
     bcolor.printGreen(content)
-    password = _genPassword()
+    password = genPassword()
     result = bcrypto.encryptText(content, password)
     pyperclip.copy(result)
     print('密文已复制到剪贴板')
@@ -55,7 +56,7 @@ async def encrypt_json():
     except:
         return btask.abort('错误：剪贴板内容必须是JSON格式', content)
     Console().print_json(data=data, indent=4, ensure_ascii=False, sort_keys=True)
-    password = _genPassword()
+    password = genPassword()
     result = bcrypto.encryptJson(data, password)
     pyperclip.copy(result)
     print('密文已复制到剪贴板')
@@ -87,7 +88,7 @@ async def encrypt_file(
 ):
     '加密文件（文件路径使用剪贴板内容）'
     assert file.is_file(), '文件不存在'
-    password = _genPassword()
+    password = genPassword()
     await bcrypto.encryptFile(file, password)
     bcolor.printGreen('OK')
 
@@ -102,15 +103,3 @@ async def decrypt_file(
     password = getpass.getpass('输入密码：')
     await bcrypto.decryptFile(file, password)
     bcolor.printGreen('OK')
-
-
-# ------------------------------------------------------------------------------------
-
-
-def _genPassword():
-    password = ''
-    while not password:
-        password = getpass.getpass('输入密码：')
-    while password != getpass.getpass('再次密码：'):
-        pass
-    return password

bcmd-0.5.11/bcmd/tasks/wasabi.py

@@ -0,0 +1,66 @@
+import getpass
+from pathlib import Path
+from typing import Final
+
+import typer
+from beni import bcolor, bcrypto, bfile, bpath, btask, bzip
+from beni.bfunc import shuffleSequence, syncCall
+from beni.binput import genPassword
+
+app: Final = btask.newSubApp('Wasabi 工具')
+
+SEP = f'{chr(852)}{chr(322)}{chr(470)}'.encode()
+MAX_ENCRYPT_SIZE = 199 * 1024
+
+
+@app.command()
+@syncCall
+async def to_dir(
+    file: Path = typer.Argument(Path.cwd(), help='工作文件'),
+    password: str = typer.Option('', '--password', '-p', help='密码'),
+):
+    '生成目录'
+    assert file.is_file(), f'不是文件 {file}'
+    workspace = file.parent / file.stem
+    assert not workspace.exists(), f'目录已存在 {workspace}'
+    password = password or getpass.getpass('请输入密码: ')
+    with bpath.useTempFile() as tempFile:
+        data = await bfile.readBytes(file)
+        if SEP not in data:
+            data = bcrypto.decrypt(data, password)
+        else:
+            partA, partB = data.split(SEP)
+            partA = bcrypto.decrypt(partA, password)
+            data = partA + partB
+        data = shuffleSequence(data)
+        await bfile.writeBytes(tempFile, data)
+        await bzip.sevenUnzip(tempFile, workspace)
+        bcolor.printGreen(workspace)
+        bcolor.printGreen('OK')
+
+
+@app.command()
+@syncCall
+async def to_file(
+    workspace: Path = typer.Argument(Path.cwd(), help='工作目录'),
+    password: str = typer.Option('', '--password', '-p', help='密码'),
+):
+    '生成文件'
+    assert workspace.is_dir(), f'不是目录 {workspace}'
+    zipFile = workspace.parent / f'{workspace.name}.dat'
+    assert not zipFile.exists(), f'文件已存在 {zipFile}'
+    password = password or genPassword()
+    with bpath.useTempFile() as tempFile:
+        await bzip.sevenZipFolder(tempFile, workspace)
+        data = await bfile.readBytes(tempFile)
+        bpath.remove(tempFile)
+        data = shuffleSequence(data)
+        if len(data) < MAX_ENCRYPT_SIZE:
+            data = bcrypto.encrypt(data, password)
+        else:
+            partA, partB = data[:MAX_ENCRYPT_SIZE], data[MAX_ENCRYPT_SIZE:]
+            partA = bcrypto.encrypt(partA, password)
+            data = partA + SEP + partB
+        await bfile.writeBytes(zipFile, data)
+    bcolor.printGreen(zipFile)
+    bcolor.printGreen('OK')

{bcmd-0.5.9 → bcmd-0.5.11}/bcmd.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.2
 Name: bcmd
-Version: 0.5.9
+Version: 0.5.11
 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.7.12
+Requires-Dist: benimang==0.7.13
 Requires-Dist: build
 Requires-Dist: cryptography
 Requires-Dist: pathspec

{bcmd-0.5.9 → bcmd-0.5.11}/bcmd.egg-info/SOURCES.txt

@@ -33,4 +33,5 @@ bcmd/tasks/project.py
 bcmd/tasks/proxy.py
 bcmd/tasks/time.py
 bcmd/tasks/upgrade.py
-bcmd/tasks/venv.py
+bcmd/tasks/venv.py
+bcmd/tasks/wasabi.py

{bcmd-0.5.9 → bcmd-0.5.11}/bcmd.egg-info/requires.txt

@@ -1,4 +1,4 @@
-benimang==0.7.12
+benimang==0.7.13
 build
 cryptography
 pathspec

{bcmd-0.5.9 → bcmd-0.5.11}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = 'bcmd'
-version = '0.5.9'
+version = '0.5.11'
 description = 'Commands for Beni'
 requires-python = '>=3.10'
 keywords = ['benimang', 'beni', 'bcmd']
@@ -12,7 +12,7 @@ maintainers = [{ name = 'Beni Mang', email = 'benimang@126.com' }]
 
 
 dependencies = [
-  'benimang==0.7.12',
+  'benimang==0.7.13',
   'build',
   'cryptography',
   'pathspec',