bcmd 0.2.8__py3-none-any.whl → 0.4.6__py3-none-any.whl

bcmd/common/func.py

@@ -0,0 +1,11 @@
+from pathlib import Path
+
+from beni import btask
+
+
+def checkFileOrNotExists(file: Path):
+    btask.check(file.is_file() or not file.exists(), f'必须是文件 {file}')
+
+
+def checkPathOrNotExists(folder: Path):
+    btask.check(folder.is_dir() or not folder.exists(), f'必须是目录 {folder}')

bcmd/resources/project/.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+    "files.exclude": {
+        ".pytest_cache": true,
+        "**/__pycache__": true,
+        ".gitignore": true,
+        ".venv": true,
+        ".venv-lock": true,
+        "venv": true,
+    },
+    "python.defaultInterpreterPath": "${workspaceFolder}/venv/Scripts/python.exe",
+}

bcmd/resources/project/{src/.vscode → .vscode}/tasks.json

@@ -7,7 +7,7 @@
             "command": "TortoiseGitProc.exe",
             "args": [
                 "/command:commit",
-                "/path:${workspaceFolder}/../",
+                "/path:${workspaceFolder}/",
             ],
         },
         {
@@ -25,7 +25,7 @@
             "command": "TortoiseGitProc.exe",
             "args": [
                 "/command:revert",
-                "/path:${workspaceFolder}/../",
+                "/path:${workspaceFolder}/",
             ],
         },
         {
@@ -43,7 +43,7 @@
             "command": "TortoiseGitProc.exe",
             "args": [
                 "/command:sync",
-                "/path:${workspaceFolder}/../",
+                "/path:${workspaceFolder}/",
             ],
         },
         {
@@ -52,7 +52,7 @@
             "command": "TortoiseGitProc.exe",
             "args": [
                 "/command:log",
-                "/path:${workspaceFolder}/../",
+                "/path:${workspaceFolder}/",
             ],
         },
         {

bcmd/tasks/lib.py

@@ -7,7 +7,8 @@ import typer
 from beni import bcolor, bfile, bpath, btask
 from beni.bfunc import syncCall
 
-from bcmd.common import password
+from ..common import password
+from .venv import getPackageList
 
 app: Final = btask.newSubApp('lib 工具')
 
@@ -23,10 +24,10 @@ async def tidy_dependencies(
         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)
-    libAry = (await bfile.readText(targetVenvFile)).strip().replace('\r\n', '\n').split('\n')
+    venvFile = bpath.get(workspace_path, f'.venv')
+    btask.check(venvFile.is_file(), '.venv 不存在', venvFile)
+    basePackages, lockPackages = await getPackageList(venvFile)
+    libAry = lockPackages if with_version else basePackages
     oldContent = await bfile.readText(pyprojectTomlFile)
     ignoreLibAry = _getIgnoreLibAry(oldContent)
     ignoreLibAry = sorted(list(set(ignoreLibAry) & set(libAry)))
@@ -79,7 +80,7 @@ async def update_version(
 @app.command()
 @syncCall
 async def build(
-    src_path: Path = typer.Argument(None, help='src 路径'),
+    workspace_path: Path = typer.Argument(None, help='workspace 路径'),
     keep_build_files: bool = typer.Option(False, '--keep-build-files', '-k', help='是否保留构建文件'),
 ):
     '发布项目'
@@ -87,22 +88,21 @@ async def build(
     # 获取用户名和密码
     u, p = await password.getPypi()
 
-    if not src_path:
-        src_path = Path.cwd()
-    src_path = src_path.resolve()
+    if not workspace_path:
+        workspace_path = Path.cwd()
+    workspace_path = workspace_path.resolve()
 
     def removeUnusedPath():
-        bpath.remove(src_path / 'dist')
-        paths = bpath.listDir(src_path)
+        bpath.remove(workspace_path / 'dist')
+        paths = bpath.listDir(workspace_path)
         for x in paths:
             if x.name.endswith('.egg-info'):
                 bpath.remove(x)
 
     try:
-        with bpath.changePath(src_path):
+        with bpath.changePath(workspace_path):
             removeUnusedPath()
-            scriptPath = (src_path / './../venv/Scripts').resolve()
-            os.system(f'{scriptPath / "pip.exe"} install setuptools -U -i https://mirrors.aliyun.com/pypi/simple')
+            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}')
     finally:

bcmd/tasks/proxy.py

@@ -17,7 +17,7 @@ async def proxy(
     port: int = typer.Option(15236, help="代理服务器端口"),
 ):
     '生成终端设置代理服务器的命令'
-    processNameAry = []
+    processNameAry:list[str] = []
     process = psutil.Process().parent()
     while process:
         processNameAry.append(process.name())

bcmd/tasks/venv.py

@@ -1,15 +1,19 @@
 import importlib.resources
 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, binput, bpath, btask
+from beni import bcolor, bexecute, bfile, bhttp, bpath, btask
 from beni.bfunc import syncCall
 from beni.btype import Null
+from prettytable import PrettyTable
 
 from bcmd.common import password
+from bcmd.common.func import checkFileOrNotExists, checkPathOrNotExists
 
 from . import bin
 
@@ -20,46 +24,52 @@ app: Final = btask.app
 @syncCall
 async def venv(
     packages: list[str] = typer.Argument(None),
-    path: Path = typer.Option(None, '--path', '-p', help='指定路径，默认当前目录'),
-    disabled_mirror: bool = typer.Option(False, '--disabled-mirror', '-d', help='是否禁用镜像'),
-    new_project: bool = typer.Option(False, '--new-project', '-n', help='是否新建项目'),
-    quiet: bool = typer.Option(False, '--quiet', '-q', help='是否安静模式'),
+    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='是否新建项目'),
+    isForceBase: bool = typer.Option(False, '--force-base', help='是否强制使用基础库去安装'),
+    isFullBase: bool = typer.Option(False, '--full-base', help='是否先清空venv目录再使用基础库去安装'),
 ):
     'python 虚拟环境配置'
+    btask.check(not (isForceBase == isFullBase == True), '不能同时使用 --force-base 和 --full-base')
     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 isFullBase:
+        bpath.remove(venvPath)
+        btask.check(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])}'
-    venvPath = bpath.get(path, 'venv')
-    assertPath(venvPath)
-    if not venvPath.exists() and not quiet:
-        await binput.confirm('指定目录为非venv目录，是否确认新创建？')
     if not venvPath.exists():
         await bexecute.run(f'python -m venv {venvPath}')
-    venvLockFile = bpath.get(path, 'venv.lock')
-    assertFile(venvLockFile)
-    venvListFile = bpath.get(path, 'venv.list')
-    assertFile(venvListFile)
-    if not venvListFile.exists():
-        await bfile.writeText(venvListFile, '')
-    await tidyVenvFile(venvListFile, packages)
-    if venvLockFile.exists():
-        await tidyVenvFile(venvLockFile, packages)
-        targetFile = venvLockFile
+    if not venvFile.exists():
+        await bfile.writeText(venvFile, '')
+    basePackages, lockPackages = await getPackageList(venvFile)
+    if isForceBase or isFullBase:
+        installPackages = _mergePackageList(basePackages, packages)
     else:
-        targetFile = venvListFile
+        installPackages = _mergePackageList(lockPackages or basePackages, packages)
+    installPackages = sorted(list(set(installPackages)))
     if sys.platform.startswith('win'):
         pip = bpath.get(venvPath, 'Scripts/pip.exe')
     else:
         pip = bpath.get(venvPath, 'bin/pip')
-    await pipInstall(pip, targetFile, disabled_mirror)
-    await bexecute.run(f'{pip} freeze > {venvLockFile}')
+    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)).strip().split('\n')
+        await updatePackageList(venvFile, basePackages, lockPackages)
+
     # 下载 bin 文件
     if binListFile.exists():
         bin.download(
@@ -68,47 +78,72 @@ async def venv(
             output=binPath,
         )
     # 新建项目
-    if new_project:
-        with bpath.changePath(path):
-            await bexecute.run('beni venv --quiet')
+    if isNewProject:
         with importlib.resources.path('bcmd.resources', 'project') as sourceProjectPath:
-            for p in bpath.listDir(sourceProjectPath):
+            for p in bpath.listPath(sourceProjectPath):
                 bpath.copy(p, path / p.name)
     bcolor.printGreen('OK')
 
 
-async def pipInstall(pip: Path, file: Path, disabled_mirror: bool):
+async def _pipInstall(pip: Path, installPackages: list[str], disabled_mirror: bool):
     python = pip.with_stem('python')
-    btask.check(python.is_file(), '无法找到指定文件', python)
-    btask.check(pip.is_file(), '无法找到指定文件', pip)
+    btask.check(python.is_file(), f'无法找到指定文件 {python}')
+    btask.check(pip.is_file(), f'无法找到指定文件 {pip}')
     indexUrl = '-i https://pypi.org/simple' if disabled_mirror else ''
-    btask.check(not await bexecute.run(f'{python} -m pip install --upgrade pip {indexUrl}'), '更新 pip 失败')
-    btask.check(not await bexecute.run(f'{pip} install -r {file} {indexUrl}'), '执行失败')
+    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.check(
+            not await bexecute.run(f'{python} -m pip install --upgrade pip {indexUrl}'),
+            '更新 pip 失败',
+        )
+        btask.check(
+            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}
 
-async def tidyVenvFile(file: Path, packages: list[str]):
-    packageNames = [getPackageName(x) for x in packages]
-    ary = (await bfile.readText(file)).strip().replace('\r', '').split('\n')
-    ary = list(filter(lambda x: getPackageName(x) not in packageNames, ary))
-    ary.extend(packages)
-    ary.sort()
-    await bfile.writeText(file, '\n'.join(ary).strip())
 
+_baseName: Final[str] = 'venv'
 
-def getPackageName(value: str):
-    sep_ary = ['>', '<', '=']
-    for sep in sep_ary:
-        if sep in value:
-            return value.split(sep)[0]
-    return value
 
+def _getLockName():
+    systemName = platform.system()
+    return f'{_baseName}-{systemName}'
 
-def assertFile(file: Path):
-    btask.check(file.is_file() or not file.exists(), '必须是文件', file)
 
+async def getPackageList(venvFile: Path):
+    result = await _getPackageDict(venvFile)
+    lockName = _getLockName()
+    return result.get(_baseName, []), result.get(lockName, [])
 
-def assertPath(folder: Path):
-    btask.check(folder.is_dir() or not folder.exists(), '必须是目录', folder)
+
+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'.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):
@@ -119,6 +154,26 @@ async def _getPackageLatestVersion(package: str):
     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
+
+
 async def _inputQiniuPassword(binListFile: Path, binPath: Path) -> None:
     '根据需要输入七牛云密码'
     if binListFile.exists():

{bcmd-0.2.8.dist-info → bcmd-0.4.6.dist-info}/METADATA

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

{bcmd-0.2.8.dist-info → bcmd-0.4.6.dist-info}/RECORD

@@ -1,12 +1,13 @@
 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/src/main.py,sha256=xdskz_sf05fYA1SRMFCIxDjx8SnegxTbCmHpW86ItLs,11
-bcmd/resources/project/src/.vscode/launch.json,sha256=Wpghb9lW9Y1wtrjqlTbyjeejDuU8BQJmBjwsLyPRh1g,478
-bcmd/resources/project/src/.vscode/settings.json,sha256=roHbI_6eQNeaU2-LXZNbqwezf96p8_0dq_EgvA1wp7U,188
-bcmd/resources/project/src/.vscode/tasks.json,sha256=vajOT61PFvnrOHpfAy2yLjz0pN2ZWti0elR-OnbVCDw,1795
+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
@@ -15,15 +16,15 @@ 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=6J1amKBMSd9noRrsJ9vfbdgaRLeos8o7oNlqc5HOCU4,4689
+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=6-qXy5_aFAJs8ikVsHTqC2R-QrMfjuJkyyVTxO7M0tk,1314
+bcmd/tasks/proxy.py,sha256=mdiBR2vah5qKt9o7dXE7rg8Lz_A6GheVJDts0m1gmSs,1324
 bcmd/tasks/time.py,sha256=nSIVYov2LsGdxsZAtC91UKXcUtVAqR9o-JmzeuevFhA,2586
-bcmd/tasks/venv.py,sha256=u2Ogke5hU2eFb0YrFQ2JtxGiEcgfiHQj6lg0lqVUcF8,4602
-bcmd-0.2.8.dist-info/METADATA,sha256=UTakK1CwhfC4FBn-A53BI1lyaIBkqt742nWR2UMjX3M,486
-bcmd-0.2.8.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-bcmd-0.2.8.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
-bcmd-0.2.8.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
-bcmd-0.2.8.dist-info/RECORD,,
+bcmd/tasks/venv.py,sha256=U4Ac2B3jFFwGhzeuFdgNJ94WQ88dAJp71ffoCKbEsXU,6800
+bcmd-0.4.6.dist-info/METADATA,sha256=PqZPpz2uBfhb7z-gf48uH_UZkY508_mGMsRpMfdvIOs,486
+bcmd-0.4.6.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+bcmd-0.4.6.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
+bcmd-0.4.6.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
+bcmd-0.4.6.dist-info/RECORD,,

bcmd/resources/project/src/.vscode/settings.json

@@ -1,7 +0,0 @@
-{
-    "files.exclude": {
-        ".pytest_cache": true,
-        "**/__pycache__": true,
-    },
-    "python.defaultInterpreterPath": "${workspaceFolder}/../venv/Scripts/python.exe",
-}