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

bcmd/tasks/image.py

@@ -3,15 +3,15 @@ import os
 import random
 from enum import StrEnum
 from pathlib import Path
-from typing import Final
+from typing import Final, List, Tuple
 
 import httpx
 import typer
-from beni import bcolor, bfile, bhttp, block, bpath, btask
+from beni import bcolor, bfile, bhttp, binput, block, bpath, btask
 from beni.bbyte import BytesReader, BytesWriter
 from beni.bfunc import syncCall
 from beni.btype import Null, XPath
-from PIL import Image
+from PIL import Image, ImageDraw, ImageFont
 
 app: Final = btask.newSubApp('图片工具集')
 
@@ -76,6 +76,92 @@ async def tiny(
     ]
     random.shuffle(keyList)
 
+    class _TinyFile:
+
+        _endian: Final = '>'
+        _sep = BytesWriter(_endian).writeStr('tiny').writeUint(9527).writeUint(709394).toBytes()
+
+        @property
+        def compression(self):
+            return self._compression
+
+        @property
+        def isTiny(self):
+            return self._isTiny
+
+        @property
+        def file(self):
+            return self._file
+
+        def __init__(self, file: XPath):
+            self._file = file
+            self._compression: float = 0.0
+            self._isTiny: bool = False
+
+        def getSizeDisplay(self):
+            size = bpath.get(self._file).stat().st_size / 1024
+            return f'{size:,.2f}KB'
+
+        async def updateInfo(self):
+            fileBytes = await bfile.readBytes(self._file)
+            self._compression = 0.0
+            self._isTiny = False
+            blockAry = fileBytes.split(self._sep)
+            if len(blockAry) > 1:
+                info = BytesReader(self._endian, blockAry[1])
+                size = info.readUint()
+                if size == len(blockAry[0]):
+                    self._compression = round(info.readFloat(), 2)
+                    self._isTiny = info.readBool()
+
+        async def _flushInfo(self, compression: float, isTiny: bool):
+            self._compression = compression
+            self._isTiny = isTiny
+            content = await self._getPureContent()
+            info = (
+                BytesWriter(self._endian)
+                .writeUint(len(content))
+                .writeFloat(compression)
+                .writeBool(isTiny)
+                .toBytes()
+            )
+            content += self._sep + info
+            await bfile.writeBytes(self._file, content)
+
+        async def _getPureContent(self):
+            content = await bfile.readBytes(self._file)
+            content = content.split(self._sep)[0]
+            return content
+
+        @block.limit(1)
+        async def runTiny(self, key: str, compression: float, isKeepOriginal: bool):
+            content = await self._getPureContent()
+            async with httpx.AsyncClient() as client:
+                response = await client.post(
+                    'https://api.tinify.com/shrink',
+                    auth=('api', key),
+                    content=content,
+                    timeout=30,
+                )
+                response.raise_for_status()
+                result = response.json()
+                outputCompression = round(result['output']['ratio'] * 100, 2)
+                if outputCompression < compression:
+                    # 下载文件
+                    url = result['output']['url']
+                    with bpath.useTempFile() as tempFile:
+                        await bhttp.download(url, tempFile)
+                        await _TinyFile(tempFile)._flushInfo(outputCompression, True)
+                        outputFile = bpath.get(self._file)
+                        if isKeepOriginal:
+                            outputFile = outputFile.with_stem(f'{outputFile.stem}_tiny')
+                        bpath.move(tempFile, outputFile, True)
+                        bcolor.printGreen(f'{outputFile}（{outputCompression - 100:.2f}% / 压缩 / {self.getSizeDisplay()}）')
+                else:
+                    # 不进行压缩
+                    await self._flushInfo(outputCompression, False)
+                    bcolor.printMagenta(f'{self._file} （{outputCompression - 100:.2f}% / 不处理 / {self.getSizeDisplay()}）')
+
     btask.assertTrue(0 < optimization < 100, '优化大小必须在0-100之间')
     compression = 100 - optimization
     await block.setLimit(_TinyFile.runTiny, len(keyList))
@@ -122,91 +208,97 @@ async def tiny(
     await asyncio.gather(*taskList)
 
 
-# ------------------------------------------------------------------------------------
+@app.command()
+@syncCall
+async def merge(
+    path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
+    force: bool = typer.Option(False, '--force', '-f', help='强制覆盖'),
+):
+    '合并多张图片'
+
+    def _get_watermark_font(font_size: int) -> ImageFont.FreeTypeFont:
+        font_candidates = [
+            'arial.ttf',                  # Windows
+            'Arial.ttf',                  # macOS（部分系统可能区分大小写）
+            'Helvetica.ttc',              # macOS
+            'DejaVuSans.ttf',             # Linux
+            'FreeSans.ttf',               # 某些Linux发行版
+            'LiberationSans-Regular.ttf'  # RHEL系发行版
+        ]
+        for font_name in font_candidates:
+            try:
+                return ImageFont.truetype(font_name, font_size)
+            except (IOError, OSError):
+                continue
+        raise Exception('No font found!')
+
+    def _add_watermark(image: Image.Image, text: str, position: Tuple[float, float]) -> Image.Image:
+        """添加圆形背景水印"""
+        draw = ImageDraw.Draw(image)
+        font_size = 100
+        font = _get_watermark_font(font_size)
 
+        # 计算文本尺寸并确定圆形参数
+        text_bbox = draw.textbbox(position, text, font=font)
+        text_width = text_bbox[2] - text_bbox[0]
+        text_height = text_bbox[3] - text_bbox[1]
 
-class _TinyFile:
-
-    _endian: Final = '>'
-    _sep = BytesWriter(_endian).writeStr('tiny').writeUint(9527).writeUint(709394).toBytes()
-
-    @property
-    def compression(self):
-        return self._compression
-
-    @property
-    def isTiny(self):
-        return self._isTiny
-
-    @property
-    def file(self):
-        return self._file
-
-    def __init__(self, file: XPath):
-        self._file = file
-        self._compression: float = 0.0
-        self._isTiny: bool = False
-
-    def getSizeDisplay(self):
-        size = bpath.get(self._file).stat().st_size / 1024
-        return f'{size:,.2f}KB'
-
-    async def updateInfo(self):
-        fileBytes = await bfile.readBytes(self._file)
-        self._compression = 0.0
-        self._isTiny = False
-        blockAry = fileBytes.split(self._sep)
-        if len(blockAry) > 1:
-            info = BytesReader(self._endian, blockAry[1])
-            size = info.readUint()
-            if size == len(blockAry[0]):
-                self._compression = round(info.readFloat(), 2)
-                self._isTiny = info.readBool()
-
-    async def _flushInfo(self, compression: float, isTiny: bool):
-        self._compression = compression
-        self._isTiny = isTiny
-        content = await self._getPureContent()
-        info = (
-            BytesWriter(self._endian)
-            .writeUint(len(content))
-            .writeFloat(compression)
-            .writeBool(isTiny)
-            .toBytes()
+        # 计算圆形参数（直径取文本宽高的最大值 + 边距）
+        diameter = max(text_width, text_height) + 20  # 10像素边距
+        radius = diameter // 2
+
+        # 计算圆形中心坐标（保持与原矩形左上角一致）
+        circle_center = (
+            position[0] + text_width // 2 + 5,  # 原位置向右偏移边距
+            position[1] + text_height // 2 + 5  # 原位置向下偏移边距
         )
-        content += self._sep + info
-        await bfile.writeBytes(self._file, content)
-
-    async def _getPureContent(self):
-        content = await bfile.readBytes(self._file)
-        content = content.split(self._sep)[0]
-        return content
-
-    @block.limit(1)
-    async def runTiny(self, key: str, compression: float, isKeepOriginal: bool):
-        content = await self._getPureContent()
-        async with httpx.AsyncClient() as client:
-            response = await client.post(
-                'https://api.tinify.com/shrink',
-                auth=('api', key),
-                content=content,
-                timeout=30,
-            )
-            response.raise_for_status()
-            result = response.json()
-            outputCompression = round(result['output']['ratio'] * 100, 2)
-            if outputCompression < compression:
-                # 下载文件
-                url = result['output']['url']
-                with bpath.useTempFile() as tempFile:
-                    await bhttp.download(url, tempFile)
-                    await _TinyFile(tempFile)._flushInfo(outputCompression, True)
-                    outputFile = bpath.get(self._file)
-                    if isKeepOriginal:
-                        outputFile = outputFile.with_stem(f'{outputFile.stem}_tiny')
-                    bpath.move(tempFile, outputFile, True)
-                    bcolor.printGreen(f'{outputFile}（{outputCompression - 100:.2f}% / 压缩 / {self.getSizeDisplay()}）')
-            else:
-                # 不进行压缩
-                await self._flushInfo(outputCompression, False)
-                bcolor.printMagenta(f'{self._file} （{outputCompression - 100:.2f}% / 不处理 / {self.getSizeDisplay()}）')
+
+        # 绘制圆形背景
+        ellipse_box = (
+            circle_center[0] - radius,
+            circle_center[1] - radius,
+            circle_center[0] + radius,
+            circle_center[1] + radius
+        )
+        draw.ellipse(ellipse_box, fill='#B920D9')
+
+        # 绘制居中文字
+        draw.text(
+            circle_center,
+            text,
+            (255, 255, 255),
+            font=font,
+            anchor="mm"  # 设置锚点为水平垂直居中
+        )
+        return image
+
+    def _merge_images(image_paths: List[Path], output_path: Path) -> None:
+        images = [Image.open(img_path) for img_path in image_paths]
+        max_width = max(img.width for img in images)
+        total_height = sum(img.height for img in images)
+        merged_image = Image.new('RGB', (max_width, total_height))
+        y_offset = 0
+        for idx, img in enumerate(images):
+            merged_image.paste(img, (0, y_offset))
+            _add_watermark(merged_image, f'{idx + 1}', (22, y_offset + 17))
+            y_offset += img.height
+        # 修改保存参数为 WebP 格式
+        merged_image.save(
+            output_path,
+            format='WEBP',
+            quality=80,        # 质量参数（0-100），推荐 80-90 之间
+            method=6,          # 压缩方法（0-6），6 为最佳压缩
+            lossless=False,    # 不使用无损压缩（更小的文件体积）
+        )
+
+    image_files = [x for x in bpath.listFile(path) if x.suffix in ('.png', '.jpg', '.jpeg', '.webp', '.bmp')]
+    output_image = path / f'merge_{path.name}.webp'  # 修改文件扩展名为 webp
+    if output_image in image_files:
+        if not force:
+            print(output_image)
+            await binput.confirm(f'生成文件已经存在，是否覆盖？')
+        image_files.remove(output_image)
+    image_files.sort(key=lambda x: x.as_posix())
+    _merge_images(image_files, output_image)
+    bcolor.printMagenta(output_image)
+    bcolor.printGreen('OK')

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.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: bcmd
-Version: 0.5.14
+Version: 0.5.16
 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.16.dist-info}/RECORD

@@ -14,7 +14,7 @@ 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/download.py,sha256=XdZYKi8zQTNYWEgUxeTNDqPgP7IGYJkMmlDDC9u93Vk,2315
-bcmd/tasks/image.py,sha256=fxCiP9Xs4mxj6PhnZY2nRc0pvYg0DAbEIOFHhj-BkXA,8088
+bcmd/tasks/image.py,sha256=-9cV8k645MejVRBsC9lmrQBOPcq_9uy3Me5IJCcNOEQ,12162
 bcmd/tasks/json.py,sha256=WWOyvcZPYaqQgp-Tkm-uIJschNMBKPKtZN3yXz_SC5s,635
 bcmd/tasks/lib.py,sha256=lq-PdHxhK-5Akf7k4QaIT8mBB-sCK5or5OqEFTdphIA,4567
 bcmd/tasks/math.py,sha256=xbl5UdaDMyAjiLodDPleP4Cutrk2S3NOAgurzAgOEAE,2862
@@ -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.16.dist-info/METADATA,sha256=FzL072W4dRsFfcC4HsqNJDz92pazZpDtIdeXGJK5MPM,500
+bcmd-0.5.16.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+bcmd-0.5.16.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
+bcmd-0.5.16.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
+bcmd-0.5.16.dist-info/RECORD,,

{bcmd-0.5.14.dist-info → bcmd-0.5.16.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.0.0)
+Generator: setuptools (76.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any