bcmd 0.4.11__py3-none-any.whl → 0.5.0__py3-none-any.whl

bcmd/tasks/image.py

@@ -1,11 +1,16 @@
+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, bpath, btask
+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('图片工具集')
@@ -52,3 +57,145 @@ async def convert(
                     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/tasks/lib.py

@@ -46,11 +46,11 @@ async def tidy_dependencies(
 @app.command()
 @syncCall
 async def update_version(
-    workspacePath: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
+    path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
     isNotCommit: bool = typer.Option(False, '--no-commit', '-d', help='是否提交git'),
 ):
     '修改 pyproject.toml 版本号'
-    file = workspacePath / 'pyproject.toml'
+    file = path / 'pyproject.toml'
     btask.assertTrue(file.is_file(), '文件不存在', file)
     data = await bfile.readToml(file)
     version = data['project']['version']
@@ -77,13 +77,13 @@ async def update_version(
 @app.command()
 @syncCall
 async def build(
-    workspacePath: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
+    path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
     isKeepBuildFiles: bool = typer.Option(False, '--keep-build-files', '-k', help='是否保留构建文件'),
 ):
     '发布项目'
     u, p = await password.getPypi()
-    with _useBuildPath(workspacePath, isKeepBuildFiles):
-        scriptPath = (workspacePath / './venv/Scripts')
+    with _useBuildPath(path, isKeepBuildFiles):
+        scriptPath = (path / './venv/Scripts')
         os.system(f'{scriptPath / "python.exe"} -m build')
         os.system(f'{scriptPath / "twine.exe"} upload dist/* -u {u} -p {p}')
 

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/tasks/venv.py

@@ -7,37 +7,91 @@ 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 update_benimang(
+    path: Path = typer.Option(None, '--path', help='指定路径，默认当前目录'),
+):
+    '更新 benimang 库'
+    await _venv(
+        ['benimang==now'],
+        path=path,
+        isOfficial=True,
+    )
+
+
+@app.command()
+@syncCall
+async def reinstall_base(
+    path: Path = typer.Option(None, '--path', help='指定路径，默认当前目录'),
+    isOfficial: bool = typer.Option(False, '--official', help='是否使用官方地址安装（https://pypi.org/simple）'),
+):
+    '重新安装基础库'
+    await _venv(
+        path=path,
+        isOfficial=isOfficial,
+        isUseBase=True,
+        isCleanup=True,
+    )
+
+
+@app.command()
+@syncCall
+async def reinstall_lock(
+    path: Path = typer.Option(None, '--path', help='指定路径，默认当前目录'),
+    isOfficial: bool = typer.Option(False, '--official', help='是否使用官方地址安装（https://pypi.org/simple）'),
+):
+    '重新安装版本固定的库'
+    await _venv(
+        path=path,
+        isOfficial=isOfficial,
+        isUseLock=True,
+        isCleanup=True,
+    )
+
+
+# ------------------------------------------------------------------------------------
+
+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 +123,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 +213,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.11.dist-info → bcmd-0.5.0.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: bcmd
-Version: 0.4.11
+Version: 0.5.0
 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.4
+Requires-Dist: benimang==0.7.5
 Requires-Dist: build
 Requires-Dist: cryptography
 Requires-Dist: pathspec
@@ -16,4 +16,3 @@ Requires-Dist: psutil
 Requires-Dist: qiniu
 Requires-Dist: twine
 Requires-Dist: typer
-

{bcmd-0.4.11.dist-info → bcmd-0.5.0.dist-info}/RECORD

@@ -14,17 +14,17 @@ bcmd/tasks/code.py,sha256=S_98EXb7QKeS1mxPfmXKu7E91yLuoA45CyXvJ6szzQY,2941
 bcmd/tasks/crypto.py,sha256=C2welnYfdI4Tc-W1cwkboGb6bk6NGWO0MRKm4Bzo_9Q,3216
 bcmd/tasks/debian.py,sha256=B9aMIIct3vNqMJr5hTr1GegXVf20H49C27FMvRRGIzI,3004
 bcmd/tasks/download.py,sha256=kQnzEXtduRWtfFFfbUugGbCEbeFWUiKvWrrZ_4RjY-Y,1792
-bcmd/tasks/image.py,sha256=OSqShLb_lwa77aQOnRNksXNemtuAnQDGg-VfiDy9fEM,2310
+bcmd/tasks/image.py,sha256=TN7vMjyNHtv-qBOKklWluEqI4OESp6U3ll3agFTkFc4,7558
 bcmd/tasks/json.py,sha256=WWOyvcZPYaqQgp-Tkm-uIJschNMBKPKtZN3yXz_SC5s,635
-bcmd/tasks/lib.py,sha256=6c7s2Mlzgjcvd0uoUot3PEhxSIf9WPiQSIUGwvBaTBE,4608
+bcmd/tasks/lib.py,sha256=_hlMzvXKtiHtDOX4nBcWkoqrpQ8A1PdICa01OBFdhVU,4563
 bcmd/tasks/math.py,sha256=xbl5UdaDMyAjiLodDPleP4Cutrk2S3NOAgurzAgOEAE,2862
 bcmd/tasks/mirror.py,sha256=nAe8NYftMKzht16MFBj7RqXwvVhR6Jh2uuAyJLh87og,1098
-bcmd/tasks/project.py,sha256=5Ui79TM8_RiTquGF_nKxextE0wMhaWHpITJ4mpMHn7E,846
+bcmd/tasks/project.py,sha256=73d5sxOD-Aqc5PwqV8FBzIfbyJjZ-juQad7JV43YZIE,948
 bcmd/tasks/proxy.py,sha256=6ApGO2t61uF9NWaQ-VpsTwR1MoDXKmfQDCWXgcC-3UY,1454
 bcmd/tasks/time.py,sha256=ZiqA1jdgl-TBtFSOxxP51nwv4g9iZItmkFKpf9MKelk,2453
-bcmd/tasks/venv.py,sha256=pGIoW2cgmK5nrhxN5MKgHTwDxPO7U2VH1fR_D-d1pcY,6684
-bcmd-0.4.11.dist-info/METADATA,sha256=i0c_m8U_lUFCYNYQJNpRX5YgFfFrJEAXyM5v0LlMcTQ,478
-bcmd-0.4.11.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-bcmd-0.4.11.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
-bcmd-0.4.11.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
-bcmd-0.4.11.dist-info/RECORD,,
+bcmd/tasks/venv.py,sha256=P2bO-ddRG5WWKvdU-JM8YAEAhPAoRdqOrku1Ihp1nFo,7144
+bcmd-0.5.0.dist-info/METADATA,sha256=Lo4gTAZs6wfBwHWcpiBKpnyO6g7ouL9_V-m2-BSEC8I,474
+bcmd-0.5.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+bcmd-0.5.0.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
+bcmd-0.5.0.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
+bcmd-0.5.0.dist-info/RECORD,,

{bcmd-0.4.11.dist-info → bcmd-0.5.0.dist-info}/WHEEL

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