bcmd 0.4.12__tar.gz → 0.5.1__tar.gz

{bcmd-0.4.12 → bcmd-0.5.1}/PKG-INFO

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

bcmd-0.5.1/bcmd/tasks/image.py

@@ -0,0 +1,201 @@
+import asyncio
+import os
+import random
+from enum import StrEnum
+from pathlib import Path
+from typing import Final
+
+import httpx
+import typer
+from beni import bcolor, bfile, bhttp, block, bpath, btask
+from beni.bbyte import BytesReader, BytesWriter
+from beni.bfunc import syncCall
+from beni.btype import Null, XPath
+from PIL import Image
+
+app: Final = btask.newSubApp('图片工具集')
+
+
+class _OutputType(StrEnum):
+    '输出类型'
+    normal = '0'
+    replace_ = '1'
+    crc_replace = '2'
+
+
+@app.command()
+@syncCall
+async def convert(
+    path: Path = typer.Option(None, '--path', '-p', help='指定目录或具体图片文件，默认当前目录'),
+    src_format: str = typer.Option('jpg|jpeg|png', '--src-format', '-s', help='如果path是目录，指定源格式，可以指定多个，默认值：jpg|jpeg|png'),
+    dst_format: str = typer.Option('webp', '--dst-format', '-d', help='目标格式，只能是单个'),
+    rgb: bool = typer.Option(False, '--rgb', help='转换为RGB格式'),
+    quality: int = typer.Option(85, '--quality', '-q', help='图片质量，0-100，默认85'),
+    output_type: _OutputType = typer.Option(_OutputType.normal, '--output-type', help='输出类型，0：普通输出，1：删除源文件，2：输出文件使用CRC32命名并删除源文件'),
+):
+    '图片格式转换'
+    path = path or Path(os.getcwd())
+    fileList: list[Path] = []
+    if path.is_file():
+        fileList.append(path)
+    elif path.is_dir():
+        extNameList = [x for x in src_format.strip().split('|')]
+        fileList = [x for x in bpath.listFile(path, True) if x.suffix[1:].lower() in extNameList]
+    if not fileList:
+        return bcolor.printRed(f'未找到图片文件（{path}）')
+    for file in fileList:
+        with Image.open(file) as img:
+            if rgb:
+                img = img.convert('RGB')
+            with bpath.useTempFile() as tempFile:
+                img.save(tempFile, format=dst_format, quality=quality)
+                outputFile = file.with_suffix(f'.{dst_format}')
+                if output_type == _OutputType.crc_replace:
+                    outputFile = outputFile.with_stem(await bfile.crc(tempFile))
+                bpath.copy(tempFile, outputFile)
+                if output_type in [_OutputType.replace_, _OutputType.crc_replace]:
+                    if outputFile != file:
+                        bpath.remove(file)
+                bcolor.printGreen(f'{file} -> {outputFile}')
+
+
+# ------------------------------------------------------------------------------------
+
+@app.command()
+@syncCall
+async def tiny(
+    path: Path = typer.Option(None, '--path', help='指定目录或具体图片文件，默认当前目录'),
+    compression: int = typer.Option(60, '--compression', help='如果压缩尺寸小于指定数值则使用原来的图片，单位：%，默认60'),
+    isKeepOriginal: bool = typer.Option(False, '--keep-original', help='保留原始图片'),
+):
+
+    keyList = [
+        'MB3QmtvZ8HKRkXcDnxhWCNTXzvx6cNF3',
+        '7L7X2CJ35GM1bChSHdT14yZPLx7FlpNk',
+        'q8YLcvrXVW2NYcr5mMyzQhsSHF4j7gny',
+    ]
+    random.shuffle(keyList)
+    await block.setLimit(_TinyFile.runTiny, len(keyList))
+
+    # 整理文件列表
+    fileList = []
+    path = path or Path(os.getcwd())
+    if path.is_file():
+        fileList.append(path)
+    elif path.is_dir():
+        fileList = [x for x in bpath.listFile(path, True) if x.suffix[1:].lower() in ['jpg', 'jpeg', 'png']]
+    else:
+        btask.abort('未找到图片文件', path)
+    fileList.sort()
+
+    # 将文件列表整理成 _TinyFile 对象
+    fileList = [_TinyFile(x) for x in fileList]
+    await asyncio.gather(*[x.updateInfo() for x in fileList])
+
+    # 过滤掉已经处理过的图片
+    for i in range(len(fileList)):
+        file = fileList[i]
+        if file.compression == 0:
+            # 未处理过的图片，进行图片的压缩处理
+            pass
+        elif not file.isTiny and file.compression < compression:
+            # 之前测试的压缩率不符合要求，不过现在符合了，进行图片的压缩处理
+            pass
+        else:
+            # 要忽略掉的文件
+            bcolor.printYellow(f'{file.file}（{file.compression}% / 忽略）')
+            fileList[i] = Null
+    fileList = [x for x in fileList if x]
+
+    # 开始压缩
+    taskList = [
+        x.runTiny(keyList[i % len(keyList)], compression, isKeepOriginal)
+        for i, x in enumerate(fileList)
+    ]
+    await asyncio.gather(*taskList)
+
+
+# ------------------------------------------------------------------------------------
+
+
+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
+
+    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}% / 已压缩）')
+            else:
+                # 不进行压缩
+                await self._flushInfo(outputCompression, False)
+                bcolor.printMagenta(f'{self._file} （{outputCompression}% / 不处理）')

{bcmd-0.4.12 → bcmd-0.5.1}/bcmd/tasks/project.py

@@ -2,11 +2,11 @@ from pathlib import Path
 from typing import Final
 
 import typer
-from beni import bcolor, bpath, btask
+from beni import bcolor, binput, bpath, btask
 from beni.bfunc import syncCall
 
 from ..common.func import useResources
-from .venv import venv
+from .venv import add as venvAdd
 
 app: Final = btask.app
 
@@ -27,6 +27,8 @@ async def _(
             bcolor.printRed('目标路径不是空目录', path)
             return
 
-    venv(['benimang'], path, False, False, False, False)
+    bcolor.printYellow(path)
+    await binput.confirm('即将在此路径生成新项目，是否继续？')
+    venvAdd(['benimang'], path)
     with useResources('project') as sourceProjectPath:
         bpath.copyOverwrite(sourceProjectPath, path)

{bcmd-0.4.12 → bcmd-0.5.1}/bcmd/tasks/venv.py

@@ -7,37 +7,93 @@ from typing import Final
 
 import typer
 from beni import bcolor, bexecute, bfile, bhttp, bpath, btask
-from beni.bfunc import syncCall, textToAry
+from beni.bfunc import syncCall
 from beni.btype import Null
 from prettytable import PrettyTable
 
-from ..common import password
 from ..common.func import checkFileOrNotExists, checkPathOrNotExists
-from . import bin
 
-app: Final = btask.app
+app: Final = btask.newSubApp('venv 相关')
 
 
 @app.command()
 @syncCall
-async def venv(
+async def add(
     packages: list[str] = typer.Argument(None),
     path: Path = typer.Option(None, '--path', help='指定路径，默认当前目录'),
     isOfficial: bool = typer.Option(False, '--official', help='是否使用官方地址安装（https://pypi.org/simple）'),
-    isUseBase: bool = typer.Option(False, '--use-base', help='是否强制使用基础库去安装'),
-    isUseLock: bool = typer.Option(False, '--use-lock', help='是否使用锁定库安装'),
-    isCleanup: bool = typer.Option(False, '--cleanup', help='是否先清空 venv 目录再执行'),
+):
+    '添加指定库'
+    await _venv(
+        packages,
+        path=path,
+        isOfficial=isOfficial,
+    )
+
+
+@app.command()
+@syncCall
+async def benimang(
+    path: Path = typer.Option(None, '--path', help='指定路径，默认当前目录'),
+):
+    '更新 benimang 库，强制使用官方源'
+    await _venv(
+        ['benimang==now'],
+        path=path,
+        isOfficial=True,
+    )
+
+
+@app.command()
+@syncCall
+async def base(
+    path: Path = typer.Option(None, '--path', help='指定路径，默认当前目录'),
+    isOfficial: bool = typer.Option(False, '--official', help='是否使用官方地址安装（https://pypi.org/simple）'),
+    isReinstall: bool = typer.Option(False, '--reinstall', help='是否清空venv目录后重新安装'),
+):
+    '安装基础库'
+    await _venv(
+        path=path,
+        isOfficial=isOfficial,
+        isUseBase=True,
+        isCleanup=isReinstall,
+    )
+
+
+@app.command()
+@syncCall
+async def lock(
+    path: Path = typer.Option(None, '--path', help='指定路径，默认当前目录'),
+    isOfficial: bool = typer.Option(False, '--official', help='是否使用官方地址安装（https://pypi.org/simple）'),
+    isReinstall: bool = typer.Option(False, '--reinstall', help='是否清空venv目录后重新安装'),
+):
+    '安装指定版本的库'
+    await _venv(
+        path=path,
+        isOfficial=isOfficial,
+        isUseLock=True,
+        isCleanup=isReinstall,
+    )
+
+
+# ------------------------------------------------------------------------------------
+
+async def _venv(
+    packages: list[str] = [],
+    *,
+    path: Path = Null,
+    isOfficial: bool = False,
+    isUseBase: bool = False,
+    isUseLock: bool = False,
+    isCleanup: bool = False,
 ):
     'python 虚拟环境配置'
     btask.assertTrue(not (isUseBase == isUseLock == True), '2个选项只能选择其中一个 --use-base / --use-lock')
     path = path or Path(os.getcwd())
-    binPath = path / 'bin'
-    binListFile = bpath.get(path, 'bin.list')
     venvPath = bpath.get(path, 'venv')
     checkPathOrNotExists(venvPath)
     venvFile = bpath.get(path, '.venv')
     checkFileOrNotExists(venvFile)
-    await _inputQiniuPassword(binListFile, binPath)
     if isCleanup:
         bpath.remove(venvPath)
         btask.assertTrue(not venvPath.exists(), f'无法删除 venv 目录 {venvPath}')
@@ -69,20 +125,9 @@ async def venv(
         basePackages = _mergePackageList(basePackages, packages)
         lockPackages = (await bfile.readText(tempFile)).strip().split('\n')
         await updatePackageList(venvFile, basePackages, lockPackages)
-
-    # 下载 bin 文件
-    if binListFile.exists():
-        bin.download(
-            names=Null,
-            file=binListFile,
-            output=binPath,
-        )
     bcolor.printGreen('OK')
 
 
-# ------------------------------------------------------------------------------------
-
-
 async def _pipInstall(pip: Path, installPackages: list[str], disabled_mirror: bool):
     python = pip.with_stem('python')
     btask.assertTrue(python.is_file(), f'无法找到指定文件 {python}')
@@ -170,12 +215,3 @@ def _getPackageName(package: str):
     if package.startswith('#'):
         package = package.replace('#', '', 1).strip()
     return package
-
-
-async def _inputQiniuPassword(binListFile: Path, binPath: Path) -> None:
-    '根据需要输入七牛云密码'
-    if binListFile.exists():
-        aaSet = set(textToAry(await bfile.readText(binListFile)))
-        bbSet = set([x.name for x in bpath.listFile(binPath)])
-        if aaSet != bbSet:
-            await password.getQiniu()

{bcmd-0.4.12 → bcmd-0.5.1}/bcmd.egg-info/PKG-INFO

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

{bcmd-0.4.12 → bcmd-0.5.1}/pyproject.toml

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

bcmd-0.4.12/bcmd/tasks/image.py

@@ -1,54 +0,0 @@
-import os
-from enum import StrEnum
-from pathlib import Path
-from typing import Final
-
-import typer
-from beni import bcolor, bfile, bpath, btask
-from beni.bfunc import syncCall
-from PIL import Image
-
-app: Final = btask.newSubApp('图片工具集')
-
-
-class _OutputType(StrEnum):
-    '输出类型'
-    normal = '0'
-    replace_ = '1'
-    crc_replace = '2'
-
-
-@app.command()
-@syncCall
-async def convert(
-    path: Path = typer.Option(None, '--path', '-p', help='指定目录或具体图片文件，默认当前目录'),
-    src_format: str = typer.Option('jpg|jpeg|png', '--src-format', '-s', help='如果path是目录，指定源格式，可以指定多个，默认值：jpg|jpeg|png'),
-    dst_format: str = typer.Option('webp', '--dst-format', '-d', help='目标格式，只能是单个'),
-    rgb: bool = typer.Option(False, '--rgb', help='转换为RGB格式'),
-    quality: int = typer.Option(85, '--quality', '-q', help='图片质量，0-100，默认85'),
-    output_type: _OutputType = typer.Option(_OutputType.normal, '--output-type', help='输出类型，0：普通输出，1：删除源文件，2：输出文件使用CRC32命名并删除源文件'),
-):
-    '图片格式转换'
-    path = path or Path(os.getcwd())
-    fileList: list[Path] = []
-    if path.is_file():
-        fileList.append(path)
-    elif path.is_dir():
-        extNameList = [x for x in src_format.strip().split('|')]
-        fileList = [x for x in bpath.listFile(path, True) if x.suffix[1:].lower() in extNameList]
-    if not fileList:
-        return bcolor.printRed(f'未找到图片文件（{path}）')
-    for file in fileList:
-        with Image.open(file) as img:
-            if rgb:
-                img = img.convert('RGB')
-            with bpath.useTempFile() as tempFile:
-                img.save(tempFile, format=dst_format, quality=quality)
-                outputFile = file.with_suffix(f'.{dst_format}')
-                if output_type == _OutputType.crc_replace:
-                    outputFile = outputFile.with_stem(await bfile.crc(tempFile))
-                bpath.copy(tempFile, outputFile)
-                if output_type in [_OutputType.replace_, _OutputType.crc_replace]:
-                    if outputFile != file:
-                        bpath.remove(file)
-                bcolor.printGreen(f'{file} -> {outputFile}')