bcmd 0.5.11__tar.gz → 0.5.13__tar.gz

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

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

{bcmd-0.5.11 → bcmd-0.5.13}/bcmd/tasks/wasabi.py

@@ -15,13 +15,13 @@ MAX_ENCRYPT_SIZE = 199 * 1024
 
 @app.command()
 @syncCall
-async def to_dir(
-    file: Path = typer.Argument(Path.cwd(), help='工作文件'),
+async def unzip(
+    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
+    workspace = file.with_suffix('')
     assert not workspace.exists(), f'目录已存在 {workspace}'
     password = password or getpass.getpass('请输入密码: ')
     with bpath.useTempFile() as tempFile:
@@ -35,19 +35,21 @@ async def to_dir(
         data = shuffleSequence(data)
         await bfile.writeBytes(tempFile, data)
         await bzip.sevenUnzip(tempFile, workspace)
+        await bpath.removeSecure(file)
         bcolor.printGreen(workspace)
         bcolor.printGreen('OK')
 
 
 @app.command()
 @syncCall
-async def to_file(
-    workspace: Path = typer.Argument(Path.cwd(), help='工作目录'),
+async def zip(
+    workspace: Path = typer.Argument(Path.cwd(), help='输出目录'),
     password: str = typer.Option('', '--password', '-p', help='密码'),
 ):
-    '生成文件'
+    '将目录压缩成加密文件'
+    workspace = workspace.absolute()
     assert workspace.is_dir(), f'不是目录 {workspace}'
-    zipFile = workspace.parent / f'{workspace.name}.dat'
+    zipFile = workspace.with_suffix('.dat')
     assert not zipFile.exists(), f'文件已存在 {zipFile}'
     password = password or genPassword()
     with bpath.useTempFile() as tempFile:
@@ -62,5 +64,22 @@ async def to_file(
             partA = bcrypto.encrypt(partA, password)
             data = partA + SEP + partB
         await bfile.writeBytes(zipFile, data)
+        await bpath.removeSecure(workspace)
     bcolor.printGreen(zipFile)
     bcolor.printGreen('OK')
+
+
+@app.command()
+@syncCall
+async def change_pass(
+    file: Path = typer.Argument(Path.cwd(), help='加密文件'),
+    password: str = typer.Option('', '--password', '-p', help='密码'),
+    new_password: str = typer.Option('', '--new-password', '-n', help='新密码'),
+):
+    with bpath.useTempPath() as tempPath:
+        tempFile = tempPath / file.name
+        bpath.copy(file, tempFile)
+        unzip(tempFile, password)
+        workspace = tempFile.with_suffix('')
+        zip(workspace, new_password)
+        bpath.copy(tempFile, file)

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

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

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

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