bcmd 0.0.56__tar.gz → 0.0.58__tar.gz

{bcmd-0.0.56 → bcmd-0.0.58}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: bcmd
-Version: 0.0.56
+Version: 0.0.58
 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.4.34
+Requires-Dist: benimang==0.5.3
 Requires-Dist: pathspec
 Requires-Dist: pyjwt

{bcmd-0.0.56 → bcmd-0.0.58}/bcmd/tasks/__init__.py

@@ -1,5 +1,6 @@
 # type: ignore
 from . import bin
+from . import download
 from . import json
 from . import lib
 from . import math
@@ -7,5 +8,6 @@ from . import mirror
 from . import proxy
 from . import pwd
 from . import task
+from . import temp
 from . import time
 from . import venv

bcmd-0.0.58/bcmd/tasks/download.py

@@ -0,0 +1,34 @@
+import asyncio
+import os
+from pathlib import Path
+from typing import Final
+
+import pyperclip
+import typer
+from beni import bcolor, bhttp, 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()])
+
+    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.56 → bcmd-0.0.58}/bcmd/tasks/pwd.py

@@ -9,7 +9,7 @@ from beni import bcolor, btask
 from beni.bfunc import magicSequence, syncCall
 from rich.console import Console
 
-app: Final = btask.newSubApp('lib 工具')
+app: Final = btask.newSubApp('密钥')
 
 
 _KEY_SALT = '_salt_@#%@#xafDGAz.nq'

bcmd-0.0.58/bcmd/tasks/temp.py

@@ -0,0 +1,31 @@
+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.56 → bcmd-0.0.58}/bcmd/tasks/venv.py

@@ -23,7 +23,11 @@ async def venv(
     quiet: bool = typer.Option(False, '--quiet', '-q', help='是否安静模式'),
 ):
     'python 虚拟环境配置'
-    await password.getQiniu()
+
+    path = path or Path(os.getcwd())
+    binPath = path / 'bin'
+    binListFile = bpath.get(path, 'bin.list')
+    await _inputQiniuPassword(binListFile, binPath)
     packages = packages or []
     for i in range(len(packages)):
         package = packages[i]
@@ -35,7 +39,6 @@ async def venv(
         if disabled_mirror and pipIniFile.is_file():
             bpath.move(pipIniFile, tempFile)
         try:
-            path = path or Path(os.getcwd())
             venvPath = bpath.get(path, 'venv')
             assertPath(venvPath)
             if not venvPath.exists() and not quiet:
@@ -59,12 +62,11 @@ async def venv(
             await bexecute.run(f'{pip} freeze > {venvLockFile}')
 
             # 下载 bin 文件
-            binListFile = bpath.get(path, 'bin.list')
             if binListFile.exists():
                 bin.download(
                     names=Null,
                     file=binListFile,
-                    output=path / 'bin',
+                    output=binPath,
                 )
 
         finally:
@@ -111,3 +113,12 @@ async def _getPackageLatestVersion(package: str):
         f'https://pypi.org/pypi/{package}/json'
     )
     return data['info']['version']
+
+
+async def _inputQiniuPassword(binListFile: Path, binPath: Path) -> None:
+    '根据需要输入七牛云密码'
+    if binListFile.exists():
+        aaSet = set([x.strip() for x in (await bfile.readText(binListFile)).strip().split('\n') if x.strip()])
+        bbSet = set([x.name for x in bpath.listFile(binPath)])
+        if aaSet != bbSet:
+            await password.getQiniu()

{bcmd-0.0.56 → bcmd-0.0.58}/bcmd.egg-info/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: bcmd
-Version: 0.0.56
+Version: 0.0.58
 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.4.34
+Requires-Dist: benimang==0.5.3
 Requires-Dist: pathspec
 Requires-Dist: pyjwt

{bcmd-0.0.56 → bcmd-0.0.58}/bcmd.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ bcmd/common/__init__.py
 bcmd/common/password.py
 bcmd/tasks/__init__.py
 bcmd/tasks/bin.py
+bcmd/tasks/download.py
 bcmd/tasks/json.py
 bcmd/tasks/lib.py
 bcmd/tasks/math.py
@@ -20,5 +21,6 @@ bcmd/tasks/mirror.py
 bcmd/tasks/proxy.py
 bcmd/tasks/pwd.py
 bcmd/tasks/task.py
+bcmd/tasks/temp.py
 bcmd/tasks/time.py
 bcmd/tasks/venv.py

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

@@ -0,0 +1,3 @@
+benimang==0.5.3
+pathspec
+pyjwt

{bcmd-0.0.56 → bcmd-0.0.58}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = 'bcmd'
-version = '0.0.56'
+version = '0.0.58'
 description = 'Commands for Beni'
 requires-python = '>=3.10'
 keywords = ['benimang', 'beni', 'bcmd']
@@ -12,7 +12,7 @@ maintainers = [{ name = 'Beni Mang', email = 'benimang@126.com' }]
 
 
 dependencies = [
-  'benimang==0.4.34',
+  'benimang==0.5.3',
   'pathspec',
   'pyjwt',
 ]

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

@@ -1,3 +0,0 @@
-benimang==0.4.34
-pathspec
-pyjwt