bcmd 0.4.7__py3-none-any.whl → 0.4.12__py3-none-any.whl

bcmd/common/func.py

@@ -1,11 +1,19 @@
+import importlib.resources
+from contextlib import contextmanager
 from pathlib import Path
 
 from beni import btask
 
 
 def checkFileOrNotExists(file: Path):
-    btask.check(file.is_file() or not file.exists(), f'必须是文件 {file}')
+    btask.assertTrue(file.is_file() or not file.exists(), f'必须是文件 {file}')
 
 
 def checkPathOrNotExists(folder: Path):
-    btask.check(folder.is_dir() or not folder.exists(), f'必须是目录 {folder}')
+    btask.assertTrue(folder.is_dir() or not folder.exists(), f'必须是目录 {folder}')
+
+
+@contextmanager
+def useResources(name: str):
+    with importlib.resources.path('bcmd.resources', name) as target:
+        yield target

bcmd/tasks/bin.py

@@ -1,16 +1,15 @@
-import os
 from datetime import datetime
 from pathlib import Path
 from typing import Final
 
 import typer
 from beni import bcolor, bfile, bpath, btask, bzip
-from beni.bfunc import syncCall
+from beni.bfunc import syncCall, textToAry
 from beni.bqiniu import QiniuBucket
 from beni.btype import Null
 from prettytable import PrettyTable
 
-from bcmd.common import password
+from ..common import password
 
 app: Final = btask.newSubApp('bin 工具')
 
@@ -20,24 +19,18 @@ _PREFIX = 'bin/'
 @app.command()
 @syncCall
 async def download(
-    names: str = typer.Argument(None, help="如果有多个使用,分割"),
+    names: list[str] = typer.Argument(None, help="支持多个"),
     file: Path = typer.Option(None, '--file', '-f', help="文件形式指定参数，行为单位"),
-    output: Path = typer.Option(None, '--output', '-o', help="本地保存路径"),
+    output: Path = typer.Option(Path.cwd(), '--output', '-o', help="本地保存路径"),
 ):
     '从七牛云下载执行文件'
     bucket: QiniuBucket = Null
-    if not output:
-        output = Path(os.curdir)
-    output = output.resolve()
-    targetList: list[str] = []
-    if names:
-        targetList.extend(names.split(','))
     if file:
         content = await bfile.readText(Path(file))
-        targetList.extend(content.split('\n'))
-    targetList = [x.strip() for x in targetList]
-    targetList = [x for x in targetList if x]
-    for target in targetList:
+        names.extend(
+            textToAry(content)
+        )
+    for target in names:
         binFile = output / target
         if binFile.exists():
             bcolor.printYellow(f'已存在 {binFile}')
@@ -98,6 +91,9 @@ async def remove(
     bcolor.printGreen('OK')
 
 
+# ------------------------------------------------------------------------------------
+
+
 async def _getBucket():
     ak, sk = await password.getQiniu()
     return QiniuBucket(

bcmd/tasks/code.py

@@ -12,13 +12,12 @@ app: Final = btask.newSubApp('code 工具')
 @app.command()
 @syncCall
 async def tidy_tasks(
-    tasks_path: Path = typer.Argument(None, help="tasks 路径"),
+    tasks_path: Path = typer.Argument(Path.cwd(), help="tasks 路径"),
 ):
     '整理 task 项目中的 tasks/__init__.py'
-    if not tasks_path:
-        tasks_path = Path.cwd()
+
     initFile = tasks_path / '__init__.py'
-    btask.check(initFile.is_file(), '文件不存在', initFile)
+    btask.assertTrue(initFile.is_file(), '文件不存在', initFile)
     files = bpath.listFile(tasks_path)
     files = [x for x in files if not x.name.startswith('_')]
     contents = [f'from . import {x.stem}' for x in files]
@@ -39,11 +38,10 @@ async def tidy_tasks(
 @app.command()
 @syncCall
 async def tidy_modules(
-    modules_path: Path = typer.Argument(None, help="modules_path 路径"),
+    modules_path: Path = typer.Argument(Path.cwd(), help="modules_path 路径"),
 ):
     '整理 fastapi 项目中的 modules/__init__.py'
-    if not modules_path:
-        modules_path = Path.cwd()
+
     importContents: list[str] = []
     managerContents: list[str] = []
 
@@ -76,25 +74,23 @@ async def tidy_modules(
 
 @app.command()
 @syncCall
-async def gen_init(
-    target_path: Path = typer.Argument(None, help="tasks 路径"),
+async def gen_init_py(
+    workspace_path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
 ):
-    '生成 __init__.py 文件'
-    if not target_path:
-        target_path = Path.cwd()
+    '递归生成 __init__.py 文件'
 
     async def makeInitFiles(p: Path):
         if p.name == '__pycache__':
             return
         if p.name.startswith('.'):
             return
-        if target_path != p:
-            initFile = p.joinpath('__init__.py')
+        if workspace_path != p:
+            initFile = p / '__init__.py'
             if not initFile.exists():
-                printYellow('生成文件', initFile)
+                printYellow(initFile)
                 await bfile.writeText(initFile, '')
         for x in bpath.listDir(p):
             await makeInitFiles(x)
 
-    await makeInitFiles(target_path)
+    await makeInitFiles(workspace_path)
     printGreen('OK')

bcmd/tasks/crypto.py

@@ -104,6 +104,9 @@ async def decrypt_file(
     bcolor.printGreen('OK')
 
 
+# ------------------------------------------------------------------------------------
+
+
 def _genPassword():
     password = ''
     while not password:

bcmd/tasks/download.py

@@ -8,7 +8,7 @@ from uuid import uuid4
 import pyperclip
 import typer
 from beni import bcolor, bfile, bhttp, binput, bpath, btask
-from beni.bfunc import syncCall
+from beni.bfunc import syncCall, textToAry
 
 app: Final = btask.app
 
@@ -29,7 +29,7 @@ async def download(
         content = await bfile.readText(url_file)
     else:
         content = pyperclip.paste()
-    urlSet = set([x.strip() for x in content.strip().split('\n') if x.strip()])
+    urlSet = set(textToAry(content))
 
     for i, url in enumerate(urlSet):
         print(f'{i + 1}. {url}')

bcmd/tasks/lib.py

@@ -1,11 +1,12 @@
 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
+from beni.bfunc import syncCall, textToAry
 
 from ..common import password
 from .venv import getPackageList
@@ -16,18 +17,16 @@ app: Final = btask.newSubApp('lib 工具')
 @app.command()
 @syncCall
 async def tidy_dependencies(
-    workspace_path: Path = typer.Argument(None, help='workspace 路径'),
-    with_version: bool = typer.Option(False, '--with-version', help='是否带版本号')
+    workspace_path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
+    isWithVersion: bool = typer.Option(False, '--with-version', help='是否带版本号')
 ):
     '整理 pyproject.toml 里面的 dependencies'
-    if not workspace_path:
-        workspace_path = Path.cwd()
     pyprojectTomlFile = workspace_path / 'pyproject.toml'
-    btask.check(pyprojectTomlFile.is_file(), 'pyproject.toml 不存在', pyprojectTomlFile)
+    btask.assertTrue(pyprojectTomlFile.is_file(), 'pyproject.toml 不存在', pyprojectTomlFile)
     venvFile = bpath.get(workspace_path, f'.venv')
-    btask.check(venvFile.is_file(), '.venv 不存在', venvFile)
+    btask.assertTrue(venvFile.is_file(), '.venv 不存在', venvFile)
     basePackages, lockPackages = await getPackageList(venvFile)
-    libAry = lockPackages if with_version else basePackages
+    libAry = lockPackages if isWithVersion else basePackages
     oldContent = await bfile.readText(pyprojectTomlFile)
     ignoreLibAry = _getIgnoreLibAry(oldContent)
     ignoreLibAry = sorted(list(set(ignoreLibAry) & set(libAry)))
@@ -47,14 +46,12 @@ async def tidy_dependencies(
 @app.command()
 @syncCall
 async def update_version(
-    workspace_path: Path = typer.Argument(None, help='workspace 路径'),
-    disabled_commit: bool = typer.Option(False, '--disabled-commit', '-d', help='是否提交git'),
+    path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
+    isNotCommit: bool = typer.Option(False, '--no-commit', '-d', help='是否提交git'),
 ):
     '修改 pyproject.toml 版本号'
-    if not workspace_path:
-        workspace_path = Path.cwd()
-    file = workspace_path / 'pyproject.toml'
-    btask.check(file.is_file(), '文件不存在', file)
+    file = path / 'pyproject.toml'
+    btask.assertTrue(file.is_file(), '文件不存在', file)
     data = await bfile.readToml(file)
     version = data['project']['version']
     versionList = [int(x) for x in version.split('.')]
@@ -69,7 +66,7 @@ async def update_version(
         raise Exception('版本号修改失败，先检查文件中定义的版本号格式是否正常')
     await bfile.writeText(file, content)
     bcolor.printCyan(newVersion)
-    if not disabled_commit:
+    if not isNotCommit:
         msg = f'更新版本号 {newVersion}'
         os.system(
             rf'TortoiseGitProc.exe /command:commit /path:{file} /logmsg:"{msg}"'
@@ -80,42 +77,42 @@ async def update_version(
 @app.command()
 @syncCall
 async def build(
-    workspace_path: Path = typer.Argument(None, help='workspace 路径'),
-    keep_build_files: bool = typer.Option(False, '--keep-build-files', '-k', help='是否保留构建文件'),
+    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(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 = \[(.*?)\]', content, re.DOTALL)[0]
+    ary = textToAry(content)
+    return sorted([x[1:].replace('"', '').replace("'", '').replace(',', '').strip() for x in filter(lambda x: x.startswith('#'), ary)])
 
-    if not workspace_path:
-        workspace_path = Path.cwd()
-    workspace_path = workspace_path.resolve()
+
+@contextmanager
+def _useBuildPath(workspacePath: Path, isKeepBuildFiles: bool):
+    '整理构建目录，先清空不必要的输出目录，结束后再判断是否需要再清空一次'
 
     def removeUnusedPath():
-        bpath.remove(workspace_path / 'dist')
-        paths = bpath.listDir(workspace_path)
+        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(workspace_path):
+        with bpath.changePath(workspacePath):
             removeUnusedPath()
-            scriptPath = (workspace_path / './venv/Scripts').resolve()
-            os.system(f'{scriptPath / "python.exe"} -m build')
-            os.system(f'{scriptPath / "twine.exe"} upload dist/* -u {u} -p {p}')
+            yield
     finally:
-        if not keep_build_files:
+        if not isKeepBuildFiles:
             removeUnusedPath()
-
-
-# -------------------------------------------------
-
-
-def _getIgnoreLibAry(content: str) -> list[str]:
-    '获取pyproject.toml中屏蔽的第三方库'
-    content = re.findall(r'dependencies = \[(.*?)\]', content, re.DOTALL)[0]
-    ary = content.strip().split('\n')
-    ary = [x.strip() for x in ary if x]
-    return sorted([x[1:].replace('"', '').replace("'", '').replace(',', '').strip() for x in filter(lambda x: x.startswith('#'), ary)])

bcmd/tasks/math.py

@@ -46,7 +46,7 @@ async def discount(
     values: list[str] = typer.Argument(..., help='每组数据使用#作为分隔符，注意后面的数据不能为0，例：123#500'),
 ):
     '计算折扣，例子：beni math discount 123#500 130#550'
-    btask.check(len(values) >= 2, '至少需要提供2组数据用作比较')
+    btask.assertTrue(len(values) >= 2, '至少需要提供2组数据用作比较')
 
     class Data:
         def __init__(self, value: str):

bcmd/tasks/mirror.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import platform
-from enum import StrEnum
 from typing import Final
 
 import typer
@@ -14,45 +13,34 @@ app: Final = btask.app
 @app.command()
 @syncCall
 async def mirror(
-    types: list[_MirrorsType] = typer.Argument(None, help="镜像的类型"),
     disabled: bool = typer.Option(False, '--disabled', '-d', help="是否禁用"),
 ):
     '设置镜像'
-    if not types:
-        # types = [_MirrorsType.pip, _MirrorsType.npm]
-        types = [_MirrorsType.pip]
-    for targetType in types:
-        data = _mirrorsFiles[targetType]
-        for file, msgAry in data.items():
-            if disabled:
-                bpath.remove(file)
-                bcolor.printRed('删除文件', file)
-            else:
-                print()
-                bcolor.printYellow(file)
-                msg = '\n'.join(msgAry)
-                await bfile.writeText(file, msg)
-                bcolor.printMagenta(msg)
-
-
-class _MirrorsType(StrEnum):
-    pip = 'pip'
-    # npm = 'npm'
-
-
-_isWindows = platform.system() == 'Windows'
-
-_mirrorsFiles = {
-    _MirrorsType.pip: {
-        bpath.user('pip/pip.ini') if _isWindows else bpath.user('.pip/pip.conf'): [
-            '[global]',
-            'index-url = https://mirrors.aliyun.com/pypi/simple',
-        ],
-    },
-    # _MirrorsType.npm: {
-    #     bpath.user('.bashrc'): [
-    #         'registry=https://registry.npm.taobao.org/',
-    #         'electron_mirror=https://npm.taobao.org/mirrors/electron/',
-    #     ],
-    # },
-}
+
+    # 根据不同的系统平台
+    match platform.system():
+        case 'Windows':
+            file = bpath.user('pip/pip.ini')
+        case 'Linux':
+            file = bpath.user('.pip/pip.conf')
+        case _:
+            btask.abort('暂时不支持该平台', platform.system())
+            return
+
+    if disabled:
+        bpath.remove(file)
+        bcolor.printRed('删除文件', file)
+    else:
+        content = _content.strip()
+        await bfile.writeText(file, content)
+        bcolor.printYellow(file)
+        bcolor.printMagenta(content)
+    bcolor.printGreen('OK')
+
+
+# ------------------------------------------------------------------------------------
+
+_content = '''
+[global]
+index-url = https://mirrors.aliyun.com/pypi/simple
+'''

bcmd/tasks/project.py

@@ -2,33 +2,31 @@ from pathlib import Path
 from typing import Final
 
 import typer
-from beni import bcolor, bfile, bpath, btask
+from beni import bcolor, bpath, btask
 from beni.bfunc import syncCall
 
-app: Final = btask.newSubApp('project 工具')
+from ..common.func import useResources
+from .venv import venv
 
+app: Final = btask.app
 
-@app.command()
+
+@app.command('project')
 @syncCall
-async def gen_init_py(
-    workspace_path: Path = typer.Argument(None, help='workspace 路径'),
+async def _(
+    path: Path = typer.Option(Path.cwd(), '--path', help='workspace 路径'),
 ):
-    '将指定目录下的所有文件生成 __init__.py 文件'
+    '生成新项目'
 
-    async def makeInitFiles(p: Path):
-        if p.name == '__pycache__':
+    # 检查目标路径是否合法
+    if path.exists():
+        if not path.is_dir():
+            bcolor.printRed('目标路径不是一个目录', path)
             return
-        if p.name.startswith('.'):
+        elif list(bpath.get(path).glob('*')):
+            bcolor.printRed('目标路径不是空目录', path)
             return
-        if workspace_path != p:
-            initFile = p / '__init__.py'
-            if not initFile.exists():
-                bcolor.printYellow(initFile)
-                await bfile.writeText(initFile, '')
-        for x in bpath.listDir(p):
-            await makeInitFiles(x)
 
-    if not workspace_path:
-        workspace_path = Path.cwd()
-    await makeInitFiles(workspace_path)
-    bcolor.printGreen('OK')
+    venv(['benimang'], path, False, False, False, False)
+    with useResources('project') as sourceProjectPath:
+        bpath.copyOverwrite(sourceProjectPath, path)

bcmd/tasks/proxy.py

@@ -6,7 +6,7 @@ import psutil
 import pyperclip
 import typer
 from beni import bcolor, btask
-from beni.bfunc import syncCall
+from beni.bfunc import syncCall, textToAry
 
 app: Final = btask.app
 
@@ -14,32 +14,41 @@ app: Final = btask.app
 @app.command()
 @syncCall
 async def proxy(
-    port: int = typer.Option(15236, help="代理服务器端口"),
+    port: int = typer.Argument(15236, help="代理服务器端口"),
 ):
     '生成终端设置代理服务器的命令'
-    processNameAry:list[str] = []
+    processNameAry: list[str] = []
     process = psutil.Process().parent()
     while process:
         processNameAry.append(process.name())
         process = process.parent()
-    msg = ''
+    template = ''
+
+    # 针对不同的终端使用不同的模板
     if 'cmd.exe' in processNameAry:
-        msg = '\r\n'.join([
-            f'set http_proxy=http://localhost:{port}',
-            f'set https_proxy=http://localhost:{port}',
-            f'set all_proxy=http://localhost:{port}',
-            '',
-        ])
+        template = cmdTemplate
     elif set(['powershell.exe', 'pwsh.exe']) & set(processNameAry):
-        msg = '\r\n'.join([
-            f'$env:http_proxy="http://localhost:{port}"',
-            f'$env:https_proxy="http://localhost:{port}"',
-            f'$env:all_proxy="http://localhost:{port}"',
-            '',
-        ])
-    if msg:
-        bcolor.printMagenta('\r\n' + msg)
-        pyperclip.copy(msg)
-        bcolor.printYellow('已复制，可直接粘贴使用')
-    else:
-        bcolor.printRed(f'不支持当前终端（{processNameAry}）')
+        template = powerShellTemplate
+
+    btask.assertTrue(template, '不支持当前终端（{processNameAry}）')
+    lineAry = textToAry(template.format(port))
+    msg = '\n'.join(lineAry)
+    bcolor.printMagenta('\r\n' + msg)
+    pyperclip.copy(msg)
+    bcolor.printYellow('已复制，可直接粘贴使用')
+
+
+# ------------------------------------------------------------------------------------
+
+
+cmdTemplate = '''
+    set http_proxy=http://localhost:{0}
+    set https_proxy=http://localhost:{0}
+    set all_proxy=http://localhost:{0}
+'''
+
+powerShellTemplate = '''
+    $env:http_proxy="http://localhost:{0}"
+    $env:https_proxy="http://localhost:{0}"
+    $env:all_proxy="http://localhost:{0}"
+'''

bcmd/tasks/time.py

@@ -6,7 +6,7 @@ from zoneinfo import ZoneInfo
 
 import typer
 from beni import bcolor, btask
-from beni.bfunc import syncCall
+from beni.bfunc import syncCall, textToAry
 from beni.btype import Null
 
 app: Final = btask.app
@@ -14,7 +14,9 @@ app: Final = btask.app
 
 @app.command('time')
 @syncCall
-async def showtime(values: list[str] = typer.Argument(None)):
+async def showtime(
+    args: list[str] = typer.Argument(None),
+):
     '''
     格式化时间戳\n
     beni time\n
@@ -23,10 +25,10 @@ async def showtime(values: list[str] = typer.Argument(None)):
     beni time 2021-9-23\n
     beni time 2021-9-23 09:47:00\n
     '''
-    values = values or []
-    btask.check(len(values) <= 2, '参数过多')
-    value1: str | None = values[0] if len(values) >= 1 else None
-    value2: str | None = values[1] if len(values) >= 2 else None
+    args = args or []
+    btask.assertTrue(len(args) <= 2, '参数过多')
+    value1: str | None = args[0] if len(args) >= 1 else None
+    value2: str | None = args[1] if len(args) >= 2 else None
     timestamp: float = Null
     if not value1:
         timestamp = time.time()
@@ -42,12 +44,10 @@ async def showtime(values: list[str] = typer.Argument(None)):
             except:
                 pass
     if not timestamp:
-        color = typer.colors.BRIGHT_RED
-        typer.secho('参数无效', fg=color)
-        typer.secho('\n可使用格式: ', fg=color)
-        msg_ary = str(showtime.__doc__).strip().replace('\n\n', '\n').split('\n')[1:]
-        msg_ary = [x.strip() for x in msg_ary]
-        typer.secho('\n'.join(msg_ary), fg=color)
+        bcolor.printRed('参数无效\n')
+        bcolor.printRed('使用示例：')
+        msgAry = textToAry(str(showtime.__doc__))[1:]
+        bcolor.printRed('\n'.join(msgAry))
         return
     print()
     bcolor.printMagenta(timestamp)

bcmd/tasks/venv.py

@@ -1,4 +1,3 @@
-import importlib.resources
 import os
 import platform
 import re
@@ -8,13 +7,12 @@ from typing import Final
 
 import typer
 from beni import bcolor, bexecute, bfile, bhttp, bpath, btask
-from beni.bfunc import syncCall
+from beni.bfunc import syncCall, textToAry
 from beni.btype import Null
 from prettytable import PrettyTable
 
-from bcmd.common import password
-from bcmd.common.func import checkFileOrNotExists, checkPathOrNotExists
-
+from ..common import password
+from ..common.func import checkFileOrNotExists, checkPathOrNotExists
 from . import bin
 
 app: Final = btask.app
@@ -26,14 +24,12 @@ async def venv(
     packages: list[str] = typer.Argument(None),
     path: Path = typer.Option(None, '--path', help='指定路径，默认当前目录'),
     isOfficial: bool = typer.Option(False, '--official', help='是否使用官方地址安装（https://pypi.org/simple）'),
-    isNewProject: bool = typer.Option(False, '--new-project', help='是否新建项目'),
     isUseBase: bool = typer.Option(False, '--use-base', help='是否强制使用基础库去安装'),
-    isReBase: bool = typer.Option(False, '--re-base', help='是否先清空venv目录再使用基础库去安装'),
     isUseLock: bool = typer.Option(False, '--use-lock', help='是否使用锁定库安装'),
-    isReLock: bool = typer.Option(False, '--re-lock', help='是否先清空venv目录再使用锁定库安装'),
+    isCleanup: bool = typer.Option(False, '--cleanup', help='是否先清空 venv 目录再执行'),
 ):
     'python 虚拟环境配置'
-    btask.check(not (isUseBase == isReBase == isUseLock == isReLock == True), '4个选项只能选择其中一个 --use-base / --re-base / --use-lock / --re-lock')
+    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')
@@ -42,9 +38,9 @@ async def venv(
     venvFile = bpath.get(path, '.venv')
     checkFileOrNotExists(venvFile)
     await _inputQiniuPassword(binListFile, binPath)
-    if isReBase or isReLock:
+    if isCleanup:
         bpath.remove(venvPath)
-        btask.check(not venvPath.exists(), f'无法删除 venv 目录 {venvPath}')
+        btask.assertTrue(not venvPath.exists(), f'无法删除 venv 目录 {venvPath}')
     packages = packages or []
     for i in range(len(packages)):
         package = packages[i]
@@ -56,9 +52,9 @@ async def venv(
     if not venvFile.exists():
         await bfile.writeText(venvFile, '')
     basePackages, lockPackages = await getPackageList(venvFile)
-    if isUseBase or isReBase:
+    if isUseBase:
         installPackages = _mergePackageList(basePackages, packages)
-    elif isUseLock or isReLock:
+    elif isUseLock:
         installPackages = _mergePackageList(lockPackages, packages)
     else:
         installPackages = _mergePackageList(lockPackages or basePackages, packages)
@@ -81,18 +77,16 @@ async def venv(
             file=binListFile,
             output=binPath,
         )
-    # 新建项目
-    if isNewProject:
-        with importlib.resources.path('bcmd.resources', 'project') as sourceProjectPath:
-            for p in bpath.listPath(sourceProjectPath):
-                bpath.copy(p, path / p.name)
     bcolor.printGreen('OK')
 
 
+# ------------------------------------------------------------------------------------
+
+
 async def _pipInstall(pip: Path, installPackages: list[str], disabled_mirror: bool):
     python = pip.with_stem('python')
-    btask.check(python.is_file(), f'无法找到指定文件 {python}')
-    btask.check(pip.is_file(), f'无法找到指定文件 {pip}')
+    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))
@@ -108,11 +102,11 @@ async def _pipInstall(pip: Path, installPackages: list[str], disabled_mirror: bo
         )
         print(table.get_string())
 
-        btask.check(
+        btask.assertTrue(
             not await bexecute.run(f'{python} -m pip install --upgrade pip {indexUrl}'),
             '更新 pip 失败',
         )
-        btask.check(
+        btask.assertTrue(
             not await bexecute.run(f'{pip} install -r {file} {indexUrl}'),
             '执行失败',
         )
@@ -146,7 +140,7 @@ async def updatePackageList(venvFile: Path, packages: list[str], lockPackages: l
     lockPackages.sort(key=lambda x: x.lower())
     packageDict[_baseName] = packages
     packageDict[lockName] = lockPackages
-    content = '\n'.join([f'\n[[ {key} ]]\n{'\n'.join(value)}' for key, value in packageDict.items()]).strip()
+    content = '\n\n\n'.join([f'\n[[ {key} ]]\n{'\n'.join(value)}' for key, value in packageDict.items()]).strip()
     await bfile.writeText(venvFile, content)
 
 
@@ -181,7 +175,7 @@ def _getPackageName(package: str):
 async def _inputQiniuPassword(binListFile: Path, binPath: Path) -> None:
     '根据需要输入七牛云密码'
     if binListFile.exists():
-        aaSet = set([x.strip() for x in (await bfile.readText(binListFile)).strip().split('\n') if x.strip()])
+        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.7.dist-info → bcmd-0.4.12.dist-info}/METADATA

@@ -1,19 +1,19 @@
 Metadata-Version: 2.1
 Name: bcmd
-Version: 0.4.7
+Version: 0.4.12
 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.6.8
+Requires-Dist: benimang ==0.7.5
 Requires-Dist: build
 Requires-Dist: cryptography
 Requires-Dist: pathspec
 Requires-Dist: pillow
 Requires-Dist: prettytable
 Requires-Dist: psutil
-Requires-Dist: qiniu ==7.13.2
+Requires-Dist: qiniu
 Requires-Dist: twine
 Requires-Dist: typer
 

bcmd-0.4.12.dist-info/RECORD

@@ -0,0 +1,30 @@
+bcmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bcmd/main.py,sha256=1HRCHLt_jeF6ImgjG_MX9N2x9H1f6FyqTX7UADzedfA,131
+bcmd/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bcmd/common/func.py,sha256=MehbfuWFHTOsihhYxVFj0_U6-hjMTfLh3n-oMrpyyKo,508
+bcmd/common/password.py,sha256=25fA1h9ttZuUobnZ_nA0Ouhmk43etBfGeM40dgxJnFY,1347
+bcmd/resources/project/.gitignore,sha256=m8wh9WahP29_Ci866EEuj07Wfn0wnkomj7wldbxd29E,26
+bcmd/resources/project/main.py,sha256=xdskz_sf05fYA1SRMFCIxDjx8SnegxTbCmHpW86ItLs,11
+bcmd/resources/project/.vscode/launch.json,sha256=Wpghb9lW9Y1wtrjqlTbyjeejDuU8BQJmBjwsLyPRh1g,478
+bcmd/resources/project/.vscode/settings.json,sha256=Ze0dt3KkKU1IiXMRiQfjbcKdSsS7XTD9PkaQn3wgEWs,290
+bcmd/resources/project/.vscode/tasks.json,sha256=gouhpkrqiPz7v65Jw1Rz-BCYU3sSdmphzXIYCzVnoe0,1783
+bcmd/tasks/__init__.py,sha256=XDE4eW0mPkUCSK9tyg1DQRGLA7A9DuTmjq5MyUiPoXs,294
+bcmd/tasks/bin.py,sha256=B_e-HYOc2Cohk-1PbKHyKn3RhI8TAUfI2EBRoFEHiTM,2961
+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/json.py,sha256=WWOyvcZPYaqQgp-Tkm-uIJschNMBKPKtZN3yXz_SC5s,635
+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/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.12.dist-info/METADATA,sha256=HW-K23e3MRAfMrqejwARheWl8XjTWXyM_lGxyg2RM6o,478
+bcmd-0.4.12.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+bcmd-0.4.12.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
+bcmd-0.4.12.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
+bcmd-0.4.12.dist-info/RECORD,,

{bcmd-0.4.7.dist-info → bcmd-0.4.12.dist-info}/WHEEL

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

bcmd-0.4.7.dist-info/RECORD

@@ -1,30 +0,0 @@
-bcmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bcmd/main.py,sha256=1HRCHLt_jeF6ImgjG_MX9N2x9H1f6FyqTX7UADzedfA,131
-bcmd/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bcmd/common/func.py,sha256=B5IFOcI0pfqKUNg91ry-vP-WZm9S22x7yzha1QMn2kM,296
-bcmd/common/password.py,sha256=25fA1h9ttZuUobnZ_nA0Ouhmk43etBfGeM40dgxJnFY,1347
-bcmd/resources/project/.gitignore,sha256=m8wh9WahP29_Ci866EEuj07Wfn0wnkomj7wldbxd29E,26
-bcmd/resources/project/main.py,sha256=xdskz_sf05fYA1SRMFCIxDjx8SnegxTbCmHpW86ItLs,11
-bcmd/resources/project/.vscode/launch.json,sha256=Wpghb9lW9Y1wtrjqlTbyjeejDuU8BQJmBjwsLyPRh1g,478
-bcmd/resources/project/.vscode/settings.json,sha256=Ze0dt3KkKU1IiXMRiQfjbcKdSsS7XTD9PkaQn3wgEWs,290
-bcmd/resources/project/.vscode/tasks.json,sha256=gouhpkrqiPz7v65Jw1Rz-BCYU3sSdmphzXIYCzVnoe0,1783
-bcmd/tasks/__init__.py,sha256=XDE4eW0mPkUCSK9tyg1DQRGLA7A9DuTmjq5MyUiPoXs,294
-bcmd/tasks/bin.py,sha256=rdag8IJv081CKflnJKo0IkVbi5wqBGowrl6gLMtP6Eg,3133
-bcmd/tasks/code.py,sha256=MEfzE879dplraLtZ59EZu94HrPkEohHCo7PNEoF_xmM,3089
-bcmd/tasks/crypto.py,sha256=IhWtFyfLLUb9xuVdPcvr-D5lZciLDtwxQDoz5SEL7Fg,3127
-bcmd/tasks/debian.py,sha256=B9aMIIct3vNqMJr5hTr1GegXVf20H49C27FMvRRGIzI,3004
-bcmd/tasks/download.py,sha256=0TYdoeEkXL--GTZ8ZSnSNzh8pC42kZhrTu6WVY5e7Fo,1824
-bcmd/tasks/image.py,sha256=OSqShLb_lwa77aQOnRNksXNemtuAnQDGg-VfiDy9fEM,2310
-bcmd/tasks/json.py,sha256=WWOyvcZPYaqQgp-Tkm-uIJschNMBKPKtZN3yXz_SC5s,635
-bcmd/tasks/lib.py,sha256=6-1WGYUzBtr80K7zuQETLiQKpB9EfXvPxiL22a8u5v8,4583
-bcmd/tasks/math.py,sha256=M7-mmyQPx1UW7JiU1knY5Ty0hBw9zv9L4NNJf9eEjZ4,2857
-bcmd/tasks/mirror.py,sha256=-ztGkkxVk81npIo4cpmyLdHa1w4ZFdiJ3mv5WIBMI5Y,1556
-bcmd/tasks/project.py,sha256=ESWyRvRu4tesoYrlBtYMrQvQoxzMnFkI-jTN2hsYruI,939
-bcmd/tasks/proxy.py,sha256=mdiBR2vah5qKt9o7dXE7rg8Lz_A6GheVJDts0m1gmSs,1324
-bcmd/tasks/time.py,sha256=nSIVYov2LsGdxsZAtC91UKXcUtVAqR9o-JmzeuevFhA,2586
-bcmd/tasks/venv.py,sha256=Metps2tKu_wyZfezMTvQPInAWgQV6FyRW9l4-WS9lk8,7160
-bcmd-0.4.7.dist-info/METADATA,sha256=PLqFGXVEpVWeo8M0qwIik_e5dHmkL40BxC1CvIV6aPo,486
-bcmd-0.4.7.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-bcmd-0.4.7.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
-bcmd-0.4.7.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
-bcmd-0.4.7.dist-info/RECORD,,