bcmd 0.6.5__tar.gz → 0.6.7__tar.gz

{bcmd-0.6.5 → bcmd-0.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcmd
-Version: 0.6.5
+Version: 0.6.7
 Summary: Commands for Beni
 Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>

bcmd-0.6.7/bcmd/common/secret.py

@@ -0,0 +1,51 @@
+import getpass
+from typing import Any, TypedDict, cast
+
+from async_lru import alru_cache
+from beni import bcrypto, btask
+from beni.bcolor import printRed
+
+
+class PypiSecret(TypedDict):
+    username: str
+    password: str
+
+
+@alru_cache
+async def getPypi(value: str = '') -> PypiSecret:
+    return cast(
+        Any,
+        _getData(value or 'QbuF2mV/lqovtF5dskZGD7qHknYbNuF2QseWRtWxLZTPrC/jL1tcxV8JEKaRjLsu46PxJZ7zepJwggnUTIWnEAoV5VtgP2/hbuzxxHha8817kR5c65H9fXm8eOal7DYXsUoGPQMnm59UWNXUKjmIaP4sn9nySFlRYqa8sEZSbYQ4N0NL35Dpj1e3wyQxJ+7h2jwKAz50Hh8G4yAM3/js9+NUe4ymts+UXcwsP3ADIBMkzjnFc0lEYg2d+fw0A74XWCvoZPoGqHZR/THUOVNAYxoGgDzP4SPIk1XsmtpxvfO/DpJd/Cg/0fB3MYagGKI1+m6Bxqhvd1I/lf0YbM5y4E4='),
+    )
+
+
+class QiniuSecret(TypedDict):
+    bucket: str
+    baseUrl: str
+    ak: str
+    sk: str
+
+
+@alru_cache
+async def getQiniu(value: str = '') -> QiniuSecret:
+    return cast(
+        Any,
+        _getData(value or 'vNroFKeKklrdcJ89suFm+iyuJsq/cyUB5+QWoeeiMc/J0oSLF9cg5rqbK1IRxF0cCQ8KmkQQhdVa+PI6kuTBhoSH6IviVTylzAOrJywEccz9jWkJkW28Y9Vo4ePZmfWf/j7wdxNB144z234KD8IxJn4lR2A0L9JN5kk1o1/hpcydXL74FNtt03lYL/E3WVcvpUfw37mri2HMYOfUw81dRwW35/hMuQjtq1BBrKrIsSKTHH44tROMcgyvt+Qy292AtDBcsYiZxBKhQtBFPMq/vUs='),
+    )
+
+
+def _getData(content: str) -> dict[str, Any]:
+    index = content.find(' ')
+    if index > -1:
+        tips = f'请输入密码（{content[:index]}）：'
+    else:
+        tips = '请输入密码：'
+    while True:
+        try:
+            pwd = getpass.getpass(tips)
+            return bcrypto.decryptJson(content, pwd)
+        except KeyboardInterrupt:
+            print('')
+            btask.abort('用户操作取消')
+        except BaseException:
+            printRed('密码错误')

{bcmd-0.6.5/bcmdx → bcmd-0.6.7/bcmd}/tasks/bin.py

@@ -9,7 +9,7 @@ from beni.bqiniu import QiniuBucket
 from beni.btype import Null
 from prettytable import PrettyTable
 
-from ..common import password
+from ..common import secret
 
 app: Final = btask.newSubApp('bin 工具')
 
@@ -22,6 +22,7 @@ async def download(
     names: list[str] = typer.Argument(None, help="支持多个"),
     file: Path = typer.Option(None, '--file', '-f', help="文件形式指定参数，行为单位"),
     output: Path = typer.Option(Path.cwd(), '--output', '-o', help="本地保存路径"),
+    secretValue: str = typer.Option('', '--secret', '-s', help='密钥信息'),
 ):
     '从七牛云下载执行文件'
     bucket: QiniuBucket = Null
@@ -36,16 +37,18 @@ async def download(
             bcolor.printYellow(f'已存在 {binFile}')
         else:
             key = f'bin/{target}.zip'
-            bucket = bucket or await _getBucket()
+            bucket = bucket or await _getBucket(secretValue)
             await bucket.downloadPrivateFileUnzip(key, output)
             bcolor.printGreen(f'added  {binFile}')
 
 
 @app.command('list')
 @syncCall
-async def getList():
+async def getList(
+    secretValue: str = typer.Option('', '--secret', '-s', help='密钥信息'),
+):
     '列出可下载的文件'
-    bucket = await _getBucket()
+    bucket = await _getBucket(secretValue)
     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)
@@ -68,9 +71,10 @@ async def getList():
 async def upload(
     file: Path = typer.Argument(..., help="本地文件路径"),
     force: bool = typer.Option(False, '--force', '-f', help="强制覆盖"),
+    secretValue: str = typer.Option('', '--secret', '-s', help='密钥信息'),
 ):
     '上传'
-    bucket = await _getBucket()
+    bucket = await _getBucket(secretValue)
     key = f'{_PREFIX}{file.name}.zip'
     if not force:
         if await bucket.getFileStatus(key):
@@ -85,8 +89,9 @@ async def upload(
 @syncCall
 async def remove(
     key: str = typer.Argument(..., help="云端文件key"),
+    secretValue: str = typer.Option('', '--secret', '-s', help='密钥信息'),
 ):
-    bucket = await _getBucket()
+    bucket = await _getBucket(secretValue)
     await bucket.deleteFiles(f'{_PREFIX}{key}.zip')
     bcolor.printGreen('OK')
 
@@ -94,11 +99,5 @@ async def remove(
 # ------------------------------------------------------------------------------------
 
 
-async def _getBucket():
-    ak, sk = await password.getQiniu()
-    return QiniuBucket(
-        'pytask',
-        'http://qiniu-cdn.pytask.com',
-        ak,
-        sk,
-    )
+async def _getBucket(secretValue: str):
+    return QiniuBucket(**await secret.getQiniu())

{bcmd-0.6.5/bcmdx → bcmd-0.6.7/bcmd}/tasks/image.py

@@ -1,6 +1,9 @@
+from __future__ import annotations
+
 import asyncio
 import os
 import random
+import tkinter as tk
 from enum import StrEnum
 from pathlib import Path
 from typing import Final, List, Tuple
@@ -13,6 +16,9 @@ from beni.bfunc import syncCall
 from beni.btype import Null, XPath
 from PIL import Image, ImageDraw, ImageFont
 
+from bcmd.utils.tkUtil import TkForm, setWidgetEnabled
+from tkinter import messagebox
+
 app: Final = btask.newSubApp('图片工具集')
 
 
@@ -302,3 +308,69 @@ async def merge(
     _merge_images(image_files, output_image)
     bcolor.printMagenta(output_image)
     bcolor.printGreen('OK')
+
+
+@app.command()
+@syncCall
+async def xone():
+    def showGui():
+        app = TkForm()
+        app.title('图片操作')
+        entry = app.addEntry('保存文件', tk.StringVar(value=r'C:\project\docs\source\docs\public\icon.webp'), width=60)
+        app.addEntry('输入密码', tk.StringVar(), password=True, width=60, command=lambda: messagebox.showerror('错误', '密码错误'))
+
+        scrolltextVar = tk.StringVar(value='xxiioo')
+        app.addScrolledText('测试信箱', scrolltextVar)
+
+
+        radioVarScale = app.addRadioBtnList(
+            '缩放操作',
+            [
+                '保持',
+                '缩放比',
+                '指定宽度',
+                '指定高度',
+            ],
+            selectedIndex=0,
+            onChanged=lambda x: onScaleValueChanged(x),
+        )
+
+        scaleValueEntry = app.addEntry('缩放参数', tk.StringVar(), width=10, justify=tk.CENTER)
+
+        app.addChoisePath('选择文件', tk.StringVar(), isDir=True, focus=True)
+
+        radioVarFormat = app.addRadioBtnList(
+            '格式转换',
+            [
+                '保持',
+                'PNG',
+                'JPEG',
+                'WEBP',
+            ],
+            selectedIndex=0,
+        )
+        app.addCheckBox('去除透明', '去除透明', False)
+        app.addCheckBox('TinyPng', 'TinyPng', True)
+        app.addCheckBoxList('其他选项', [
+            ('去除透明', False),
+            ('TinyPng', True),
+        ])
+
+        def onScaleValueChanged(value: str):
+            match value:
+                case '保持':
+                    setWidgetEnabled(scaleValueEntry, False)
+                case _:
+                    setWidgetEnabled(scaleValueEntry, True)
+
+        app.addBtn('确定', lambda: onBtn())
+
+        def onBtn():
+            nonlocal result
+            app.destroy()
+
+        result: str = ''
+        app.run()
+        return result
+
+    showGui()

{bcmd-0.6.5/bcmdx → bcmd-0.6.7/bcmd}/tasks/lib.py

@@ -6,9 +6,9 @@ import typer
 from beni import bcolor, bfile, bpath, brun, btask
 from beni.bfunc import syncCall
 
-from bcmdx.utils.tkUtil import TkForm
+from bcmd.utils.tkUtil import TkForm
 
-from ..common import password
+from ..common import secret
 
 app: Final = btask.newSubApp('lib 工具')
 
@@ -35,7 +35,7 @@ async def update_version(
         app = TkForm()
         app.title('bcmd 版本更新')
         app.addLabel('当前版本号', latestVersion)
-        version_var = app.addRadioBtn(
+        version_var = app.addRadioBtnList(
             '请选择新版本',
             versionList,
             selectedIndex=-1,
@@ -80,14 +80,15 @@ async def update_version(
 @syncCall
 async def build(
     path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
+    secretValue: str = typer.Option('', '--secret', '-s', help='密钥信息'),
 ):
     '发布项目'
-    user, pwd = await password.getPypi()
+    data = await secret.getPypi(secretValue)
     bpath.remove(path / 'dist')
     bpath.remove(
         *list(path.glob('*.egg-info'))
     )
     with bpath.changePath(path):
         await brun.run(f'uv build')
-        await brun.run(f'uv publish -u {user} -p {pwd}')
+        await brun.run(f'uv publish -u {data['username']} -p {data['password']}')
     bcolor.printGreen('OK')

bcmd-0.6.7/bcmd/utils/tkUtil.py

@@ -0,0 +1,243 @@
+import tkinter as tk
+from tkinter import filedialog
+from tkinter.scrolledtext import ScrolledText
+from typing import Any, Callable, Literal, TypeVar, Union
+from uuid import uuid4
+
+RADIO_NOTHING = uuid4().hex
+TkVar = TypeVar('TkVar', bound=Union[tk.StringVar, tk.IntVar, tk.DoubleVar, tk.BooleanVar])
+
+
+class TkForm(tk.Tk):
+
+    _rowIndex = -1
+    _initList: list[Callable[..., None]] = []
+    _varList: list[tk.Variable] = []  # 用来存储 var 变量，避免传出去，外面没有接收导致界面异常
+
+    def __init__(self):
+        super().__init__()
+        self.resizable(False, False)
+        self.bind("<Map>", self._onInit)
+
+    def _onInit(self, evt: tk.Event):
+        if evt.widget == self:
+            for callback in self._initList:
+                callback()
+            self._initList.clear()
+
+    def addInitHandler(self, handler: Callable[..., None]):
+        self._initList.append(handler)
+
+    def _initVar(self, var: TkVar) -> TkVar:
+        self._varList.append(var)
+        return var
+
+    def run(self):
+        self.center()
+        self.mainloop()
+
+    def center(self):
+        self.withdraw()  # 先隐藏窗口，避免闪动
+        self.update_idletasks()  # 确保获取正确的窗口尺寸
+        width = self.winfo_width()  # 获取窗口宽度
+        height = self.winfo_height()  # 获取窗口高度
+        screen_width = self.winfo_screenwidth()  # 屏幕宽度
+        screen_height = self.winfo_screenheight()  # 屏幕高度
+        x = (screen_width - width) // 2  # 水平居中
+        y = (screen_height - height) // 2  # 垂直居中
+        self.geometry(f"+{x}+{y}")  # 设置窗口位置
+        self.deiconify()  # 恢复显示窗口
+
+    def addRow(self, desc: str, widget: tk.Widget):
+        self._rowIndex += 1
+        tk.Label(text=desc).grid(row=self._rowIndex, column=0, padx=10, pady=5, sticky='e')
+        widget.grid(row=self._rowIndex, column=1, padx=10, pady=5, sticky='w')
+
+    def addRowFrame(self):
+        self._rowIndex += 1
+        frame = tk.Frame(self)
+        frame.grid(row=self._rowIndex, column=0, columnspan=2, padx=10, pady=5)
+        return frame
+
+    def addRowFrameWithDesc(self, desc: str):
+        self._rowIndex += 1
+        tk.Label(text=desc).grid(row=self._rowIndex, column=0, padx=10, pady=5, sticky='e')
+        frame = tk.Frame(self)
+        frame.grid(row=self._rowIndex, column=1, padx=10, pady=5, sticky='w')
+        return frame
+
+    def addLabel(
+        self,
+        desc: str,
+        text: str
+    ):
+        self.addRow(desc, tk.Label(text=text))
+
+    def addBtn(
+        self,
+        label: str,
+        command: Callable[..., None],
+        *,
+        width: int = 20,
+        focus: bool = False
+    ):
+        frame = self.addRowFrame()
+        btn = tk.Button(frame, text=label, width=width, command=command)
+        btn.pack(side="left", expand=True, padx=15)
+        if focus:
+            self._initFocus(btn)
+
+    def addRadioBtnList(
+        self,
+        desc: str,
+        selectionList: list[str],
+        *,
+        selectedIndex: int | None = None,
+        focusIndex: int | None = None,
+        onChanged: Callable[[str], None] | None = None,
+    ):
+        frame = tk.Frame()
+        self.addRow(desc, frame)
+        var = tk.StringVar(value=selectionList[selectedIndex] if selectedIndex is not None else RADIO_NOTHING)
+        radioBtnList: list[tk.Radiobutton] = []
+        for version in selectionList:
+            radioBtn = tk.Radiobutton(frame, text=version, variable=var, value=version)
+            radioBtn.pack(side="left", padx=(0, 15))
+            setWidgetClickFocus(radioBtn)
+            radioBtnList.append(radioBtn)
+        if focusIndex is not None:
+            self._initFocus(radioBtnList[focusIndex])
+        if onChanged:
+            var.trace_add('write', lambda *args: onChanged(var.get()))  # type: ignore
+            self.addInitHandler(
+                lambda: onChanged(var.get())
+            )
+        return var
+
+    def addEntry(
+        self,
+        desc: str,
+        var: tk.StringVar,
+        *,
+        width: int = 60,
+        focus: bool = False,
+        justify: Literal['left', 'right', 'center'] = tk.LEFT,
+        password: bool = False,
+        command: Callable[..., Any] | None = None,
+    ):
+        self._initVar(var)
+        entry = tk.Entry(self, width=width, justify=justify, textvariable=var)
+        entry.icursor(tk.END)
+        self.addRow(desc, entry)
+        if password:
+            entry.config(show='*')
+        if focus:
+            self._initFocus(entry)
+        if command:
+            entry.bind('<Return>', lambda event: command())
+        return entry
+
+    def addChoisePath(
+        self,
+        desc: str,
+        var: tk.StringVar,
+        *,
+        width: int = 47,
+        focus: bool = False,
+        isDir: bool = False,
+    ):
+        self._initVar(var)
+        frame = self.addRowFrameWithDesc(desc)
+        entry = tk.Entry(frame, width=width, textvariable=var)
+        entry.icursor(tk.END)
+        entry.pack(side="left")
+        btn = tk.Button(frame, text=f'选择{'目录' if isDir else '文件'} ...', width=10, command=lambda: onBtn())
+        btn.pack(side="left", padx=(10, 0))
+        if focus:
+            self._initFocus(btn)
+
+        def onBtn():
+            if isDir:
+                var.set(filedialog.askdirectory())
+            else:
+                var.set(filedialog.askopenfilename())
+
+    def addScrolledText(
+        self,
+        desc: str,
+        var: tk.StringVar,
+        *,
+        width: int = 60,
+        height: int = 3,
+        focus: bool = False,
+    ):
+        self._initVar(var)
+        scrolledText = ScrolledText(self, width=width, height=height)
+        scrolledText.insert(tk.END, var.get())
+        self.addRow(desc, scrolledText)
+
+        def on_text_change(*args: Any):
+            new_value = scrolledText.get("1.0", tk.END)
+            if new_value != var.get():
+                var.set(new_value)
+
+        scrolledText.bind("<KeyRelease>", on_text_change)
+
+        def on_tab(event: tk.Event):
+            widget = event.widget.tk_focusNext()
+            assert widget
+            widget.focus_set()
+            return "break"
+
+        scrolledText.bind("<Tab>", on_tab)
+
+        if focus:
+            self._initFocus(scrolledText)
+        return scrolledText
+
+    def addCheckBox(
+        self,
+        desc: str,
+        text: str,
+        value: bool = False,
+    ):
+        var = tk.BooleanVar(value=value)
+        self._initVar(var)
+        check_btn = tk.Checkbutton(text=text, variable=var)
+        self.addRow(desc, check_btn)
+        self.addInitHandler(
+            lambda: var.set(var.get())
+        )
+        setWidgetClickFocus(check_btn)
+        return var
+
+    def addCheckBoxList(
+        self,
+        desc: str,
+        dataList: list[tuple[str, bool]],
+    ):
+        varDict: dict[str, tk.BooleanVar] = {}
+        frame = tk.Frame(self)
+        self.addRow(desc, frame)
+        for label, value in dataList:
+            varDict[label] = tk.BooleanVar(value=value)
+            checkbox = tk.Checkbutton(frame, text=label, variable=varDict[label])
+            checkbox.pack(side="left", expand=True, padx=(0, 15))
+            setWidgetClickFocus(checkbox)
+            self.addInitHandler(
+                lambda: varDict[label].set(varDict[label].get())
+            )
+        return varDict
+
+    def _initFocus(self, widget: tk.Widget):
+        self.addInitHandler(
+            lambda: widget.focus_set()
+        )
+
+
+def setWidgetEnabled(widget: tk.Widget, value: bool):
+    widget['state'] = tk.NORMAL if value else tk.DISABLED
+
+
+def setWidgetClickFocus(widget: tk.Widget):
+    widget.bind("<Button-1>", lambda args: args.widget.focus_set())

{bcmd-0.6.5 → bcmd-0.6.7}/bcmd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcmd
-Version: 0.6.5
+Version: 0.6.7
 Summary: Commands for Beni
 Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>

bcmd-0.6.7/bcmd.egg-info/SOURCES.txt

@@ -0,0 +1,60 @@
+MANIFEST.in
+README.md
+pyproject.toml
+./bcmd/__init__.py
+./bcmd/common/__init__.py
+./bcmd/common/func.py
+./bcmd/common/secret.py
+./bcmd/resources/project/main.py
+./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/lib.py
+./bcmd/tasks/math.py
+./bcmd/tasks/mirror.py
+./bcmd/tasks/pdf.py
+./bcmd/tasks/proxy.py
+./bcmd/tasks/time.py
+./bcmd/tasks/upgrade.py
+./bcmd/tasks/wasabi.py
+./bcmd/utils/__init__.py
+./bcmd/utils/tkUtil.py
+./test/__init__.py
+./test/conftest.py
+./test/test_pdf.py
+./test/test_proxy.py
+./test/test_wasabi.py
+bcmd/__init__.py
+bcmd.egg-info/PKG-INFO
+bcmd.egg-info/SOURCES.txt
+bcmd.egg-info/dependency_links.txt
+bcmd.egg-info/entry_points.txt
+bcmd.egg-info/requires.txt
+bcmd.egg-info/top_level.txt
+bcmd/common/__init__.py
+bcmd/common/func.py
+bcmd/common/secret.py
+bcmd/resources/project/main.py
+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/lib.py
+bcmd/tasks/math.py
+bcmd/tasks/mirror.py
+bcmd/tasks/pdf.py
+bcmd/tasks/proxy.py
+bcmd/tasks/time.py
+bcmd/tasks/upgrade.py
+bcmd/tasks/wasabi.py
+bcmd/utils/__init__.py
+bcmd/utils/tkUtil.py

bcmd-0.6.7/bcmd.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+beni = bcmd:run

bcmd-0.6.7/bcmd.egg-info/top_level.txt

@@ -0,0 +1,3 @@
+bcmd
+dist
+test

{bcmd-0.6.5 → bcmd-0.6.7}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = 'bcmd'
-version = '0.6.5'
+version = '0.6.7'
 description = 'Commands for Beni'
 requires-python = '>=3.10'
 keywords = ['benimang', 'beni', 'bcmd']
@@ -33,12 +33,14 @@ full = [
 ]
 
 [project.scripts]
-beni = 'bcmdx.main:run'
+beni = 'bcmd:run'
 
 [tool.uv]
 package = true
 
-# 使用默认镜像地址
+[tool.setuptools]
+package-dir = { "" = "." }
+
 [[tool.uv.index]]
 url = "https://mirrors.aliyun.com/pypi/simple"
 default = true

bcmd-0.6.7/test/conftest.py

@@ -0,0 +1,17 @@
+# '''
+# 快捷键（默认）
+# CTRL+; A        执行全部单元测试
+# CTRL+; E        只执行上次出错的用例
+# CTRL+; C        清除结果
+# CTRL+; CTRL+A   调试全部单元测试
+# CTRL+; CTRL+E   只调试上次出错的用例
+# '''
+
+import pytest_asyncio
+
+from bcmd.tasks import *
+
+
+@pytest_asyncio.fixture(scope='session', autouse=True)  # type: ignore
+def prepareSession():
+    yield

bcmd-0.6.7/test/test_pdf.py

@@ -0,0 +1,47 @@
+from contextlib import asynccontextmanager
+from pathlib import Path
+from typing import Literal
+
+import img2pdf
+import pytest
+from beni import bfile, bpath, btask
+from PIL import Image
+
+
+@pytest.mark.asyncio
+async def test_pdf_output_images():
+    async with _createTempPdfFile() as pdfFile:
+        result = btask.testCall('pdf', 'output-images', '--target', pdfFile.as_posix())
+        assert result.exit_code == 0
+        outputImagesPath = pdfFile.parent / f'{pdfFile.stem}-PDF图片文件'
+        assert outputImagesPath.is_dir()
+        assert len(list(outputImagesPath.glob('*.png'))) == 1
+        assert len(list(outputImagesPath.glob('*.jpeg'))) == 1
+
+
+@asynccontextmanager
+async def _createTempPdfFile():
+
+    def create_color_block_image(
+            file: Path,
+            color: tuple[int, int, int],
+            size: tuple[int, int] = (500, 500),
+            image_format: Literal['JPEG', 'PNG'] = 'JPEG'
+    ):
+        image = Image.new('RGB', size, color)
+        image.save(file, format=image_format)
+        image.close()
+        return file
+
+    with bpath.useTempPath(True) as tempPath:
+        # 创建色块图片
+        fileList = [
+            create_color_block_image(tempPath / 'blue.png', (0, 0, 255), image_format='PNG'),
+            create_color_block_image(tempPath / 'red.jpeg', (255, 0, 0), image_format='JPEG'),
+        ]
+
+        # 生成PDF文件
+        pdfFile = tempPath / 'output.pdf'
+        await bfile.writeBytes(pdfFile, img2pdf.convert(fileList))  # type: ignore
+
+        yield pdfFile

bcmd-0.6.7/test/test_proxy.py

@@ -0,0 +1,8 @@
+import pytest
+from beni import btask
+
+
+@pytest.mark.asyncio
+async def test_proxy():
+    result = btask.testCall('proxy', '--help')
+    assert result.exit_code == 0

bcmd-0.6.7/test/test_wasabi.py

@@ -0,0 +1,28 @@
+from uuid import uuid4
+
+import pytest
+from beni import bfile, bpath, btask
+
+
+@pytest.mark.asyncio
+async def test_wasabi():
+    with bpath.useTempPath() as tempPath:
+        target = tempPath / uuid4().hex
+        file = target / uuid4().hex
+        content = uuid4().hex
+        password = uuid4().hex
+        await bfile.writeText(file, content)
+
+        result = btask.testCall('wasabi', 'zip', target.as_posix(), '--password', password)
+        assert result.exit_code == 0
+        assert target.is_file(), '生成加密文件失败'
+
+        newPassword = uuid4().hex
+        result = btask.testCall('wasabi', 'change-pass', target.as_posix(), '--password', password, '--new-password', newPassword)
+        assert result.exit_code == 0
+        assert target.is_file(), '修改密码失败'
+
+        result = btask.testCall('wasabi', 'unzip', target.as_posix(), '--password', newPassword)
+        assert result.exit_code == 0
+        assert target.is_dir(), '解密文件失败'
+        assert await bfile.readText(file) == content, '解密文件内容不一致'

bcmd-0.6.5/bcmd.egg-info/SOURCES.txt

@@ -1,33 +0,0 @@
-MANIFEST.in
-README.md
-pyproject.toml
-bcmd.egg-info/PKG-INFO
-bcmd.egg-info/SOURCES.txt
-bcmd.egg-info/dependency_links.txt
-bcmd.egg-info/entry_points.txt
-bcmd.egg-info/requires.txt
-bcmd.egg-info/top_level.txt
-bcmdx/__init__.py
-bcmdx/main.py
-bcmdx/common/__init__.py
-bcmdx/common/func.py
-bcmdx/common/password.py
-bcmdx/resources/project/main.py
-bcmdx/tasks/__init__.py
-bcmdx/tasks/bin.py
-bcmdx/tasks/code.py
-bcmdx/tasks/crypto.py
-bcmdx/tasks/debian.py
-bcmdx/tasks/download.py
-bcmdx/tasks/image.py
-bcmdx/tasks/json.py
-bcmdx/tasks/lib.py
-bcmdx/tasks/math.py
-bcmdx/tasks/mirror.py
-bcmdx/tasks/pdf.py
-bcmdx/tasks/proxy.py
-bcmdx/tasks/time.py
-bcmdx/tasks/upgrade.py
-bcmdx/tasks/wasabi.py
-bcmdx/utils/__init__.py
-bcmdx/utils/tkUtil.py

bcmd-0.6.5/bcmd.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-beni = bcmdx.main:run

bcmd-0.6.5/bcmd.egg-info/top_level.txt

@@ -1 +0,0 @@
-bcmdx

bcmd-0.6.5/bcmdx/common/password.py

@@ -1,35 +0,0 @@
-import getpass
-from typing import Any
-
-from async_lru import alru_cache
-from beni import bcrypto
-
-
-@alru_cache
-async def getPypi() -> tuple[str, str]:
-    content = 'QbuF2mV/lqovtF5dskZGD7qHknYbNuF2QseWRtWxLZTPrC/jL1tcxV8JEKaRjLsu46PxJZ7zepJwggnUTIWnEAoV5VtgP2/hbuzxxHha8817kR5c65H9fXm8eOal7DYXsUoGPQMnm59UWNXUKjmIaP4sn9nySFlRYqa8sEZSbYQ4N0NL35Dpj1e3wyQxJ+7h2jwKAz50Hh8G4yAM3/js9+NUe4ymts+UXcwsP3ADIBMkzjnFc0lEYg2d+fw0A74XWCvoZPoGqHZR/THUOVNAYxoGgDzP4SPIk1XsmtpxvfO/DpJd/Cg/0fB3MYagGKI1+m6Bxqhvd1I/lf0YbM5y4E4='
-    data = _getData(content)
-    return data['username'], data['password']
-
-
-@alru_cache
-async def getQiniu() -> tuple[str, str]:
-    content = '7xOuA0FPCndTWcWmWLbqklQTqLTAhuEw9CarRTBYhWQ/g8wPxktw6VAiu50TLv49D1L8oCVfGafsowYDZw/prF6NQwCluPcCMy5JfdC9sKauvuZa51Nsf6PTR1UIyU8ZLUSzH+Ec2Ufcz/yAZCrcAtn63zMHNu3tTAVcZNPL597lSHdSRkpmDR8CaoUh/raH/Q=='
-    data = _getData(content)
-    return data['ak'], data['sk']
-
-
-def _getData(content: str) -> dict[str, Any]:
-    index = content.find(' ')
-    if index > -1:
-        tips = f'请输入密码（{content[:index]}）：'
-    else:
-        tips = '请输入密码：'
-    while True:
-        try:
-            pwd = getpass.getpass(tips)
-            return bcrypto.decryptJson(content, pwd)
-        except KeyboardInterrupt:
-            raise Exception('操作取消')
-        except BaseException:
-            pass

bcmd-0.6.5/bcmdx/utils/tkUtil.py

@@ -1,130 +0,0 @@
-import tkinter as tk
-from tkinter.scrolledtext import ScrolledText
-from typing import Callable
-from uuid import uuid4
-
-# version 2026-0621
-
-
-class TkForm(tk.Tk):
-
-    _row = -1
-    _initFocusItem: tk.Widget | None = None
-
-    RADIO_NOTHING = uuid4().hex
-
-    def __init__(self):
-        super().__init__()
-        self.resizable(False, False)
-        self.bind("<Map>", self._onMap)
-
-    def _onMap(self, event: tk.Event):
-        if self._initFocusItem:
-            self._initFocusItem.focus_set()
-            self._initFocusItem = None
-
-    def add(self, desc: str, widget: tk.Widget):
-        self._row += 1
-        tk.Label(text=desc).grid(row=self._row, column=0, padx=10, pady=5, sticky='n')
-        widget.grid(row=self._row, column=1, padx=10, pady=5, sticky='w')
-
-    def addFrame(self, frame: tk.Frame):
-        self._row += 1
-        frame.grid(row=self._row, column=0, columnspan=2, padx=10, pady=5)
-
-    def run(self):
-        self.center()
-        self.mainloop()
-
-    def center(self):
-        self.withdraw()  # 先隐藏窗口，避免闪动
-        self.update_idletasks()  # 确保获取正确的窗口尺寸
-        width = self.winfo_width()  # 获取窗口宽度
-        height = self.winfo_height()  # 获取窗口高度
-        screen_width = self.winfo_screenwidth()  # 屏幕宽度
-        screen_height = self.winfo_screenheight()  # 屏幕高度
-        x = (screen_width - width) // 2  # 水平居中
-        y = (screen_height - height) // 2  # 垂直居中
-        self.geometry(f"+{x}+{y}")  # 设置窗口位置
-        self.deiconify()  # 恢复显示窗口
-
-    def addLabel(self, desc: str, text: str):
-        self.add(desc, tk.Label(text=text))
-
-    def addBtn(self, label: str, command: Callable[..., None], *, width: int = 20, focus: bool = False):
-        frame = tk.Frame(self)
-        self.addFrame(frame)
-        btn = tk.Button(frame, text=label, width=width, command=command)
-        btn.pack(side="left", expand=True, padx=15)
-        if focus:
-            self._initFocusItem = btn
-
-    def addRadioBtn(self, desc: str, selectionList: list[str], *, selectedIndex: int | None = None, focusIndex: int | None = None):
-        frame = tk.Frame()
-        self.add(desc, frame)
-        var = tk.StringVar(value=selectionList[selectedIndex] if selectedIndex is not None else self.RADIO_NOTHING)
-        radioBtnList: list[tk.Radiobutton] = []
-        for version in selectionList:
-            radioBtn = tk.Radiobutton(frame, text=version, variable=var, value=version)
-            radioBtn.pack(side="left", padx=(0, 15))
-            radioBtnList.append(radioBtn)
-        if focusIndex is not None:
-            self._initFocusItem = radioBtnList[focusIndex]
-        return var
-
-    def addEntry(self, desc: str, text: str = '', *, width: int = 60, focus: bool = False):
-        entry = tk.Entry(self, width=30)
-        entry.insert(0, text)
-        self.add(desc, entry)
-        if focus:
-            self._initFocusItem = entry
-        return entry
-
-    def addScrolledText(self, desc: str, text: str = '', *, width: int = 60, height: int = 20, focus: bool = False):
-        scrolledText = ScrolledText(self, width=width, height=height)
-        scrolledText.insert("1.0", text)
-        self.add(desc, scrolledText)
-        if focus:
-            self._initFocusItem = scrolledText
-        return scrolledText
-
-    def addCheckBox(self, text: str, value: bool = False):
-        remember_var = tk.BooleanVar(value=value)
-        check_btn = tk.Checkbutton(text=text, variable=remember_var)
-        self.add("", check_btn)
-        return remember_var
-
-    def addPasswordInput(self, desc: str, *, width: int = 60, command: Callable[..., None] | None = None):
-        password_entry = tk.Entry(self, show="*", width=width)  # 使用 show="*" 隐藏输入内容
-        if command:
-            password_entry.bind('<Return>', lambda event: command())
-        self.add(desc, password_entry)
-        return password_entry
-
-
-''' 例子
-app = TkForm()
-app.title('更新版本信息')
-app.addLabel('当前版本号', '3.11.8')
-app.addLabel('上次更新时间', '2025-06-16 16:00:00')
-version_var = app.addRadioBtn(
-    '请选择新版本',
-    ['3.11.8', '3.11.9', '3.11.10'],
-    2,
-)
-log_text = app.addScrolledText('更新日志', '123\n23454asd这个')
-vara = app.addCheckBox('记住密码', False)
-varb = app.addCheckBox('阿萨德法师大润发', True)
-passwordInput = app.addPasswordInput('密码', command=lambda: onBtn())
-
-
-def onBtn():
-    print(version_var.get())
-    print(log_text.get('1.0', "end-1c").split('\n'))
-    app.destroy()
-
-
-app.addBtn('确定', onBtn)
-app.bind("<Visibility>", lambda e: passwordInput.focus_set())
-app.run()
-'''