bcmd 0.0.66__tar.gz → 0.2.8__tar.gz

bcmd-0.2.8/MANIFEST.in

@@ -0,0 +1 @@
+recursive-include bcmd/resources *

bcmd-0.2.8/PKG-INFO

@@ -0,0 +1,18 @@
+Metadata-Version: 2.1
+Name: bcmd
+Version: 0.2.8
+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: build
+Requires-Dist: cryptography
+Requires-Dist: pathspec
+Requires-Dist: pillow
+Requires-Dist: prettytable
+Requires-Dist: psutil
+Requires-Dist: qiniu==7.13.2
+Requires-Dist: twine
+Requires-Dist: typer

{bcmd-0.0.66 → bcmd-0.2.8}/bcmd/main.py

@@ -6,5 +6,5 @@ from .tasks import *
 
 
 def run():
-    btask.options.lock = ''
+    btask.options.lock = 0
     asyncio.run(btask.main())

bcmd-0.2.8/bcmd/resources/project/.gitignore

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

bcmd-0.2.8/bcmd/resources/project/src/.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python: main.py",
+            "type": "debugpy",
+            "request": "launch",
+            // "console": "internalConsole",
+            "program": "${workspaceFolder}/main.py"
+        }
+    ]
+}

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

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

bcmd-0.2.8/bcmd/resources/project/src/.vscode/tasks.json

@@ -0,0 +1,68 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "git commit",
+            "problemMatcher": [],
+            "command": "TortoiseGitProc.exe",
+            "args": [
+                "/command:commit",
+                "/path:${workspaceFolder}/../",
+            ],
+        },
+        {
+            "label": "git commit file",
+            "problemMatcher": [],
+            "command": "TortoiseGitProc.exe",
+            "args": [
+                "/command:commit",
+                "/path:${file}",
+            ],
+        },
+        {
+            "label": "git revert",
+            "problemMatcher": [],
+            "command": "TortoiseGitProc.exe",
+            "args": [
+                "/command:revert",
+                "/path:${workspaceFolder}/../",
+            ],
+        },
+        {
+            "label": "git revert file",
+            "problemMatcher": [],
+            "command": "TortoiseGitProc.exe",
+            "args": [
+                "/command:revert",
+                "/path:${file}",
+            ],
+        },
+        {
+            "label": "git sync",
+            "problemMatcher": [],
+            "command": "TortoiseGitProc.exe",
+            "args": [
+                "/command:sync",
+                "/path:${workspaceFolder}/../",
+            ],
+        },
+        {
+            "label": "git log",
+            "problemMatcher": [],
+            "command": "TortoiseGitProc.exe",
+            "args": [
+                "/command:log",
+                "/path:${workspaceFolder}/../",
+            ],
+        },
+        {
+            "label": "git log file",
+            "problemMatcher": [],
+            "command": "TortoiseGitProc.exe",
+            "args": [
+                "/command:log",
+                "/path:${file}",
+            ],
+        },
+    ],
+}

bcmd-0.2.8/bcmd/resources/project/src/main.py

@@ -0,0 +1 @@
+print('OK')

{bcmd-0.0.66 → bcmd-0.2.8}/bcmd/tasks/__init__.py

@@ -1,15 +1,15 @@
 # type: ignore
 from . import bin
+from . import code
 from . import crypto
 from . import debian
 from . import download
+from . import image
 from . import json
-from . import jwt
 from . import lib
 from . import math
 from . import mirror
+from . import project
 from . import proxy
-from . import task
-from . import temp
 from . import time
 from . import venv

{bcmd-0.0.66 → bcmd-0.2.8}/bcmd/tasks/bin.py

@@ -55,6 +55,7 @@ async def getList():
     bucket = await _getBucket()
     datas = (await bucket.getFileList(_PREFIX, limit=1000))[0]
     datas = [x for x in datas if x.key != _PREFIX and x.key.endswith('.zip')]
+    datas.sort(key=lambda x: x.time, reverse=True)
     table = PrettyTable()
     table.add_column(
         bcolor.yellow('文件名称'),

bcmd-0.2.8/bcmd/tasks/code.py

@@ -0,0 +1,100 @@
+from pathlib import Path
+from typing import Final
+
+import typer
+from beni import bfile, bpath, btask
+from beni.bcolor import printGreen, printMagenta, printYellow
+from beni.bfunc import syncCall
+
+app: Final = btask.newSubApp('code 工具')
+
+
+@app.command()
+@syncCall
+async def tidy_tasks(
+    tasks_path: Path = typer.Argument(None, 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)
+    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]
+    contents.insert(0, '# type: ignore')
+    contents.append('')
+    content = '\n'.join(contents)
+    oldContent = await bfile.readText(initFile)
+    if oldContent != content:
+        await bfile.writeText(
+            initFile,
+            content,
+        )
+        printYellow(initFile)
+        printMagenta(content)
+    printGreen('OK')
+
+
+@app.command()
+@syncCall
+async def tidy_modules(
+    modules_path: Path = typer.Argument(None, help="modules_path 路径"),
+):
+    '整理 fastapi 项目中的 modules/__init__.py'
+    if not modules_path:
+        modules_path = Path.cwd()
+    importContents: list[str] = []
+    managerContents: list[str] = []
+
+    xxdict: dict[str, set[Path]] = {}
+    for file in sorted(modules_path.glob('**/*Manager.py')):
+        if file.parent == modules_path:
+            subName = '.'
+        elif file.parent.parent == modules_path:
+            subName = f'.{file.parent.stem}'
+        else:
+            continue
+        xxdict.setdefault(subName, set()).add(file)
+    for subName in sorted(xxdict.keys()):
+        files = sorted(xxdict[subName])
+        importContents.append(f'from {subName} import {", ".join([x.stem for x in files])}')
+    managerContents.extend([f'    {x.stem},' for x in sorted([y for x in xxdict.values() for y in x])])
+
+    managerContents = [x for x in managerContents if x]
+    contents = [
+        '\n'.join(importContents),
+        'managers = [\n' + '\n'.join(managerContents) + '\n]',
+    ]
+    content = '\n\n'.join(contents) + '\n'
+    file = modules_path / '__init__.py'
+    printYellow(str(file))
+    printMagenta(content)
+    await bfile.writeText(file, content)
+    printGreen('OK')
+
+
+@app.command()
+@syncCall
+async def gen_init(
+    target_path: Path = typer.Argument(None, help="tasks 路径"),
+):
+    '生成 __init__.py 文件'
+    if not target_path:
+        target_path = Path.cwd()
+
+    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 not initFile.exists():
+                printYellow('生成文件', initFile)
+                await bfile.writeText(initFile, '')
+        for x in bpath.listDir(p):
+            await makeInitFiles(x)
+
+    await makeInitFiles(target_path)
+    printGreen('OK')

bcmd-0.2.8/bcmd/tasks/download.py

@@ -0,0 +1,57 @@
+import asyncio
+import os
+from pathlib import Path
+from typing import Final
+from urllib.parse import urlparse
+from uuid import uuid4
+
+import pyperclip
+import typer
+from beni import bcolor, bfile, bhttp, binput, bpath, btask
+from beni.bfunc import syncCall
+
+app: Final = btask.app
+
+
+@app.command()
+@syncCall
+async def download(
+    url_file: Path = typer.Option(None, '--file', '-f', help='需要下载的url文件路径，默认使用剪贴板内容'),
+    save_path: Path = typer.Option(None, '--path', '-p', help='下载存放目录，默认当前目录'),
+    keep_directory: bool = typer.Option(False, '--keep', '-k', help='保持原始目录结构，默认不保持'),
+):
+    '下载资源资源文件'
+    save_path = save_path or Path(os.getcwd())
+
+    if url_file:
+        if not url_file.exists():
+            btask.abort('指定文件不存在', url_file)
+        content = await bfile.readText(url_file)
+    else:
+        content = pyperclip.paste()
+    urlSet = set([x.strip() for x in content.strip().split('\n') if x.strip()])
+
+    for i, url in enumerate(urlSet):
+        print(f'{i + 1}. {url}')
+    print(f'输出目录：{save_path}')
+    await binput.confirm('是否确认？')
+
+    fileSet: set[Path] = set()
+
+    async def download(url: str):
+        urlPath = urlparse(url).path
+        if keep_directory:
+            file = bpath.get(save_path, '/'.join([x for x in urlPath.split('/') if x]))
+        else:
+            file = save_path / Path(urlPath).name
+        if file in fileSet:
+            file = file.with_stem(f'{file.stem}--{uuid4()}')
+        fileSet.add(file)
+        try:
+            bcolor.printGreen(url)
+            await bhttp.download(url, file)
+        except:
+            bcolor.printRed(url)
+
+    await asyncio.gather(*[download(x) for x in urlSet])
+    bcolor.printYellow('Done')

bcmd-0.2.8/bcmd/tasks/image.py

@@ -0,0 +1,54 @@
+import os
+from enum import StrEnum
+from pathlib import Path
+from typing import Final
+
+import typer
+from beni import bcolor, bfile, bpath, btask
+from beni.bfunc import syncCall
+from PIL import Image
+
+app: Final = btask.newSubApp('图片工具集')
+
+
+class _OutputType(StrEnum):
+    '输出类型'
+    normal = '0'
+    replace_ = '1'
+    crc_replace = '2'
+
+
+@app.command()
+@syncCall
+async def convert(
+    path: Path = typer.Option(None, '--path', '-p', help='指定目录或具体图片文件，默认当前目录'),
+    src_format: str = typer.Option('jpg|jpeg|png', '--src-format', '-s', help='如果path是目录，指定源格式，可以指定多个，默认值：jpg|jpeg|png'),
+    dst_format: str = typer.Option('webp', '--dst-format', '-d', help='目标格式，只能是单个'),
+    rgb: bool = typer.Option(False, '--rgb', help='转换为RGB格式'),
+    quality: int = typer.Option(85, '--quality', '-q', help='图片质量，0-100，默认85'),
+    output_type: _OutputType = typer.Option(_OutputType.normal, '--output-type', help='输出类型，0：普通输出，1：删除源文件，2：输出文件使用CRC32命名并删除源文件'),
+):
+    '图片格式转换'
+    path = path or Path(os.getcwd())
+    fileList: list[Path] = []
+    if path.is_file():
+        fileList.append(path)
+    elif path.is_dir():
+        extNameList = [x for x in src_format.strip().split('|')]
+        fileList = [x for x in bpath.listFile(path, True) if x.suffix[1:].lower() in extNameList]
+    if not fileList:
+        return bcolor.printRed(f'未找到图片文件（{path}）')
+    for file in fileList:
+        with Image.open(file) as img:
+            if rgb:
+                img = img.convert('RGB')
+            with bpath.useTempFile() as tempFile:
+                img.save(tempFile, format=dst_format, quality=quality)
+                outputFile = file.with_suffix(f'.{dst_format}')
+                if output_type == _OutputType.crc_replace:
+                    outputFile = outputFile.with_stem(await bfile.crc(tempFile))
+                bpath.copy(tempFile, outputFile)
+                if output_type in [_OutputType.replace_, _OutputType.crc_replace]:
+                    if outputFile != file:
+                        bpath.remove(file)
+                bcolor.printGreen(f'{file} -> {outputFile}')

{bcmd-0.0.66 → bcmd-0.2.8}/bcmd/tasks/lib.py

@@ -14,7 +14,7 @@ app: Final = btask.newSubApp('lib 工具')
 
 @app.command()
 @syncCall
-async def tidy(
+async def tidy_dependencies(
     workspace_path: Path = typer.Argument(None, help='workspace 路径'),
     with_version: bool = typer.Option(False, '--with-version', help='是否带版本号')
 ):
@@ -26,9 +26,12 @@ async def tidy(
     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])
+    libAry = (await bfile.readText(targetVenvFile)).strip().replace('\r\n', '\n').split('\n')
     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,15 @@ async def tidy(
 
 @app.command()
 @syncCall
-async def version(
+async def update_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='第三方库是否带版本号')
 ):
-    '修改 pyproject.toml 版本号（同时会更新依赖列表）'
+    '修改 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)
     data = await bfile.readToml(file)
     version = data['project']['version']
     versionList = [int(x) for x in version.split('.')]
@@ -68,10 +69,7 @@ async def version(
     await bfile.writeText(file, content)
     bcolor.printCyan(newVersion)
     if not disabled_commit:
-        msg = ''.join([
-            f'更新版本号 {newVersion}',
-            '（注意：本次有修改依赖）' if isChangeDependencies else '',
-        ]).strip()
+        msg = f'更新版本号 {newVersion}'
         os.system(
             rf'TortoiseGitProc.exe /command:commit /path:{file} /logmsg:"{msg}"'
         )
@@ -80,7 +78,7 @@ async def version(
 
 @app.command()
 @syncCall
-async def publish(
+async def build(
     src_path: Path = typer.Argument(None, help='src 路径'),
     keep_build_files: bool = typer.Option(False, '--keep-build-files', '-k', help='是否保留构建文件'),
 ):
@@ -110,3 +108,14 @@ async def publish(
     finally:
         if not keep_build_files:
             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-0.0.66 → bcmd-0.2.8}/bcmd/tasks/math.py

@@ -1,4 +1,3 @@
-from math import nan
 from typing import Final
 
 import typer
@@ -41,52 +40,6 @@ 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(
@@ -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-0.0.66 → bcmd-0.2.8}/bcmd/tasks/mirror.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import platform
 from enum import StrEnum
 from typing import Final
 
@@ -39,9 +40,11 @@ class _MirrorsType(StrEnum):
     # npm = 'npm'
 
 
+_isWindows = platform.system() == 'Windows'
+
 _mirrorsFiles = {
     _MirrorsType.pip: {
-        bpath.user('pip/pip.ini'): [
+        bpath.user('pip/pip.ini') if _isWindows else bpath.user('.pip/pip.conf'): [
             '[global]',
             'index-url = https://mirrors.aliyun.com/pypi/simple',
         ],

bcmd-0.2.8/bcmd/tasks/project.py

@@ -0,0 +1,34 @@
+from pathlib import Path
+from typing import Final
+
+import typer
+from beni import bcolor, bfile, bpath, btask
+from beni.bfunc import syncCall
+
+app: Final = btask.newSubApp('project 工具')
+
+
+@app.command()
+@syncCall
+async def gen_init_py(
+    workspace_path: Path = typer.Argument(None, help='workspace 路径'),
+):
+    '将指定目录下的所有文件生成 __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():
+                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')

bcmd-0.2.8/bcmd/tasks/proxy.py

@@ -0,0 +1,45 @@
+from __future__ import annotations
+
+from typing import Final
+
+import psutil
+import pyperclip
+import typer
+from beni import bcolor, btask
+from beni.bfunc import syncCall
+
+app: Final = btask.app
+
+
+@app.command()
+@syncCall
+async def proxy(
+    port: int = typer.Option(15236, help="代理服务器端口"),
+):
+    '生成终端设置代理服务器的命令'
+    processNameAry = []
+    process = psutil.Process().parent()
+    while process:
+        processNameAry.append(process.name())
+        process = process.parent()
+    msg = ''
+    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}',
+            '',
+        ])
+    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}）')

{bcmd-0.0.66 → bcmd-0.2.8}/bcmd/tasks/venv.py

@@ -1,10 +1,11 @@
+import importlib.resources
 import os
 import sys
 from pathlib import Path
 from typing import Final
 
 import typer
-from beni import bexecute, bfile, bhttp, binput, bpath, btask
+from beni import bcolor, bexecute, bfile, bhttp, binput, bpath, btask
 from beni.bfunc import syncCall
 from beni.btype import Null
 
@@ -21,6 +22,7 @@ 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='是否安静模式'),
 ):
     'python 虚拟环境配置'
@@ -65,6 +67,14 @@ async def venv(
             file=binListFile,
             output=binPath,
         )
+    # 新建项目
+    if new_project:
+        with bpath.changePath(path):
+            await bexecute.run('beni venv --quiet')
+        with importlib.resources.path('bcmd.resources', 'project') as sourceProjectPath:
+            for p in bpath.listDir(sourceProjectPath):
+                bpath.copy(p, path / p.name)
+    bcolor.printGreen('OK')
 
 
 async def pipInstall(pip: Path, file: Path, disabled_mirror: bool):

bcmd-0.2.8/bcmd.egg-info/PKG-INFO

@@ -0,0 +1,18 @@
+Metadata-Version: 2.1
+Name: bcmd
+Version: 0.2.8
+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: build
+Requires-Dist: cryptography
+Requires-Dist: pathspec
+Requires-Dist: pillow
+Requires-Dist: prettytable
+Requires-Dist: psutil
+Requires-Dist: qiniu==7.13.2
+Requires-Dist: twine
+Requires-Dist: typer

{bcmd-0.0.66 → bcmd-0.2.8}/bcmd.egg-info/SOURCES.txt

@@ -11,18 +11,23 @@ bcmd.egg-info/requires.txt
 bcmd.egg-info/top_level.txt
 bcmd/common/__init__.py
 bcmd/common/password.py
+bcmd/resources/project/.gitignore
+bcmd/resources/project/src/main.py
+bcmd/resources/project/src/.vscode/launch.json
+bcmd/resources/project/src/.vscode/settings.json
+bcmd/resources/project/src/.vscode/tasks.json
 bcmd/tasks/__init__.py
 bcmd/tasks/bin.py
+bcmd/tasks/code.py
 bcmd/tasks/crypto.py
 bcmd/tasks/debian.py
 bcmd/tasks/download.py
+bcmd/tasks/image.py
 bcmd/tasks/json.py
-bcmd/tasks/jwt.py
 bcmd/tasks/lib.py
 bcmd/tasks/math.py
 bcmd/tasks/mirror.py
+bcmd/tasks/project.py
 bcmd/tasks/proxy.py
-bcmd/tasks/task.py
-bcmd/tasks/temp.py
 bcmd/tasks/time.py
 bcmd/tasks/venv.py

bcmd-0.2.8/bcmd.egg-info/requires.txt

@@ -0,0 +1,10 @@
+benimang==0.6.8
+build
+cryptography
+pathspec
+pillow
+prettytable
+psutil
+qiniu==7.13.2
+twine
+typer

{bcmd-0.0.66 → bcmd-0.2.8}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = 'bcmd'
-version = '0.0.66'
+version = '0.2.8'
 description = 'Commands for Beni'
 requires-python = '>=3.10'
 keywords = ['benimang', 'beni', 'bcmd']
@@ -12,8 +12,17 @@ maintainers = [{ name = 'Beni Mang', email = 'benimang@126.com' }]
 
 
 dependencies = [
-  'benimang==0.5.18',
+  'benimang==0.6.8',
+  'build',
+  'cryptography',
   'pathspec',
+  'pillow',
+  'prettytable',
+  'psutil',
+  'qiniu==7.13.2',
+  'twine',
+  'typer',
+  # 'setuptools',
 ]
 
 [project.scripts]

bcmd-0.0.66/MANIFEST.in

@@ -1 +0,0 @@
-recursive-include bcmd/data *

bcmd-0.0.66/PKG-INFO

@@ -1,10 +0,0 @@
-Metadata-Version: 2.1
-Name: bcmd
-Version: 0.0.66
-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.5.18
-Requires-Dist: pathspec

bcmd-0.0.66/bcmd/tasks/download.py

@@ -1,39 +0,0 @@
-import asyncio
-import os
-from pathlib import Path
-from typing import Final
-
-import pyperclip
-import typer
-from beni import bcolor, bhttp, binput, bpath, btask
-from beni.bfunc import syncCall
-
-app: Final = btask.newSubApp('下载')
-
-
-@app.command()
-@syncCall
-async def urls(
-    path: Path = typer.Option(None, '--path', '-p', help='指定路径，默认当前目录'),
-):
-    '下载文件'
-    path = path or Path(os.getcwd())
-    content = pyperclip.paste()
-    urlSet = set([x.strip() for x in content.strip().split('\n') if x.strip()])
-
-    for i, url in enumerate(urlSet):
-        print(f'{i + 1}. {url}')
-    print(f'输出目录：{path}')
-    await binput.confirm('是否确认？')
-
-    async def download(url: str):
-        file = bpath.get(path, '/'.join([x for x in url.replace('://', '/').split('/') if x]))
-        try:
-            bcolor.printGreen(url)
-            await bhttp.download(url, file)
-        except:
-            bcolor.printRed(url)
-
-    await asyncio.gather(*[download(x) for x in urlSet])
-
-    bcolor.printYellow('Done')

bcmd-0.0.66/bcmd/tasks/jwt.py

@@ -1,87 +0,0 @@
-import getpass
-import json
-from typing import Final
-
-import pyperclip
-from beni import bcolor, bjwt, btask
-from beni.bfunc import syncCall
-from rich.console import Console
-
-app: Final = btask.newSubApp('JWT密文')
-
-
-@app.command()
-@syncCall
-async def encode_json():
-    '生成JSON密文（使用剪贴板内容）'
-    content = pyperclip.paste()
-    try:
-        data = json.loads(content)
-    except:
-        return btask.abort('错误：剪贴板内容必须是JSON格式', content)
-    Console().print_json(data=data, indent=4, ensure_ascii=False, sort_keys=True)
-    secret, tips = _genSecret()
-    result = bjwt.encodeJson(data, secret, tips)
-    pyperclip.copy(result)
-    print('密文已复制到剪贴板')
-    bcolor.printYellow(result)
-
-
-@app.command()
-@syncCall
-async def encode_text():
-    '生成文本密文（使用剪贴板内容）'
-    content = pyperclip.paste()
-    assert content, '剪贴板内容不能为空'
-    bcolor.printGreen(content)
-    secret, tips = _genSecret()
-    result = bjwt.encodeText(content, secret, tips)
-    pyperclip.copy(result)
-    print('密文已复制到剪贴板')
-    bcolor.printYellow(result)
-
-
-@app.command()
-@syncCall
-async def decode_json():
-    '还原JSON密文内容（使用剪贴板内容）'
-    content = pyperclip.paste().strip()
-    bcolor.printYellow(content)
-    while True:
-        try:
-            password = getpass.getpass('输入密码：')
-            data = bjwt.decodeJson(content, password)
-            Console().print_json(data=data, indent=4, ensure_ascii=False, sort_keys=True)
-            return
-        except KeyboardInterrupt:
-            break
-        except BaseException:
-            pass
-
-
-@app.command()
-@syncCall
-async def decode_text():
-    '还原文本密文内容（使用剪贴板内容）'
-    content = pyperclip.paste().strip()
-    bcolor.printYellow(content)
-    while True:
-        try:
-            password = getpass.getpass('输入密码：')
-            data = bjwt.decodeText(content, password)
-            bcolor.printGreen(data)
-            return
-        except KeyboardInterrupt:
-            break
-        except BaseException:
-            pass
-
-
-def _genSecret():
-    secret = ''
-    while not secret:
-        secret = getpass.getpass('输入密码：')
-    while secret != getpass.getpass('再次密码：'):
-        pass
-    tips = input('密码提示（可选）：')
-    return secret, tips

bcmd-0.0.66/bcmd/tasks/proxy.py

@@ -1,27 +0,0 @@
-from __future__ import annotations
-
-from typing import Final
-
-import pyperclip
-import typer
-from beni import bcolor, btask
-from beni.bfunc import syncCall
-
-app: Final = btask.app
-
-
-@app.command()
-@syncCall
-async def proxy(
-    port: int = typer.Option(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}',
-        '',
-    ])
-    bcolor.printMagenta('\r\n' + msg)
-    pyperclip.copy(msg)
-    bcolor.printYellow('已复制，可直接粘贴使用')

bcmd-0.0.66/bcmd/tasks/task.py

@@ -1,144 +0,0 @@
-from pathlib import Path
-from typing import Final
-
-import pathspec
-import typer
-from beni import bcolor, bfile, binput, bpath, btask, btime, bzip
-from beni.bfunc import syncCall, toAny, tryRun
-from beni.bqiniu import QiniuBucket
-from beni.btype import Null
-
-from bcmd.common import password
-
-from . import bin, venv
-
-app: Final = btask.newSubApp('BTask 工具')
-
-
-_PREFIX = 'template/'
-
-
-@app.command()
-@syncCall
-async def template_gen(
-    tempalte_name: str = typer.Argument(..., help="模板名称"),
-    project_path: Path = typer.Argument(None, help="用于生成模板的文件夹路径"),
-):
-    '生成模板'
-    with bpath.useTempPath() as tempPath:
-        project_path = bpath.get(project_path)
-        await _copyTemplateFiles(project_path, tempPath)
-        bucket = await _getBucket()
-        fileList, _ = await bucket.getFileList(f'{_PREFIX}{tempalte_name}/', 200)
-        num = len(fileList)
-        if num > 100:
-            bcolor.printYellow(f'当前模板的版本数量已经超过 {num} 个，建议删除一些不常用的版本')
-        elif num > 180:
-            btask.abort(f'当前模板的版本数量已经超过 {num} 个，无法继续添加')
-        with bpath.useTempFile() as tempFile:
-            bzip.zipFolder(tempFile, tempPath)
-            nowTime = await btime.networkTime()
-            key = f'{_PREFIX}{tempalte_name}/{tempalte_name}_{nowTime.strftime("%Y%m%d_%H%M%S")}.zip'
-            with tryRun():
-                await bucket.deleteFiles(key)
-            await bucket.uploadFile(key, tempFile)
-        bcolor.printGreen('OK')
-
-
-async def _copyTemplateFiles(src: Path, dst: Path):
-    spec = pathspec.PathSpec.from_lines(
-        toAny(pathspec.patterns).GitWildMatchPattern,
-        (await bfile.readText(src / '.gitignore')).splitlines() + ['.git'],
-    )
-    files = bpath.listFile(src, True)
-    files = [x for x in files if not spec.match_file(x.relative_to(src))]
-    for file in sorted(files):
-        toFile = bpath.changeRelative(file, src, dst)
-        bpath.copy(file, toFile)
-
-
-@app.command()
-@syncCall
-async def create(
-    tempalte_name: str = typer.Argument(..., help="模板名称"),
-    project_path: Path = typer.Argument(None, help="项目路径，不填标识在当前目录创建"),
-):
-    '创建项目'
-    if not project_path:
-        project_path = Path.cwd()
-    project_path = bpath.get(project_path)
-    if project_path.exists():
-        await binput.confirm(f'项目路径 {project_path} 已存在，是否覆盖？')
-    if Path(tempalte_name).is_absolute():
-        btask.abort(f'模板名称不能为绝对路径：{tempalte_name}')
-    bucket = await _getBucket()
-    fileList, _ = await bucket.getFileList(f'{_PREFIX}{tempalte_name}/', 1000)
-    if not fileList:
-        btask.abort('模板不存在')
-    fileList.sort(key=lambda x: x.key)
-    with bpath.useTempPath(True) as tempPath:
-        key = fileList[-1].key
-        bcolor.printGreen(f'正在使用版本 {key}')
-        await bucket.downloadPrivateFileUnzip(key, tempPath)
-        for item in bpath.listPath(tempPath):
-            toItem = project_path / item.name
-            bpath.copy(item, toItem)
-    init(project_path)
-
-
-@app.command()
-@syncCall
-async def init(
-    project_path: Path = typer.Argument(None, help="项目路径"),
-):
-    '初始化 BTask 项目，包括 venv 和 bin 操作'
-    if not project_path:
-        project_path = Path.cwd()
-    fileList = bpath.listFile(project_path, True)
-    for file in fileList:
-        if file.name == 'venv.list':
-            targetPath = file.parent
-            venv.venv(
-                packages=Null,
-                path=targetPath,
-                disabled_mirror=False,
-                quiet=True,
-            )
-            binListFile = targetPath / 'bin.list'
-            if binListFile.is_file():
-                bin.download(
-                    names=Null,
-                    file=binListFile,
-                    output=targetPath / 'bin',
-                )
-
-
-@app.command()
-@syncCall
-async def tidy(
-    tasks_path: Path = typer.Argument(None, help="tasks 路径"),
-):
-    '整理 tasks 文件'
-    initFile = tasks_path / '__init__.py'
-    btask.check(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]
-    contents.insert(0, '# type: ignore')
-    contents.append('')
-    content = '\n'.join(contents)
-    await bfile.writeText(
-        initFile,
-        content,
-    )
-    print(content)
-
-
-async def _getBucket():
-    ak, sk = await password.getQiniu()
-    return QiniuBucket(
-        'pytask',
-        'http://qiniu-cdn.pytask.com',
-        ak,
-        sk,
-    )

bcmd-0.0.66/bcmd/tasks/temp.py

@@ -1,31 +0,0 @@
-from pathlib import Path
-from typing import Final
-
-import typer
-from beni import bcolor, bpath, btask
-from beni.bfunc import syncCall
-from beni.bqiniu import QiniuBucket
-
-from bcmd.common import password
-
-app: Final = btask.newSubApp('temp 工具')
-
-
-@app.command()
-@syncCall
-async def upload_qiniu(
-    local_path: Path = typer.Argument(..., help="本地路径"),
-    bucket_name: str = typer.Argument(None,  help="七牛云空间名称"),
-):
-    ak, sk = await password.getQiniu()
-    bucket = QiniuBucket(
-        'pytask-doc',
-        '',
-        ak,
-        sk,
-    )
-    for file in bpath.listFile(local_path, True):
-        key = file.relative_to(local_path).as_posix()
-        await bucket.uploadFile(key, file)
-        print(key)
-    bcolor.printGreen('OK')

bcmd-0.0.66/bcmd.egg-info/PKG-INFO

@@ -1,10 +0,0 @@
-Metadata-Version: 2.1
-Name: bcmd
-Version: 0.0.66
-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.5.18
-Requires-Dist: pathspec

bcmd-0.0.66/bcmd.egg-info/requires.txt

@@ -1,2 +0,0 @@
-benimang==0.5.18
-pathspec