bcmd 0.5.14__py3-none-any.whl → 0.5.15__py3-none-any.whl

bcmd/tasks/wasabi.py

@@ -1,4 +1,5 @@
 import getpass
+import stat
 from pathlib import Path
 from typing import Final
 
@@ -16,16 +17,14 @@ MAX_ENCRYPT_SIZE = 199 * 1024
 @app.command()
 @syncCall
 async def unzip(
-    file: Path = typer.Argument(Path.cwd(), help='加密文件'),
+    target: Path = typer.Argument(Path.cwd(), help='加密文件'),
     password: str = typer.Option('', '--password', '-p', help='密码'),
 ):
     '解压缩加密文件成目录'
-    assert file.is_file(), f'不是文件 {file}'
-    workspace = file.with_suffix('')
-    assert not workspace.exists(), f'目录已存在 {workspace}'
+    assert target.is_file(), f'不是文件 {target}'
     password = password or getpass.getpass('请输入密码: ')
     with bpath.useTempFile() as tempFile:
-        data = await bfile.readBytes(file)
+        data = await bfile.readBytes(target)
         if SEP not in data:
             data = bcrypto.decrypt(data, password)
         else:
@@ -34,28 +33,31 @@ async def unzip(
             data = partA + partB
         data = shuffleSequence(data)
         await bfile.writeBytes(tempFile, data)
-        await bzip.sevenUnzip(tempFile, workspace)
-        await bpath.removeSecure(file)
-        bcolor.printGreen(workspace)
+        tempPath = target.with_suffix('.tmp')
+        await bzip.sevenUnzip(tempFile, tempPath)
+
+        # 调整文件权限，完全擦除
+        target.chmod(stat.S_IWRITE)
+        await bpath.removeSecure(target)
+
+        bpath.move(tempPath, target)
         bcolor.printGreen('OK')
 
 
 @app.command()
 @syncCall
 async def zip(
-    workspace: Path = typer.Argument(Path.cwd(), help='输出目录'),
+    target: Path = typer.Argument(Path.cwd(), help='输出目录'),
     password: str = typer.Option('', '--password', '-p', help='密码'),
 ):
     '将目录压缩成加密文件'
-    workspace = workspace.absolute()
-    assert workspace.is_dir(), f'不是目录 {workspace}'
-    zipFile = workspace.with_suffix('.dat')
-    assert not zipFile.exists(), f'文件已存在 {zipFile}'
+    target = target.absolute()
+    assert target.is_dir(), f'不是目录 {target}'
     password = password or genPassword()
     with bpath.useTempFile() as tempFile:
-        await bzip.sevenZipFolder(tempFile, workspace)
+        await bzip.sevenZipFolder(tempFile, target)
         data = await bfile.readBytes(tempFile)
-        bpath.remove(tempFile)
+        bpath.remove(tempFile)  # 为了安全所以立即删除
         data = shuffleSequence(data)
         if len(data) < MAX_ENCRYPT_SIZE:
             data = bcrypto.encrypt(data, password)
@@ -63,9 +65,17 @@ async def zip(
             partA, partB = data[:MAX_ENCRYPT_SIZE], data[MAX_ENCRYPT_SIZE:]
             partA = bcrypto.encrypt(partA, password)
             data = partA + SEP + partB
-        await bfile.writeBytes(zipFile, data)
-        await bpath.removeSecure(workspace)
-    bcolor.printGreen(zipFile)
+        tempZipFile = target.with_suffix('.tmp')
+        await bfile.writeBytes(tempZipFile, data)
+
+        # 调整目录权限，完全擦除
+        target.chmod(stat.S_IWRITE)
+        for file in target.glob('**/*'):
+            file.chmod(stat.S_IWRITE)
+        await bpath.removeSecure(target)
+
+        bpath.move(tempZipFile, target)
+
     bcolor.printGreen('OK')
 
 
@@ -77,9 +87,8 @@ async def change_pass(
     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)
+        target = tempPath / file.name
+        bpath.copy(file, target)
+        unzip(target, password)
+        zip(target, new_password)
+        bpath.copy(target, file)

{bcmd-0.5.14.dist-info → bcmd-0.5.15.dist-info}/METADATA

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

{bcmd-0.5.14.dist-info → bcmd-0.5.15.dist-info}/RECORD

@@ -25,9 +25,9 @@ bcmd/tasks/proxy.py,sha256=xvxN5PClUnc5LQpmq2Wug7_LUVpJboMWLXBvL9lX7EM,1552
 bcmd/tasks/time.py,sha256=ZiqA1jdgl-TBtFSOxxP51nwv4g9iZItmkFKpf9MKelk,2453
 bcmd/tasks/upgrade.py,sha256=ZiyecgVbnnoTU_LAsd78CIKA4ioc9so9pXpAM76b_0M,447
 bcmd/tasks/venv.py,sha256=a7ZDyagUPQvCAXx3cZJIqJt0p1Iy5u5qmmj8iRbDQZE,7673
-bcmd/tasks/wasabi.py,sha256=W1sBLU1qp6VLSnRb2xUqPFWdcYpO79nY13hKnSYPwjY,2989
-bcmd-0.5.14.dist-info/METADATA,sha256=5iDYYa6l0S21sWJCjmrzB7R8CizQA04xMVi5VCyO_FA,500
-bcmd-0.5.14.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-bcmd-0.5.14.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
-bcmd-0.5.14.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
-bcmd-0.5.14.dist-info/RECORD,,
+bcmd/tasks/wasabi.py,sha256=xWFAxprSIlBqDDMGaNXZFb-SahnW1d_R9XxSKRYIhnM,3110
+bcmd-0.5.15.dist-info/METADATA,sha256=4jTS3Z4qWZdQQGfDWSpTfpHWabDwQBJQV56s1xHDssk,500
+bcmd-0.5.15.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+bcmd-0.5.15.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
+bcmd-0.5.15.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
+bcmd-0.5.15.dist-info/RECORD,,