bcmd 0.0.25__tar.gz → 0.0.27__tar.gz

{bcmd-0.0.25 → bcmd-0.0.27}/PKG-INFO

@@ -1,9 +1,8 @@
 Metadata-Version: 2.1
 Name: bcmd
-Version: 0.0.25
+Version: 0.0.27
 Summary: Commands for Beni
-Author: Beni Mang
-Author-email: benimang@126.com
+Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>
 Keywords: benimang,beni,bcmd
 Requires-Python: >=3.10

bcmd-0.0.27/bcmd/tasks/bin.py

@@ -0,0 +1,94 @@
+import os
+from datetime import datetime
+from pathlib import Path
+from typing import Final
+
+import typer
+from beni import bcolor, bfile, bfunc, bstore, btable, btask
+from beni.bqiniu import QiniuBucket
+
+app: Final = btask.newSubApp('bin 工具')
+
+_PREFIX = 'bin/'
+
+
+@app.command()
+@bfunc.syncCall
+async def init(
+    ak: str = typer.Argument(..., help="七牛云账号AK"),
+    sk: str = typer.Argument(..., help="七牛云账号SK"),
+):
+    '初始化七牛云服务'
+    await bstore.set(__file__, (ak, sk))
+    bcolor.printGreen('OK')
+
+
+@app.command()
+@bfunc.syncCall
+async def clear():
+    '清空 token'
+    await bstore.clear(__file__)
+    bcolor.printGreen('OK')
+
+
+@app.command()
+@bfunc.syncCall
+async def download(
+    names: str = typer.Argument(None, help="如果有多个使用,分割"),
+    file: Path = typer.Option(None, '--file', '-f', help="文件形式指定参数，行为单位"),
+    output: Path = typer.Option(None, '--output', '-o', help="本地保存路径"),
+):
+    '从七牛云下载执行文件'
+    bucket = await _getBucket()
+    if bucket:
+        if output is None:
+            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:
+            binFile = output / target
+            if binFile.exists():
+                bcolor.printYellow(f'已存在 {binFile}')
+            else:
+                key = f'bin/{target}.zip'
+                await bucket.downloadPrivateFileUnzip(key, output)
+                bcolor.printGreen(f'added  {binFile}')
+
+
+@app.command('list')
+@bfunc.syncCall
+async def getList():
+    '列出可下载的文件'
+    bucket = await _getBucket()
+    if bucket:
+        datas = (await bucket.getFileList(_PREFIX, limit=1000))[0]
+        datas = [x for x in datas if x.key != _PREFIX and x.key.endswith('.zip')]
+        print(
+            btable.get(
+                datas,
+                fields=[
+                    ('名称<', lambda x: x.key[len(_PREFIX):-len('.zip')]),
+                    ('时间<', lambda x: datetime.fromtimestamp(x.time / 10000000).strftime('%Y-%m-%d %H:%M:%S')),
+                ]
+            )
+        )
+
+
+async def _getBucket():
+    try:
+        (ak, sk) = await bstore.get(__file__)
+        return QiniuBucket(
+            'pytask',
+            'http://qiniu-cdn.pytask.com',
+            ak,
+            sk,
+        )
+    except:
+        bcolor.printRed('请先执行 beni bin init 进行初始化')

{bcmd-0.0.25 → bcmd-0.0.27}/bcmd/tasks/lib.py

@@ -11,13 +11,13 @@ app: Final = btask.newSubApp('lib 工具')
 @app.command()
 @bfunc.syncCall
 async def version(
-    workspacePath: Path = typer.Argument(None, help='workspace 路径'),
-    disabledCommit: bool = typer.Option(False, '--disabled-commit', '-d', help='是否提交git'),
+    workspace_path: Path = typer.Argument(None, help='workspace 路径'),
+    disabled_commit: bool = typer.Option(False, '--disabled-commit', '-d', help='是否提交git'),
 ):
     '修改 pyproject.toml 版本号'
-    if workspacePath is None:
-        workspacePath = Path.cwd()
-    file = workspacePath / 'pyproject.toml'
+    if workspace_path is None:
+        workspace_path = Path.cwd()
+    file = workspace_path / 'pyproject.toml'
     assert file.is_file(), f'文件不存在 {file}'
     data = await bfile.readToml(file)
     version = data['project']['version']
@@ -32,7 +32,7 @@ async def version(
     else:
         raise Exception('版本号修改失败，先检查文件中定义的版本号格式是否正常')
     await bfile.writeText(file, content)
-    if not disabledCommit:
+    if not disabled_commit:
         os.system(
             rf'TortoiseGitProc.exe /command:commit /path:{file} /logmsg:"更新版本号 {newVersion}"'
         )
@@ -41,28 +41,28 @@ async def version(
 @app.command()
 @bfunc.syncCall
 async def publish(
-    workspacePath: Path = typer.Argument(None, help='workspace 路径'),
-    keepBuildFiles: bool = typer.Option(False, '--keep-build-files', '-k', help='是否保留构建文件'),
+    workspace_path: Path = typer.Argument(None, help='workspace 路径'),
+    keep_build_files: bool = typer.Option(False, '--keep-build-files', '-k', help='是否保留构建文件'),
 ):
     '发布项目'
-    if workspacePath is None:
-        workspacePath = Path.cwd()
-    workspacePath = workspacePath.resolve()
+    if workspace_path is None:
+        workspace_path = Path.cwd()
+    workspace_path = workspace_path.resolve()
 
     async def removeUnusedPath():
-        await bpath.remove(workspacePath / 'dist')
-        paths = await bpath.listDir(workspacePath)
+        await bpath.remove(workspace_path / 'dist')
+        paths = await bpath.listDir(workspace_path)
         for x in paths:
             if x.name.endswith('.egg-info'):
                 await bpath.remove(x)
 
     try:
-        async with bpath.usePath(workspacePath):
+        async with bpath.usePath(workspace_path):
             await removeUnusedPath()
-            scriptPath = (workspacePath / './../venv/Scripts').resolve()
+            scriptPath = (workspace_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 benimang')
     finally:
-        if not keepBuildFiles:
+        if not keep_build_files:
             await removeUnusedPath()

{bcmd-0.0.25 → bcmd-0.0.27}/bcmd/tasks/task.py

@@ -15,52 +15,52 @@ app: Final = btask.newSubApp('BTask 工具')
 @app.command()
 @bfunc.syncCall
 async def create(
-    projectPath: Path = typer.Argument(None, help="项目路径"),
+    project_path: Path = typer.Argument(None, help="项目路径"),
 ):
     '创建 BTask 项目'
-    if projectPath is None:
-        projectPath = Path.cwd()
-    if projectPath.exists():
-        await binput.confirm(f'项目路径 {projectPath} 已存在，是否覆盖？')
-    await bfile.makeFiles(_files, projectPath)
-    init(projectPath)
+    if project_path is None:
+        project_path = Path.cwd()
+    if project_path.exists():
+        await binput.confirm(f'项目路径 {project_path} 已存在，是否覆盖？')
+    await bfile.makeFiles(_files, project_path)
+    init(project_path)
 
 
 @app.command()
 @bfunc.syncCall
 async def init(
-    projectPath: Path = typer.Argument(None, help="项目路径"),
+    project_path: Path = typer.Argument(None, help="项目路径"),
 ):
     '初始化 BTask 项目，包括 venv 和 bin 操作'
-    if projectPath is None:
-        projectPath = Path.cwd()
+    if project_path is None:
+        project_path = Path.cwd()
     venv.venv(
         packages=Null,
-        path=projectPath,
-        disabledMirror=False,
+        path=project_path,
+        disabled_mirror=False,
         quiet=True,
     )
     bin.download(
         names=Null,
-        file=projectPath / 'bin.list',
-        output=projectPath / 'bin',
+        file=project_path / 'bin.list',
+        output=project_path / 'bin',
     )
 
 
 @app.command()
 @bfunc.syncCall
 async def export(
-    projectPath: Path = typer.Argument(None, help="项目路径"),
+    project_path: Path = typer.Argument(None, help="项目路径"),
 ):
     '导出文件内容到剪贴板'
-    if projectPath is None:
-        projectPath = Path.cwd()
+    if project_path is None:
+        project_path = Path.cwd()
     ignores = [
-        projectPath / 'bin',
-        projectPath / 'venv',
-        projectPath / 'venv.lock',
+        project_path / 'bin',
+        project_path / 'venv',
+        project_path / 'venv.lock',
     ]
-    files = await bpath.listFile(projectPath, True)
+    files = await bpath.listFile(project_path, True)
     files = [x for x in files if '__pycache__' not in x.parts]
     contents: list[str] = []
     for file in files:
@@ -68,7 +68,7 @@ async def export(
             if file.is_relative_to(ignore):
                 break
         else:
-            contents.append(f'>>> {str(file.relative_to(projectPath)).replace(os.path.sep, "/")}\n{await bfile.readText(file)}')
+            contents.append(f'>>> {str(file.relative_to(project_path)).replace(os.path.sep, "/")}\n{await bfile.readText(file)}')
     contents.sort()
     content = '_files = \'\'\'\n' + '\n\n\n'.join(contents) + '\n\'\'\''
     pyperclip.copy(content)
@@ -78,18 +78,22 @@ async def export(
 @app.command()
 @bfunc.syncCall
 async def tidy(
-    tasksPath: Path = typer.Argument(None, help="tasks 路径"),
+    tasks_path: Path = typer.Argument(None, help="tasks 路径"),
 ):
     '整理 tasks 文件'
-    files = await bpath.listFile(tasksPath)
+    initFile = tasks_path / '__init__.py'
+    assert initFile.is_file(), f'文件不存在 {initFile}'
+    files = await 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(
-        tasksPath / '__init__.py',
-        '\n'.join(contents),
+        initFile,
+        content,
     )
+    print(content)
 
 
 _files = '''
@@ -203,70 +207,61 @@ venv/
             ],
         },
         {
-            "label": "update version",
+            "label": "tasks tidy",
             "type": "shell",
             "problemMatcher": [],
             "command": "beni",
             "args": [
-                "lib",
-                "version",
-                "${workspaceFolder}"
+                "task",
+                "tidy",
+                "${workspaceFolder}/tasks"
             ],
         },
     ],
 }
 
 
->>> src/dev.py
-import main
-from beni import btask
-
-main.init()
-
-btask.dev('sub.haha')
-
-
 >>> src/main.py
-from beni import btask, bpath
-
-
-def init():
-    btask.options.tasksPath = bpath.get(__file__, '../tasks')
-    btask.options.lock = 'xxxxxx'
+import asyncio
 
+from beni import btask
 
-def run():
-    init()
-    btask.main()
+from tasks import *
 
+btask.options.lock = 'bcmd'
+asyncio.run(btask.main())
 
-if __name__ == '__main__':
-    run()
 
 
 >>> src/tasks/__init__.py
+# type: ignore
+from . import hello
+from . import sub
 
 
 
 >>> src/tasks/hello.py
+from typing import Final
+
 from beni import bfunc, btask
 
+app: Final = btask.app
+
 
-@btask.app.command()
+@app.command()
 @bfunc.syncCall
 async def hello():
     '打印 hello'
     print('hello')
 
 
+
 >>> src/tasks/sub.py
 from typing import Final
 
-import typer
-from beni import bfunc
-
+from beni import bfunc, btask
 
-app: Final = typer.Typer(help='子工具集')
+app: Final = btask.newSubApp('子工具集')
 
 
 @app.command()
@@ -283,13 +278,14 @@ async def bye():
     print('bye')
 
 
+
 >>> venv.list
 aioconsole
 aiofiles
 aiohttp
 aiosqlite
 autopep8
-benimang==0.4.10
+benimang==0.4.13
 nest-asyncio
 orjson
 portalocker
@@ -300,4 +296,4 @@ pyinstaller
 pyyaml
 qiniu
 typer
-'''
+'''

{bcmd-0.0.25 → bcmd-0.0.27}/bcmd/tasks/venv.py

@@ -13,14 +13,14 @@ app: Final = btask.app
 async def venv(
     packages: list[str] = typer.Argument(None),
     path: Path = typer.Option(None, '--path', '-p', help='指定路径，默认当前目录'),
-    disabledMirror: bool = typer.Option(False, '--disabled-mirror', '-d', help='是否禁用镜像'),
+    disabled_mirror: bool = typer.Option(False, '--disabled-mirror', '-d', help='是否禁用镜像'),
     quiet: bool = typer.Option(False, '--quiet', '-q', help='是否安静模式'),
 ):
     'python 虚拟环境配置'
     packages = packages or []
     async with bpath.useTempFile() as tempFile:
         pipIniFile = bpath.user('pip/pip.ini')
-        if disabledMirror and pipIniFile.is_file():
+        if disabled_mirror and pipIniFile.is_file():
             await bpath.move(pipIniFile, tempFile)
         try:
             path = path or Path(os.getcwd())

{bcmd-0.0.25 → bcmd-0.0.27}/bcmd.egg-info/PKG-INFO

@@ -1,9 +1,8 @@
 Metadata-Version: 2.1
 Name: bcmd
-Version: 0.0.25
+Version: 0.0.27
 Summary: Commands for Beni
-Author: Beni Mang
-Author-email: benimang@126.com
+Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>
 Keywords: benimang,beni,bcmd
 Requires-Python: >=3.10

{bcmd-0.0.25 → bcmd-0.0.27}/bcmd.egg-info/requires.txt

@@ -2,7 +2,7 @@ aioconsole
 aiofiles
 aiohttp
 autopep8
-benimang>=0.4.13
+benimang<0.5
 build
 colorama
 nest-asyncio

{bcmd-0.0.25 → bcmd-0.0.27}/pyproject.toml

@@ -3,24 +3,19 @@
 
 [project]
 name = 'bcmd'
-version = '0.0.25'
+version = '0.0.27'
 description = 'Commands for Beni'
 requires-python = '>=3.10'
 keywords = ['benimang', 'beni', 'bcmd']
-authors = [
-  {email = 'benimang@126.com'},
-  {name = 'Beni Mang'},
-]
-maintainers = [
-  {name = 'Beni Mang', email = 'benimang@126.com'},
-]
+authors = [{ name = 'Beni Mang', email = 'benimang@126.com' }]
+maintainers = [{ name = 'Beni Mang', email = 'benimang@126.com' }]
 
 dependencies = [
   'aioconsole',
   'aiofiles',
   'aiohttp',
   'autopep8',
-  'benimang>=0.4.13',
+  'benimang<0.5',
   'build',
   'colorama',
   'nest-asyncio',
@@ -35,4 +30,4 @@ dependencies = [
 ]
 
 [project.scripts]
-beni = 'bcmd.main:run'
+beni = 'bcmd.main:run'

bcmd-0.0.25/bcmd/tasks/bin.py

@@ -1,56 +0,0 @@
-import os
-from pathlib import Path
-from typing import Final
-
-import typer
-from beni import bcolor, bfile, bfunc, bstore, btask
-from beni.bqiniu import QiniuBucket
-
-
-app: Final = btask.newSubApp('bin 工具')
-
-
-@app.command()
-@bfunc.syncCall
-async def init(
-    ak: str = typer.Argument(..., help="七牛云账号AK"),
-    sk: str = typer.Argument(..., help="七牛云账号SK"),
-):
-    '初始化七牛云服务'
-    await bstore.set(__file__, (ak, sk))
-
-
-@app.command()
-@bfunc.syncCall
-async def download(
-    names: str = typer.Argument(None, help="如果有多个使用,分割"),
-    file: Path = typer.Option(None, '--file', '-f', help="文件形式指定参数，行为单位"),
-    output: Path = typer.Option(None, '--output', '-o', help="本地保存路径"),
-):
-    '从七牛云下载执行文件'
-    try:
-        (ak, sk) = await bstore.get(__file__)
-    except:
-        return bcolor.printRed('请先执行 beni bin init 进行初始化')
-    bucketName = 'pytask'
-    bucketUrl = 'http://qiniu-cdn.pytask.com'
-    if output is None:
-        output = Path(os.curdir)
-    output = output.resolve()
-    bucket = QiniuBucket(bucketName, bucketUrl, ak, sk)
-    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:
-        binFile = output / target
-        if binFile.exists():
-            bcolor.printYellow(f'已存在 {binFile}')
-        else:
-            key = f'bin/{target}.zip'
-            await bucket.downloadPrivateFileUnzip(key, output)
-            bcolor.printGreen(f'added  {binFile}')