bcmd 0.0.26__tar.gz → 0.0.27__tar.gz

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

@@ -1,9 +1,8 @@
 Metadata-Version: 2.1
 Name: bcmd
-Version: 0.0.26
+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.26 → 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}"'
         )

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

@@ -81,15 +81,19 @@ async def tidy(
     tasks_path: Path = typer.Argument(None, help="tasks 路径"),
 ):
     '整理 tasks 文件'
+    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(
-        tasks_path / '__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.26 → bcmd-0.0.27}/bcmd.egg-info/PKG-INFO

@@ -1,9 +1,8 @@
 Metadata-Version: 2.1
 Name: bcmd
-Version: 0.0.26
+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.26 → 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.26 → bcmd-0.0.27}/pyproject.toml

@@ -3,24 +3,19 @@
 
 [project]
 name = 'bcmd'
-version = '0.0.26'
+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.26/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}')