bcmd 0.5.3__tar.gz → 0.5.5__tar.gz

{bcmd-0.5.3 → bcmd-0.5.5}/PKG-INFO

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

{bcmd-0.5.3 → bcmd-0.5.5}/bcmd/resources/project/.gitignore

@@ -1,3 +1,3 @@
-__pycache__
-*~$*
-venv/
+__pycache__
+*~$*
+venv/

{bcmd-0.5.3 → bcmd-0.5.5}/bcmd/resources/project/.vscode/settings.json

@@ -1,11 +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",
+{
+    "files.exclude": {
+        ".pytest_cache": true,
+        "**/__pycache__": true,
+        ".gitignore": true,
+        ".venv": true,
+        ".venv-lock": true,
+        "venv": true,
+    },
+    "python.defaultInterpreterPath": "${workspaceFolder}/venv/Scripts/python.exe",
 }

{bcmd-0.5.3 → bcmd-0.5.5}/bcmd/tasks/code.py

@@ -1,3 +1,4 @@
+import asyncio
 from pathlib import Path
 from typing import Final
 
@@ -79,18 +80,48 @@ async def gen_init_py(
 ):
     '递归生成 __init__.py 文件'
 
-    async def makeInitFiles(p: Path):
-        if p.name == '__pycache__':
-            return
-        if p.name.startswith('.'):
-            return
-        if workspace_path != p:
-            initFile = p / '__init__.py'
-            if not initFile.exists():
-                printYellow(initFile)
-                await bfile.writeText(initFile, '')
-        for x in bpath.listDir(p):
-            await makeInitFiles(x)
-
-    await makeInitFiles(workspace_path)
+    ignoreSubDirs = [
+        '.git',
+        'venv',
+        'node_modules',
+        '.pytest_cache',
+        '__pycache__',
+        '.vscode',
+    ]
+    folderList = bpath.listDir(workspace_path, True)
+    # 剔除子目录是这些的文件 .git venv ...
+    folderList = [x for x in folderList if not any([y in x.parts for y in ignoreSubDirs])]
+    for folder in folderList:
+        pyInitFile = folder / '__init__.py'
+        if not pyInitFile.exists():
+            printYellow(pyInitFile)
+            await bfile.writeText(pyInitFile, '')
+    printGreen('OK')
+
+
+@app.command()
+@syncCall
+async def to_lf(
+    path: Path = typer.Option(None, '--path', help='指定目录或具体图片文件，默认当前目录'),
+):
+    '将所有文件转换为 LF 格式'
+    ignoreSubDirs = [
+        '.git',
+        'venv',
+        'node_modules',
+        '.pytest_cache',
+        '__pycache__',
+    ]
+    files = bpath.listFile(path, True)
+    # 剔除子目录是这些的文件 .git venv ...
+    files = [x for x in files if not any([y in x.parts for y in ignoreSubDirs])]
+
+    async def convertFile(file: Path):
+        try:
+            await bfile.toLf(file)
+            print(file)
+        except:
+            pass
+
+    await asyncio.gather(*[convertFile(file) for file in files])
     printGreen('OK')

{bcmd-0.5.3 → bcmd-0.5.5}/bcmd/tasks/image.py

@@ -103,7 +103,7 @@ async def tiny(
             pass
         else:
             # 要忽略掉的文件
-            bcolor.printYellow(f'{file.file}（{file.compression}% / 忽略）')
+            bcolor.printYellow(f'{file.file}（{file.compression - 100:.2f}% / 已压缩 / {file.getSizeDisplay()}）')
             fileList[i] = Null
     fileList = [x for x in fileList if x]
 
@@ -140,6 +140,10 @@ class _TinyFile:
         self._compression: float = 0.0
         self._isTiny: bool = False
 
+    def getSizeDisplay(self):
+        size = bpath.get(self._file).stat().st_size / 1024
+        return f'{size:,.2f}KB'
+
     async def updateInfo(self):
         fileBytes = await bfile.readBytes(self._file)
         self._compression = 0.0
@@ -194,8 +198,8 @@ class _TinyFile:
                     if isKeepOriginal:
                         outputFile = outputFile.with_stem(f'{outputFile.stem}_tiny')
                     bpath.move(tempFile, outputFile, True)
-                    bcolor.printGreen(f'{outputFile}（{outputCompression}% / 已压缩）')
+                    bcolor.printGreen(f'{outputFile}（{outputCompression - 100:.2f}% / 压缩 / {self.getSizeDisplay()}）')
             else:
                 # 不进行压缩
                 await self._flushInfo(outputCompression, False)
-                bcolor.printMagenta(f'{self._file} （{outputCompression}% / 不处理）')
+                bcolor.printMagenta(f'{self._file} （{outputCompression - 100:.2f}% / 不处理 / {self.getSizeDisplay()}）')

bcmd-0.5.5/bcmd/tasks/project.py

@@ -0,0 +1,59 @@
+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-0.5.3 → bcmd-0.5.5}/bcmd/tasks/proxy.py

@@ -34,6 +34,7 @@ async def proxy(
     lineAry = textToAry(template.format(port))
     msg = '\n'.join(lineAry)
     bcolor.printMagenta('\r\n' + msg)
+    msg += '\n' # 多增加一个换行，直接粘贴的时候相当于最后一行也执行完
     pyperclip.copy(msg)
     bcolor.printYellow('已复制，可直接粘贴使用')
 

{bcmd-0.5.3 → bcmd-0.5.5}/bcmd/tasks/venv.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from typing import Final
 
 import typer
-from beni import bcolor, bexecute, bfile, bhttp, bpath, btask
+from beni import bcolor, bexecute, bfile, bhttp, bpath, brun, btask
 from beni.bfunc import syncCall
 from beni.btype import Null
 from prettytable import PrettyTable
@@ -37,10 +37,11 @@ async def install_benimang(
     path: Path = typer.Option(None, '--path', help='指定路径，默认当前目录'),
 ):
     '更新 benimang 库，强制使用官方源'
+    pip = getPipFile(path)
+    await brun.run(f'{pip} install benimang -U -i https://pypi.org/simple', isPrint=True)
     await _venv(
         ['benimang==now'],
         path=path,
-        isOfficial=True,
     )
 
 
@@ -90,7 +91,7 @@ async def _venv(
     'python 虚拟环境配置'
     btask.assertTrue(not (isUseBase == isUseLock == True), '2个选项只能选择其中一个 --use-base / --use-lock')
     path = path or Path(os.getcwd())
-    venvPath = bpath.get(path, 'venv')
+    venvPath = getVenvPath(path)
     checkPathOrNotExists(venvPath)
     venvFile = bpath.get(path, '.venv')
     checkFileOrNotExists(venvFile)
@@ -115,15 +116,12 @@ async def _venv(
     else:
         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')
+    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)).strip().split('\n')
+        lockPackages = (await bfile.readText(tempFile)).replace('\r\n', '\n').strip().split('\n')
         await updatePackageList(venvFile, basePackages, lockPackages)
     bcolor.printGreen('OK')
 
@@ -215,3 +213,14 @@ def _getPackageName(package: str):
     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')

{bcmd-0.5.3 → bcmd-0.5.5}/bcmd.egg-info/PKG-INFO

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

{bcmd-0.5.3 → bcmd-0.5.5}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = 'bcmd'
-version = '0.5.3'
+version = '0.5.5'
 description = 'Commands for Beni'
 requires-python = '>=3.10'
 keywords = ['benimang', 'beni', 'bcmd']

bcmd-0.5.3/bcmd/tasks/project.py

@@ -1,34 +0,0 @@
-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)