bcmd 0.5.17__py3-none-any.whl → 0.6.0__py3-none-any.whl

bcmd/tasks/__init__.py

@@ -10,9 +10,7 @@ from . import lib
 from . import math
 from . import mirror
 from . import pdf
-from . import project
 from . import proxy
 from . import time
 from . import upgrade
-from . import venv
 from . import wasabi

bcmd/tasks/image.py

@@ -285,14 +285,14 @@ async def merge(
         # 修改保存参数为 WebP 格式
         merged_image.save(
             output_path,
-            format='WEBP',
+            format='JPEG',
             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
+    output_image = path / f'merge_{path.name}.jpg'  # 修改文件扩展名为 webp
     if output_image in image_files:
         if not force:
             print(output_image)

bcmd/tasks/lib.py

@@ -1,48 +1,16 @@
 import os
-import re
-from contextlib import contextmanager
 from pathlib import Path
 from typing import Final
 
 import typer
-from beni import bcolor, bfile, bpath, btask
-from beni.bfunc import syncCall, textToAry
+from beni import bcolor, bfile, bpath, brun, btask
+from beni.bfunc import syncCall
 
 from ..common import password
-from .venv import getPackageList
 
 app: Final = btask.newSubApp('lib 工具')
 
 
-@app.command()
-@syncCall
-async def tidy_dependencies(
-    workspace_path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
-    isWithVersion: bool = typer.Option(False, '--with-version', help='是否带版本号')
-):
-    '整理 pyproject.toml 里面的 dependencies'
-    pyprojectTomlFile = workspace_path / 'pyproject.toml'
-    btask.assertTrue(pyprojectTomlFile.is_file(), 'pyproject.toml 不存在', pyprojectTomlFile)
-    venvFile = bpath.get(workspace_path, f'.venv')
-    btask.assertTrue(venvFile.is_file(), '.venv 不存在', venvFile)
-    basePackages, lockPackages = await getPackageList(venvFile)
-    libAry = lockPackages if isWithVersion else basePackages
-    oldContent = await bfile.readText(pyprojectTomlFile)
-    ignoreLibAry = _getIgnoreLibAry(oldContent)
-    ignoreLibAry = sorted(list(set(ignoreLibAry) & set(libAry)))
-    libAry = sorted(list(set(libAry) - set(ignoreLibAry)))
-    replaceContent = '\n'.join([f"  '{x}'," for x in libAry]) + '\n' + '\n'.join([f"  # '{x}'," for x in ignoreLibAry])
-    newContent = re.sub(r'dependencies = \[(.*?)\n\]', f"dependencies = [\n{replaceContent}\n]", oldContent, 0, re.DOTALL)
-    if oldContent != newContent:
-        await bfile.writeText(pyprojectTomlFile, newContent)
-        bcolor.printYellow(pyprojectTomlFile)
-        bcolor.printMagenta(newContent)
-        return True
-    else:
-        bcolor.printGreen('无需修改依赖')
-        return False
-
-
 @app.command()
 @syncCall
 async def update_version(
@@ -81,38 +49,11 @@ async def build(
     isKeepBuildFiles: bool = typer.Option(False, '--keep-build-files', '-k', help='是否保留构建文件'),
 ):
     '发布项目'
-    u, p = await password.getPypi()
-    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}')
-
-
-# ------------------------------------------------------------------------------------
-
-
-def _getIgnoreLibAry(content: str) -> list[str]:
-    '获取pyproject.toml中屏蔽的第三方库'
-    content = re.findall(r'dependencies = \[(.*?)\n\]', content, re.DOTALL)[0]
-    ary = textToAry(content)
-    return sorted([x[1:].replace('"', '').replace("'", '').replace(',', '').strip() for x in filter(lambda x: x.startswith('#'), ary)])
-
-
-@contextmanager
-def _useBuildPath(workspacePath: Path, isKeepBuildFiles: bool):
-    '整理构建目录，先清空不必要的输出目录，结束后再判断是否需要再清空一次'
-
-    def removeUnusedPath():
-        bpath.remove(workspacePath / 'dist')
-        paths = bpath.listDir(workspacePath)
-        for x in paths:
-            if x.name.endswith('.egg-info'):
-                bpath.remove(x)
-
-    try:
-        with bpath.changePath(workspacePath):
-            removeUnusedPath()
-            yield
-    finally:
-        if not isKeepBuildFiles:
-            removeUnusedPath()
+    user, pwd = await password.getPypi()
+    bpath.remove(path / 'dist')
+    bpath.remove(
+        *list(path.glob('*.egg-info'))
+    )
+    with bpath.changePath(path):
+        await brun.run(f'uv build')
+        await brun.run(f'uv publish -u {user} -p {pwd}')

bcmd/tasks/upgrade.py

@@ -1,6 +1,7 @@
 from typing import Final
 
 import pyperclip
+import typer
 from beni import bcolor, btask
 from beni.bfunc import syncCall
 
@@ -9,9 +10,12 @@ app: Final = btask.app
 
 @app.command()
 @syncCall
-async def upgrade():
-    '使用 pipx 官方源更新 bcmd 到最新版本'
-    cmd = 'pipx upgrade bcmd -i https://pypi.org/simple'
+async def upgrade(
+    name: str = typer.Argument('bcmd', help='要更新的包名'),
+):
+    '使用 pipx 官方源更新指定包到最新版本'
+
+    cmd = f'pipx upgrade {name} -i https://pypi.org/simple'
     pyperclip.copy(cmd + '\n')
     bcolor.printGreen(cmd)
     bcolor.printGreen('已复制到剪贴板（需要手动执行）')

{bcmd-0.5.17.dist-info → bcmd-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcmd
-Version: 0.5.17
+Version: 0.6.0
 Summary: Commands for Beni
 Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>
@@ -17,3 +17,9 @@ Requires-Dist: pymupdf
 Requires-Dist: qiniu
 Requires-Dist: twine
 Requires-Dist: typer
+Provides-Extra: full
+Requires-Dist: img2pdf; extra == "full"
+Requires-Dist: pytest; extra == "full"
+Requires-Dist: pytest-asyncio; extra == "full"
+Requires-Dist: pytest-order; extra == "full"
+Requires-Dist: setuptools; extra == "full"

{bcmd-0.5.17.dist-info → bcmd-0.6.0.dist-info}/RECORD

@@ -8,26 +8,24 @@ bcmd/resources/project/main.py,sha256=xdskz_sf05fYA1SRMFCIxDjx8SnegxTbCmHpW86ItL
 bcmd/resources/project/.vscode/launch.json,sha256=Wpghb9lW9Y1wtrjqlTbyjeejDuU8BQJmBjwsLyPRh1g,478
 bcmd/resources/project/.vscode/settings.json,sha256=G4rCroWxEHcQfsqIJ6CXRHI6VGr3WYQI3KPPjH_JANs,280
 bcmd/resources/project/.vscode/tasks.json,sha256=gouhpkrqiPz7v65Jw1Rz-BCYU3sSdmphzXIYCzVnoe0,1783
-bcmd/tasks/__init__.py,sha256=lGWAgrSd9A4fsg4ilPjqpAeSox7H4VFnf_BxSyG5h8s,355
+bcmd/tasks/__init__.py,sha256=lcVrTgdEph3tKBwwCPVyEOHp-1A3zdFA_6OWLrOo19M,314
 bcmd/tasks/bin.py,sha256=B_e-HYOc2Cohk-1PbKHyKn3RhI8TAUfI2EBRoFEHiTM,2961
 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=-9cV8k645MejVRBsC9lmrQBOPcq_9uy3Me5IJCcNOEQ,12162
+bcmd/tasks/image.py,sha256=Q8ujT6tq2tt0qS0DIY87PNG2RJ1wSArt2dHVTtCuccA,12161
 bcmd/tasks/json.py,sha256=WWOyvcZPYaqQgp-Tkm-uIJschNMBKPKtZN3yXz_SC5s,635
-bcmd/tasks/lib.py,sha256=lq-PdHxhK-5Akf7k4QaIT8mBB-sCK5or5OqEFTdphIA,4567
+bcmd/tasks/lib.py,sha256=UFRF9ckxJ5mItd5R01N_xeKLi9fjG3XC6od2ZuoJ6Vs,2015
 bcmd/tasks/math.py,sha256=xbl5UdaDMyAjiLodDPleP4Cutrk2S3NOAgurzAgOEAE,2862
 bcmd/tasks/mirror.py,sha256=nAe8NYftMKzht16MFBj7RqXwvVhR6Jh2uuAyJLh87og,1098
 bcmd/tasks/pdf.py,sha256=fkHRgxqzrRxdb4_-9pL9wp2roqAHJPS_dVqAGJvRUsM,1504
-bcmd/tasks/project.py,sha256=yLYL6WNmq0mlY-hQ-SGKZ6uRjwceJxpgbP-QAo0Wk-Y,1948
 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=O7E-6FYoMsB4p1UM9m6_bljI-oBmlKg4AJWtsCln-8k,7661
+bcmd/tasks/upgrade.py,sha256=2Wu_aFn-UcToNPDzjRG78VSChirEiD2KnAf6fJUgYak,535
 bcmd/tasks/wasabi.py,sha256=xWFAxprSIlBqDDMGaNXZFb-SahnW1d_R9XxSKRYIhnM,3110
-bcmd-0.5.17.dist-info/METADATA,sha256=4Z6DuWwyZOa1AOj-dSa3JL0c153qk8B5QfcEYRgE4xY,500
-bcmd-0.5.17.dist-info/WHEEL,sha256=DK49LOLCYiurdXXOXwGJm6U4DkHkg4lcxjhqwRa0CP4,91
-bcmd-0.5.17.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
-bcmd-0.5.17.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
-bcmd-0.5.17.dist-info/RECORD,,
+bcmd-0.6.0.dist-info/METADATA,sha256=OnKOZH3BCKfYGoCLzv2wFDXseqR8HkuvBSnIOrIAZq0,740
+bcmd-0.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bcmd-0.6.0.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
+bcmd-0.6.0.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
+bcmd-0.6.0.dist-info/RECORD,,

{bcmd-0.5.17.dist-info → bcmd-0.6.0.dist-info}/WHEEL

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

bcmd/tasks/project.py

@@ -1,59 +0,0 @@
-from pathlib import Path
-from typing import Final
-
-import typer
-from beni import bcolor, binput, bpath, brun, btask
-from beni.bfunc import syncCall
-
-from ..common.func import useResources
-from . import venv
-
-app: Final = btask.newSubApp('项目相关')
-
-
-@app.command()
-@syncCall
-async def create_py(
-    path: Path = typer.Option(Path.cwd(), '--path', help='workspace 路径'),
-):
-    '生成新项目'
-
-    # 检查目标路径是否合法
-    if path.exists():
-        if not path.is_dir():
-            bcolor.printRed('目标路径不是一个目录', path)
-            return
-        elif list(bpath.get(path).glob('*')):
-            bcolor.printRed('目标路径不是空目录', path)
-            return
-
-    bcolor.printYellow(path)
-    await binput.confirm('即将在此路径生成新项目，是否继续？')
-    venv.add(['benimang==now'], path)
-    with useResources('project') as sourceProjectPath:
-        bpath.copyOverwrite(sourceProjectPath, path)
-
-
-@app.command()
-@syncCall
-async def install(
-    path: Path = typer.Option(Path.cwd(), '--path', help='初始化项目的路径'),
-    deep: int = typer.Option(3, '--deep', help='探索路径深度（默认：1）'),
-):
-    '初始化项目（python项目执行beni venv install-lock / nodejs项目执行 pnpm install）'
-
-    async def checkPath(currentPath: Path, currentDeep: int):
-        for file in bpath.listFile(currentPath):
-            if file.name == '.venv':
-                with bpath.changePath(file.parent):
-                    await brun.run('beni venv install-lock', isPrint=True)
-                return
-            elif file.name == 'package.json':
-                with bpath.changePath(file.parent):
-                    await brun.run('pnpm install', isPrint=True)
-                return
-        if currentDeep < deep:
-            for folder in bpath.listPath(currentPath):
-                await checkPath(folder, currentDeep + 1)
-
-    await checkPath(path, 0)

bcmd/tasks/venv.py

@@ -1,227 +0,0 @@
-import os
-import platform
-import re
-import sys
-from pathlib import Path
-from typing import Final
-
-import typer
-from beni import bcolor, bexecute, bfile, bhttp, bpath, brun, btask
-from beni.bfunc import syncCall
-from beni.btype import Null
-from prettytable import PrettyTable
-
-from ..common.func import checkFileOrNotExists, checkPathOrNotExists
-
-app: Final = btask.newSubApp('venv 相关')
-
-
-@app.command()
-@syncCall
-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）'),
-):
-    '添加指定库'
-    await _venv(
-        packages,
-        path=path,
-        isOfficial=isOfficial,
-    )
-
-
-@app.command()
-@syncCall
-async def install_benimang(
-    path: Path = typer.Option(None, '--path', help='指定路径，默认当前目录'),
-):
-    '更新 benimang 库，强制使用官方源'
-    path = path or Path(os.getcwd())
-    pip = getPipFile(path)
-    await brun.run(f'{pip} install benimang -U -i https://pypi.org/simple', isPrint=True)
-    await _venv(
-        ['benimang==now'],
-        path=path,
-    )
-
-
-@app.command()
-@syncCall
-async def install_base(
-    path: Path = typer.Option(None, '--path', help='指定路径，默认当前目录'),
-    isOfficial: bool = typer.Option(False, '--official', help='是否使用官方地址安装（https://pypi.org/simple）'),
-    isCleanup: bool = typer.Option(False, '--cleanup', help='是否清空venv目录后重新安装'),
-):
-    '安装基础库'
-    await _venv(
-        path=path,
-        isOfficial=isOfficial,
-        isUseBase=True,
-        isCleanup=isCleanup,
-    )
-
-
-@app.command()
-@syncCall
-async def install_lock(
-    path: Path = typer.Option(None, '--path', help='指定路径，默认当前目录'),
-    isOfficial: bool = typer.Option(False, '--official', help='是否使用官方地址安装（https://pypi.org/simple）'),
-    isCleanup: bool = typer.Option(False, '--cleanup', help='是否清空venv目录后重新安装'),
-):
-    '安装指定版本的库'
-    await _venv(
-        path=path,
-        isOfficial=isOfficial,
-        isUseLock=True,
-        isCleanup=isCleanup,
-    )
-
-
-# ------------------------------------------------------------------------------------
-
-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())
-    venvPath = getVenvPath(path)
-    checkPathOrNotExists(venvPath)
-    venvFile = bpath.get(path, '.venv')
-    checkFileOrNotExists(venvFile)
-    if isCleanup:
-        bpath.remove(venvPath)
-        btask.assertTrue(not venvPath.exists(), f'无法删除 venv 目录 {venvPath}')
-    packages = packages or []
-    for i in range(len(packages)):
-        package = packages[i]
-        if package.endswith('==now'):
-            ary = package.split('==')
-            packages[i] = f'{ary[0]}=={await _getPackageLatestVersion(ary[0])}'
-    if not venvPath.exists():
-        await bexecute.run(f'python -m venv {venvPath}')
-    if not venvFile.exists():
-        await bfile.writeText(venvFile, '')
-    basePackages, lockPackages = await getPackageList(venvFile)
-    if isUseBase:
-        installPackages = _mergePackageList(basePackages, packages)
-    elif isUseLock:
-        installPackages = _mergePackageList(lockPackages, packages)
-    else:
-        installPackages = _mergePackageList(lockPackages or basePackages, packages)
-    installPackages = sorted(list(set(installPackages)))
-    pip = getPipFile(path)
-    await _pipInstall(pip, installPackages, isOfficial)
-    with bpath.useTempFile() as tempFile:
-        await bexecute.run(f'{pip} freeze > {tempFile}')
-        basePackages = _mergePackageList(basePackages, packages)
-        lockPackages = (await bfile.readText(tempFile)).replace('\r\n', '\n').strip().split('\n')
-        await updatePackageList(venvFile, basePackages, lockPackages)
-    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}')
-    btask.assertTrue(pip.is_file(), f'无法找到指定文件 {pip}')
-    indexUrl = '-i https://pypi.org/simple' if disabled_mirror else ''
-    with bpath.useTempFile() as file:
-        await bfile.writeText(file, '\n'.join(installPackages))
-        table = PrettyTable()
-        table.add_column(
-            bcolor.yellow('#'),
-            [x + 1 for x in range(len(installPackages))],
-        )
-        table.add_column(
-            bcolor.yellow('安装库'),
-            [x for x in installPackages],
-            'l',
-        )
-        print(table.get_string())
-
-        btask.assertTrue(
-            not await bexecute.run(f'{python} -m pip install --upgrade pip {indexUrl}'),
-            '更新 pip 失败',
-        )
-        btask.assertTrue(
-            not await bexecute.run(f'{pip} install -r {file} {indexUrl}'),
-            '执行失败',
-        )
-
-
-async def _getPackageDict(venvFile: Path):
-    content = await bfile.readText(venvFile)
-    pattern = r'\[\[ (.*?) \]\]\n(.*?)(?=\n\[\[|\Z)'
-    matches: list[tuple[str, str]] = re.findall(pattern, content.strip(), re.DOTALL)
-    return {match[0]: [line.strip() for line in match[1].strip().split('\n') if line.strip()] for match in matches}
-
-
-_baseName: Final[str] = 'venv'
-
-
-def _getLockName():
-    systemName = platform.system()
-    return f'{_baseName}-{systemName}'
-
-
-async def getPackageList(venvFile: Path):
-    result = await _getPackageDict(venvFile)
-    lockName = _getLockName()
-    return result.get(_baseName, []), result.get(lockName, [])
-
-
-async def updatePackageList(venvFile: Path, packages: list[str], lockPackages: list[str]):
-    packageDict = await _getPackageDict(venvFile)
-    lockName = _getLockName()
-    packages.sort(key=lambda x: x.lower())
-    lockPackages.sort(key=lambda x: x.lower())
-    packageDict[_baseName] = packages
-    packageDict[lockName] = lockPackages
-    content = '\n\n\n'.join([f'\n[[ {key} ]]\n{'\n'.join(value)}' for key, value in packageDict.items()]).strip()
-    await bfile.writeText(venvFile, content)
-
-
-async def _getPackageLatestVersion(package: str):
-    '获取指定包的最新版本'
-    data = await bhttp.getJson(
-        f'https://pypi.org/pypi/{package}/json'
-    )
-    return data['info']['version']
-
-
-def _mergePackageList(basePackages: list[str], addPackages: list[str]):
-    basePackagesDict = {_getPackageName(x): x for x in basePackages}
-    addPackagesDict = {_getPackageName(x): x for x in addPackages}
-    packagesDict = basePackagesDict | addPackagesDict
-    return sorted([x for x in packagesDict.values()])
-
-
-def _getPackageName(package: str):
-    if '==' in package:
-        package = package.split('==')[0]
-    elif '>' in package:
-        package = package.split('>')[0]
-    elif '<' in package:
-        package = package.split('<')[0]
-    package = package.strip()
-    if package.startswith('#'):
-        package = package.replace('#', '', 1).strip()
-    return package
-
-
-def getVenvPath(path: Path):
-    return bpath.get(path, 'venv')
-
-
-def getPipFile(path: Path):
-    if sys.platform.startswith('win'):
-        return bpath.get(getVenvPath(path), 'Scripts/pip.exe')
-    else:
-        return bpath.get(getVenvPath(path), 'bin/pip')