bcmd 0.0.66__py3-none-any.whl → 0.5.2__py3-none-any.whl

bcmd/tasks/lib.py

@@ -1,34 +1,37 @@
 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 bcmd.common import password
+from ..common import password
+from .venv import getPackageList
 
 app: Final = btask.newSubApp('lib 工具')
 
 
 @app.command()
 @syncCall
-async def tidy(
-    workspace_path: Path = typer.Argument(None, help='workspace 路径'),
-    with_version: bool = typer.Option(False, '--with-version', help='是否带版本号')
+async def tidy_dependencies(
+    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)
-    targetVenvFileName = 'venv.lock' if with_version else 'venv.list'
-    targetVenvFile = bpath.get(workspace_path, f'./../{targetVenvFileName}')
-    btask.check(targetVenvFile.is_file(), '文件不存在', targetVenvFile)
-    ary = (await bfile.readText(targetVenvFile)).strip().replace('\r\n', '\n').split('\n')
-    replaceContent = '\n'.join([f"  '{x}'," for x in ary])
+    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 = \[(.*?)\]', f"dependencies = [\n{replaceContent}\n]", oldContent, 0, re.DOTALL)
     if oldContent != newContent:
         await bfile.writeText(pyprojectTomlFile, newContent)
@@ -42,17 +45,13 @@ async def tidy(
 
 @app.command()
 @syncCall
-async def version(
-    workspace_path: Path = typer.Argument(None, help='workspace 路径'),
-    disabled_commit: bool = typer.Option(False, '--disabled-commit', '-d', help='是否提交git'),
-    with_dependencies_version: bool = typer.Option(False, '--with_dependencies_version', help='第三方库是否带版本号')
+async def update_version(
+    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)
-    isChangeDependencies = tidy(workspace_path, with_dependencies_version)
+    '修改 pyproject.toml 版本号'
+    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('.')]
@@ -67,11 +66,8 @@ async def version(
         raise Exception('版本号修改失败，先检查文件中定义的版本号格式是否正常')
     await bfile.writeText(file, content)
     bcolor.printCyan(newVersion)
-    if not disabled_commit:
-        msg = ''.join([
-            f'更新版本号 {newVersion}',
-            '（注意：本次有修改依赖）' if isChangeDependencies else '',
-        ]).strip()
+    if not isNotCommit:
+        msg = f'更新版本号 {newVersion}'
         os.system(
             rf'TortoiseGitProc.exe /command:commit /path:{file} /logmsg:"{msg}"'
         )
@@ -80,33 +76,43 @@ async def version(
 
 @app.command()
 @syncCall
-async def publish(
-    src_path: Path = typer.Argument(None, help='src 路径'),
-    keep_build_files: bool = typer.Option(False, '--keep-build-files', '-k', help='是否保留构建文件'),
+async def build(
+    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 src_path:
-        src_path = Path.cwd()
-    src_path = src_path.resolve()
+@contextmanager
+def _useBuildPath(workspacePath: Path, isKeepBuildFiles: bool):
+    '整理构建目录，先清空不必要的输出目录，结束后再判断是否需要再清空一次'
 
     def removeUnusedPath():
-        bpath.remove(src_path / 'dist')
-        paths = bpath.listDir(src_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(src_path):
+        with bpath.changePath(workspacePath):
             removeUnusedPath()
-            scriptPath = (src_path / './../venv/Scripts').resolve()
-            os.system(f'{scriptPath / "pip.exe"} install setuptools -U -i https://mirrors.aliyun.com/pypi/simple')
-            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()

bcmd/tasks/math.py

@@ -1,4 +1,3 @@
-from math import nan
 from typing import Final
 
 import typer
@@ -41,59 +40,13 @@ async def scale(
     print(table.get_string(header=False))
 
 
-@app.command()
-@syncCall
-async def increase(
-    old: float = typer.Argument(nan, help='原始数值'),
-    new: float = typer.Argument(nan, help='新数值'),
-):
-    '''
-    计算增长率
-
-    例子：beni math increase 123 456
-
-    例子（连续对话）：beni math increase
-    '''
-    if old is not nan and new is not nan:
-        value = (new - old) / old
-        if value > 0:
-            valueStr = bcolor.red(f'{value*100:+,.3f}%')
-        else:
-            valueStr = bcolor.green(f'{value*100:+,.3f}%')
-        table = PrettyTable(
-            title=bcolor.yellow('计算增长率'),
-        )
-        table.add_rows([
-            ['旧数值', f'{old:,}'],
-            ['新数值', f'{new:,}'],
-            ['增长率', valueStr],
-        ])
-        print()
-        print(table.get_string(header=False))
-    elif old is nan and new is nan:
-        while True:
-            print()
-            value = input('输入2个数值，空格分隔，退出输入 [exit] ：').strip()
-            if value == 'exit':
-                break
-            try:
-                ary = value.split(' ')
-                ary = [float(x) for x in ary if x]
-                assert len(ary) == 2, '参数必须要2个数值'
-                increase(ary[0], ary[1])
-            except Exception as e:
-                bcolor.printRed(e)
-    else:
-        btask.abort('参数错误，不传参数，或者传入2个数值参数')
-
-
 @app.command()
 @syncCall
 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):
@@ -135,7 +88,7 @@ async def discount(
             f'{data.a:,}',
             f'{data.b:,}',
             f'{data.v:,.3f}',
-            f'{data.discount*100:+,.3f}%' if data.discount else '',
+            f'{data.discount * 100:+,.3f}%' if data.discount else '',
         ]
         table.add_column(
             chr(65 + counter()),

bcmd/tasks/mirror.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from enum import StrEnum
+import platform
 from typing import Final
 
 import typer
@@ -13,43 +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'
-
-
-_mirrorsFiles = {
-    _MirrorsType.pip: {
-        bpath.user('pip/pip.ini'): [
-            '[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

@@ -0,0 +1,34 @@
+from pathlib import Path
+from typing import Final
+
+import typer
+from beni import bcolor, binput, bpath, btask
+from beni.bfunc import syncCall
+
+from ..common.func import useResources
+from .venv import add as venvAdd
+
+app: Final = btask.app
+
+
+@app.command('project')
+@syncCall
+async def _(
+    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('即将在此路径生成新项目，是否继续？')
+    venvAdd(['benimang'], path)
+    with useResources('project') as sourceProjectPath:
+        bpath.copyOverwrite(sourceProjectPath, path)

bcmd/tasks/proxy.py

@@ -2,10 +2,11 @@ from __future__ import annotations
 
 from typing import Final
 
+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
 
@@ -13,15 +14,41 @@ app: Final = btask.app
 @app.command()
 @syncCall
 async def proxy(
-    port: int = typer.Option(15236, help="代理服务器端口"),
+    port: int = typer.Argument(15236, help="代理服务器端口"),
 ):
     '生成终端设置代理服务器的命令'
-    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}',
-        '',
-    ])
+    processNameAry: list[str] = []
+    process = psutil.Process().parent()
+    while process:
+        processNameAry.append(process.name())
+        process = process.parent()
+    template = ''
+
+    # 针对不同的终端使用不同的模板
+    if 'cmd.exe' in processNameAry:
+        template = cmdTemplate
+    elif set(['powershell.exe', 'pwsh.exe']) & set(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)