bcmd 0.0.26__py3-none-any.whl → 0.0.27__py3-none-any.whl

bcmd/tasks/bin.py

@@ -1,14 +1,16 @@
 import os
+from datetime import datetime
 from pathlib import Path
 from typing import Final
 
 import typer
-from beni import bcolor, bfile, bfunc, bstore, btask
+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
@@ -18,6 +20,15 @@ async def init(
 ):
     '初始化七牛云服务'
     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()
@@ -28,29 +39,56 @@ async def download(
     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:
-        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}')
+        bcolor.printRed('请先执行 beni bin init 进行初始化')

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/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.dist-info → bcmd-0.0.27.dist-info}/METADATA

@@ -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
@@ -11,7 +10,7 @@ Requires-Dist: aioconsole
 Requires-Dist: aiofiles
 Requires-Dist: aiohttp
 Requires-Dist: autopep8
-Requires-Dist: benimang (>=0.4.13)
+Requires-Dist: benimang (<0.5)
 Requires-Dist: build
 Requires-Dist: colorama
 Requires-Dist: nest-asyncio

{bcmd-0.0.26.dist-info → bcmd-0.0.27.dist-info}/RECORD

@@ -1,16 +1,16 @@
 bcmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bcmd/main.py,sha256=_ycMuR_Opl2muPSZAQYTLk9wGM20x_4I0o7eF_HV848,136
 bcmd/tasks/__init__.py,sha256=38xSWPovSYYIhFcAcRBUoob6PC65Do-88KTIWFCxnQs,168
-bcmd/tasks/bin.py,sha256=5fTiMe5GV_1w1PenIIFGtjgMRwlwQvo_bIp2D3jvHAM,1775
+bcmd/tasks/bin.py,sha256=htkV2tUwq_AuXrr-iEM5pGJWZlGKu-oi70n9uW_0Wf4,2748
 bcmd/tasks/json.py,sha256=ZGhtApi_IYoPoTKluiw4NKc1Pmc5aD8Dd9uv4BdIYsM,490
-bcmd/tasks/lib.py,sha256=aVJ99XU8auOX4ECSull4YhzASfHtcxM358DfpzddVyM,2560
+bcmd/tasks/lib.py,sha256=KMlpu6T1uV8S37XcFJLZP2Jsedrzakltzz8J0A6Tj0Y,2566
 bcmd/tasks/mirror.py,sha256=2IUeno1voK4TduwymIGxjkG1Q1IN-Jw3sfuRZkKSYHc,1384
 bcmd/tasks/proxy.py,sha256=DLIklFMRWUNBKE_0i8pciQdBE5bvAHCejXzzIYp4Ng8,641
-bcmd/tasks/task.py,sha256=3J-J-JdD8ihzi9n5Wr7FAMjYYlxGVcXzEP0vMkFO-bw,6425
+bcmd/tasks/task.py,sha256=A7NUEoxivjMypr3fQqmsbA3bbU3O37Omx0NpwT097-o,6449
 bcmd/tasks/time.py,sha256=LqwDQL_CvEFs6qgocGzXR00ZwR5yZQ4x-BZ2UD7YWUc,2565
 bcmd/tasks/venv.py,sha256=awS5PDCkuf3itj1He8_nmajo9TxdKUhIiaMuqOOmeoI,3082
-bcmd-0.0.26.dist-info/METADATA,sha256=pKxmGA9FXHiAv7pUeHBSkXRqkyFIg7BtC9Qm_L8L-48,645
-bcmd-0.0.26.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
-bcmd-0.0.26.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
-bcmd-0.0.26.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
-bcmd-0.0.26.dist-info/RECORD,,
+bcmd-0.0.27.dist-info/METADATA,sha256=HCrLVDRmmTUdsplOPMroFI_OEaliCV6Y75P9u_UmULM,634
+bcmd-0.0.27.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
+bcmd-0.0.27.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
+bcmd-0.0.27.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
+bcmd-0.0.27.dist-info/RECORD,,